diff --git a/flake.lock b/flake.lock index 064c92f..dfb9354 100644 --- a/flake.lock +++ b/flake.lock @@ -1518,9 +1518,12 @@ "shajra-private": { "locked": { "lastModified": 1703403775, - "narHash": "sha256-QHvYcT9XO+kPaPofpVqQLPeZOOQ6NhxnfTHFSspuN74=", - "path": "/home/shajra/src/shajra-private", - "type": "path" + "narHash": "sha256-sjpjPADRvk2HHszN+/807ZjEK9F3svgcdvnQo9RlaJ4=", + "ref": "refs/heads/main", + "rev": "225f23178657dcdb871e2fc8aea8729945cf7396", + "revCount": 2, + "type": "git", + "url": "ssh://tnks@cake/~/src/shajra/shajra-private?branch=main" }, "original": { "id": "shajra-private", diff --git a/flake.nix b/flake.nix index 1e98ea8..6296e58 100644 --- a/flake.nix +++ b/flake.nix @@ -91,6 +91,7 @@ nixosConfigurations.cake = configLib.nixosConfiguration { system = "x86_64-linux"; path = machines/target/cake; + privateModule = shajra-private.nixosModules.cake; }; darwinConfigurations.bagel = configLib.darwinConfiguration { system = "aarch64-darwin"; @@ -99,6 +100,7 @@ darwinConfigurations.lemon = configLib.darwinConfiguration { system = "aarch64-darwin"; path = machines/target/lemon; + privateModule = shajra-private.darwinModules.lemon; }; homeConfigurations.bagel = configLib.homeConfiguration { system = "aarch64-darwin"; @@ -122,9 +124,21 @@ path = home/target/shajra/lab.nix; }; - # DESIGN: "Slim" configurations below are for CI. These omit - # packages built independently, which helps avoid hitting - # job time and disk space limits in GitHub Actions. + # DESIGN: "Slim" configurations below are for CI. These + # avoid references to the shajra-private local Nix registry. + # For Home Manager, these also omit packages built + # independently, which helps avoid hitting job time and disk + # space limits. + + nixosConfigurations.cake-slim = configLib.nixosConfiguration { + system = "x86_64-linux"; + path = machines/target/cake; + }; + + darwinConfigurations.lemon-slim = configLib.darwinConfiguration { + system = "aarch64-darwin"; + path = machines/target/lemon; + }; homeConfigurations.bagel-slim = configLib.homeConfiguration { system = "aarch64-darwin"; diff --git a/garnix.yaml b/garnix.yaml index e996767..cacc17d 100644 --- a/garnix.yaml +++ b/garnix.yaml @@ -2,9 +2,6 @@ builds: include: - 'packages.*.*' - 'checks.*.*' - - 'nixosConfigurations.*' - - 'darwinConfigurations.*' - - 'homeConfigurations.bagel-slim' - - 'homeConfigurations.cake-slim' - - 'homeConfigurations.lemon-slim' - - 'homeConfigurations.shajra-slim' + - 'nixosConfigurations.*-slim' + - 'darwinConfigurations.*-slim' + - 'homeConfigurations.*-slim' diff --git a/machines/target/cake/default.nix b/machines/target/cake/default.nix index 7d5b1bc..a4f1a27 100644 --- a/machines/target/cake/default.nix +++ b/machines/target/cake/default.nix @@ -126,6 +126,7 @@ in { services.libinput.mouse.naturalScrolling = true; services.libinput.mouse.scrollMethod = "button"; services.locate.enable = true; + services.mealie.enable = true; services.ntp.enable = true; services.openssh.enable = true; services.openssh.extraConfig = ''AllowUsers tnks mzhajra'';