diff options
| -rw-r--r-- | flake.nix | 9 | ||||
| -rw-r--r-- | system/boot/boot.nix | 1 | ||||
| -rw-r--r-- | system/filesystemLayouts/filesystemLayouts.nix | 22 | ||||
| -rw-r--r-- | system/users/users.nix | 2 |
4 files changed, 15 insertions, 19 deletions
diff --git a/flake.nix b/flake.nix index f0664d36..65a6f08c 100644 --- a/flake.nix +++ b/flake.nix @@ -12,10 +12,15 @@ nixpkgs, ... } @ attrs: { - nixosConfigurations.IDOHVE = nixpkgs.lib.nixosSystem { + nixosConfigurations.Tiamat = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; - modules = [./hosts/IDOHVE/configuration.nix]; + modules = [./hosts/Tiamat/configuration.nix]; + }; + nixosConfigurations.Apzu = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = attrs; + modules = [./hosts/Apzu/configuration.nix]; }; }; } diff --git a/system/boot/boot.nix b/system/boot/boot.nix index 629e63ae..511c14c5 100644 --- a/system/boot/boot.nix +++ b/system/boot/boot.nix @@ -7,6 +7,7 @@ initrd = { compressor = "lz4"; compressorArgs = ["-9"]; + kernelModules = [ "nvme" "btrfs" ]; }; kernelPackages = pkgs.linuxPackages_latest; diff --git a/system/filesystemLayouts/filesystemLayouts.nix b/system/filesystemLayouts/filesystemLayouts.nix index 5992179a..ad51bbb8 100644 --- a/system/filesystemLayouts/filesystemLayouts.nix +++ b/system/filesystemLayouts/filesystemLayouts.nix @@ -30,32 +30,22 @@ in { "/nix" = { device = cfg.mainDisk; fsType = "btrfs"; - options = ["subvol=@nix" "compress-force=zstd:9"]; + options = ["subvol=nix" "compress-force=zstd:15"]; }; - "/boot" = { - device = cfg.efiDisk; - fsType = "vfat"; - }; - - "/srv/home" = { + "/srv" = { device = cfg.mainDisk; fsType = "btrfs"; - options = ["subvol=@home" "compress-force=zstd:9"]; + options = ["subvol=storage" "compress-force=zstd:15"]; }; - "/srv/nixos-config" = { - device = cfg.mainDisk; - fsType = "btrfs"; - options = ["subvol=@nixos-config" "compress-force=zstd:9"]; + "/boot" = { + device = cfg.efiDisk; + fsType = "vfat"; }; "/etc/nixos" = { device = "/srv/nix-config"; options = ["bind"]; }; - "/home" = { - device = "/srv/home"; - options = ["bind"]; - }; }; swapDevices = []; }; diff --git a/system/users/users.nix b/system/users/users.nix index ca2fc352..2c962c26 100644 --- a/system/users/users.nix +++ b/system/users/users.nix @@ -7,7 +7,7 @@ mutableUsers = false; users.soispha = { isNormalUser = true; - home = "/home/soispha"; + home = "/srv/home/soispha"; shell = pkgs.zsh; initialHashedPassword = "$y$jFT$ONrCqZIJKB7engmfA4orD/$0GO58/wV5wrYWj0cyONhyujZPjFmbT0XKtx2AvXLG0B"; extraGroups = ["wheel"]; |