Update macbook to home-manager 21.11

flake.lock

@@ -91,27 +91,30 @@
         "type": "github"
       }
     },
-    "home-manager-unstable": {
+    "home-manager-21_11": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": [
+          "nixpkgs-21_11"
+        ]
       },
       "locked": {
-        "lastModified": 1635473360,
+        "lastModified": 1637917557,
-        "narHash": "sha256-sxb4xuP/9f6z29y4Sxzk0g6gzFKUX9r3vNzga/pCROw=",
+        "narHash": "sha256-3u5bLyGn5NUG3RJA7/v1Bqa/QCFGqp/01Bh/4REf9m4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cf4866d2187399117d3aed47a58e6f8ef58e5afd",
+        "rev": "4daff26495ca9ac67476cba8cf15c3e36d91ab18",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-21.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "naersk": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1635444951,
@@ -129,7 +132,7 @@
     },
     "naersk_2": {
       "inputs": {
-        "nixpkgs": "nixpkgs_7"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1635777496,
@@ -161,6 +164,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-21_11": {
+      "locked": {
+        "lastModified": 1637616027,
+        "narHash": "sha256-ldV5S6zqexLHrzwjbK2BsOfvFcka9Xw5w6oxYSDhikA=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "e3e553c5f547f42629739d0491279eeb25e25cb2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "21.11-beta",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-unstable": {
       "locked": {
         "lastModified": 1637831627,
@@ -192,20 +211,6 @@
       }
     },
     "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1635471979,
-        "narHash": "sha256-qlpiKdJ5gF7hU1TuNoz4xTsroUSrdErwovu3rD5cy2c=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3f33a306a55bd7ecedf586a627063a211ffdc6f0",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_4": {
       "locked": {
         "lastModified": 1635527206,
         "narHash": "sha256-vuktnugcLNX5HFpj8nVSKgojRDYQlxtKtcYWtOveegE=",
@@ -219,7 +224,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1622516815,
         "narHash": "sha256-ZjBd81a6J3TwtlBr3rHsZspYUwT9OdhDk+a/SgSEf7I=",
@@ -235,7 +240,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_6": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1625223284,
         "narHash": "sha256-jjLcDSU1rRiJb+n3uez23XAa7kbnPcGZTa6jIKh1GMQ=",
@@ -251,7 +256,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1635956637,
         "narHash": "sha256-65J/mVWr0M1y/59QOGSq6jOqiYYo6zoURJqdc0EzSZA=",
@@ -265,7 +270,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1635956637,
         "narHash": "sha256-65J/mVWr0M1y/59QOGSq6jOqiYYo6zoURJqdc0EzSZA=",
@@ -323,9 +328,10 @@
         "darwin": "darwin",
         "deploy-rs": "deploy-rs",
         "home-manager-21_05": "home-manager-21_05",
-        "home-manager-unstable": "home-manager-unstable",
+        "home-manager-21_11": "home-manager-21_11",
         "naersk": "naersk",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_4",
+        "nixpkgs-21_11": "nixpkgs-21_11",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur",
         "rnix-lsp": "rnix-lsp",
@@ -351,7 +357,7 @@
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1633273832,
@@ -401,7 +407,7 @@
       "inputs": {
         "flake-utils": "flake-utils",
         "naersk": "naersk_2",
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
         "lastModified": 1637534778,

flake.nix

@@ -3,10 +3,12 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/21.05";
+    nixpkgs-21_11.url = "github:nixos/nixpkgs/21.11-beta"; # TODO: Change this to 21.11 once done
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     darwin.url = "github:lnl7/nix-darwin/master";
     darwin.inputs.nixpkgs.follows = "nixpkgs-unstable";
-    home-manager-unstable.url = "github:nix-community/home-manager";
+    home-manager-21_11.url = "github:nix-community/home-manager/release-21.11";
+    home-manager-21_11.inputs.nixpkgs.follows = "nixpkgs-21_11";
     home-manager-21_05.url = "github:nix-community/home-manager/release-21.05";
     sops-nix.url = "github:Mic92/sops-nix";
     deploy-rs.url = "github:Serokell/deploy-rs";
@@ -25,7 +27,7 @@
     secrets.url = "git+ssh://git@github.com/natsukagami/nix-deploy-secrets";
   };
 
-  outputs = { self, darwin, nixpkgs, nixpkgs-unstable, home-manager-unstable, home-manager-21_05, deploy-rs, sops-nix, nur, ... }@inputs:
+  outputs = { self, darwin, nixpkgs, nixpkgs-unstable, home-manager-21_11, home-manager-21_05, deploy-rs, sops-nix, nur, ... }@inputs:
     let
       overlayForSystem = import ./overlay.nix inputs;
     in
@@ -35,7 +37,7 @@
         system = "aarch64-darwin";
         modules = [
           ./darwin/configuration.nix
-          home-manager-unstable.darwinModules.home-manager
+          home-manager-21_11.darwinModules.home-manager
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;

home/common.nix

@@ -83,7 +83,6 @@
 
     direnv.enable = true;
     direnv.nix-direnv.enable = true;
-    direnv.nix-direnv.enableFlakes = true;
 
     exa = {
       enable = true;

overlay.nix

@@ -14,6 +14,14 @@ let
   };
 in
 {
-  nixpkgs.overlays = [ overlay-unstable overlay-needs-unstable overlay-imported nur.overlay ]; # we assign the overlay created before to the overlays of nixpkgs.
+  nixpkgs.overlays = [
+    overlay-unstable
+    overlay-needs-unstable
+    overlay-imported
+    nur.overlay
+
+    # Bug fixes
+    (import ./overlays/bugfixes/delta)
+  ]; # we assign the overlay created before to the overlays of nixpkgs.
 }
 

overlays/bugfixes/delta/default.nix

@@ -0,0 +1,15 @@
+final: prev: {
+  delta =
+    if (prev.delta.version == "0.10.0") then
+    # There is a bug where prev.delta on v0.10.0 does NOT have adequate dependencies on Darwin.
+      (prev.delta.overrideAttrs
+        (oldAttrs: {
+          version = "0.10.0-patched";
+          buildInputs = final.lib.optionals final.stdenv.isDarwin (with final; [
+            darwin.apple_sdk.frameworks.DiskArbitration
+            darwin.apple_sdk.frameworks.Foundation
+            darwin.apple_sdk.frameworks.Security
+            libiconv
+          ]);
+        })) else prev.delta;
+}