From 04e65f4939f161f5fb42a50731d4efba74bd3467 Mon Sep 17 00:00:00 2001 From: Alexander Date: Sun, 3 Aug 2025 21:12:53 +0200 Subject: [PATCH] Move izanagi configs to new structure --- flake.nix | 45 +++++++------------ machines/fujin/minimal/default.nix | 2 +- machines/izanagi/{ => main}/.sops.yaml | 0 machines/izanagi/{ => main}/default.nix | 2 - .../main}/disko-config.nix | 0 .../main}/hardware-configuration.nix | 0 machines/izanagi/{ => main}/home.nix | 0 .../izanagi/{ => main}/secrets/secrets.yaml | 0 machines/izanagi/{ => main}/sops.nix | 0 .../minimal}/default.nix | 8 ++-- .../minimal}/home.nix | 0 11 files changed, 21 insertions(+), 36 deletions(-) rename machines/izanagi/{ => main}/.sops.yaml (100%) rename machines/izanagi/{ => main}/default.nix (99%) rename machines/{izanagi-minimal => izanagi/main}/disko-config.nix (100%) rename machines/{izanagi-minimal => izanagi/main}/hardware-configuration.nix (100%) rename machines/izanagi/{ => main}/home.nix (100%) rename machines/izanagi/{ => main}/secrets/secrets.yaml (100%) rename machines/izanagi/{ => main}/sops.nix (100%) rename machines/{izanagi-minimal => izanagi/minimal}/default.nix (97%) rename machines/{izanagi-minimal => izanagi/minimal}/home.nix (100%) diff --git a/flake.nix b/flake.nix index 751405f..3115591 100644 --- a/flake.nix +++ b/flake.nix @@ -92,7 +92,7 @@ }; mkComputer = configurationNix: extraModules: username: inputs.nixpkgs.lib.nixosSystem { - specialArgs = { inherit inputs pkgs nixos-hardware extraHomeModules username; }; + specialArgs = { inherit inputs nixos-hardware extraHomeModules username; }; modules = [ disko.nixosModules.disko @@ -103,7 +103,7 @@ }; mkUnstableComputer = configurationNix: extraModules: username: inputs.unstable.lib.nixosSystem { - specialArgs = { inherit inputs upkgs nixos-hardware extraHomeModules username; }; + specialArgs = { inherit inputs nixos-hardware extraHomeModules username; }; modules = [ disko.nixosModules.disko @@ -145,35 +145,22 @@ ### # Proxmox Remote Dev Machine ### - izanagi-minimal = - let - username = "izanagi"; - in nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs extraHomeModules username;}; - modules = [ - disko.nixosModules.disko - home-manager.nixosModules.home-manager - ./machines/izanagi-minimal - ]; - }; - izanagi = - let - username = "izanagi"; - in nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs outputs extraHomeModules username;}; - modules = [ - disko.nixosModules.disko - home-manager.nixosModules.home-manager - sops-nix.nixosModules.sops + izanagi-minimal = mkComputer + ./machines/izanagi/minimal + [] + "izanagi"; + izanagi = mkComputer + ./machines/izanagi/main + [ + sops-nix.nixosModules.sops - # Applications - inputs.copyparty.nixosModules.default - inputs.vscode-server.nixosModules.default + # Applications + inputs.copyparty.nixosModules.default + inputs.vscode-server.nixosModules.default - ./machines/izanagi - ./modules - ]; - }; + ./modules + ] + "izanagi"; ### # Omen Laptop diff --git a/machines/fujin/minimal/default.nix b/machines/fujin/minimal/default.nix index a1d62c0..a5819ae 100644 --- a/machines/fujin/minimal/default.nix +++ b/machines/fujin/minimal/default.nix @@ -3,9 +3,9 @@ { imports = [ ../../minimal.nix + ../hardware-configuration.nix ../disko-config.nix - ]; users.users.${username} = { diff --git a/machines/izanagi/.sops.yaml b/machines/izanagi/main/.sops.yaml similarity index 100% rename from machines/izanagi/.sops.yaml rename to machines/izanagi/main/.sops.yaml diff --git a/machines/izanagi/default.nix b/machines/izanagi/main/default.nix similarity index 99% rename from machines/izanagi/default.nix rename to machines/izanagi/main/default.nix index 73c9f0c..78457a0 100644 --- a/machines/izanagi/default.nix +++ b/machines/izanagi/main/default.nix @@ -91,8 +91,6 @@ in { # This is fujin root user ssh key, it needs to be updated if fujin is reinstalled "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDbNm8WiTyYxEv0Hb9V/E84WH3fiCwWeYG9da8sDaU0V root@nixos" ]; - - shell = pkgs.zsh; }; environment.systemPackages = with pkgs; [ diff --git a/machines/izanagi-minimal/disko-config.nix b/machines/izanagi/main/disko-config.nix similarity index 100% rename from machines/izanagi-minimal/disko-config.nix rename to machines/izanagi/main/disko-config.nix diff --git a/machines/izanagi-minimal/hardware-configuration.nix b/machines/izanagi/main/hardware-configuration.nix similarity index 100% rename from machines/izanagi-minimal/hardware-configuration.nix rename to machines/izanagi/main/hardware-configuration.nix diff --git a/machines/izanagi/home.nix b/machines/izanagi/main/home.nix similarity index 100% rename from machines/izanagi/home.nix rename to machines/izanagi/main/home.nix diff --git a/machines/izanagi/secrets/secrets.yaml b/machines/izanagi/main/secrets/secrets.yaml similarity index 100% rename from machines/izanagi/secrets/secrets.yaml rename to machines/izanagi/main/secrets/secrets.yaml diff --git a/machines/izanagi/sops.nix b/machines/izanagi/main/sops.nix similarity index 100% rename from machines/izanagi/sops.nix rename to machines/izanagi/main/sops.nix diff --git a/machines/izanagi-minimal/default.nix b/machines/izanagi/minimal/default.nix similarity index 97% rename from machines/izanagi-minimal/default.nix rename to machines/izanagi/minimal/default.nix index 5b4bf61..9084d84 100644 --- a/machines/izanagi-minimal/default.nix +++ b/machines/izanagi/minimal/default.nix @@ -13,8 +13,10 @@ let in { imports = [ - ./hardware-configuration.nix - ./disko-config.nix + ../../minimal.nix + + ../hardware-configuration.nix + ../disko-config.nix ]; nixpkgs = { @@ -85,8 +87,6 @@ in { openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBcGhVpjmWEw1GEw0y/ysJPa2v3+u/Rt/iES/Se2huH2 alexander0derevianko@gmail.com" ]; - - shell = pkgs.zsh; }; environment.systemPackages = with pkgs; [ diff --git a/machines/izanagi-minimal/home.nix b/machines/izanagi/minimal/home.nix similarity index 100% rename from machines/izanagi-minimal/home.nix rename to machines/izanagi/minimal/home.nix