Merge branch 'devos'

2021-12-30 21:54:42 +01:00 · 2021-12-30 21:54:42 +01:00 · b8b3404d4c
parent e45744d6fe 1cbf28f445
commit b8b3404d4c
9 changed files with 245 additions and 198 deletions
--- a/bud/get.bash
+++ b/bud/get.bash
@ -1 +0,0 @@
-nix flake new -t "github:divnix/devos/main" "${2:-devos}"
--- a/flake.lock
+++ b/flake.lock
@ -3,15 +3,15 @@
    "agenix": {
      "inputs": {
        "nixpkgs": [
-          "latest"
+          "nixos"
        ]
      },
      "locked": {
-        "lastModified": 1620877075,
-        "narHash": "sha256-XvgTqtmQZHegu9UMDSR50gK5cHEM2gbnRH0qecmdN54=",
+        "lastModified": 1637793790,
+        "narHash": "sha256-oPXavjxETEWGXq8g7kQHyRLKUmLX2yPtGn+t3V0mrTY=",
        "owner": "ryantm",
        "repo": "agenix",
-        "rev": "e543aa7d68f222e1e771165da9e9a64b5bf7b3e3",
+        "rev": "f85eea0e29fa9a8924571d0e398215e175f80d55",
        "type": "github"
      },
      "original": {
@ -70,11 +70,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1633373878,
-        "narHash": "sha256-9+ziZ8l6rq3yXyY6B0wYXrVdfxr6cdpEbPEGRHywBKc=",
+        "lastModified": 1640836100,
+        "narHash": "sha256-My9Lay6BCDwAZgrL4SuVXHkYPHIU7ypnuiS/pd7eg1M=",
        "owner": "divnix",
        "repo": "bud",
-        "rev": "4e709a2fcf19df500ba87d9c3b1b1481401cd53b",
+        "rev": "b1d8ab3970f4dfb5fb90d7d8a9ab493c75d031fc",
        "type": "github"
      },
      "original": {
@ -86,15 +86,15 @@
    "darwin": {
      "inputs": {
        "nixpkgs": [
-          "latest"
+          "nixos"
        ]
      },
      "locked": {
-        "lastModified": 1622060422,
-        "narHash": "sha256-hPVlvrAyf6zL7tTx0lpK+tMxEfZeMiIZ/A2xaJ41WOY=",
+        "lastModified": 1634994402,
+        "narHash": "sha256-xmlCVVOYGpZoxgOqsDOVF0B0ASrnbNGVAEzID9qh2xo=",
        "owner": "LnL7",
        "repo": "nix-darwin",
-        "rev": "007d700e644ac588ad6668e6439950a5b6e2ff64",
+        "rev": "44da835ac40dab5fd231298b59d83487382d2fab",
        "type": "github"
      },
      "original": {
@ -105,37 +105,34 @@
    },
    "deploy": {
      "inputs": {
+        "fenix": "fenix",
        "flake-compat": "flake-compat",
        "nixpkgs": [
-          "digga",
-          "latest"
+          "nixos"
        ],
-        "utils": [
-          "digga",
-          "flake-utils"
-        ]
+        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1632822684,
-        "narHash": "sha256-lt7eayYmgsD5OQwpb1XYfHpxttn43bWo7G7hIJs+zJw=",
-        "owner": "serokell",
+        "lastModified": 1637357482,
+        "narHash": "sha256-mMRxOlcQs3V9cZYsKGKWEjl+oqclhaH1SKT3QGeTQ0Q=",
+        "owner": "input-output-hk",
        "repo": "deploy-rs",
-        "rev": "9a02de4373e0ec272d08a417b269a28ac8b961b4",
+        "rev": "5a6db26726ec8c7904aea5bcdf13589342386f9d",
        "type": "github"
      },
      "original": {
-        "owner": "serokell",
+        "owner": "input-output-hk",
        "repo": "deploy-rs",
        "type": "github"
      }
    },
    "devshell": {
      "locked": {
-        "lastModified": 1632436039,
-        "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=",
+        "lastModified": 1637575296,
+        "narHash": "sha256-ZY8YR5u8aglZPe27+AJMnPTG6645WuavB+w0xmhTarw=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6",
+        "rev": "0e56ef21ba1a717169953122c7415fa6a8cd2618",
        "type": "github"
      },
      "original": {
@ -147,15 +144,16 @@
    "digga": {
      "inputs": {
        "blank": "blank",
-        "deploy": "deploy",
+        "deploy": [
+          "deploy"
+        ],
        "devshell": "devshell",
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils_3",
        "flake-utils-plus": "flake-utils-plus",
        "home-manager": [
          "home"
        ],
        "latest": "latest",
-        "nix": "nix",
        "nixlib": [
          "nixos"
        ],
@ -165,11 +163,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1632959483,
-        "narHash": "sha256-jXogai6e+QRtiZFBOrMmYdeLXejzVT91kuDKu2RuJ10=",
+        "lastModified": 1640031018,
+        "narHash": "sha256-ZzyS803XuCl99XE4581m0Suni+q1Hz+Mpw6A9bs7VKM=",
        "owner": "divnix",
        "repo": "digga",
-        "rev": "6549cf4c87d1a77138cbecbc6bb9483c20572cd7",
+        "rev": "3157889810e51a1ae03f82bf6bf6657ba8cf93c6",
        "type": "github"
      },
      "original": {
@ -178,6 +176,25 @@
        "type": "github"
      }
    },
+    "fenix": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2",
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1637303083,
+        "narHash": "sha256-e2A5JBjxYNpjoGd53K0oVUUaS9ojwOT5rnThyPNS46M=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "8294ceadbbbe1a886640bfcc15f5a02a2b471955",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
    "flake-compat": {
      "flake": false,
      "locked": {
@ -194,6 +211,22 @@
        "type": "github"
      }
    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1627913399,
+        "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
    "flake-utils": {
      "locked": {
        "lastModified": 1623875721,
@ -211,17 +244,14 @@
    },
    "flake-utils-plus": {
      "inputs": {
-        "flake-utils": [
-          "digga",
-          "flake-utils"
-        ]
+        "flake-utils": "flake-utils_4"
      },
      "locked": {
-        "lastModified": 1630859749,
-        "narHash": "sha256-qkoU2rIbbP2+T0dfcqXW35GCWNsi0Y1IgN9BELmt4Zo=",
+        "lastModified": 1638994888,
+        "narHash": "sha256-iz/ynGNZlvqKCOnFrEKqGA+BVKGQMG+g2JT+e3OOLN8=",
        "owner": "divnix",
        "repo": "flake-utils-plus",
-        "rev": "a4e267e3fc87e60c5029c6c3855935ff1ff3018e",
+        "rev": "b4f9f517574cb7bd6ee3f19c72c19634c9f536e1",
        "type": "github"
      },
      "original": {
@ -232,11 +262,56 @@
    },
    "flake-utils_2": {
      "locked": {
-        "lastModified": 1623875721,
-        "narHash": "sha256-A8BU7bjS5GirpAUv4QA+QnJ4CceLHkcXdRp4xITDB0s=",
+        "lastModified": 1638122382,
+        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "f7e004a55b120c02ecb6219596820fcd32ca8772",
+        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "locked": {
+        "lastModified": 1638122382,
+        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "locked": {
+        "lastModified": 1638122382,
+        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_5": {
+      "locked": {
+        "lastModified": 1631561581,
+        "narHash": "sha256-3VQMV5zvxaVLvqqUrNz3iJelLw30mIVSfZmAaauM3dA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "7e5bf3925f6fbdfaf50a2a7ca0be2879c4261d19",
        "type": "github"
      },
      "original": {
@ -252,27 +327,27 @@
        ]
      },
      "locked": {
-        "lastModified": 1624228557,
-        "narHash": "sha256-wwOqe73BsrXfRv1PhyXQFNC8iTET50KvE/HitdkRgxs=",
+        "lastModified": 1637917557,
+        "narHash": "sha256-3u5bLyGn5NUG3RJA7/v1Bqa/QCFGqp/01Bh/4REf9m4=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "35a24648d155843a4d162de98c17b1afd5db51e4",
+        "rev": "4daff26495ca9ac67476cba8cf15c3e36d91ab18",
        "type": "github"
      },
      "original": {
        "owner": "nix-community",
-        "ref": "release-21.05",
+        "ref": "release-21.11",
        "repo": "home-manager",
        "type": "github"
      }
    },
    "latest": {
      "locked": {
-        "lastModified": 1632660378,
-        "narHash": "sha256-sjA8eQlnyDjDLyAyq3XlJmN0nqW0ftl/pb7VnMg86L0=",
+        "lastModified": 1638198142,
+        "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "31ffc50c571e6683e9ecc9dbcbd4a8e9914b4497",
+        "rev": "8a308775674e178495767df90c419425474582a1",
        "type": "github"
      },
      "original": {
@ -284,11 +359,11 @@
    },
    "latest_2": {
      "locked": {
-        "lastModified": 1627942574,
-        "narHash": "sha256-guUcGRWvY2mfiVSet2x/zeHIyflm2wgglj0ldg0mMio=",
+        "lastModified": 1638198142,
+        "narHash": "sha256-plU9b8r4St6q4U7VHtG9V7oF8k9fIpfXl/KDaZLuY9k=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "c464dc811babfe316ed4ab7bbc12351122e69dd7",
+        "rev": "8a308775674e178495767df90c419425474582a1",
        "type": "github"
      },
      "original": {
@ -298,35 +373,18 @@
        "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"
-      }
-    },
    "naersk": {
      "inputs": {
        "nixpkgs": [
-          "latest"
+          "nixos"
        ]
      },
      "locked": {
-        "lastModified": 1623927034,
-        "narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=",
+        "lastModified": 1638203339,
+        "narHash": "sha256-Sz3iCvbWrVWOD/XfYQeRJgP/7MVYL3/VKsNXvDeWBFc=",
        "owner": "nmattia",
        "repo": "naersk",
-        "rev": "e09c320446c5c2516d430803f7b19f5833781337",
+        "rev": "c3e56b8a4ffb6d906cdfcfee034581f9a8ece571",
        "type": "github"
      },
      "original": {
@ -335,25 +393,18 @@
        "type": "github"
      }
    },
-    "nix": {
-      "inputs": {
-        "lowdown-src": "lowdown-src",
-        "nixpkgs": [
-          "digga",
-          "nixpkgs"
-        ]
-      },
+    "nixlib": {
      "locked": {
-        "lastModified": 1630335771,
-        "narHash": "sha256-eljjEPJdLK3aDskF7qX4YM/6KCq+w9nr+IKhrKW/AIQ=",
-        "owner": "nixos",
-        "repo": "nix",
-        "rev": "50a35860ee9237d341948437c5f70a7f0987d393",
+        "lastModified": 1640478849,
+        "narHash": "sha256-S4lNc3fb9UpYgVtTa/mZZXphq7+xGy74YGIlOWB1ceE=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "c85a293f7d094a799dcf1197c31925bc44e94d6b",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
-        "repo": "nix",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
        "type": "github"
      }
    },
@ -378,37 +429,31 @@
    },
    "nixos": {
      "locked": {
-        "lastModified": 1628203131,
-        "narHash": "sha256-jQgXeJ9NQQS0Eobb/qQOvS+RRULkqRikAeXkkFKOPDA=",
+        "lastModified": 1638231428,
+        "narHash": "sha256-Sm5loBKdeusSvIAC+LtzRT6I7tAcqZdIPnHcxZt7NaE=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "178da37860823d35e801c7df2f73d7866d3d598a",
+        "rev": "393c5357a0071d51668bcdc69dfc25ddacbd5840",
        "type": "github"
      },
      "original": {
        "owner": "nixos",
-        "ref": "release-21.05",
+        "ref": "release-21.11",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixos-generators": {
      "inputs": {
-        "nixlib": [
-          "digga",
-          "nixlib"
-        ],
-        "nixpkgs": [
-          "digga",
-          "blank"
-        ]
+        "nixlib": "nixlib",
+        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
-        "lastModified": 1624973746,
-        "narHash": "sha256-11JbJRduNwyf556gndGErR5/12ceyHOHBfEuha5Vws4=",
+        "lastModified": 1637655461,
+        "narHash": "sha256-kXZPbclN3gKwjhp2/RYFDFpAsSBwzX1iLF4EcnHZsPQ=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "022ef440af8dc237ab1f59fa363cb1e25783ec3e",
+        "rev": "05a3eb158a9c7746a5d463726d7f7cccf07500e4",
        "type": "github"
      },
      "original": {
@ -419,11 +464,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1625333638,
-        "narHash": "sha256-M6J9RN60XJyv6nUfDFCwnz5aVjhe8+GJnV8Q9VpdQQQ=",
+        "lastModified": 1638182287,
+        "narHash": "sha256-vBzf+hbTJz2ZdXV/DWirl6wOO7tjdqzTIU+0FANt65U=",
        "owner": "nixos",
        "repo": "nixos-hardware",
-        "rev": "41775780a0b6b32b3d32dcc32bb9bc6df809062d",
+        "rev": "6b3f79de09c3de7c91ab51e55e87879f61b6faec",
        "type": "github"
      },
      "original": {
@ -434,27 +479,58 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1626556499,
-        "narHash": "sha256-c2ueMT7fi/yvCNq3nGLEC2v5GklS7eHpB1240LRSW9Y=",
+        "lastModified": 1640831728,
+        "narHash": "sha256-KK5SKqqfAt+ev3bHLrVXJ6i4zx9YQW6k19oUInY8T2M=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b59c06dc92f8d03660eb4155754d93a6c34cda83",
+        "rev": "5d90841dd0179430db010dfc2c58b2a7de4371be",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1636976544,
+        "narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1640418986,
+        "narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nur": {
      "locked": {
-        "lastModified": 1626378135,
-        "narHash": "sha256-koC6DBYmLCrgXA+AMHVaODf1uHYPmvcFygHfy3eg6vI=",
+        "lastModified": 1638231901,
+        "narHash": "sha256-XzuvFTmsXULdWynQWzgaPHikepNhjEpK4o5WXfmRqek=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "00c2ec8f0bbdf0cfb2135bde55fbae5d6b64aa6d",
+        "rev": "4e68fb3d8f48e91196deb13f44bcfb421da25afb",
        "type": "github"
      },
      "original": {
@ -464,26 +540,18 @@
    },
    "nvfetcher": {
      "inputs": {
-        "flake-compat": [
-          "digga",
-          "deploy",
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "digga",
-          "flake-utils-plus",
-          "flake-utils"
-        ],
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_5",
        "nixpkgs": [
-          "latest"
+          "nixos"
        ]
      },
      "locked": {
-        "lastModified": 1632700276,
-        "narHash": "sha256-XABvQUq2qv+YcQxW93DnU8mgtVsGJWyhcznny/Lbp0Q=",
+        "lastModified": 1634524567,
+        "narHash": "sha256-v9ZTZj1WNQaaVfs1P1mUPuh518mmwpqszj1EjdeGUmc=",
        "owner": "berberman",
        "repo": "nvfetcher",
-        "rev": "248fe98ed1bc352ce164d08a9e76fdc5f301ba2d",
+        "rev": "807513f4bbd0e3b5863f4c3b91f8ac846ed6da9b",
        "type": "github"
      },
      "original": {
@ -494,16 +562,8 @@
    },
    "poetry2nix": {
      "inputs": {
-        "flake-utils": [
-          "bud",
-          "beautysh",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "bud",
-          "beautysh",
-          "nixpkgs"
-        ]
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs"
      },
      "locked": {
        "lastModified": 1625240517,
@ -522,25 +582,10 @@
    "root": {
      "inputs": {
        "agenix": "agenix",
-        "blank": [
-          "digga",
-          "blank"
-        ],
        "bud": "bud",
        "darwin": "darwin",
-        "deploy": [
-          "digga",
-          "deploy"
-        ],
+        "deploy": "deploy",
        "digga": "digga",
-        "flake-utils": [
-          "digga",
-          "flake-utils"
-        ],
-        "flake-utils-plus": [
-          "digga",
-          "flake-utils-plus"
-        ],
        "home": "home",
        "latest": "latest_2",
        "naersk": "naersk",
@ -551,12 +596,41 @@
        ],
        "nixos": "nixos",
        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": [
-          "nixos"
-        ],
        "nur": "nur",
        "nvfetcher": "nvfetcher"
      }
+    },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1637268320,
+        "narHash": "sha256-lxB1r+7cmZisiGLx0tZ2LaC6X/EcQTbRIWZfnLIIgs4=",
+        "owner": "rust-analyzer",
+        "repo": "rust-analyzer",
+        "rev": "f0da9406bcbde1bc727242b481d8de825e84f59a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-analyzer",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
+    "utils": {
+      "locked": {
+        "lastModified": 1637014545,
+        "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -1,54 +1,45 @@
 {
  description = "A highly structured configuration database.";

-  nixConfig.extra-experimental-features = "nix-command flakes ca-references";
+  nixConfig.extra-experimental-features = "nix-command flakes";
  nixConfig.extra-substituters = "https://nrdxp.cachix.org https://nix-community.cachix.org";
  nixConfig.extra-trusted-public-keys = "nrdxp.cachix.org-1:Fc5PSqY2Jm1TrWfm88l6cvGWwz3s93c6IOifQWnhNW4= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=";

  inputs =
    {
-      nixos.url = "github:nixos/nixpkgs/release-21.05";
+      nixos.url = "github:nixos/nixpkgs/release-21.11";
      latest.url = "github:nixos/nixpkgs/nixos-unstable";

      digga.url = "github:divnix/digga";
      digga.inputs.nixpkgs.follows = "nixos";
      digga.inputs.nixlib.follows = "nixos";
      digga.inputs.home-manager.follows = "home";
+      digga.inputs.deploy.follows = "deploy";

      bud.url = "github:divnix/bud";
      bud.inputs.nixpkgs.follows = "nixos";
      bud.inputs.devshell.follows = "digga/devshell";

-      home.url = "github:nix-community/home-manager/release-21.05";
+      home.url = "github:nix-community/home-manager/release-21.11";
      home.inputs.nixpkgs.follows = "nixos";

      darwin.url = "github:LnL7/nix-darwin";
-      darwin.inputs.nixpkgs.follows = "latest";
+      darwin.inputs.nixpkgs.follows = "nixos";

-      deploy.follows = "digga/deploy";
+      deploy.url = "github:input-output-hk/deploy-rs";
+      deploy.inputs.nixpkgs.follows = "nixos";

      agenix.url = "github:ryantm/agenix";
-      agenix.inputs.nixpkgs.follows = "latest";
+      agenix.inputs.nixpkgs.follows = "nixos";

      nvfetcher.url = "github:berberman/nvfetcher";
-      nvfetcher.inputs.nixpkgs.follows = "latest";
-      nvfetcher.inputs.flake-compat.follows = "digga/deploy/flake-compat";
-      nvfetcher.inputs.flake-utils.follows = "digga/flake-utils-plus/flake-utils";
+      nvfetcher.inputs.nixpkgs.follows = "nixos";

      naersk.url = "github:nmattia/naersk";
-      naersk.inputs.nixpkgs.follows = "latest";
+      naersk.inputs.nixpkgs.follows = "nixos";

      nixos-hardware.url = "github:nixos/nixos-hardware";

-      # 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
-
      # PubSolarOS additions
      nix-dram.url = "github:dramforever/nix-dram";
    };
@ -77,7 +68,6 @@
          nixos = {
            imports = [ (digga.lib.importOverlays ./overlays) ];
            overlays = [
-              digga.overlays.patchedNix
              nur.overlay
              agenix.overlay
              nvfetcher.overlay
@ -85,11 +75,7 @@
              ./pkgs/default.nix
            ];
          };
-          latest = {
-            overlays = [
-              deploy.overlay
-            ];
-          };
+          latest = { };
        };

        lib = import ./lib { lib = digga.lib // nixos.lib; };
@ -162,7 +148,7 @@
      }
    //
    {
-      budModules = { devos = import ./bud; };
+      budModules = { devos = import ./shell/bud; };
    }
  ;
 }
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@ -25,6 +25,8 @@ channels: final: prev: {
    looking-glass-client
    ;

+  # nix is set to 2.3 in 21.11
+  nix-direnv = prev.nix-direnv.override { nix = prev.nixUnstable; };

  haskellPackages = prev.haskellPackages.override
    (old: {
--- a/overlays/various-flake-fixes.nix
+++ b/overlays/various-flake-fixes.nix
@ -1,11 +0,0 @@
-final: prev: {
-  # Since: https://github.com/NixOS/nixpkgs/pull/126137
-  nix-direnv =
-    if builtins.hasAttr "enableFlakes" prev.nix-direnv.override.__functionArgs
-    then
-      prev.nix-direnv.override
-        {
-          enableFlakes = true;
-        }
-    else prev.nix-direnv;
-}
--- a/shell/bud/default.nix
+++ b/shell/bud/default.nix
--- a/shell/bud/get.bash
+++ b/shell/bud/get.bash
@ -0,0 +1 @@
+git clone https://github.com/divnix/devos.git "${2:-devos}"
--- a/shell/devos.nix
+++ b/shell/devos.nix
@ -1,4 +1,4 @@
-{ pkgs, extraModulesPath, ... }:
+{ pkgs, extraModulesPath, inputs, ... }:
 let

  hooks = import ./hooks;
@ -43,12 +43,9 @@ in
    (linter editorconfig-checker)
    # (docs python3Packages.grip) too many deps
    (docs mdbook)
+    (devos inputs.deploy.packages.${pkgs.system}.deploy-rs)
  ]

-  ++ lib.optional
-    (pkgs ? deploy-rs)
-    (devos deploy-rs.deploy-rs)
-
  ++ lib.optional
    (system != "i686-linux")
    (devos cachix)
--- a/users/profiles/direnv/default.nix
+++ b/users/profiles/direnv/default.nix
@ -3,7 +3,6 @@
    enable = true;
    nix-direnv = {
      enable = true;
-      enableFlakes = true;
    };
  };
 }
				`@ -1 +0,0 @@`
				`nix flake new -t "github:divnix/devos/main" "${2:-devos}"`
				`@ -0,0 +1 @@`
				`git clone https://github.com/divnix/devos.git "${2:-devos}"`