fix home-manager switch on nixos

2 files changed, 22 insertions, 1 deletions

diff --git a/home/default.nix b/home/default.nix
index 63a95c5..74a7887 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -76,6 +76,13 @@ in {
       "pulse/client.conf" = {
         text = "cookie-file = ${config.xdg.configHome}/pulse/cookie";
       };
+
+      # we dont want home-manager to place these
+      # files into .config/nix, as we use that folder
+      # for our dotfiles, and we also provide a seperate
+      # nix.conf that is used for bootstrapping
+      "nix/nix.conf".enable = false;
+      "nix/registry.json".enable = false;
     };
 
     dataFile = {
diff --git a/lib/default.nix b/lib/default.nix
index 62efd3f..006e638 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,9 +1,11 @@
-{...} @ inputs: let
+{lib, ...} @ inputs: let
   callLibs = file: import file inputs;
   files = callLibs ./files.nix;
 in {
   inherit (files) getFiles certs sshKeys gpgKeys;
 
+  # set of options we want to copy from a system
+  # config to home manager
   homeConfig = config:
     {
       inherit
@@ -40,6 +42,18 @@ in {
         # Packages
         extraPackages
         ;
+      nix = lib.mkForce {
+        inherit
+          (config.nix)
+          buildMachines
+          checkConfig
+          distributedBuilds
+          gc
+          package
+          registry
+          settings
+          ;
+      };
     }
     // config.extraHome;
 }