a

flake.lock

@@ -195,15 +195,15 @@
         "flakeCompat": "flakeCompat",
         "nixCargoIntegration": "nixCargoIntegration",
         "nixpkgs": [
-          "nixpkgs"
+          "latest"
         ]
       },
       "locked": {
-        "lastModified": 1632917236,
+        "lastModified": 1634392661,
-        "narHash": "sha256-ieAp53SlK8d7RinZSueJHBes8l9jssKIYBeBXjRf5LY=",
+        "narHash": "sha256-3ez+Ts5dOXKq+nuDrEUBrDWqKqD+0GTTySdssZl4duY=",
         "ref": "master",
-        "rev": "e47632114a92dbabc2f9d41bedb455e13996924e",
+        "rev": "89707a858f593c99d44af173e9fb2c0d72b8697e",
-        "revCount": 1491,
+        "revCount": 1529,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/helix-editor/helix.git"
@@ -284,6 +284,22 @@
         "type": "github"
       }
     },
+    "lowdown-src_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1633514407,
+        "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=",
+        "owner": "kristapsdz",
+        "repo": "lowdown",
+        "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kristapsdz",
+        "repo": "lowdown",
+        "type": "github"
+      }
+    },
     "naersk": {
       "inputs": {
         "nixpkgs": [
@@ -349,6 +365,28 @@
         "type": "github"
       }
     },
+    "nix_2": {
+      "inputs": {
+        "lowdown-src": "lowdown-src_2",
+        "nixpkgs": [
+          "latest"
+        ]
+      },
+      "locked": {
+        "lastModified": 1634305820,
+        "narHash": "sha256-IEDfqsWNI7ZbU8xmFg4B+nthpcCIE7mr9WYJ2oyYJhA=",
+        "owner": "nixos",
+        "repo": "nix",
+        "rev": "130284b8508dad3c70e8160b15f3d62042fc730a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "master",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "nixos": {
       "locked": {
         "lastModified": 1632918953,
@@ -424,7 +462,7 @@
       "inputs": {
         "cachix": "cachix",
         "nixpkgs": [
-          "nixos"
+          "latest"
         ]
       },
       "locked": {
@@ -447,9 +485,10 @@
           "naersk"
         ],
         "nixpkgs": [
-          "nixpkgs"
+          "latest"
         ],
         "utils": [
+          "digga",
           "flake-utils"
         ]
       },
@@ -469,33 +508,15 @@
     },
     "root": {
       "inputs": {
-        "blank": [
-          "digga",
-          "blank"
-        ],
         "digga": "digga",
-        "flake-utils": [
-          "digga",
-          "flake-utils"
-        ],
-        "flake-utils-plus": [
-          "digga",
-          "flake-utils-plus"
-        ],
         "helix": "helix",
         "home": "home",
         "latest": "latest_2",
         "naersk": "naersk",
-        "nixlib": [
+        "nix": "nix_2",
-          "digga",
-          "nixlib"
-        ],
         "nixos": "nixos",
         "nixos-hardware": "nixos-hardware",
         "nixosPersistence": "nixosPersistence",
-        "nixpkgs": [
-          "nixos"
-        ],
         "nixpkgsWayland": "nixpkgsWayland",
         "rnixLsp": "rnixLsp"
       }

flake.nix

@@ -6,6 +6,11 @@
       nixos.url = "github:nixos/nixpkgs/nixos-21.05";
       latest.url = "github:nixos/nixpkgs/nixos-unstable";
 
+      nix = {
+        url = "github:nixos/nix/master";
+        inputs.nixpkgs.follows = "latest";
+      };
+
       digga.url = "github:divnix/digga/main";
       digga.inputs.nixpkgs.follows = "nixos";
       digga.inputs.nixlib.follows = "nixos";
@@ -37,28 +42,20 @@
       rnixLsp = {
         url = "github:nix-community/rnix-lsp";
         inputs.naersk.follows = "naersk";
-        inputs.nixpkgs.follows = "nixpkgs";
+        inputs.nixpkgs.follows = "latest";
-        inputs.utils.follows = "flake-utils";
+        inputs.utils.follows = "digga/flake-utils";
       };
       helix = {
         url = "https://github.com/helix-editor/helix.git";
         type = "git";
         submodules = true;
-        inputs.nixpkgs.follows = "nixpkgs";
+        inputs.nixpkgs.follows = "latest";
       };
       nixosPersistence.url = "github:nix-community/impermanence";
       nixpkgsWayland = {
         url = "github:colemickens/nixpkgs-wayland";
-        inputs.nixpkgs.follows = "nixos";
+        inputs.nixpkgs.follows = "latest";
       };
-      # start ANTI CORRUPTION LAYER
-      # remove after https://github.com/NixOS/nix/pull/4641
-      nixpkgs.follows = "nixos";
-      nixlib.follows = "digga/nixlib";
-      blank.follows = "digga/blank";
-      flake-utils-plus.follows = "digga/flake-utils-plus";
-      flake-utils.follows = "digga/flake-utils";
-      # end ANTI CORRUPTION LAYER
     };
 
   outputs =
@@ -71,6 +68,7 @@
       #, nur
       #, agenix
       #, nvfetcher
+    , nix
     , nixosPersistence
     , nixpkgsWayland
     , rnixLsp
@@ -93,15 +91,19 @@
               #nvfetcher.overlay
               #deploy.overlay
               #nixpkgsWayland.overlay
-              (_: prev: {
+              nix.overlay
-                helix = helix.packages.${prev.system}.helix;
-                helix-src = helix;
-                rnix-lsp = rnixLsp.packages.${prev.system}.rnix-lsp;
-              })
               ./pkgs/default.nix
             ];
           };
-          latest = { };
+          latest = {
+            overlays = [
+              (_: prev: {
+                #helix = helix.packages.${prev.system}.helix;
+                #helix-src = prev.helix.src;
+                #rnix-lsp = rnixLsp.packages.${prev.system}.rnix-lsp;
+              })
+            ];
+          };
         };
 
         lib = import ./lib { lib = digga.lib // nixos.lib; };

overlays/overrides.nix

@@ -24,6 +24,8 @@ channels: final: prev: {
     sublime4
     git
     git-lfs
+    helix
+    rnix-lsp
     ;
 
   libnotify-latest = channels.latest.libnotify;