nix: Merge flakes into one

juanibiapina · May 7, 2024 · a213ec0 · a213ec0
1 parent 9097687
commit a213ec0
Show file tree

Hide file tree

Showing 9 changed files with 1,038 additions and 869 deletions.
diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml
@@ -28,4 +28,4 @@ jobs:
       - name: "Build desktop configuration"
         env:
           NIXPKGS_ALLOW_UNFREE: 1
-        run: "nix build ./assets/nix#nixosConfigurations.desktop.config.system.build.toplevel"
+        run: "nix build .#nixosConfigurations.desktop.config.system.build.toplevel"
diff --git a/.github/workflows/mini.yml b/.github/workflows/mini.yml
@@ -26,4 +26,4 @@ jobs:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
       - name: "Build mini configuration"
-        run: "nix build ./assets/nix#nixosConfigurations.mini.config.system.build.toplevel"
+        run: "nix build .#nixosConfigurations.mini.config.system.build.toplevel"
diff --git a/.github/workflows/upgrade.yml b/.github/workflows/upgrade.yml
@@ -28,10 +28,10 @@ jobs:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
       - name: "Update flake"
-        run: "cd assets/nix && nix flake update"
+        run: "nix flake update"
 
       - name: "Build mini configuration"
-        run: "nix build ./assets/nix#nixosConfigurations.mini.config.system.build.toplevel"
+        run: "nix build .#nixosConfigurations.mini.config.system.build.toplevel"
 
       - name: "Build desktop configuration"
-        run: "nix build ./assets/nix#nixosConfigurations.desktop.config.system.build.toplevel"
+        run: "nix build .#nixosConfigurations.desktop.config.system.build.toplevel"