diff --git a/data.nix b/data.nix index 3a31dcf..c03e583 100644 --- a/data.nix +++ b/data.nix @@ -58,12 +58,12 @@ rec { vno4IP ]; }; - "sqq1-desk2.jakst.vpn" = rec { + "vno2-desk2.jakst.vpn" = rec { publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBKJjc2V5meA4+4O3GXX+Pwh6Lwwu4cvBGIZ52tufB4X"; system = "x86_64-linux"; jakstIP = "100.89.176.8"; extraHostNames = [ - "sqq1-desk2" + "vno2-desk2" jakstIP ]; }; diff --git a/flake.nix b/flake.nix index feadfd4..fd8a952 100644 --- a/flake.nix +++ b/flake.nix @@ -224,11 +224,11 @@ // inputs; }; - sqq1-desk2 = nixpkgs.lib.nixosSystem { + vno2-desk2 = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ { nixpkgs.overlays = baseOverlays; } - ./hosts/sqq1-desk2/configuration.nix + ./hosts/vno2-desk2/configuration.nix home-manager.nixosModules.home-manager agenix.nixosModules.default ]; @@ -297,12 +297,12 @@ }; }; - sqq1-desk2 = { - hostname = "sqq1-desk2.jakst.vpn"; + vno2-desk2 = { + hostname = "vno2-desk2.jakst.vpn"; profiles = { system = { sshUser = "motiejus"; - path = self.nixosConfigurations.sqq1-desk2.pkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.sqq1-desk2; + path = self.nixosConfigurations.vno2-desk2.pkgs.deploy-rs.lib.activate.nixos self.nixosConfigurations.vno2-desk2; user = "root"; }; }; diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix index 533fd5a..3ab44eb 100644 --- a/hosts/fwminex/configuration.nix +++ b/hosts/fwminex/configuration.nix @@ -484,7 +484,7 @@ in "fwminex.jakst.vpn" "mtworx.jakst.vpn" "vno1-gdrx.jakst.vpn" - "sqq1-desk2.jakst.vpn" + "vno2-desk2.jakst.vpn" ]; }; @@ -716,8 +716,8 @@ in pingTarget = "vno1-gdrx.jakst.vpn"; } { - derivationTarget = ".#sqq1-desk2"; - pingTarget = "sqq1-desk2.jakst.vpn"; + derivationTarget = ".#vno2-desk2"; + pingTarget = "vno2-desk2.jakst.vpn"; } ]; }; diff --git a/hosts/sqq1-desk2/configuration.nix b/hosts/vno2-desk2/configuration.nix similarity index 95% rename from hosts/sqq1-desk2/configuration.nix rename to hosts/vno2-desk2/configuration.nix index 4ce2154..0bc822f 100644 --- a/hosts/sqq1-desk2/configuration.nix +++ b/hosts/vno2-desk2/configuration.nix @@ -20,8 +20,8 @@ in age.secrets = { motiejus-passwd-hash.file = ../../secrets/motiejus_passwd_hash.age; root-passwd-hash.file = ../../secrets/root_passwd_hash.age; - syncthing-key.file = ../../secrets/sqq1-desk2/syncthing/key.pem.age; - syncthing-cert.file = ../../secrets/sqq1-desk2/syncthing/cert.pem.age; + syncthing-key.file = ../../secrets/vno2-desk2/syncthing/key.pem.age; + syncthing-cert.file = ../../secrets/vno2-desk2/syncthing/cert.pem.age; }; boot = { @@ -166,7 +166,7 @@ in networking = { hostId = "c14cbb01"; - hostName = "sqq1-desk2"; + hostName = "vno2-desk2"; domain = "jakst.vpn"; firewall.rejectPackets = true; }; diff --git a/modules/services/syncthing/default.nix b/modules/services/syncthing/default.nix index 4781d07..9e24c38 100644 --- a/modules/services/syncthing/default.nix +++ b/modules/services/syncthing/default.nix @@ -16,7 +16,7 @@ let "vno1-vinc".id = "4W3S7R2-OWI6XO6-V4NMDNB-NTIETYP-QJSBQGA-WEIXPHR-WNZZ7R4-VT4COAR"; "vno1-gdrx".id = "XOZO6GL-MEH55QR-PTNRVHE-45PD3L2-SHP7XW6-VXKROQ5-F47U3AX-QQACLQP"; "vno2-irena".id = "VL2MA2E-ZDGVHYN-A3Q3EKU-7J625QM-FG7CNXY-UKDL563-MDRRIEG-XQDS3AW"; - "sqq1-desk2".id = "HUM7DHH-54XEV44-UVIK3TJ-DDMUFKR-S6IHDMB-6XXOSP2-3RKL4TB-M5VCGAQ"; + "vno2-desk2".id = "HUM7DHH-54XEV44-UVIK3TJ-DDMUFKR-S6IHDMB-6XXOSP2-3RKL4TB-M5VCGAQ"; "vno3-nk".id = "HDESTGW-C3PGZLU-7V7KLWP-SIJVM3V-JEG6OMT-CGOLOQW-DZMIPS7-G7SVSQB"; "v-kfire".id = "REEDZAL-KPLWARZ-466J4BR-H5UDI6D-UUA33QG-HPZHIMX-WNFLDGD-PJLTFQZ"; "a-kfire".id = "VIQF4QW-2OLBBIK-XWOIO4A-264J32R-BE4J4BT-WEJXMYO-MXQDQHD-SJ6MEQ7"; @@ -76,7 +76,7 @@ let Vaikai = { devices = [ "vno1-vinc" - "sqq1-desk2" + "vno2-desk2" "vno1-gdrx" "fwminex" "mtworx" @@ -156,7 +156,7 @@ let "fwminex" "vno1-gdrx" "vno2-irena" - "sqq1-desk2" + "vno2-desk2" ]; id = "wuwai-qkcqj"; label = "Irenos"; @@ -216,16 +216,16 @@ in mxp1 vxp10 vno2-irena - sqq1-desk2 + vno2-desk2 rzj-744P2PE vno1-vinc v-kfire a-kfire ; }) - // (lib.optionalAttrs (config.networking.hostName == "sqq1-desk2") { + // (lib.optionalAttrs (config.networking.hostName == "vno2-desk2") { inherit (devices) - sqq1-desk2 + vno2-desk2 vxp10 mtworx fwminex @@ -256,7 +256,7 @@ in rzj-744P2PE vno1-vinc vno2-irena - sqq1-desk2 + vno2-desk2 v-kfire a-kfire ; @@ -264,7 +264,7 @@ in // (lib.optionalAttrs (config.networking.hostName == "mtworx") { inherit (devices) mtworx - sqq1-desk2 + vno2-desk2 vno1-gdrx vno3-nk fwminex @@ -328,7 +328,7 @@ in "${cfg.dataDir}/music" = Music; "${cfg.dataDir}/www" = www-vno1-gdrx; }) - // (lib.optionalAttrs (config.networking.hostName == "sqq1-desk2") { + // (lib.optionalAttrs (config.networking.hostName == "vno2-desk2") { "${cfg.dataDir}/Sync" = Irenos; "${cfg.dataDir}/Vaikai" = Vaikai; }); diff --git a/secrets.nix b/secrets.nix index 871e1b0..179f0e5 100644 --- a/secrets.nix +++ b/secrets.nix @@ -11,7 +11,7 @@ let fra1-c = (import ./data.nix).hosts."fra1-c.jakst.vpn".publicKey; mtworx = (import ./data.nix).hosts."mtworx.jakst.vpn".publicKey; vno1-gdrx = (import ./data.nix).hosts."vno1-gdrx.jakst.vpn".publicKey; - sqq1-desk2 = (import ./data.nix).hosts."sqq1-desk2.jakst.vpn".publicKey; + vno2-desk2 = (import ./data.nix).hosts."vno2-desk2.jakst.vpn".publicKey; systems = [ fra1-c @@ -19,7 +19,7 @@ let fwminex vno3-nk vno1-gdrx - sqq1-desk2 + vno2-desk2 ]; mk = @@ -48,9 +48,9 @@ in "secrets/vno3-nk/syncthing/cert.pem.age" "secrets/vno3-nk/borgbackup-password.age" ] -// mk ([ sqq1-desk2 ] ++ motiejus) [ - "secrets/sqq1-desk2/syncthing/key.pem.age" - "secrets/sqq1-desk2/syncthing/cert.pem.age" +// mk ([ vno2-desk2 ] ++ motiejus) [ + "secrets/vno2-desk2/syncthing/key.pem.age" + "secrets/vno2-desk2/syncthing/cert.pem.age" ] // mk ([ vno1-gdrx ] ++ motiejus) [ "secrets/vno1-gdrx/syncthing/key.pem.age" diff --git a/secrets/sqq1-desk2/syncthing/cert.pem.age b/secrets/vno2-desk2/syncthing/cert.pem.age similarity index 100% rename from secrets/sqq1-desk2/syncthing/cert.pem.age rename to secrets/vno2-desk2/syncthing/cert.pem.age diff --git a/secrets/sqq1-desk2/syncthing/key.pem.age b/secrets/vno2-desk2/syncthing/key.pem.age similarity index 100% rename from secrets/sqq1-desk2/syncthing/key.pem.age rename to secrets/vno2-desk2/syncthing/key.pem.age