feat: add subflake for development & testing (#64)

catppuccin · Dec 16, 2023 · 07e54f5 · 07e54f5
1 parent cceb519
commit 07e54f5
Show file tree

Hide file tree

Showing 9 changed files with 151 additions and 121 deletions.
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -11,10 +11,14 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+
       - uses: cachix/install-nix-action@v23
-        with:
-          github_access_token: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Run formatter
-        run: nix fmt
+        run: |
+          pushd dev/
+          nix fmt
+          popd
+
       - name: Check for changes
         run: git diff --color=always --exit-code
diff --git a/.github/workflows/test-vm.yml b/.github/workflows/test-vm.yml
@@ -19,10 +19,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+
       - uses: cachix/install-nix-action@v23
         with:
           extra_nix_config: "system-features = benchmark big-parallel kvm nixos-test uid-range"
+
       - uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: Run VM
-        run: nix build -Lv .#checks.x86_64-linux.module-vm-test
+        run: |
+          nix build -Lv ./dev#checks.x86_64-linux.module-vm-test
diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml
@@ -32,7 +32,8 @@ jobs:
           echo "rev=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
 
       - name: Build doc
-        run: nix build .#${{ matrix.package }}-doc
+        run: |
+          nix build ./dev#${{ matrix.package }}-doc
 
       - name: Update doc
         run: cat result > docs/${{ matrix.package }}-options.md

diff --git a/.github/workflows/update-lock.yml b/.github/workflows/update-lock.yml
@@ -21,8 +21,10 @@ jobs:
 
       - name: Update flake inputs
         run: |
+          pushd dev
           nix flake update \
-            --commit-lock-file --commit-lockfile-summary "chore: update flake inputs"
+            --commit-lock-file --commit-lockfile-summary "chore: update dev flake inputs"
+          popd
 
       - name: Update upstream sources
         run: |

diff --git a/dev/flake.lock b/dev/flake.lock
diff --git a/dev/flake.nix b/dev/flake.nix
@@ -0,0 +1,66 @@
+{
+  description = "Soothing pastel theme for Nix";
+
+  inputs = {
+    nixpkgs.url = "nixpkgs/nixos-unstable";
+
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    call-flake.url = "github:divnix/call-flake";
+  };
+
+  outputs = { self, nixpkgs, call-flake, ... }@inputs:
+    let
+      systems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+
+      inherit (nixpkgs) lib;
+
+      forAllSystems = fn: lib.genAttrs systems (s: fn nixpkgs.legacyPackages.${s});
+      ctp = call-flake ../.;
+    in
+    {
+      checks = forAllSystems (pkgs: lib.optionalAttrs pkgs.stdenv.isLinux {
+        module-vm-test = pkgs.nixosTest (import ../test.nix { inherit ctp inputs; });
+      });
+
+      formatter = forAllSystems (pkgs: pkgs.nixpkgs-fmt);
+
+      packages = forAllSystems (pkgs:
+        let
+          eval = module: lib.evalModules {
+            modules = [
+              module
+              {
+                _module.check = false;
+              }
+            ];
+          };
+
+          mkDoc = name: module:
+            let
+              doc = pkgs.nixosOptionsDoc {
+                options = lib.filterAttrs (n: _: n != "_module") (eval module).options;
+                documentType = "none";
+                revision = builtins.substring 0 8 self.rev or "dirty";
+              };
+            in
+            pkgs.runCommand "${name}-module-doc.md" { } ''
+              cat ${doc.optionsCommonMark} > $out
+            '';
+        in
+        {
+          nixos-doc = mkDoc "nixos" ctp.nixosModules.catppuccin;
+          home-manager-doc = mkDoc "home-manager" ctp.homeManagerModules.catppuccin;
+
+          default = self.packages.${pkgs.system}.home-manager-doc;
+        });
+    };
+}
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,70 +1,8 @@
 {
   description = "Soothing pastel theme for Nix";
 
-  inputs = {
-    nixpkgs.url = "nixpkgs/nixos-unstable";
-
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+  outputs = _: {
+    homeManagerModules.catppuccin = import ./modules/home-manager;
+    nixosModules.catppuccin = import ./modules/nixos;
   };
-
-  outputs = { self, nixpkgs, ... }@inputs:
-    let
-      systems = [
-        "x86_64-linux"
-        "aarch64-linux"
-        "x86_64-darwin"
-        "aarch64-darwin"
-      ];
-
-      inherit (nixpkgs) lib;
-
-      forAllSystems = fn: lib.genAttrs systems (s: fn nixpkgs.legacyPackages.${s});
-    in
-    {
-      checks = forAllSystems (pkgs: lib.optionalAttrs pkgs.stdenv.isLinux {
-        module-vm-test = pkgs.nixosTest (import ./test.nix { inherit self inputs; });
-      });
-
-      formatter = forAllSystems (pkgs: pkgs.nixpkgs-fmt);
-
-      homeManagerModules.catppuccin = import ./modules/home-manager;
-
-      nixosModules.catppuccin = import ./modules/nixos;
-
-      packages = forAllSystems (pkgs:
-        let
-          eval = module: lib.evalModules {
-            modules = [
-              module
-              {
-                _module = {
-                  check = false;
-                  args.lib = import ./modules/lib/mkExtLib.nix lib;
-                };
-              }
-            ];
-          };
-
-          mkDoc = name: module:
-            let
-              doc = pkgs.nixosOptionsDoc {
-                options = lib.filterAttrs (n: _: n != "_module") (eval module).options;
-                documentType = "none";
-                revision = builtins.substring 0 8 self.rev or "dirty";
-              };
-            in
-            pkgs.runCommand "${name}-module-doc.md" { } ''
-              cat ${doc.optionsCommonMark} > $out
-            '';
-        in
-        {
-          nixos-doc = mkDoc "nixos" self.nixosModules.catppuccin;
-          home-manager-doc = mkDoc "home-manager" self.homeManagerModules.catppuccin;
-
-          default = self.packages.${pkgs.system}.home-manager-doc;
-        });
-    };
 }
diff --git a/test.nix b/test.nix
@@ -1,4 +1,4 @@
-{ self
+{ ctp
 , inputs
 , ...
 }:
@@ -21,7 +21,7 @@ in
 
   nodes.machine = { lib, ... }: {
     imports = [
-      self.nixosModules.catppuccin
+      ctp.nixosModules.catppuccin
       inputs.home-manager.nixosModules.default
       common
     ];
@@ -37,7 +37,7 @@ in
 
     home-manager.users.test = {
       imports = [
-        self.homeManagerModules.catppuccin
+        ctp.homeManagerModules.catppuccin
       ];
 
       inherit (common) catppuccin;