adama nixos config

Author: esselius

darwin-modules/context.nix

@@ -18,5 +18,8 @@ in
     nixpkgs-path = mkOption {
       type = path;
     };
+    nixpkgs-unstable-path = mkOption {
+      type = path;
+    };
   };
 }

flake.nix

@@ -79,13 +79,18 @@
 
               system.stateVersion = 4;
               nixpkgs-path = inputs.nixpkgs;
+              nixpkgs-unstable-path = inputs.nixpkgs-unstable;
             }
             inputs.home-manager.darwinModules.home-manager
             ({ config, ... }: {
               home-manager.users.${config.mainUser} = {
                 imports = [
                   ./home-configurations/peteresselius.nix
                   ./home-modules/default.nix
+                  inputs.agenix.homeManagerModules.default
+                  inputs.krewfile.homeManagerModules.krewfile
+                  inputs.nix-index-database.hmModules.nix-index
+                  inputs.nixvim.homeManagerModules.nixvim
                 ];
               };
               home-manager.extraSpecialArgs = { inherit inputs; };
@@ -114,8 +119,39 @@
           nix = ./home-modules/nix.nix;
           neovim = ./home-modules/neovim.nix;
         };
+
+        nixosConfigurations.adama = inputs.nixpkgs-nixos.lib.nixosSystem {
+          modules = [
+            ./nixos-configurations/adama.nix
+            ./nixos-modules/default.nix
+            inputs.raspberry-pi-nix.nixosModules.raspberry-pi
+            inputs.agenix.nixosModules.default
+            inputs.authentik-nix.nixosModules.default
+            {
+              _module.args.mkAuthentikScope = inputs.authentik-nix.lib.mkAuthentikScope;
+              nixpkgs-path = inputs.nixpkgs-nixos;
+              nixpkgs-unstable-path = inputs.nixpkgs-unstable;
+            }
+            inputs.home-manager-nixos.nixosModules.home-manager
+            ({ config, ... }: {
+              home-manager.users.${config.mainUser} = {
+                imports = [
+                  ./home-configurations/peteresselius.nix
+                  ./home-modules/default.nix
+                  inputs.agenix.homeManagerModules.default
+                  inputs.krewfile.homeManagerModules.krewfile
+                  inputs.nix-index-database.hmModules.nix-index
+                  inputs.nixvim.homeManagerModules.nixvim
+                ];
+              };
+              home-manager.extraSpecialArgs = { inherit inputs; };
+            })
+          ];
+          specialArgs = { inherit inputs; };
+        };
       };
 
+
       dev.enable = true;
     };
 }

home-configurations/peteresselius.nix

@@ -1,4 +1,4 @@
-{ inputs, config, ... }:
+{ config, ... }:
 
 {
   imports = [
@@ -10,10 +10,6 @@
     ../home-modules/git.nix
     ../home-modules/ssh.nix
     ../home-modules/profiles
-    inputs.agenix.homeManagerModules.default
-    inputs.krewfile.homeManagerModules.krewfile
-    inputs.nix-index-database.hmModules.nix-index
-    inputs.nixvim.homeManagerModules.nixvim
   ];
 
   config = {

home-modules/agenix.nix

@@ -1,16 +1,14 @@
-{ inputs, ezModules, config, ... }:
+{ config, ... }:
 
 {
-  _module.args.mkAuthentikScope = inputs.authentik-nix.lib.mkAuthentikScope;
-
   imports = [
-    ezModules.authentik-blueprints
-    ezModules.sshd
-    ezModules.user-peteresselius
-    ezModules.ca
-    ezModules.nginx
-    ezModules.nix-gc
-    ezModules.hardware-rpi5
+    ../nixos-modules/authentik-blueprints.nix
+    ../nixos-modules/sshd.nix
+    ../nixos-modules/user-peteresselius.nix
+    ../nixos-modules/ca.nix
+    ../nixos-modules/nginx.nix
+    ../nixos-modules/nix-gc.nix
+    ../nixos-modules/hardware-rpi5.nix
   ];
 
   nixpkgs.hostPlatform = "aarch64-linux";

nixos-configurations/adama.nix

@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkOption;
-  inherit (lib.types) enum str;
+  inherit (lib.types) enum str path;
 in
 {
   options = {
@@ -15,5 +15,11 @@ in
     mainUser = mkOption {
       type = str;
     };
+    nixpkgs-path = mkOption {
+      type = path;
+    };
+    nixpkgs-unstable-path = mkOption {
+      type = path;
+    };
   };
 }

nixos-modules/agenix.nix

@@ -1,11 +1,10 @@
-{ ezModules, ... }:
+{ ... }:
 
 {
   imports = [
-    ezModules.context
-    ezModules.agenix
-    ezModules.nix
-    ezModules.profiles
+    ./context.nix
+    ./nix.nix
+    ./profiles
     ../overlays.nix
   ];
 }

nixos-modules/context.nix

@@ -1,13 +1,9 @@
-{ inputs, lib, config, ... }:
+{ lib, config, ... }:
 
 let
   cfg = config.hardware-rpi5;
 in
 {
-  imports = [
-    inputs.raspberry-pi-nix.nixosModules.raspberry-pi
-  ];
-
   options.hardware-rpi5 = {
     enable = lib.mkEnableOption "Enable extra Raspberry Pi 5 hardware features";
     enableNVMe = lib.mkEnableOption "Enable NVMe support";

nixos-modules/default.nix

@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ config, ... }:
 
 {
   nix = {
@@ -8,16 +8,14 @@
 
     settings.trusted-users = [ "root" "@wheel" ];
 
-    registry.nixpkgs.flake = inputs.nixpkgs;
-
     optimise = {
       automatic = true;
       dates = [ "03:45" ];
     };
 
     nixPath = [
-      "nixpkgs=${inputs.nixpkgs}"
-      "nixpkgs-unstable=${inputs.nixpkgs-unstable}"
+      "nixpkgs=${config.nixpkgs-path}"
+      "nixpkgs-unstable=${config.nixpkgs-unstable-path}"
     ];
   };
 }