From 1b36918cedb39d102575476be189f237ab14eb27 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 1 Mar 2025 15:58:02 -0600 Subject: [PATCH] feat: changed system naming convention --- flake.nix | 24 +++++++++---------- modules/nixos/default.nix | 6 ++--- profiles/user0/default.nix | 1 + profiles/user0/files/justfile | 2 +- systems/{callisto => charon}/config/boot.nix | 0 .../config/filesystem.nix | 4 ++-- .../{callisto => charon}/config/graphics.nix | 0 .../{callisto => charon}/config/hardware.nix | 0 .../config/networking.nix | 4 ++-- systems/{callisto => charon}/default.nix | 0 systems/{ganymede => deimos}/config/boot.nix | 0 .../config/filesystem.nix | 4 ++-- .../{ganymede => deimos}/config/graphics.nix | 0 .../{ganymede => deimos}/config/hardware.nix | 0 .../config/networking.nix | 4 ++-- systems/{ganymede => deimos}/config/sops.nix | 0 systems/{jupiter => deimos}/default.nix | 4 ++-- systems/{jupiter => mars}/config/boot.nix | 0 .../{jupiter => mars}/config/filesystem.nix | 14 +++++------ systems/{jupiter => mars}/config/graphics.nix | 0 systems/{jupiter => mars}/config/hardware.nix | 0 .../{jupiter => mars}/config/networking.nix | 7 +++--- systems/{jupiter => mars}/config/sops.nix | 0 systems/{ganymede => mars}/default.nix | 4 ++-- systems/{saturn => venus}/config/boot.nix | 0 .../{saturn => venus}/config/filesystem.nix | 14 +++++------ systems/{saturn => venus}/config/graphics.nix | 0 systems/{saturn => venus}/config/hardware.nix | 0 .../{saturn => venus}/config/networking.nix | 4 ++-- systems/{saturn => venus}/default.nix | 4 ++-- 30 files changed, 51 insertions(+), 49 deletions(-) rename systems/{callisto => charon}/config/boot.nix (100%) rename systems/{callisto => charon}/config/filesystem.nix (85%) rename systems/{callisto => charon}/config/graphics.nix (100%) rename systems/{callisto => charon}/config/hardware.nix (100%) rename systems/{callisto => charon}/config/networking.nix (92%) rename systems/{callisto => charon}/default.nix (100%) rename systems/{ganymede => deimos}/config/boot.nix (100%) rename systems/{ganymede => deimos}/config/filesystem.nix (97%) rename systems/{ganymede => deimos}/config/graphics.nix (100%) rename systems/{ganymede => deimos}/config/hardware.nix (100%) rename systems/{ganymede => deimos}/config/networking.nix (92%) rename systems/{ganymede => deimos}/config/sops.nix (100%) rename systems/{jupiter => deimos}/default.nix (88%) rename systems/{jupiter => mars}/config/boot.nix (100%) rename systems/{jupiter => mars}/config/filesystem.nix (87%) rename systems/{jupiter => mars}/config/graphics.nix (100%) rename systems/{jupiter => mars}/config/hardware.nix (100%) rename systems/{jupiter => mars}/config/networking.nix (89%) rename systems/{jupiter => mars}/config/sops.nix (100%) rename systems/{ganymede => mars}/default.nix (87%) rename systems/{saturn => venus}/config/boot.nix (100%) rename systems/{saturn => venus}/config/filesystem.nix (71%) rename systems/{saturn => venus}/config/graphics.nix (100%) rename systems/{saturn => venus}/config/hardware.nix (100%) rename systems/{saturn => venus}/config/networking.nix (84%) rename systems/{saturn => venus}/default.nix (88%) diff --git a/flake.nix b/flake.nix index 1031401..05e9ba1 100755 --- a/flake.nix +++ b/flake.nix @@ -74,11 +74,11 @@ { config, ... }: { nixosConfigurations = { - jupiter = inputs.self.lib.mkLinuxSystem [ - ./systems/jupiter + mars = inputs.self.lib.mkLinuxSystem [ + ./systems/mars ./profiles/user0 ./profiles/user1 - config.nixosModules.jupiter + config.nixosModules.mars config.nixosModules.core config.nixosModules.mantle config.nixosModules.crust @@ -89,10 +89,10 @@ inputs.sops-nix.nixosModules.sops inputs.nixvim.nixosModules.nixvim ]; - saturn = inputs.self.lib.mkLinuxSystem [ - ./systems/saturn + venus = inputs.self.lib.mkLinuxSystem [ + ./systems/venus ./profiles/user2 - config.nixosModules.saturn + config.nixosModules.venus config.nixosModules.core config.nixosModules.mantle config.nixosModules.crust @@ -100,11 +100,11 @@ inputs.lix-module.nixosModules.default inputs.sops-nix.nixosModules.sops ]; - ganymede = inputs.self.lib.mkLinuxSystem [ - ./systems/ganymede + deimos = inputs.self.lib.mkLinuxSystem [ + ./systems/deimos ./profiles/user0 ./profiles/user1 - config.nixosModules.ganymede + config.nixosModules.deimos config.nixosModules.core config.nixosModules.mantle config.nixosModules.crust @@ -113,10 +113,10 @@ inputs.nur.modules.nixos.default inputs.sops-nix.nixosModules.sops ]; - callisto = inputs.self.lib.mkLinuxSystem [ - ./systems/callisto + charon = inputs.self.lib.mkLinuxSystem [ + ./systems/charon ./profiles/user1 - config.nixosModules.callisto + config.nixosModules.charon config.nixosModules.core config.nixosModules.crust inputs.home-manager.nixosModules.home-manager diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index b1b397f..1f933cc 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -4,7 +4,7 @@ let in { flake.nixosModules = { - jupiter = { + mars = { imports = builtins.attrValues { inherit (modules) mullvad @@ -17,7 +17,7 @@ in }; }; - saturn = { + venus = { imports = builtins.attrValues { inherit (modules) plasma @@ -27,7 +27,7 @@ in }; }; - ganymede = { + deimos = { imports = builtins.attrValues { inherit (modules) gnome diff --git a/profiles/user0/default.nix b/profiles/user0/default.nix index cf65463..33ba64f 100755 --- a/profiles/user0/default.nix +++ b/profiles/user0/default.nix @@ -31,6 +31,7 @@ in "networkmanager" "nextcloud" "ollama" + "plugdev" "postgres" "redis-mastodon" "samba" diff --git a/profiles/user0/files/justfile b/profiles/user0/files/justfile index 4e83af0..3e7a82c 100755 --- a/profiles/user0/files/justfile +++ b/profiles/user0/files/justfile @@ -5,7 +5,7 @@ vpnoff: sudo protonvpn d rebuild: - nixos-rebuild switch --use-remote-sudo --flake ~/Files/Projects/dotfiles#jupiter --show-trace + nixos-rebuild switch --use-remote-sudo --flake ~/Files/Projects/dotfiles#mars --show-trace elm: cd ~/Files/Projects/website/frontend; elm-land server diff --git a/systems/callisto/config/boot.nix b/systems/charon/config/boot.nix similarity index 100% rename from systems/callisto/config/boot.nix rename to systems/charon/config/boot.nix diff --git a/systems/callisto/config/filesystem.nix b/systems/charon/config/filesystem.nix similarity index 85% rename from systems/callisto/config/filesystem.nix rename to systems/charon/config/filesystem.nix index a146e65..0a7cbd4 100755 --- a/systems/callisto/config/filesystem.nix +++ b/systems/charon/config/filesystem.nix @@ -5,7 +5,7 @@ }: let inherit (flake.config.people) user1; - inherit (flake.config.machines.devices) callisto; + inherit (flake.config.machines.devices) charon; in { fileSystems = { @@ -16,7 +16,7 @@ in "/boot" = { device = "/dev/disk/by-uuid/1703-D452"; fsType = "vfat"; - options = callisto.boot.options; + options = charon.boot.options; }; }; diff --git a/systems/callisto/config/graphics.nix b/systems/charon/config/graphics.nix similarity index 100% rename from systems/callisto/config/graphics.nix rename to systems/charon/config/graphics.nix diff --git a/systems/callisto/config/hardware.nix b/systems/charon/config/hardware.nix similarity index 100% rename from systems/callisto/config/hardware.nix rename to systems/charon/config/hardware.nix diff --git a/systems/callisto/config/networking.nix b/systems/charon/config/networking.nix similarity index 92% rename from systems/callisto/config/networking.nix rename to systems/charon/config/networking.nix index 451c38d..64ecc59 100755 --- a/systems/callisto/config/networking.nix +++ b/systems/charon/config/networking.nix @@ -5,12 +5,12 @@ }: let inherit (flake.config.machines.devices) - callisto + charon ; in { networking = { - hostName = callisto.name; + hostName = charon.name; networkmanager.enable = true; nftables.enable = true; useDHCP = lib.mkDefault true; diff --git a/systems/callisto/default.nix b/systems/charon/default.nix similarity index 100% rename from systems/callisto/default.nix rename to systems/charon/default.nix diff --git a/systems/ganymede/config/boot.nix b/systems/deimos/config/boot.nix similarity index 100% rename from systems/ganymede/config/boot.nix rename to systems/deimos/config/boot.nix diff --git a/systems/ganymede/config/filesystem.nix b/systems/deimos/config/filesystem.nix similarity index 97% rename from systems/ganymede/config/filesystem.nix rename to systems/deimos/config/filesystem.nix index bd0ba53..b8d6cc1 100755 --- a/systems/ganymede/config/filesystem.nix +++ b/systems/deimos/config/filesystem.nix @@ -9,7 +9,7 @@ let user1 ; inherit (flake.config.machines.devices) - ganymede + deimos synology ceres ; @@ -63,7 +63,7 @@ in "/boot" = { device = "/dev/disk/by-uuid/C506-9E18"; fsType = "vfat"; - options = ganymede.boot.options; + options = deimos.boot.options; }; } // (builtins.listToAttrs (map synologyMounts synologyDrives)) diff --git a/systems/ganymede/config/graphics.nix b/systems/deimos/config/graphics.nix similarity index 100% rename from systems/ganymede/config/graphics.nix rename to systems/deimos/config/graphics.nix diff --git a/systems/ganymede/config/hardware.nix b/systems/deimos/config/hardware.nix similarity index 100% rename from systems/ganymede/config/hardware.nix rename to systems/deimos/config/hardware.nix diff --git a/systems/ganymede/config/networking.nix b/systems/deimos/config/networking.nix similarity index 92% rename from systems/ganymede/config/networking.nix rename to systems/deimos/config/networking.nix index 9d71960..76d482e 100755 --- a/systems/ganymede/config/networking.nix +++ b/systems/deimos/config/networking.nix @@ -5,12 +5,12 @@ }: let inherit (flake.config.machines.devices) - ganymede + deimos ; in { networking = { - hostName = ganymede.name; + hostName = deimos.name; networkmanager.enable = true; nftables.enable = true; useDHCP = lib.mkDefault true; diff --git a/systems/ganymede/config/sops.nix b/systems/deimos/config/sops.nix similarity index 100% rename from systems/ganymede/config/sops.nix rename to systems/deimos/config/sops.nix diff --git a/systems/jupiter/default.nix b/systems/deimos/default.nix similarity index 88% rename from systems/jupiter/default.nix rename to systems/deimos/default.nix index 84ec802..a3744f2 100755 --- a/systems/jupiter/default.nix +++ b/systems/deimos/default.nix @@ -2,7 +2,7 @@ let configPath = ./config; - jupiterImports = + deimosImports = let files = builtins.attrNames (builtins.readDir configPath); in @@ -11,7 +11,7 @@ let ); in { - imports = jupiterImports; + imports = deimosImports; nixpkgs.hostPlatform = lib.mkForce "x86_64-linux"; system.stateVersion = lib.mkForce "24.05"; } diff --git a/systems/jupiter/config/boot.nix b/systems/mars/config/boot.nix similarity index 100% rename from systems/jupiter/config/boot.nix rename to systems/mars/config/boot.nix diff --git a/systems/jupiter/config/filesystem.nix b/systems/mars/config/filesystem.nix similarity index 87% rename from systems/jupiter/config/filesystem.nix rename to systems/mars/config/filesystem.nix index 97bae83..1cb70b1 100755 --- a/systems/jupiter/config/filesystem.nix +++ b/systems/mars/config/filesystem.nix @@ -9,7 +9,7 @@ let user1 ; inherit (flake.config.machines.devices) - jupiter + mars ceres synology ; @@ -50,11 +50,11 @@ in }; storageMounts = storageDrive: { - name = "${jupiter.${storageDrive}.mount}"; + name = "${mars.${storageDrive}.mount}"; value = { - device = jupiter.${storageDrive}.device; + device = mars.${storageDrive}.device; fsType = "ext4"; - options = jupiter.${storageDrive}.options; + options = mars.${storageDrive}.options; }; }; @@ -77,7 +77,7 @@ in "/boot" = { device = "/dev/disk/by-uuid/F095-17B7"; fsType = "vfat"; - options = jupiter.boot.options; + options = mars.boot.options; }; } // (builtins.listToAttrs (map synologyMounts synologyDrives)) @@ -91,8 +91,8 @@ in systemd.tmpfiles.rules = [ "Z ${config.home-manager.users.${user0}.home.homeDirectory} 0755 ${user0} users -" "Z ${config.home-manager.users.${user1}.home.homeDirectory} 0755 ${user1} users -" - "Z ${jupiter.storage0.mount} 0755 ${user0} users -" - "Z ${jupiter.storage1.mount} 0755 ${user0} users -" + "Z ${mars.storage0.mount} 0755 ${user0} users -" + "Z ${mars.storage1.mount} 0755 ${user0} users -" ]; services.udisks2.enable = true; diff --git a/systems/jupiter/config/graphics.nix b/systems/mars/config/graphics.nix similarity index 100% rename from systems/jupiter/config/graphics.nix rename to systems/mars/config/graphics.nix diff --git a/systems/jupiter/config/hardware.nix b/systems/mars/config/hardware.nix similarity index 100% rename from systems/jupiter/config/hardware.nix rename to systems/mars/config/hardware.nix diff --git a/systems/jupiter/config/networking.nix b/systems/mars/config/networking.nix similarity index 89% rename from systems/jupiter/config/networking.nix rename to systems/mars/config/networking.nix index ed015c6..2304177 100755 --- a/systems/jupiter/config/networking.nix +++ b/systems/mars/config/networking.nix @@ -5,12 +5,12 @@ }: let inherit (flake.config.machines.devices) - jupiter + mars ; in { networking = { - hostName = jupiter.name; + hostName = mars.name; networkmanager.enable = true; nftables.enable = true; useDHCP = lib.mkDefault true; @@ -22,7 +22,8 @@ in 2234 # Soulseek 3131 # Deskreen 1234 # Elm-land server - 55473 + 5037 # ADB Server + 52006 ]; }; }; diff --git a/systems/jupiter/config/sops.nix b/systems/mars/config/sops.nix similarity index 100% rename from systems/jupiter/config/sops.nix rename to systems/mars/config/sops.nix diff --git a/systems/ganymede/default.nix b/systems/mars/default.nix similarity index 87% rename from systems/ganymede/default.nix rename to systems/mars/default.nix index 067b37c..9cbf0e4 100755 --- a/systems/ganymede/default.nix +++ b/systems/mars/default.nix @@ -2,7 +2,7 @@ let configPath = ./config; - ganymedeImports = + marsImports = let files = builtins.attrNames (builtins.readDir configPath); in @@ -11,7 +11,7 @@ let ); in { - imports = ganymedeImports; + imports = marsImports; nixpkgs.hostPlatform = lib.mkForce "x86_64-linux"; system.stateVersion = lib.mkForce "24.05"; } diff --git a/systems/saturn/config/boot.nix b/systems/venus/config/boot.nix similarity index 100% rename from systems/saturn/config/boot.nix rename to systems/venus/config/boot.nix diff --git a/systems/saturn/config/filesystem.nix b/systems/venus/config/filesystem.nix similarity index 71% rename from systems/saturn/config/filesystem.nix rename to systems/venus/config/filesystem.nix index 6e54180..c517920 100755 --- a/systems/saturn/config/filesystem.nix +++ b/systems/venus/config/filesystem.nix @@ -5,7 +5,7 @@ }: let inherit (flake.config.people) user2; - inherit (flake.config.machines.devices) saturn; + inherit (flake.config.machines.devices) venus; in { imports = [ ]; @@ -18,11 +18,11 @@ in ]; storageMounts = storage: { - name = "${saturn.${storage}.mount}"; + name = "${venus.${storage}.mount}"; value = { - device = saturn.${storage}.device; + device = venus.${storage}.device; fsType = "ext4"; - options = saturn.${storage}.options; + options = venus.${storage}.options; }; }; in @@ -34,7 +34,7 @@ in "/boot" = { device = "/dev/disk/by-uuid/22BD-5A25"; fsType = "vfat"; - options = saturn.boot.options; + options = venus.boot.options; }; } // (builtins.listToAttrs (map storageMounts storageDrives)); @@ -45,8 +45,8 @@ in systemd.tmpfiles.rules = [ "Z ${config.home-manager.users.${user2}.home.homeDirectory} 0755 ${user2} users -" - "Z ${saturn.storage0.mount} 0755 ${user2} users -" - "Z ${saturn.storage1.mount} 0755 ${user2} users -" + "Z ${venus.storage0.mount} 0755 ${user2} users -" + "Z ${venus.storage1.mount} 0755 ${user2} users -" ]; services.udisks2.enable = true; diff --git a/systems/saturn/config/graphics.nix b/systems/venus/config/graphics.nix similarity index 100% rename from systems/saturn/config/graphics.nix rename to systems/venus/config/graphics.nix diff --git a/systems/saturn/config/hardware.nix b/systems/venus/config/hardware.nix similarity index 100% rename from systems/saturn/config/hardware.nix rename to systems/venus/config/hardware.nix diff --git a/systems/saturn/config/networking.nix b/systems/venus/config/networking.nix similarity index 84% rename from systems/saturn/config/networking.nix rename to systems/venus/config/networking.nix index 54bdeb3..b774ad9 100755 --- a/systems/saturn/config/networking.nix +++ b/systems/venus/config/networking.nix @@ -4,11 +4,11 @@ ... }: let - inherit (flake.config.machines.devices) saturn; + inherit (flake.config.machines.devices) venus; in { networking = { - hostName = saturn.name; + hostName = venus.name; networkmanager.enable = true; useDHCP = lib.mkDefault true; firewall = { diff --git a/systems/saturn/default.nix b/systems/venus/default.nix similarity index 88% rename from systems/saturn/default.nix rename to systems/venus/default.nix index 76e2a29..e5f8f64 100755 --- a/systems/saturn/default.nix +++ b/systems/venus/default.nix @@ -5,7 +5,7 @@ let configPath = ./config; - saturnImports = + venusImports = let files = builtins.attrNames (builtins.readDir configPath); in @@ -14,7 +14,7 @@ let ); in { - imports = saturnImports; + imports = venusImports; nixpkgs.hostPlatform = lib.mkForce "x86_64-linux"; system.stateVersion = lib.mkForce "24.05"; }