diff --git a/README.md b/README.md index ef54f84..b2e015a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ NixOS - -# Snowflake +# My NixOs Empire My personal NixOS flake, building dotfiles for all of my systems and servers. @@ -11,11 +10,11 @@ Shell scripts are built from the flake at ## Hosts -- `zeus` - Desktop workstation/gaming pc -- `x1` - Thinkpad X1 Carbon gen11 work laptop -- `monitoring` - Grafana and prometheus server for monitoring Miso Bot -- `apollo` - Syncthing central sync node and cloud server for web services -- `archimedes` - Raspberry Pi 4B, local homelab for local services such as DNS +- `rome` - Desktop workstation/gaming pc +- `athens` - Thinkpad X1 Carbon gen11 work laptop +- `byzantium` - Grafana and prometheus server for monitoring Miso Bot +- `alexandria` - Syncthing central sync node and cloud server for web services +- `carthage` - Raspberry Pi 4B, local homelab for local services such as DNS ## Installing a configuration diff --git a/deployments.nix b/deployments.nix index 2083a1c..c91a421 100644 --- a/deployments.nix +++ b/deployments.nix @@ -3,28 +3,28 @@ let inherit (self.inputs) deploy-rs; x86 = { - apollo = { + alexandria = { hostname = "65.21.249.145"; profiles.system = { user = "root"; - path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.apollo; + path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.alexandria; }; }; - monitoring = { + byzantium = { hostname = "65.108.222.239"; profiles.system = { user = "root"; - path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.monitoring; + path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.byzantium; }; }; }; aarch64 = { - archimedes = { + kyoto = { hostname = "192.168.1.3"; profiles.system = { user = "root"; - path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.archimedes; + path = deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.kyoto; }; }; }; diff --git a/flake.nix b/flake.nix index 2bbd281..b60c621 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,6 @@ { - description = "A Special Snowflake :3"; + description = "The strength of an empire is in its cities, + for they are the pillars that uphold its greatness."; nixConfig = { extra-substituters = [ diff --git a/home-modules/common.nix b/home-modules/common.nix index 93e995d..7c689d9 100644 --- a/home-modules/common.nix +++ b/home-modules/common.nix @@ -45,6 +45,7 @@ # utils azure-cli + tree rsync pciutils usbutils diff --git a/hosts/apollo/default.nix b/hosts/alexandria/default.nix similarity index 99% rename from hosts/apollo/default.nix rename to hosts/alexandria/default.nix index 9a6f229..35bfe4f 100644 --- a/hosts/apollo/default.nix +++ b/hosts/alexandria/default.nix @@ -32,7 +32,7 @@ in }) ]; - networking.hostName = "apollo"; + networking.hostName = "alexandria"; nixpkgs.hostPlatform = "x86_64-linux"; system.stateVersion = "24.05"; diff --git a/hosts/apollo/secrets.yaml b/hosts/alexandria/secrets.yaml similarity index 100% rename from hosts/apollo/secrets.yaml rename to hosts/alexandria/secrets.yaml diff --git a/hosts/x1/default.nix b/hosts/athens/default.nix similarity index 97% rename from hosts/x1/default.nix rename to hosts/athens/default.nix index e9c0c8b..ed0f635 100644 --- a/hosts/x1/default.nix +++ b/hosts/athens/default.nix @@ -30,7 +30,7 @@ ]; networking = { - hostName = "x1"; + hostName = "athens"; hostId = "c08d7d71"; }; diff --git a/hosts/x1/hardware-configuration.nix b/hosts/athens/hardware-configuration.nix similarity index 100% rename from hosts/x1/hardware-configuration.nix rename to hosts/athens/hardware-configuration.nix diff --git a/hosts/monitoring/default.nix b/hosts/byzantium/default.nix similarity index 98% rename from hosts/monitoring/default.nix rename to hosts/byzantium/default.nix index b1bfeb5..6148465 100644 --- a/hosts/monitoring/default.nix +++ b/hosts/byzantium/default.nix @@ -24,7 +24,7 @@ in ]; nixpkgs.hostPlatform = "x86_64-linux"; - networking.hostName = "monitoring"; + networking.hostName = "byzantium"; environment.systemPackages = with pkgs; [ busybox ]; diff --git a/hosts/monitoring/secrets.yaml b/hosts/byzantium/secrets.yaml similarity index 100% rename from hosts/monitoring/secrets.yaml rename to hosts/byzantium/secrets.yaml diff --git a/hosts/default.nix b/hosts/default.nix index be751d6..cf27864 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -6,8 +6,8 @@ let email = "joonas@rautiola.co"; gpgKey = "0x090EB48A4669AA54"; sshKeys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGlFqSQFoSSuAS1IjmWBFXie329I5Aqf71QhVOnLTBG+ joonas@x1" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB3h/Aj66ndKFtqpQ8H53tE9KbbO0obThC0qbQQKFQRr joonas@zeus" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGlFqSQFoSSuAS1IjmWBFXie329I5Aqf71QhVOnLTBG+ joonas@athens" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB3h/Aj66ndKFtqpQ8H53tE9KbbO0obThC0qbQQKFQRr joonas@rome" ]; home = "/home/${user.name}"; }; @@ -18,25 +18,25 @@ let in { flake.nixosConfigurations = { - x1 = lib.nixosSystem { + athens = lib.nixosSystem { inherit specialArgs; - modules = [ ./x1 ]; + modules = [ ./athens ]; }; - zeus = lib.nixosSystem { + rome = lib.nixosSystem { inherit specialArgs; - modules = [ ./zeus ]; + modules = [ ./rome ]; }; - apollo = lib.nixosSystem { + alexandria = lib.nixosSystem { inherit specialArgs; - modules = [ ./apollo ]; + modules = [ ./alexandria ]; }; - monitoring = lib.nixosSystem { + byzantium = lib.nixosSystem { inherit specialArgs; - modules = [ ./monitoring ]; + modules = [ ./byzantium ]; }; - archimedes = lib.nixosSystem { + kyoto = lib.nixosSystem { inherit specialArgs; - modules = [ ./archimedes ]; + modules = [ ./kyoto ]; }; }; } diff --git a/hosts/archimedes/blocky.nix b/hosts/kyoto/blocky.nix similarity index 95% rename from hosts/archimedes/blocky.nix rename to hosts/kyoto/blocky.nix index a970b42..6b1e54b 100644 --- a/hosts/archimedes/blocky.nix +++ b/hosts/kyoto/blocky.nix @@ -54,9 +54,9 @@ access-point = [ "192.168.1.2" ]; # tailscale addresses pixel = [ "100.64.0.1" ]; - zeus = [ "100.64.0.3" ]; - archimedes = [ "100.64.0.3" ]; - x1 = [ "100.64.0.4" ]; + rome = [ "100.64.0.3" ]; + kyoto = [ "100.64.0.3" ]; + athens = [ "100.64.0.4" ]; }; }; diff --git a/hosts/archimedes/default.nix b/hosts/kyoto/default.nix similarity index 97% rename from hosts/archimedes/default.nix rename to hosts/kyoto/default.nix index d7cd7aa..66518d0 100644 --- a/hosts/archimedes/default.nix +++ b/hosts/kyoto/default.nix @@ -41,7 +41,7 @@ }; nixpkgs.hostPlatform = "aarch64-linux"; - networking.hostName = "archimedes"; + networking.hostName = "kyoto"; system.stateVersion = "24.05"; console.enable = false; diff --git a/hosts/archimedes/monitoring.nix b/hosts/kyoto/monitoring.nix similarity index 100% rename from hosts/archimedes/monitoring.nix rename to hosts/kyoto/monitoring.nix diff --git a/hosts/archimedes/rpi-exporter.nix b/hosts/kyoto/rpi-exporter.nix similarity index 100% rename from hosts/archimedes/rpi-exporter.nix rename to hosts/kyoto/rpi-exporter.nix diff --git a/hosts/archimedes/sdcard.nix b/hosts/kyoto/sdcard.nix similarity index 100% rename from hosts/archimedes/sdcard.nix rename to hosts/kyoto/sdcard.nix diff --git a/hosts/archimedes/unifi.nix b/hosts/kyoto/unifi.nix similarity index 100% rename from hosts/archimedes/unifi.nix rename to hosts/kyoto/unifi.nix diff --git a/hosts/zeus/default.nix b/hosts/rome/default.nix similarity index 98% rename from hosts/zeus/default.nix rename to hosts/rome/default.nix index b404b42..0b256e5 100644 --- a/hosts/zeus/default.nix +++ b/hosts/rome/default.nix @@ -39,7 +39,7 @@ }; networking = { - hostName = "zeus"; + hostName = "rome"; hostId = "c5a9072d"; }; diff --git a/hosts/zeus/hardware-configuration.nix b/hosts/rome/hardware-configuration.nix similarity index 100% rename from hosts/zeus/hardware-configuration.nix rename to hosts/rome/hardware-configuration.nix diff --git a/hosts/zeus/secrets.yaml b/hosts/rome/secrets.yaml similarity index 100% rename from hosts/zeus/secrets.yaml rename to hosts/rome/secrets.yaml