Skip to content

Commit fa79aea

Browse files
micarteymicartey
committed
idk anymore
1 parent 663702c commit fa79aea

File tree

12 files changed

+72
-45
lines changed

12 files changed

+72
-45
lines changed

‎flake.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,19 @@
7474
modules = [ ./hosts/desktop/home ];
7575
};
7676

77-
# homeImg = nixpkgs.lib.nixosSystem {
78-
# inherit system;
79-
# specialArgs = {
80-
# inherit
81-
# inputs
82-
# pkgs-unstable
83-
# system
84-
# stateVersion
85-
# meta
86-
# ;
87-
# };
88-
# modules = [ ./hosts/img/configuration.nix ];
89-
# };
77+
homeImg = nixpkgs.lib.nixosSystem {
78+
inherit system;
79+
specialArgs = {
80+
inherit
81+
inputs
82+
pkgs-unstable
83+
system
84+
stateVersion
85+
meta
86+
;
87+
};
88+
modules = [ ./hosts/img/configuration.nix ];
89+
};
9090
};
9191
};
9292
}

‎home-manager/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
./editor.nix
1111
./shell.nix
1212

13-
inputs.catppuccin.homeManagerModules.catppuccin
13+
inputs.catppuccin.homeModules.catppuccin
1414
];
1515

1616
programs.home-manager.enable = true;

‎home-manager/desktop/hyprland.nix

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,6 @@ in
142142
"${mainMod}, mouse:273, resizewindow"
143143
];
144144

145-
windowrule = [ ];
146-
147145
windowrulev2 = [
148146
"float,title:(Picture-in-picture)"
149147
"float,title:(Picture-in-Picture)"

‎home-manager/shell.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ in
6767

6868
programs.git = {
6969
enable = true;
70+
lfs.enable = true;
7071

7172
userEmail = meta.git.email;
7273
userName = meta.git.username;

‎hosts/fonts.nix

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,13 @@
88
nerd-fonts.space-mono
99
helvetica-neue-lt-std
1010
];
11+
12+
fontconfig = {
13+
defaultFonts = {
14+
monospace = [ "Jetbrains Mono" ];
15+
sansSerif = [ "Jetbrains Mono" ];
16+
serif = [ "Jetbrains Mono" ];
17+
};
18+
};
1119
};
1220
}

‎hosts/img/configuration.nix

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ modulesPath, system, ... }:
1+
{ modulesPath, system, lib, pkgs, ... }:
22

33
let
44
# We need the absolute path to the project root for the imports
@@ -7,18 +7,20 @@ let
77
in
88
{
99
imports = [
10-
"${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
10+
# "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
11+
"${modulesPath}/profiles/qemu-guest.nix"
1112

1213
# Import the server configuration
1314
# This entrypoint would be called by the default in sirius which also imports the hardware configuration
1415
"${PROJECT_ROOT}/hosts/desktop/default.nix"
1516
];
1617

17-
# programs.zsh.initExtra = ''
18-
# if [[ $(id -u) -ne 1001 ]]; then
19-
# sudo su sirius
20-
# fi
21-
# '';
18+
19+
fileSystems."/" = {
20+
device = "/dev/disk/by-label/nixos";
21+
autoResize = true;
22+
fsType = "ext4";
23+
};
2224

2325
# Is that required? Idk, but it's here
2426
nixpkgs.hostPlatform = system;
@@ -28,4 +30,13 @@ in
2830
"console=ttyS0,115200"
2931
"console=tty1"
3032
];
33+
34+
boot.growPartition = true;
35+
boot.loader.grub.device = lib.mkDefault "/dev/vda"; # "nodev" for non x86_64-linux
36+
37+
boot.loader.grub.efiSupport = lib.mkIf (pkgs.stdenv.system != "x86_64-linux") (lib.mkDefault true);
38+
boot.loader.grub.efiInstallAsRemovable = lib.mkIf (pkgs.stdenv.system != "x86_64-linux") (
39+
lib.mkDefault true
40+
);
41+
boot.loader.timeout = 0;
3142
}

‎hosts/users.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
users = {
55
defaultUserShell = pkgs.zsh;
66
users = {
7-
root = {
8-
openssh.authorizedKeys.keys = [ (builtins.readFile ../../../dots/ssh/id_ed25519.pub) ];
9-
};
7+
# root = {
8+
# openssh.authorizedKeys.keys = [ (builtins.readFile ../../../dots/ssh/id_ed25519.pub) ];
9+
# };
1010

1111
${meta.user.username} = {
1212
isNormalUser = true;
@@ -18,10 +18,10 @@
1818
"wheel"
1919
"docker"
2020
"wireshark"
21-
"ydotool" # For typ
21+
"ydotool" # For typing
2222
"dialout" # For COM-Ports (Arduino)
2323
];
24-
openssh.authorizedKeys.keys = [ (builtins.readFile ../../../dots/ssh/id_ed25519.pub) ];
24+
# openssh.authorizedKeys.keys = [ (builtins.readFile ../../../dots/ssh/id_ed25519.pub) ];
2525
};
2626
};
2727
};

‎justfile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,15 @@ home-switch:
99
# 2. remove networking.networkmanager from cloudflare_dns.nix
1010
# 3. comment openssh.authorizedKeys.keys in users.nix
1111
home-iso:
12-
# NixOS-generators does not seem to do the trick
13-
NIX_BUILD_CORES=32 nix build \
14-
.#nixosConfigurations.homeImg.config.system.build.isoImage \
15-
--impure
12+
nix run github:nix-community/nixos-generators -- \
13+
--format qcow \
14+
--flake .#homeImg \
15+
-o result
16+
17+
sudo cp result/*.qcow2 nixos.qcow2
18+
sudo chown $(id -u):$(id -g) nixos.qcow2
19+
sudo chmod 600 nixos.qcow2
20+
1621

1722
home-vm:
1823
qemu-system-x86_64 \
@@ -26,3 +31,6 @@ home-vm:
2631

2732
flake-update:
2833
nix flake update
34+
35+
flake-update-unstable:
36+
nix flake update nixpkgs-unstable

‎modules/network/tailscale.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
{ config, ... }:
22

33
{
4-
54
services.tailscale = {
65
enable = true;
7-
extraUpFlags = [ "--ssh" ];
6+
extraUpFlags = [
7+
"--ssh"
8+
];
89
authKeyFile = config.sops.secrets."tailscale/auth_key".path;
910
};
1011

0 commit comments

Comments
 (0)