Mealie: Part 1

shajra · Nov 19, 2024 · b5b8d04 · b5b8d04
1 parent 2ea4d09
commit b5b8d04
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 45 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -81,7 +81,7 @@ jobs:
     - run: cat ~/.config/nix/nix.conf
     - run: nix flake check --no-build --verbose
     # DESIGN: Can't CI homes; even slimmed they're too big for GitHub
-    - run: nix run .#nixosConfigurations.cake.nixos-rebuild -- --flake .#cake build
+    - run: nix run .#nixosConfigurations.cake.nixos-rebuild -- --flake .#cake-slim build
   installers-darwin:
     needs: [pkgs-darwin]
     runs-on: macos-latest
@@ -103,4 +103,4 @@ jobs:
     - run: cat ~/.config/nix/nix.conf
     - run: nix flake check --no-build --verbose
     # DESIGN: Can't CI home because sketchybar-lua won't build on x86_64
-    - run: ./darwin-rebuild --flake .#bagel build
+    - run: ./darwin-rebuild --flake .#lemon-slim build
diff --git a/build/nixpkgs/packages/shajra-darwin-rebuild/default.nix b/build/nixpkgs/packages/shajra-darwin-rebuild/default.nix
@@ -26,7 +26,7 @@ set -eu
 set -o pipefail
 
 
-BOOTSTRAP="${sources.shajra-provisioning}#darwinConfigurations.bagel.system"
+BOOTSTRAP="${sources.shajra-provisioning}#darwinConfigurations.lemon.system"
 FLAKE="${sources.shajra-provisioning}#$(hostname)"
 HELP_RESPONSE=true
 NIX_EXE="$(command -v /run/current-system/sw/bin/nix \

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -86,23 +86,17 @@
             flake =
                 let configLib = import build/configurations.nix inputs withSystem;
                 in rec {
-                    checks.aarch64-darwin.ci-darwinConfiguration-bagel = darwinConfigurations.bagel.system;
                     overlays.default = import build/overlay.nix inputs withSystem;
+
                     nixosConfigurations.cake = configLib.nixosConfiguration {
                         system = "x86_64-linux";
                         path   = machines/target/cake;
-                    };
-                    darwinConfigurations.bagel = configLib.darwinConfiguration {
-                        system = "aarch64-darwin";
-                        path   = machines/target/bagel;
+                        privateModule = shajra-private.nixosModules.cake;
                     };
                     darwinConfigurations.lemon = configLib.darwinConfiguration {
                         system = "aarch64-darwin";
                         path   = machines/target/lemon;
-                    };
-                    homeConfigurations.bagel = configLib.homeConfiguration {
-                        system = "aarch64-darwin";
-                        path   = home/target/bagel;
+                        privateModule = shajra-private.darwinModules.lemon;
                     };
                     homeConfigurations.cake = configLib.homeConfiguration {
                         system = "x86_64-linux";
@@ -113,26 +107,20 @@
                         system = "aarch64-darwin";
                         path   = home/target/lemon;
                     };
-                    homeConfigurations.shajra = configLib.homeConfiguration {
-                        system = "x86_64-linux";
-                        path   = home/target/shajra;
-                    };
-                    homeConfigurations.shajra-lab = configLib.homeConfiguration {
-                        system = "x86_64-linux";
-                        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.
 
-                    homeConfigurations.bagel-slim = configLib.homeConfiguration {
-                        system = "aarch64-darwin";
-                        path   = home/target/bagel/slim.nix;
+                    nixosConfigurations.cake-slim = configLib.nixosConfiguration {
+                        system = "x86_64-linux";
+                        path   = machines/target/cake;
                     };
-                    homeConfigurations.bagel-fake-slim = configLib.homeConfiguration {
-                        system = "x86_64-darwin";
-                        path   = home/target/bagel/slim.nix;
+                    darwinConfigurations.lemon-slim = configLib.darwinConfiguration {
+                        system = "aarch64-darwin";
+                        path   = machines/target/lemon;
                     };
                     homeConfigurations.cake-slim = configLib.homeConfiguration {
                         system = "x86_64-linux";
@@ -142,14 +130,6 @@
                         system = "aarch64-darwin";
                         path   = home/target/lemon/slim.nix;
                     };
-                    homeConfigurations.lemon-fake-slim = configLib.homeConfiguration {
-                        system = "x86_64-darwin";
-                        path   = home/target/lemon/slim.nix;
-                    };
-                    homeConfigurations.shajra-slim = configLib.homeConfiguration {
-                        system = "x86_64-linux";
-                        path   = home/target/shajra/slim.nix;
-                    };
                 };
         });
 }
diff --git a/garnix.yaml b/garnix.yaml
@@ -2,9 +2,7 @@ builds:
   include:
   - 'packages.*.*'
   - 'checks.*.*'
-  - 'nixosConfigurations.*'
-  - 'darwinConfigurations.*'
-  - 'homeConfigurations.bagel-slim'
+  - 'nixosConfigurations.cake-slim'
+  - 'darwinConfigurations.lemon-slim'
   - 'homeConfigurations.cake-slim'
   - 'homeConfigurations.lemon-slim'
-  - 'homeConfigurations.shajra-slim'
diff --git 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'';