all repos — nixfiles @ d9b117b368db8071057e5ca0bd23448e45a6d8b3

System and user configuration, managed by nix and home-manager

Import private configuration on servers, as well Split out SSH configuration for now as they have their own SSH configs for unattended keys

Alan Pearce
commit

d9b117b368db8071057e5ca0bd23448e45a6d8b3

parent

8ec65b0e00d9ac15bc21d14072d0142ad0e7d85d

2 files changed, 15 insertions(+), 7 deletions(-)

jump to
M flake.lock → flake.lock
@@ -141,11 +141,11 @@ },
     "secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1685251658,
-        "narHash": "sha256-7e9RYUShuGvQT1Z15/tFQzRsd7GJDBeWazL14G3IqqY=",
-        "ref": "5fe9ee76eb7096fbab817d3fc1942f0840e4b72e",
-        "rev": "5fe9ee76eb7096fbab817d3fc1942f0840e4b72e",
-        "revCount": 46,
+        "lastModified": 1686549813,
+        "narHash": "sha256-PUlxkCDkEHFEI1kKoL3Hqyt0uGJAn02SfZ0d3iVXpMw=",
+        "ref": "refs/heads/main",
+        "rev": "c12bb9e097a58e53f0b7bb517e0973a34dce0ac6",
+        "revCount": 47,
         "type": "git",
         "url": "file:///home/alan/projects/alanpearce.eu/nixfiles/private"
       },
M flake.nix → flake.nix
@@ -46,6 +46,7 @@ pkgs = darwinPkgs;
         modules = [
           ./user/mba.nix
           (secrets + "/default.nix")
+          (secrets + "/ssh.nix")
           ({ nixpkgs.overlays = [ emacs-overlay.overlay ]; })
         ];
       };

@@ -54,16 +55,23 @@ pkgs = nixosPkgs;
         modules = [
           ./user/prefect.nix
           (secrets + "/default.nix")
+          (secrets + "/ssh.nix")
           ({ nixpkgs.overlays = [ emacs-overlay.overlay ]; })
         ];
       };
       homeConfigurations."alan@nanopi" = home-manager.lib.homeManagerConfiguration {
         pkgs = aarch64LinuxPackages;
-        modules = [ ./user/nanopi.nix ];
+        modules = [
+          ./user/nanopi.nix
+          (secrets + "/default.nix")
+        ];
       };
       homeConfigurations."alan@pappel" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixosPkgs;
-        modules = [ ./user/server.nix ];
+        modules = [
+          ./user/server.nix
+          (secrets + "/default.nix")
+        ];
       };
     };
 }