refactor: merge subflake back into main flake

this is annoying to maintain
catppuccin · Nov 27, 2024 · 645cd89 · 645cd89
1 parent d770f61
commit 645cd89
Show file tree

Hide file tree

Showing 7 changed files with 161 additions and 210 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -41,9 +41,7 @@ jobs:
 
       - name: Format changes
         run: |
-          nix run \
-            --inputs-from ./dev \
-            'nixpkgs#nixfmt-rfc-style' -- .
+          nix fmt
 
       - name: Commit changes
         run: |
@@ -75,7 +73,7 @@ jobs:
       - name: Run tests
         run: |
           nix run \
-            --inputs-from ./dev \
+            --inputs-from . \
             github:Mic92/nix-fast-build -- \
             --no-nom \
-            --flake "./dev#checks.$(nix eval --raw --impure --expr builtins.currentSystem)"
+            --flake ".#checks.$(nix eval --raw --impure --expr builtins.currentSystem)"
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -37,7 +37,7 @@ jobs:
           nix build \
             --print-build-logs \
             --show-trace \
-            './dev#site'
+            '.#site'
 
       - name: Get artifact directory
         id: find-path

diff --git a/dev/flake.lock b/dev/flake.lock
diff --git a/dev/flake.nix b/dev/flake.nix
diff --git a/flake.lock b/flake.lock