[NixOS] Use custom nix with submodule support in self for flakes

nixos/all.nix

@@ -110,7 +110,6 @@
     ispell
     jq
     libtool
-    # lorri
     lsof
     mercurial
     ncdu
@@ -144,7 +143,7 @@
 
     # Nix
     nix-prefetch-git
-    cachix
+    # cachix
 
     # Miscellaneous
     android-udev-rules

nixos/base.nix

@@ -4,7 +4,6 @@
     ./users.nix
     ./fonts.nix
     ./essential.nix
-    ./flakes.nix
   ];
 
   nixpkgs.overlays = [

nixos/flake.lock

@@ -2,7 +2,7 @@
   "nodes": {
     "gitIgnoreSource": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1625992881,
@@ -26,11 +26,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1626317009,
+        "lastModified": 1626387497,
-        "narHash": "sha256-rx+U8lQM+gu072VQsa63DEHtR4IVQ1zA/Fg4CpDUsVc=",
+        "narHash": "sha256-b+KjkO0+wXKIpfPWrVEsaKpZusUOS005Vx3FiP1aS0A=",
         "owner": "IvanMalison",
         "repo": "home-manager",
-        "rev": "bc44222fe944712ba4e5065119f77eeb540937e3",
+        "rev": "2f5b9e26bf5bc441dfc83a44d8cbbf203eddac14",
         "type": "github"
       },
       "original": {
@@ -39,6 +39,43 @@
         "type": "github"
       }
     },
+    "lowdown-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1617481909,
+        "narHash": "sha256-SqnfOFuLuVRRNeVJr1yeEPJue/qWoCp5N6o5Kr///p4=",
+        "owner": "kristapsdz",
+        "repo": "lowdown",
+        "rev": "148f9b2f586c41b7e36e73009db43ea68c7a1a4d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "kristapsdz",
+        "ref": "VERSION_0_8_4",
+        "repo": "lowdown",
+        "type": "github"
+      }
+    },
+    "nix": {
+      "inputs": {
+        "lowdown-src": "lowdown-src",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1626394428,
+        "narHash": "sha256-KZpyYrZIRgzO9OnLXzCzNc0TqSsAQXapLAPAsQ20j0A=",
+        "owner": "IvanMalison",
+        "repo": "nix",
+        "rev": "f92beacb67d4c2cfe1c0080fe351d5fd4d45eae8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "IvanMalison",
+        "ref": "master",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1625333638,
@@ -56,11 +93,26 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1626311920,
+        "lastModified": 1624862269,
-        "narHash": "sha256-6kZKVvYEbsYioboSgLZD6AKDqI6SnnurUattCWsAsmY=",
+        "narHash": "sha256-JFcsh2+7QtfKdJFoPibLFPLgIW6Ycnv8Bts9a7RYme0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f77036342e2b690c61c97202bf48f2ce13acc022",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-21.05-small",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1626384428,
+        "narHash": "sha256-cllqP3lJ9DdVRD1SEOf3s7U3dWqYqGicayxwGTsq/lc=",
         "owner": "IvanMalison",
         "repo": "nixpkgs",
-        "rev": "db3b4f84cb0aeab66cce1ab0ce8f51e7f4f864f1",
+        "rev": "cb2bdbe09bfc1ec11386c524b3bbfb55e5d2f376",
         "type": "github"
       },
       "original": {
@@ -70,17 +122,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "narHash": "sha256-2VpqiYwgoTLYeQnNz+YbMdtGrQQkjZjEH0UqVl5vm2s=",
-        "path": "/home/imalison/Projects/nixpkgs",
-        "type": "path"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
     "nixpkgs_3": {
       "locked": {
         "narHash": "sha256-2VpqiYwgoTLYeQnNz+YbMdtGrQQkjZjEH0UqVl5vm2s=",
@@ -94,7 +135,7 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "narHash": "sha256-jW8aPg5rlg3aSgY1Atb6810VkBNtX0Gf5irEhcdwP5s=",
+        "narHash": "sha256-2VpqiYwgoTLYeQnNz+YbMdtGrQQkjZjEH0UqVl5vm2s=",
         "path": "/home/imalison/Projects/nixpkgs",
         "type": "path"
       },
@@ -105,7 +146,18 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "narHash": "sha256-jW8aPg5rlg3aSgY1Atb6810VkBNtX0Gf5irEhcdwP5s=",
+        "narHash": "sha256-UlUBl0x3MKu9ZdVJJxmZcI2MrAeUU+RLUojqtSiRkzw=",
+        "path": "/home/imalison/Projects/nixpkgs",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "narHash": "sha256-UlUBl0x3MKu9ZdVJJxmZcI2MrAeUU+RLUojqtSiRkzw=",
         "path": "/home/imalison/Projects/nixpkgs",
         "type": "path"
       },
@@ -117,8 +169,9 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "nix": "nix",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "taffybar": "taffybar",
         "xmonad": "xmonad",
         "xmonad-contrib": "xmonad-contrib"
@@ -127,7 +180,7 @@
     "taffybar": {
       "inputs": {
         "gitIgnoreSource": "gitIgnoreSource",
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "narHash": "sha256-ulmlBKbUqYhFz7CDFrZAEjP677bpwTVXkYcPBo4rzIs=",
@@ -141,7 +194,7 @@
     },
     "xmonad": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "narHash": "sha256-wrruQzvSPGiYrHnqql5qLjK/2Ypf4PMgGpmWvxZ7OHw=",
@@ -155,7 +208,7 @@
     },
     "xmonad-contrib": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "narHash": "sha256-U+FcJ5c1EDc1ce0gbHyhiK5XFI1e9+HTwfRqxktPJts=",

nixos/flake.nix

@@ -1,5 +1,8 @@
 {
   inputs = {
+    nix = {
+      url = github:IvanMalison/nix/master;
+    };
     nixpkgs = {
       url = github:IvanMalison/nixpkgs/my-unstable;
     };
@@ -18,10 +21,17 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
-  outputs = { self, nixpkgs, nixos-hardware, home-manager, taffybar, xmonad, xmonad-contrib }:
+  outputs = { self, nix, nixpkgs, nixos-hardware, home-manager, taffybar, xmonad, xmonad-contrib }:
-  let forAll = ({...}: {
+  let forAll = ({ ... }: {
-    nix.registry.nixpkgs.flake = nixpkgs;
+    nix = {
-    nixpkgs.overlays = [ taffybar.overlay xmonad.overlay xmonad-contrib.overlay ];
+      extraOptions = ''
+        experimental-features = nix-command flakes
+      '';
+      registry.nixpkgs.flake = nixpkgs;
+    };
+    nixpkgs.overlays = [
+      taffybar.overlay xmonad.overlay xmonad-contrib.overlay nix.overlay
+    ];
     imports = [
       home-manager.nixosModule
     ];

nixos/flakes.nix

@@ -1,9 +0,0 @@
-{ pkgs, nixpkgs, ... }:
-{
-  nix = {
-    package = pkgs.nixUnstable;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-   };
-}

nixos/home-manager.nix

@@ -33,7 +33,7 @@
   };
 
   services.blueman-applet = {
-    enable = true;
+    enable = false;
   };
 
   services.taffybar = {

nixos/machines/imalison-home.nix

@@ -4,7 +4,7 @@
   imports = [
     <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
     ../full.nix
-    ../cachix.nix
+    # ../cachix.nix
   ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];