From 46f5b502625402b130a23b3f25d6c4395c154806 Mon Sep 17 00:00:00 2001 From: Mel Date: Fri, 3 Oct 2025 18:24:28 +0200 Subject: Rename Russian VPN server "zibeline" into "truite" I think when all our VPN server names start with a "T", it looks pretty nice! If you didn't notice: The "T" stands for "Tunnel"! :) Signed-off-by: Mel --- flake.nix | 4 ++-- machines/truite/default.nix | 51 ++++++++++++++++++++++++++++++++++++++++++ machines/truite/devices.nix | 39 ++++++++++++++++++++++++++++++++ machines/truite/hardware.nix | 23 +++++++++++++++++++ machines/truite/home.nix | 9 ++++++++ machines/zibeline/default.nix | 51 ------------------------------------------ machines/zibeline/devices.nix | 39 -------------------------------- machines/zibeline/hardware.nix | 23 ------------------- machines/zibeline/home.nix | 9 -------- secrets/keys.nix | 12 +++++----- secrets/secrets.nix | 6 ++--- 11 files changed, 133 insertions(+), 133 deletions(-) create mode 100644 machines/truite/default.nix create mode 100644 machines/truite/devices.nix create mode 100644 machines/truite/hardware.nix create mode 100644 machines/truite/home.nix delete mode 100644 machines/zibeline/default.nix delete mode 100644 machines/zibeline/devices.nix delete mode 100644 machines/zibeline/hardware.nix delete mode 100644 machines/zibeline/home.nix diff --git a/flake.nix b/flake.nix index 61c0522..2698651 100644 --- a/flake.nix +++ b/flake.nix @@ -62,10 +62,10 @@ machines = with systems; mkMachines [ { name = "corsac"; system = x86; tailscale.ip = "100.64.100.100"; } { name = "lapin"; system = arm; tailscale.ip = "100.83.254.27"; } - { name = "taupe"; system = arm; tailscale.ip = "100.103.211.75"; } { name = "renard"; system = x86; tailscale.ip = "100.75.17.75"; } { name = "fourmi"; system = arm; tailscale.ip = "100.99.119.83"; } - { name = "zibeline"; system = x86; tailscale.ip = "100.103.200.75"; } + { name = "taupe"; system = arm; tailscale.ip = "100.103.211.75"; } + { name = "truite"; system = x86; tailscale.ip = "100.103.200.75"; } { name = "taureau"; system = x86; tailscale.ip = "100.67.75.4"; } ]; diff --git a/machines/truite/default.nix b/machines/truite/default.nix new file mode 100644 index 0000000..9670da2 --- /dev/null +++ b/machines/truite/default.nix @@ -0,0 +1,51 @@ +{ me, machines, ... }: + +{ + imports = [ + ../../modules/common.nix + + ./hardware.nix + ./devices.nix + ]; + + foundation = { + www = { + enable = true; + + public = true; + tailnet = false; + }; + + monitoring = { + client.enable = true; + services = [ + "base" + "tailnet" + ]; + }; + + wireguard.server = { + enable = true; + externalInterface = "eth0"; + + peers = { + mel = { + key = "vnZoHXapCLLUhZ8A8R5W0iJ8LpWVLve29z41kkoT0BU="; + ip = 2; + }; + + andrei = { + key = "qqU4uYImLfUohIwl4KBshPtTINFcs0JVALjbmwpfxRg="; + ip = 3; + }; + + sergo = { + key = "qbZGMNIDZFCJC6SHtlyNIlIdGWHELceXClJCcagrj2Y="; + ip = 4; + }; + }; + }; + }; + + system.stateVersion = "25.05"; +} diff --git a/machines/truite/devices.nix b/machines/truite/devices.nix new file mode 100644 index 0000000..dce5ff2 --- /dev/null +++ b/machines/truite/devices.nix @@ -0,0 +1,39 @@ +{ config, lib, pkgs, ... }: + +{ + boot = { + loader.grub = { + enable = true; + device = "/dev/sda"; + }; + + kernelModules = [ "wireguard" ]; + + swraid.enable = true; + }; + + zramSwap = { + enable = true; + algorithm = "zstd"; + swapDevices = 1; + memoryPercent = 100; + }; + + networking = { + nameservers = [ + "9.9.9.9" + "149.112.112.112" + ]; + + useDHCP = false; + }; + + systemd.network.enable = true; + systemd.network.networks."10-wan" = { + name = "eth0"; + DHCP = "no"; + address = [ "194.169.163.56/24" ]; + gateway = [ "194.169.163.1" ]; + }; +} + diff --git a/machines/truite/hardware.nix b/machines/truite/hardware.nix new file mode 100644 index 0000000..b60a848 --- /dev/null +++ b/machines/truite/hardware.nix @@ -0,0 +1,23 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = [ ]; + + boot.initrd.availableKernelModules = [ "ata_piix" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/a029352d-e2e9-432d-ae2a-43921652ea8b"; + fsType = "ext4"; + }; + + swapDevices = [ ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + virtualisation.hypervGuest.enable = true; +} diff --git a/machines/truite/home.nix b/machines/truite/home.nix new file mode 100644 index 0000000..8f27ed2 --- /dev/null +++ b/machines/truite/home.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: + +{ + imports = [ + ../../modules/home/common.nix + ]; + + home.stateVersion = "25.05"; +} diff --git a/machines/zibeline/default.nix b/machines/zibeline/default.nix deleted file mode 100644 index 9670da2..0000000 --- a/machines/zibeline/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ me, machines, ... }: - -{ - imports = [ - ../../modules/common.nix - - ./hardware.nix - ./devices.nix - ]; - - foundation = { - www = { - enable = true; - - public = true; - tailnet = false; - }; - - monitoring = { - client.enable = true; - services = [ - "base" - "tailnet" - ]; - }; - - wireguard.server = { - enable = true; - externalInterface = "eth0"; - - peers = { - mel = { - key = "vnZoHXapCLLUhZ8A8R5W0iJ8LpWVLve29z41kkoT0BU="; - ip = 2; - }; - - andrei = { - key = "qqU4uYImLfUohIwl4KBshPtTINFcs0JVALjbmwpfxRg="; - ip = 3; - }; - - sergo = { - key = "qbZGMNIDZFCJC6SHtlyNIlIdGWHELceXClJCcagrj2Y="; - ip = 4; - }; - }; - }; - }; - - system.stateVersion = "25.05"; -} diff --git a/machines/zibeline/devices.nix b/machines/zibeline/devices.nix deleted file mode 100644 index dce5ff2..0000000 --- a/machines/zibeline/devices.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - boot = { - loader.grub = { - enable = true; - device = "/dev/sda"; - }; - - kernelModules = [ "wireguard" ]; - - swraid.enable = true; - }; - - zramSwap = { - enable = true; - algorithm = "zstd"; - swapDevices = 1; - memoryPercent = 100; - }; - - networking = { - nameservers = [ - "9.9.9.9" - "149.112.112.112" - ]; - - useDHCP = false; - }; - - systemd.network.enable = true; - systemd.network.networks."10-wan" = { - name = "eth0"; - DHCP = "no"; - address = [ "194.169.163.56/24" ]; - gateway = [ "194.169.163.1" ]; - }; -} - diff --git a/machines/zibeline/hardware.nix b/machines/zibeline/hardware.nix deleted file mode 100644 index b60a848..0000000 --- a/machines/zibeline/hardware.nix +++ /dev/null @@ -1,23 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - -{ - imports = [ ]; - - boot.initrd.availableKernelModules = [ "ata_piix" "sd_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = - { device = "/dev/disk/by-uuid/a029352d-e2e9-432d-ae2a-43921652ea8b"; - fsType = "ext4"; - }; - - swapDevices = [ ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - virtualisation.hypervGuest.enable = true; -} diff --git a/machines/zibeline/home.nix b/machines/zibeline/home.nix deleted file mode 100644 index 8f27ed2..0000000 --- a/machines/zibeline/home.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: - -{ - imports = [ - ../../modules/home/common.nix - ]; - - home.stateVersion = "25.05"; -} diff --git a/secrets/keys.nix b/secrets/keys.nix index 088a5c1..ab330ac 100644 --- a/secrets/keys.nix +++ b/secrets/keys.nix @@ -10,11 +10,6 @@ let system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGMD/EN9v8YgHOu4YG74Q+xvwjCdxbMIZjnQcUXi0QhZ"; }; - taupe = { - user = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDBv7uF/8uWEMO0RpWnUhhx/wcoEWyIGGOoBxk43vxh2"; - system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJG9kD3fE28ZOc4ISUnfZbSQFOwI1Bg3H2MvrhpPK3YT"; - }; - corsac = { user = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDlqytVSNMFAfbB+rdiNktv3WYViVBMeK7zUO2Pjfii+"; system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHxghVX0Oq+eHklg/e7s/qhC8CK8PLUgvpLk2G53xEjK"; @@ -25,7 +20,12 @@ let system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIClKCe1ziELUE1N+65xdpctJT1rpn5OgJd0NWNg6bW6J"; }; - zibeline = { + taupe = { + user = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDBv7uF/8uWEMO0RpWnUhhx/wcoEWyIGGOoBxk43vxh2"; + system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJG9kD3fE28ZOc4ISUnfZbSQFOwI1Bg3H2MvrhpPK3YT"; + }; + + truite = { user = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOLLEV06Tj36gqxMHrBNK7pb7VuSv4dDdKQH9Gvf4gDt"; system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBMUaDM6HdFXCSGzOR9KekbyBqog7blRiR6kEsiHJinm"; }; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 670f747..9fc5281 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -5,10 +5,10 @@ let inherit (keys.system) renard lapin - taupe corsac fourmi - zibeline + taupe + truite taureau ; in @@ -46,7 +46,7 @@ in renard taupe - zibeline + truite taureau ] ++ allAdmins; } -- cgit 1.4.1