cilly/flakes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

winter: rename to blossom

Browse source
This commit is contained in:
LavaDesu 2021-11-02 00:53:56 +07:00
parent 72c6763508
commit f91c64d71e
Signed by: cilly
GPG key ID: 6500251E087653C9
10 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -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;
};

1
hosts/apricot/networking.nix
View file

@ -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

6
hosts/winter/default.nix → hosts/blossom/default.nix
View file

@ -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; [

19
hosts/winter/filesystem.nix → hosts/blossom/filesystem.nix
View file

@ -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";

0
hosts/winter/kernel.nix → hosts/blossom/kernel.nix
View file

1
hosts/winter/networking.nix → hosts/blossom/networking.nix
View file

@ -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

1
hosts/fondue/networking.nix
View file

@ -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
'';
};

2
modules/system/wireguard.nix
View file

@ -8,7 +8,7 @@ let
publicKey = "CpQJxoDeWJr7DdhbIO09svCxP7tuG2vUwRM8U4io5ms=";
allowedIPs = [ "10.100.0.2/32" ];
};
winter = {
blossom = {
publicKey = "6nVhazYdmC15A/nke9VrqIg3sOBVOmqj4GEsyBq7MVo=";
allowedIPs = [ "10.100.0.3/32" ];
};

14
secrets.nix
View file

@ -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 ];
}

0
secrets/wg_winter.age → secrets/wg_blossom.age
View file