Merge remote-tracking branch 'github/main' into config

CHANGELOG.md

@@ -1,114 +0,0 @@
-# Changelog
-
-## [v0.10.0](https://github.com/divnix/devos/tree/v0.10.0) (2021-05-24)
-
-**Implemented enhancements:**
-
-- Providing an interface to nixpkgs.config [\#237](https://github.com/divnix/devos/issues/237)
-- Making the user available in profiles [\#230](https://github.com/divnix/devos/issues/230)
-- copy evaluation store paths to iso [\#195](https://github.com/divnix/devos/issues/195)
-- Extract custom system builds from devosSystem out of lib [\#170](https://github.com/divnix/devos/issues/170)
-- Allow setting of channel host-wide [\#117](https://github.com/divnix/devos/issues/117)
-- alacritty: CSIu support [\#51](https://github.com/divnix/devos/issues/51)
-
-**Fixed bugs:**
-
-- Cachix timeouts + how to disable nrdxp cachix \(if needed\) [\#294](https://github.com/divnix/devos/issues/294)
-- default.nix flake-compat is broken [\#285](https://github.com/divnix/devos/issues/285)
-- All suites return "attribute missing" [\#282](https://github.com/divnix/devos/issues/282)
-- nix is built two times [\#203](https://github.com/divnix/devos/issues/203)
-- fix lib docs [\#166](https://github.com/divnix/devos/issues/166)
-
-**Closed issues:**
-
-- eliminate userFlakeNixOS [\#257](https://github.com/divnix/devos/issues/257)
-- devos-as-library [\#214](https://github.com/divnix/devos/issues/214)
-
-**Merged pull requests:**
-
-- Update evalArgs to match the new planned API [\#239](https://github.com/divnix/devos/pull/239)
-
-## [v0.9.0](https://github.com/divnix/devos/tree/v0.9.0) (2021-04-19)
-
-**Implemented enhancements:**
-
-- pin inputs into iso live registry [\#190](https://github.com/divnix/devos/issues/190)
-- Pass 'self' to lib [\#169](https://github.com/divnix/devos/issues/169)
-- doc: quickstart "ISO. What next?" [\#167](https://github.com/divnix/devos/issues/167)
-- Integrate Android AOSP putting mobile under control [\#149](https://github.com/divnix/devos/issues/149)
-- Inoculate host identity on first use [\#132](https://github.com/divnix/devos/issues/132)
-- kubenix support [\#130](https://github.com/divnix/devos/issues/130)
-- Improve Home Manager support: profiles/suites, modules, extern, flake outputs [\#119](https://github.com/divnix/devos/issues/119)
-- Local CA \(between hosts\) [\#104](https://github.com/divnix/devos/issues/104)
-- Q5: git annex for machine state [\#68](https://github.com/divnix/devos/issues/68)
-- name space ./pkgs overlays [\#60](https://github.com/divnix/devos/issues/60)
-- remap global keys easily [\#57](https://github.com/divnix/devos/issues/57)
-- make pass state part of this repo's structure [\#56](https://github.com/divnix/devos/issues/56)
-- Incorporate ./shells [\#38](https://github.com/divnix/devos/issues/38)
-- Encrypt with \(r\)age [\#37](https://github.com/divnix/devos/issues/37)
-
-**Fixed bugs:**
-
-- `pathsToImportedAttrs` does not accept directories [\#221](https://github.com/divnix/devos/issues/221)
-- Cachix caches aren't added to the configuration [\#208](https://github.com/divnix/devos/issues/208)
-- Issues with current changelog workflow [\#205](https://github.com/divnix/devos/issues/205)
-- iso: systemd service startup [\#194](https://github.com/divnix/devos/issues/194)
-- Help adding easy-hls-nix to devos [\#174](https://github.com/divnix/devos/issues/174)
-- `flk update` fails because of obsolete flag [\#159](https://github.com/divnix/devos/issues/159)
-- Expected that not all packages are exported? [\#151](https://github.com/divnix/devos/issues/151)
-- Segmentation fault when generating iso [\#150](https://github.com/divnix/devos/issues/150)
-
-**Documentation:**
-
-- doc: split iso [\#193](https://github.com/divnix/devos/issues/193)
-- lib: can depend on pkgs \(a la nixpkgs\#pkgs/pkgs-lib\) [\#147](https://github.com/divnix/devos/pull/147)
-
-**Closed issues:**
-
-- FRRouting router implementation [\#154](https://github.com/divnix/devos/issues/154)
-- ARM aarch64 Support [\#72](https://github.com/divnix/devos/issues/72)
-
-## [v0.8.0](https://github.com/divnix/devos/tree/v0.8.0) (2021-03-02)
-
-**Implemented enhancements:**
-
-- semi automatic update for /pkgs [\#118](https://github.com/divnix/devos/issues/118)
-- Home-manager external modules from flakes [\#106](https://github.com/divnix/devos/issues/106)
-
-**Fixed bugs:**
-
-- My emacsGcc overlay is not working  [\#146](https://github.com/divnix/devos/issues/146)
-- local flake registry freezes branches [\#142](https://github.com/divnix/devos/issues/142)
-- nixos-option no longer works after collect garbage [\#138](https://github.com/divnix/devos/issues/138)
-- Profiles imports are brittle, causing failure if imported twice [\#136](https://github.com/divnix/devos/issues/136)
-
-## [0.7.0](https://github.com/divnix/devos/tree/0.7.0) (2021-02-20)
-
-**Implemented enhancements:**
-
-- add zoxide [\#53](https://github.com/divnix/devos/issues/53)
-- Multiarch support? [\#17](https://github.com/divnix/devos/issues/17)
-- initial multiArch support [\#18](https://github.com/divnix/devos/pull/18)
-
-**Fixed bugs:**
-
-- Missing shebang from flk.sh [\#131](https://github.com/divnix/devos/issues/131)
-- Rename Meta Issue [\#128](https://github.com/divnix/devos/issues/128)
-- specialisations break the `system` argument [\#46](https://github.com/divnix/devos/issues/46)
-- Revert "Add extraArgs to lib.nixosSystem call to add system args." [\#47](https://github.com/divnix/devos/pull/47)
-
-**Documentation:**
-
-- update home-manager urls [\#62](https://github.com/divnix/devos/pull/62)
-
-**Closed issues:**
-
-- add github action for cachix build ci [\#59](https://github.com/divnix/devos/issues/59)
-
-## [12052020](https://github.com/divnix/devos/tree/12052020) (2020-12-06)
-
-## [07092020](https://github.com/divnix/devos/tree/07092020) (2020-07-09)
-
-
-
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

flake.lock

@@ -3,15 +3,15 @@
     "agenix": {
       "inputs": {
         "nixpkgs": [
-          "latest"
+          "nixos"
         ]
       },
       "locked": {
-        "lastModified": 1641576265,
+        "lastModified": 1643841757,
-        "narHash": "sha256-G4W39k5hdu2kS13pi/RhyTOySAo7rmrs7yMUZRH0OZI=",
+        "narHash": "sha256-9tKhu4JzoZvustC9IEWK6wKcDhPLuK/ICbLgm8QnLnk=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "08b9c96878b2f9974fc8bde048273265ad632357",
+        "rev": "a17d1f30550260f8b45764ddbd0391f4b1ed714a",
         "type": "github"
       },
       "original": {
@@ -83,15 +83,15 @@
     "darwin": {
       "inputs": {
         "nixpkgs": [
-          "latest"
+          "nixos"
         ]
       },
       "locked": {
-        "lastModified": 1641152326,
+        "lastModified": 1642495030,
-        "narHash": "sha256-yQXzXrjrilGzBjC+2kZVPZRgBPSdCLovSLmJ7Na7EDo=",
+        "narHash": "sha256-u1ZlFbLWzkM6zOfuZ1tr0tzTuDWucOYwALPWDWLorkE=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "15635ae63878b83598a18ae421e8c819b691dc55",
+        "rev": "bcdb6022b3a300abf59cb5d0106c158940f5120e",
         "type": "github"
       },
       "original": {
@@ -102,20 +102,23 @@
     },
     "deploy": {
       "inputs": {
+        "fenix": "fenix",
         "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": [
+          "nixos"
+        ],
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1632822684,
+        "lastModified": 1639771334,
-        "narHash": "sha256-lt7eayYmgsD5OQwpb1XYfHpxttn43bWo7G7hIJs+zJw=",
+        "narHash": "sha256-4hgZmsCPaL5QlcEijHmzaYYrEwHtUFqraCUrCqLGJOo=",
-        "owner": "serokell",
+        "owner": "input-output-hk",
         "repo": "deploy-rs",
-        "rev": "9a02de4373e0ec272d08a417b269a28ac8b961b4",
+        "rev": "7267eab9139ca4476fd8ed49e2e8652bba4c037f",
         "type": "github"
       },
       "original": {
-        "owner": "serokell",
+        "owner": "input-output-hk",
         "repo": "deploy-rs",
         "type": "github"
       }
@@ -138,9 +141,10 @@
     "digga": {
       "inputs": {
         "blank": "blank",
-        "deploy": "deploy",
+        "deploy": [
+          "deploy"
+        ],
         "devshell": "devshell",
-        "flake-utils": "flake-utils_3",
         "flake-utils-plus": "flake-utils-plus",
         "home-manager": [
           "home"
@@ -155,11 +159,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1641574422,
+        "lastModified": 1643510242,
-        "narHash": "sha256-Xqv1S59sClwoTcCLGOTtA1voSaHYmrseV3cc8FddF/A=",
+        "narHash": "sha256-9C9DyJhQ5bevk0CEEjGct+U9EqUgHg8T70nxz47zjMI=",
         "owner": "divnix",
         "repo": "digga",
-        "rev": "fca1df3dcdb78531772baf801b79e01489280864",
+        "rev": "33bfb05b8a148d8ad6a842de74e22209bf9fe5d7",
         "type": "github"
       },
       "original": {
@@ -170,15 +174,34 @@
     },
     "fenix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_3",
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1642055186,
+        "lastModified": 1639117493,
-        "narHash": "sha256-/ITnW+ZcNQC/FHWlWHn5msdzLfnV/zsKDd/wbisftxQ=",
+        "narHash": "sha256-67H9uXUdauaqMfkcKzpgHR3GeOKPAwOs6G3C1VpT67o=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "f3868e8dab8887b3ee47b0a07ad5ea0dc8d6b366",
+        "rev": "94b5686cad2ed210da106b0b7e1e212dab43fbf2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
+    "fenix_2": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_5",
+        "rust-analyzer-src": "rust-analyzer-src_2"
+      },
+      "locked": {
+        "lastModified": 1644474183,
+        "narHash": "sha256-G8zMOuZRkxrTgD/0wu9RrIPXjCXjn9PQ5tGkCFQOnlc=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "2ac45eb4b067715f53a94769d6a0882a19eb93d3",
         "type": "github"
       },
       "original": {
@@ -203,6 +226,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": 1631561581,
@@ -220,29 +259,29 @@
     },
     "flake-utils-plus": {
       "inputs": {
-        "flake-utils": "flake-utils_4"
+        "flake-utils": "flake-utils_3"
       },
       "locked": {
-        "lastModified": 1638994888,
+        "lastModified": 1639385028,
-        "narHash": "sha256-iz/ynGNZlvqKCOnFrEKqGA+BVKGQMG+g2JT+e3OOLN8=",
+        "narHash": "sha256-oqorKz3mwf7UuDJwlbCEYCB2LfcWLL0DkeCWhRIL820=",
-        "owner": "divnix",
+        "owner": "gytis-ivaskevicius",
         "repo": "flake-utils-plus",
-        "rev": "b4f9f517574cb7bd6ee3f19c72c19634c9f536e1",
+        "rev": "be1be083af014720c14f3b574f57b6173b4915d0",
         "type": "github"
       },
       "original": {
-        "owner": "divnix",
+        "owner": "gytis-ivaskevicius",
         "repo": "flake-utils-plus",
         "type": "github"
       }
     },
     "flake-utils_2": {
       "locked": {
-        "lastModified": 1638122382,
+        "lastModified": 1644229661,
-        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+        "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
         "type": "github"
       },
       "original": {
@@ -288,11 +327,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1639871969,
+        "lastModified": 1643933536,
-        "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=",
+        "narHash": "sha256-yRmsWAG4DnLxLIUtlaZsl0kH7rN5xSoyNRlf0YZrcH4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "697cc8c68ed6a606296efbbe9614c32537078756",
+        "rev": "2860d7e3bb350f18f7477858f3513f9798896831",
         "type": "github"
       },
       "original": {
@@ -320,11 +359,11 @@
     },
     "latest_2": {
       "locked": {
-        "lastModified": 1641887635,
+        "lastModified": 1644420267,
-        "narHash": "sha256-kDGpufwzVaiGe5e1sBUBPo9f1YN+nYHJlYqCaVpZTQQ=",
+        "narHash": "sha256-rFJuctggkjM412OC6OGPdXogFp7czGDW05ueWqpJbj8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b2737d4980a17cc2b7d600d7d0b32fd7333aca88",
+        "rev": "98bb5b77c8c6666824a4c13d23befa1e07210ef1",
         "type": "github"
       },
       "original": {
@@ -337,7 +376,7 @@
     "naersk": {
       "inputs": {
         "nixpkgs": [
-          "latest"
+          "nixos"
         ]
       },
       "locked": {
@@ -371,16 +410,16 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1641870998,
+        "lastModified": 1644472683,
-        "narHash": "sha256-6HkxR2WZsm37VoQS7jgp6Omd71iw6t1kP8bDbaqCDuI=",
+        "narHash": "sha256-sP6iM4NksOYO6NFfTJ96cg+ClPnq6cdY30xKA1iYtyU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "386234e2a61e1e8acf94dfa3a3d3ca19a6776efb",
+        "rev": "7adc9c14ec74b27358a8df9b973087e351425a79",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-21.11",
+        "ref": "release-21.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -406,11 +445,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1641965797,
+        "lastModified": 1643980037,
-        "narHash": "sha256-AfxfIzAZbt9aAzpVBn0Bwhd/M4Wix7G91kEjm9H6FPo=",
+        "narHash": "sha256-RdVHt2mD408WXMjQIOLvUzy8cSUHu8NAbilDmPVxf7E=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "87a35a0d58f546dc23f37b4f6af575d0e4be6a7a",
+        "rev": "9886a06e4745edb31587d0e9481ad82d35f0d593",
         "type": "github"
       },
       "original": {
@@ -437,11 +476,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1642104889,
+        "lastModified": 1644484625,
-        "narHash": "sha256-ZGS7DKXeH4rn+t8KcUFptV5Y2Np7JpFgL73Zj615yq0=",
+        "narHash": "sha256-XCujxhJbZ2NkYBV31bIhjmgKO49esKIwvPm0l1tpim8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "47619623ea15c6464b0e378092d5a46742dd3f9e",
+        "rev": "95845f4ca78589ae162ea74e96c2f29815772810",
         "type": "github"
       },
       "original": {
@@ -452,27 +491,27 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1641969095,
+        "lastModified": 1638986258,
-        "narHash": "sha256-WCiFqG6+E5NmeI6xnw/fxuKHgdsfb8xjL8N9Gxu4/hU=",
+        "narHash": "sha256-OceRdctKZRSgqQxVRvvNB0MaEnFMzQqjUffecoDE9eI=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b458e5133fba2c873649f071f7a8dfeae52ebd17",
+        "rev": "581d2d6c9cd5c289002203581d8aa0861963a933",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1641969095,
+        "lastModified": 1644420267,
-        "narHash": "sha256-WCiFqG6+E5NmeI6xnw/fxuKHgdsfb8xjL8N9Gxu4/hU=",
+        "narHash": "sha256-rFJuctggkjM412OC6OGPdXogFp7czGDW05ueWqpJbj8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b458e5133fba2c873649f071f7a8dfeae52ebd17",
+        "rev": "98bb5b77c8c6666824a4c13d23befa1e07210ef1",
         "type": "github"
       },
       "original": {
@@ -484,11 +523,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1641887635,
+        "lastModified": 1644359234,
-        "narHash": "sha256-kDGpufwzVaiGe5e1sBUBPo9f1YN+nYHJlYqCaVpZTQQ=",
+        "narHash": "sha256-u/sBnRgrFrn9W8gZMS6vN3ZnJsoTvbws968TpqwlDJQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b2737d4980a17cc2b7d600d7d0b32fd7333aca88",
+        "rev": "c5051e2b5fe9fab43a64f0e0d06b62c81a890b90",
         "type": "github"
       },
       "original": {
@@ -500,26 +539,18 @@
     },
     "nvfetcher": {
       "inputs": {
-        "flake-compat": [
+        "flake-compat": "flake-compat_2",
-          "digga",
+        "flake-utils": "flake-utils_4",
-          "deploy",
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "digga",
-          "flake-utils-plus",
-          "flake-utils"
-        ],
         "nixpkgs": [
-          "latest"
+          "nixos"
         ]
       },
       "locked": {
-        "lastModified": 1642013624,
+        "lastModified": 1644123018,
-        "narHash": "sha256-LjE6uGfAeJ8rm4KpIfkpdnQ42XflZWZDhVAhgfgRXkg=",
+        "narHash": "sha256-xEhhLmuy4FnT4Zdkf3epPX9T3xqn59yERCsicG4IEyM=",
         "owner": "berberman",
         "repo": "nvfetcher",
-        "rev": "ac6f8d2f09e91d2095bc9814beda937a3db9ab6d",
+        "rev": "9f2cb15c4668859312b6a854d79ad753d5b98b03",
         "type": "github"
       },
       "original": {
@@ -550,49 +581,44 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "blank": [
-          "digga",
-          "blank"
-        ],
         "bud": "bud",
         "darwin": "darwin",
-        "deploy": [
+        "deploy": "deploy",
-          "digga",
-          "deploy"
-        ],
         "digga": "digga",
-        "fenix": "fenix",
+        "fenix": "fenix_2",
-        "flake-utils": [
-          "digga",
-          "flake-utils"
-        ],
-        "flake-utils-plus": [
-          "digga",
-          "flake-utils-plus"
-        ],
         "home": "home",
         "latest": "latest_2",
         "naersk": "naersk",
-        "nixlib": [
-          "digga",
-          "nixlib"
-        ],
         "nixos": "nixos",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": [
-          "nixos"
-        ],
         "nvfetcher": "nvfetcher"
       }
     },
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1642015335,
+        "lastModified": 1639071661,
-        "narHash": "sha256-E7VQiv5SL4SEz1vDW+A8z7QSfd7Q48JMA0W211IC79w=",
+        "narHash": "sha256-4YySLORuK0qGGIEJj78S7CZ4jy4GIHJ5ks17k5AWblo=",
         "owner": "rust-analyzer",
         "repo": "rust-analyzer",
-        "rev": "62a13cce9b6356af0dfeeeb6add3432f0e76a19f",
+        "rev": "2534b7db1a093543d5bd759b3a1ca9e34418fa31",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-analyzer",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
+    "rust-analyzer-src_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1644391473,
+        "narHash": "sha256-39Mhn0JxV8QHog+B2KjeMalblXP8DFU5rRVkLXZILGk=",
+        "owner": "rust-analyzer",
+        "repo": "rust-analyzer",
+        "rev": "08348d79fa3ccb2aeeea87e758dcd5f1614c7ad8",
         "type": "github"
       },
       "original": {
@@ -604,11 +630,11 @@
     },
     "utils": {
       "locked": {
-        "lastModified": 1638122382,
+        "lastModified": 1637014545,
-        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+        "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
         "type": "github"
       },
       "original": {

flake.nix

@@ -11,6 +11,7 @@
       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";
@@ -21,33 +22,21 @@
       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.nixpkgs.follows = "nixos";
-      nvfetcher.inputs.flake-compat.follows = "digga/deploy/flake-compat";
-      nvfetcher.inputs.flake-utils.follows = "digga/flake-utils-plus/flake-utils";
 
       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
-
       fenix.url = "github:nix-community/fenix";
     };
 
@@ -81,11 +70,7 @@
               fenix.overlay
             ];
           };
-          latest = {
+          latest = { };
-            overlays = [
-              deploy.overlay
-            ];
-          };
         };
 
         lib = import ./lib { lib = digga.lib // nixos.lib; };
@@ -140,8 +125,6 @@
           }; # digga.lib.importers.rakeLeaves ./users/hm;
         };
 
-        devshell = ./shell;
-
         homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
 
         deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };
@@ -153,7 +136,7 @@
       }
     //
     {
-      budModules = { devos = import ./bud; };
+      budModules = { devos = import ./shell/bud; };
     }
   ;
 }

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;
-}

profiles/core/default.nix

@@ -2,7 +2,13 @@
 let inherit (lib) fileContents;
 in
 {
+  # For rage encryption, all hosts need a ssh key pair
+  services.openssh = {
+    enable = true;
+    openFirewall = lib.mkDefault false;
+  };
 
+  # This is just a representation of the nix default
   nix.systemFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
   nix.registry.nixpkgs.flake = self.inputs.nixos;
   nix.registry.latest.flake = self.inputs.latest;
@@ -65,12 +71,19 @@ in
   };
 
   nix = {
+    # Improve nix store disk usage
     autoOptimiseStore = true;
     gc.automatic = true;
     optimise.automatic = true;
+
+    # Prevents impurities in builds
     useSandbox = true;
+
+    # give root and @wheel special privileges with nix
     allowedUsers = [ "@wheel" ];
     trustedUsers = [ "root" "@wheel" ];
+
+    # Generally useful nix option defaults
     extraOptions = ''
       keep-outputs = true
       keep-derivations = true
@@ -82,12 +95,7 @@ in
   time.timeZone = "Europe/Warsaw";
   i18n.defaultLocale = "en_US.UTF-8";
 
-  # For rage encryption, all hosts need a ssh key pair
+  # Service that makes Out of Memory Killer more effective
-  services.openssh = {
-    enable = true;
-    openFirewall = lib.mkDefault false;
-  };
-
   services.earlyoom.enable = true;
   users.mutableUsers = false;
   console.keyMap = "pl";

shell/default.nix

@@ -1,10 +0,0 @@
-{ self, inputs, ... }:
-{
-  modules = with inputs; [
-    bud.devshellModules.bud
-  ];
-  exportedModules = [
-    ./devos.nix
-  ];
-}
-

shell/devos.nix

@@ -1,57 +0,0 @@
-{ pkgs, extraModulesPath, ... }:
-let
-
-  hooks = import ./hooks;
-
-  pkgWithCategory = category: package: { inherit package category; };
-  linter = pkgWithCategory "linter";
-  docs = pkgWithCategory "docs";
-  devos = pkgWithCategory "devos";
-
-in
-{
-  _file = toString ./.;
-
-  imports = [ "${extraModulesPath}/git/hooks.nix" ];
-  git = { inherit hooks; };
-
-  # tempfix: remove when merged https://github.com/numtide/devshell/pull/123
-  devshell.startup.load_profiles = pkgs.lib.mkForce (pkgs.lib.noDepEntry ''
-    # PATH is devshell's exorbitant privilige:
-    # fence against its pollution
-    _PATH=''${PATH}
-    # Load installed profiles
-    for file in "$DEVSHELL_DIR/etc/profile.d/"*.sh; do
-      # If that folder doesn't exist, bash loves to return the whole glob
-      [[ -f "$file" ]] && source "$file"
-    done
-    # Exert exorbitant privilige and leave no trace
-    export PATH=''${_PATH}
-    unset _PATH
-  '');
-
-  commands = with pkgs; [
-    (devos nixUnstable)
-    (devos agenix)
-    {
-      category = "devos";
-      name = pkgs.nvfetcher-bin.pname;
-      help = pkgs.nvfetcher-bin.meta.description;
-      command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml $@";
-    }
-    (linter nixpkgs-fmt)
-    (linter editorconfig-checker)
-    # (docs python3Packages.grip) too many deps
-    (docs mdbook)
-  ]
-
-  ++ lib.optional
-    (pkgs ? deploy-rs)
-    (devos deploy-rs.deploy-rs)
-
-  ++ lib.optional
-    (system != "i686-linux")
-    (devos cachix)
-
-  ;
-}

shell/hooks/default.nix

@@ -1,4 +0,0 @@
-{
-  enable = true;
-  pre-commit.text = builtins.readFile ./pre-commit.sh;
-}

shell/hooks/pre-commit.sh

@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-if git rev-parse --verify HEAD >/dev/null 2>&1
-then
-  against=HEAD
-else
-  # Initial commit: diff against an empty tree object
-  against=$(${git}/bin/git hash-object -t tree /dev/null)
-fi
-
-diff="git diff-index --name-only --cached $against --diff-filter d"
-
-nix_files=($($diff -- '*.nix'))
-all_files=($($diff))
-
-# Format staged nix files.
-if [[ -n "${nix_files[@]}" ]]; then
-  nixpkgs-fmt "${nix_files[@]}" \
-  && git add "${nix_files[@]}"
-fi
-
-# check editorconfig
-editorconfig-checker -- "${all_files[@]}"
-if [[ $? != '0' ]]; then
-  printf "%b\n" \
-    "\nCode is not aligned with .editorconfig" \
-    "Review the output and commit your fixes" >&2
-  exit 1
-fi

users/profiles/direnv/default.nix

@@ -3,7 +3,6 @@
     enable = true;
     nix-direnv = {
       enable = true;
-      enableFlakes = true;
     };
   };
 }