diff --git a/flake.nix b/flake.nix index ed4be5e..e9a9a9d 100644 --- a/flake.nix +++ b/flake.nix @@ -111,8 +111,8 @@ in { nixosConfigurations."apricot" = mkSystem "apricot" "x86_64-linux" false; + nixosConfigurations."blossom" = mkSystem "blossom" "x86_64-linux" true; nixosConfigurations."fondue" = mkSystem "fondue" "x86_64-linux" false; - nixosConfigurations."winter" = mkSystem "winter" "x86_64-linux" true; packages.x86_64-linux = customPackages nixpkgs.legacyPackages.x86_64-linux; }; diff --git a/hosts/apricot/networking.nix b/hosts/apricot/networking.nix index bafab92..f1a2f9f 100644 --- a/hosts/apricot/networking.nix +++ b/hosts/apricot/networking.nix @@ -26,6 +26,7 @@ 192.168.100.11 peach 192.168.100.12 butterfly 192.168.100.13 winter + 192.168.100.13 blossom 192.168.100.14 apricot 10.100.0.1 fondue diff --git a/hosts/winter/default.nix b/hosts/blossom/default.nix similarity index 78% rename from hosts/winter/default.nix rename to hosts/blossom/default.nix index 936ba0c..6ce1f0f 100644 --- a/hosts/winter/default.nix +++ b/hosts/blossom/default.nix @@ -1,11 +1,11 @@ { config, modules, overlays, pkgs, ... }: { - networking.hostName = "winter"; - system.stateVersion = "20.09"; + networking.hostName = "blossom"; + system.stateVersion = "21.05"; time.timeZone = "Asia/Phnom_Penh"; age.secrets = { passwd.file = ../../secrets/passwd.age; - wg_winter.file = ../../secrets/wg_winter.age; + wg_blossom.file = ../../secrets/wg_blossom.age; wpa_conf.file = ../../secrets/wpa_conf.age; }; imports = with modules.system; [ diff --git a/hosts/winter/filesystem.nix b/hosts/blossom/filesystem.nix similarity index 54% rename from hosts/winter/filesystem.nix rename to hosts/blossom/filesystem.nix index 519698b..c971324 100644 --- a/hosts/winter/filesystem.nix +++ b/hosts/blossom/filesystem.nix @@ -5,8 +5,8 @@ let fsType = type; options = [ "defaults" "relatime" ]; }; - mkBtrfsMount = subvolid: atime: mkMount "8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d" "btrfs" // { - options = [ "autodefrag" "compress=zstd:3" "defaults" "nossd" "nossd_spread" "subvolid=${builtins.toString subvolid}" (if atime then "relatime" else "noatime")]; + mkBtrfsMount = subvolid: atime: mkMount "cf0f4302-f006-46a5-afc7-ada04d17f6f2" "btrfs" // { + options = [ "autodefrag" "compress=zstd:3" "defaults" "discard=async" "space_cache=v2" "ssd" "subvolid=${builtins.toString subvolid}" (if atime then "relatime" else "noatime") ]; }; in { @@ -16,15 +16,18 @@ in fsType = "tmpfs"; options = [ "defaults" "size=4G" "mode=755" ]; }; - "/boot" = mkMount "E8E8-E570" "vfat"; + "/boot" = mkMount "186A-A42E" "vfat"; "/mnt/hdd" = mkMount "d5e3cfe5-c73a-4695-b81b-fc0215d4cefe" "ext4"; + "/mnt/prev" = mkMount "8f0ba28e-5dff-4a4e-8db0-aa72cc90cb5d" "btrfs" // { + options = [ "autodefrag" "compress=zstd:3" "defaults" "nossd" "noatime" "ro" ]; + }; "/mnt/butter" = mkBtrfsMount 5 true; - "/nix" = mkBtrfsMount 258 false; - "/home" = mkBtrfsMount 260 true; - "/home/.snapshots" = mkBtrfsMount 319 false; - "/root" = mkBtrfsMount 261 false; - "/var" = mkBtrfsMount 259 false; + "/nix" = mkBtrfsMount 257 false; + "/home" = mkBtrfsMount 259 true; + "/home/.snapshots" = mkBtrfsMount 262 false; + "/root" = mkBtrfsMount 260 false; + "/var" = mkBtrfsMount 258 false; # "/mnt/nfs" = { # device = "192.168.100.11:/srv/nfs"; diff --git a/hosts/winter/kernel.nix b/hosts/blossom/kernel.nix similarity index 100% rename from hosts/winter/kernel.nix rename to hosts/blossom/kernel.nix diff --git a/hosts/winter/networking.nix b/hosts/blossom/networking.nix similarity index 96% rename from hosts/winter/networking.nix rename to hosts/blossom/networking.nix index 50077b3..9edb0f8 100644 --- a/hosts/winter/networking.nix +++ b/hosts/blossom/networking.nix @@ -26,6 +26,7 @@ 192.168.100.11 peach 192.168.100.12 butterfly 192.168.100.13 winter + 192.168.100.13 blossom 192.168.100.14 apricot 10.100.0.1 fondue diff --git a/hosts/fondue/networking.nix b/hosts/fondue/networking.nix index c159468..4a574cb 100644 --- a/hosts/fondue/networking.nix +++ b/hosts/fondue/networking.nix @@ -13,6 +13,7 @@ extraHosts = '' 10.100.0.2 apricot 10.100.0.3 winter + 10.100.0.3 blossom 10.100.0.4 strawberry ''; }; diff --git a/modules/system/wireguard.nix b/modules/system/wireguard.nix index c0a49d9..3498660 100644 --- a/modules/system/wireguard.nix +++ b/modules/system/wireguard.nix @@ -8,7 +8,7 @@ let publicKey = "CpQJxoDeWJr7DdhbIO09svCxP7tuG2vUwRM8U4io5ms="; allowedIPs = [ "10.100.0.2/32" ]; }; - winter = { + blossom = { publicKey = "6nVhazYdmC15A/nke9VrqIg3sOBVOmqj4GEsyBq7MVo="; allowedIPs = [ "10.100.0.3/32" ]; }; diff --git a/secrets.nix b/secrets.nix index 20ff733..9f51f7f 100644 --- a/secrets.nix +++ b/secrets.nix @@ -1,16 +1,16 @@ let apricot = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGGS0M4BOLiVUM/qdUpcg9Y4aTeyDfyQl89uhXwFORjn"; + blossom = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5wfPCcpkNR3ubr7cBV0UwVCDo/sMmV0aI/JOJTIxQj"; fondue = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIkKZYsYWnI+MgecBjOwf7aL5jtiT0ymCDme3pzucTei"; - winter = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA5wfPCcpkNR3ubr7cBV0UwVCDo/sMmV0aI/JOJTIxQj"; rin-apricot = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINxzygMMJ/hmPRUeQu/eMmEhAKfFSFIEVstDIerPzxgZ"; + rin-blossom = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPru5eTBvHJ4ZmrrzPRHCGM09wQP/ZHSaKYalDuBVO15"; rin-fondue = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKbPamP5bovUsrBNYnjOk4SN2TaQZAVlJ+4JldK2cL5M"; - rin-winter = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPru5eTBvHJ4ZmrrzPRHCGM09wQP/ZHSaKYalDuBVO15"; in { - "secrets/passwd.age".publicKeys = [ apricot fondue winter rin-apricot rin-fondue rin-winter ]; - "secrets/wpa_conf.age".publicKeys = [ apricot winter rin-apricot rin-winter ]; + "secrets/passwd.age".publicKeys = [ apricot fondue blossom rin-apricot rin-fondue rin-blossom ]; + "secrets/wpa_conf.age".publicKeys = [ apricot blossom rin-apricot rin-blossom ]; - "secrets/wg_apricot.age".publicKeys = [ apricot rin-apricot rin-winter ]; - "secrets/wg_fondue.age".publicKeys = [ fondue rin-fondue rin-winter ]; - "secrets/wg_winter.age".publicKeys = [ winter rin-winter ]; + "secrets/wg_apricot.age".publicKeys = [ apricot rin-apricot rin-blossom ]; + "secrets/wg_fondue.age".publicKeys = [ fondue rin-fondue rin-blossom ]; + "secrets/wg_blossom.age".publicKeys = [ blossom rin-blossom ]; } diff --git a/secrets/wg_winter.age b/secrets/wg_blossom.age similarity index 100% rename from secrets/wg_winter.age rename to secrets/wg_blossom.age