Merge pull request #47 from tsandrini/parts-update

ci(workflows): post update fixes
tsandrini · Aug 5, 2024 · 89740c0 · 89740c0
2 parents 9eac892 + 1b450c4
commit 89740c0
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 58 deletions.
diff --git a/.github/workflows/cachix-push.yml b/.github/workflows/cachix-push.yml
@@ -16,19 +16,18 @@ jobs:
 
       - name: "Installing and configuring the nix package manager..."
         uses: DeterminateSystems/nix-installer-action@main
-
-      - name: "Setting up magic-nix-cache..."
-        uses: DeterminateSystems/magic-nix-cache-action@main
         with:
           extra-conf: |
             accept-flake-config = true
+            allow-import-from-derivation = true
+
+      - name: "Setting up magic-nix-cache..."
+        uses: DeterminateSystems/magic-nix-cache-action@main
 
       - name: "Settings up cachix binary cache..."
         uses: cachix/cachix-action@v15
         with:
-          name: mycache
-          # If you chose signing key for write access
-          signingKey: "${{ secrets.CACHIX_SIGNING_KEY }}"
+          name: tsandrini
           # If you chose API tokens for write access OR if you have a private cache
           authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
 

diff --git a/.github/workflows/flake-check.yml b/.github/workflows/flake-check.yml
@@ -23,6 +23,7 @@ jobs:
         with:
           extra-conf: |
             accept-flake-config = true
+            allow-import-from-derivation = true
 
       - name: "Setting up magic-nix-cache..."
         uses: DeterminateSystems/magic-nix-cache-action@main

diff --git a/.github/workflows/flakehub-publish.yml b/.github/workflows/flakehub-publish.yml
@@ -22,6 +22,7 @@ jobs:
         with:
           extra-conf: |
             accept-flake-config = true
+            allow-import-from-derivation = true
 
       - name: "Setting up magic-nix-cache..."
         uses: DeterminateSystems/magic-nix-cache-action@main

diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml
@@ -18,6 +18,7 @@ jobs:
         with:
           extra-conf: |
             accept-flake-config = true
+            allow-import-from-derivation = true
 
       - name: "Setting up magic-nix-cache..."
         uses: DeterminateSystems/magic-nix-cache-action@main

diff --git a/flake-parts/homes/default.nix b/flake-parts/homes/default.nix
@@ -12,65 +12,60 @@
 # 888   88888888 888  888 "Y8888b. 888  888 888     888    888 888 88888888 "Y8888b.
 # Y88b. Y8b.     888  888      X88 Y88..88P 888     888    888 888 Y8b.          X88
 #  "Y888 "Y8888  888  888  88888P'  "Y88P"  888     888    888 888  "Y8888   88888P'
-{
-  lib,
-  inputs,
-  withSystem,
-  config,
-  ...
-}:
-let
-  mkHome =
-    args: home:
-    {
-      extraSpecialArgs ? { },
-      extraModules ? [ ],
-      extraOverlays ? [ ],
-      ...
-    }:
-    inputs.home-manager.lib.homeManagerConfiguration {
-      inherit (args) pkgs;
-      extraSpecialArgs = {
-        inherit (args) system;
-        inherit inputs home;
-      } // extraSpecialArgs;
-      modules =
-        [
-          {
-            nixpkgs.overlays = extraOverlays;
-            nixpkgs.config.allowUnfree = true;
-          }
-          ./${home}
-        ]
-        ++ extraModules
-        # Disabled by default, therefore load every module and enable via attributes
-        # instead of imports
-        ++ (lib.attrValues config.flake.homeModules);
-    };
-in
+{ lib, config, ... }:
+# let
+#   mkHome =
+#     args: home:
+#     {
+#       extraSpecialArgs ? { },
+#       extraModules ? [ ],
+#       extraOverlays ? [ ],
+#       ...
+#     }:
+#     inputs.home-manager.lib.homeManagerConfiguration {
+#       inherit (args) pkgs;
+#       extraSpecialArgs = {
+#         inherit (args) system;
+#         inherit inputs home;
+#       } // extraSpecialArgs;
+#       modules =
+#         [
+#           {
+#             nixpkgs.overlays = extraOverlays;
+#             nixpkgs.config.allowUnfree = true;
+#           }
+#           ./${home}
+#         ]
+#         ++ extraModules
+#         # Disabled by default, therefore load every module and enable via attributes
+#         # instead of imports
+#         ++ (lib.attrValues config.flake.homeModules);
+#     };
+# in
 {
   options.flake.homeConfigurations = lib.mkOption {
     type = with lib.types; lazyAttrsOf unspecified;
     default = { };
   };
 
   config = {
-    flake.homeConfigurations = {
-      "tsandrini@jetbundle" = withSystem "x86_64-linux" (
-        args:
-        mkHome args "tsandrini@jetbundle" {
-          extraOverlays = with inputs; [
-            neovim-nightly-overlay.overlays.default
-            emacs-overlay.overlays.default
-            nur.overlay
-            # (final: _prev: { nur = import inputs.nur { pkgs = final; }; })
-          ];
-        }
-      );
-    };
+    # TODO free up computing power since I am not using this atm
+    # flake.homeConfigurations = {
+    #   "tsandrini@jetbundle" = withSystem "x86_64-linux" (
+    #     args:
+    #     mkHome args "tsandrini@jetbundle" {
+    #       extraOverlays = with inputs; [
+    #         neovim-nightly-overlay.overlays.default
+    #         emacs-overlay.overlays.default
+    #         nur.overlay
+    #         # (final: _prev: { nur = import inputs.nur { pkgs = final; }; })
+    #       ];
+    #     }
+    #   );
+    # };
 
-    flake.checks."x86_64-linux" = {
-      "home-tsandrini@jetbundle" = config.flake.homeConfigurations."tsandrini@jetbundle".config.home.path;
-    };
+    # flake.checks."x86_64-linux" = {
+    #   "home-tsandrini@jetbundle" = config.flake.homeConfigurations."tsandrini@jetbundle".config.home.path;
+    # };
   };
 }