fix/upstreaming-merge-conflicts (#41)

Co-authored-by: Anton <fetsorn@gmail.com>
Co-authored-by: Chris Montgomery <chris@cdom.io>
Co-authored-by: Timothy DeHerrera <tim.deh@pm.me>
Co-authored-by: Parthiv Seetharaman <pachum99@myrdd.info>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Co-authored-by: GTrunSec <gtrunsec@hardenedlinux.org>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/41
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>

flake.lock

@@ -82,10 +82,9 @@
     "deploy": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "naersk": "naersk",
         "nixpkgs": [
           "digga",
-          "nixpkgs"
+          "latest"
         ],
         "utils": [
           "digga",
@@ -93,11 +92,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1628068208,
+        "lastModified": 1632822684,
-        "narHash": "sha256-akJBkj6os4bjO1drhketJvXNC21yPuy4ufL2pyius4M=",
+        "narHash": "sha256-lt7eayYmgsD5OQwpb1XYfHpxttn43bWo7G7hIJs+zJw=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "d72174307d5b88ec24cc2e69e875228fe3d642ed",
+        "rev": "9a02de4373e0ec272d08a417b269a28ac8b961b4",
         "type": "github"
       },
       "original": {
@@ -108,11 +107,11 @@
     },
     "devshell": {
       "locked": {
-        "lastModified": 1625086391,
+        "lastModified": 1632436039,
-        "narHash": "sha256-IpNPv1v8s4L3CoxhwcgZIitGpcrnNgnj09X7TA0QV3k=",
+        "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "4b5ac7cf7d9a1cc60b965bb51b59922f2210cbc7",
+        "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6",
         "type": "github"
       },
       "original": {
@@ -131,6 +130,8 @@
         "home-manager": [
           "home"
         ],
+        "latest": "latest",
+        "nix": "nix",
         "nixlib": [
           "nixos"
         ],
@@ -140,11 +141,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1628211944,
+        "lastModified": 1632959483,
-        "narHash": "sha256-2q1dNUzitVd0JNRHYTubbyb8ks3fL9hPJOvQgofxELE=",
+        "narHash": "sha256-jXogai6e+QRtiZFBOrMmYdeLXejzVT91kuDKu2RuJ10=",
         "owner": "divnix",
         "repo": "digga",
-        "rev": "760bb9c29063258ba547145de0ab96acd7eba4c0",
+        "rev": "6549cf4c87d1a77138cbecbc6bb9483c20572cd7",
         "type": "github"
       },
       "original": {
@@ -156,11 +157,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1606424373,
+        "lastModified": 1627913399,
-        "narHash": "sha256-oq8d4//CJOrVj+EcOaSXvMebvuTkmBJuT5tzlfewUnQ=",
+        "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "99f1c2157fba4bfe6211a321fd0ee43199025dbf",
+        "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
         "type": "github"
       },
       "original": {
@@ -192,16 +193,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1627071952,
+        "lastModified": 1630859749,
-        "narHash": "sha256-FhE0KOuI9Kl4eyGJXu4bh9fBP2hbxjnD1DlKHljCcYs=",
+        "narHash": "sha256-qkoU2rIbbP2+T0dfcqXW35GCWNsi0Y1IgN9BELmt4Zo=",
-        "owner": "gytis-ivaskevicius",
+        "owner": "divnix",
         "repo": "flake-utils-plus",
-        "rev": "51a82925db31073bc4822c9b538a0a3ebf1134b2",
+        "rev": "a4e267e3fc87e60c5029c6c3855935ff1ff3018e",
         "type": "github"
       },
       "original": {
-        "owner": "gytis-ivaskevicius",
+        "owner": "divnix",
-        "ref": "staging",
         "repo": "flake-utils-plus",
         "type": "github"
       }
@@ -243,6 +243,22 @@
       }
     },
     "latest": {
+      "locked": {
+        "lastModified": 1632660378,
+        "narHash": "sha256-sjA8eQlnyDjDLyAyq3XlJmN0nqW0ftl/pb7VnMg86L0=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "31ffc50c571e6683e9ecc9dbcbd4a8e9914b4497",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "latest_2": {
       "locked": {
         "lastModified": 1627942574,
         "narHash": "sha256-guUcGRWvY2mfiVSet2x/zeHIyflm2wgglj0ldg0mMio=",
@@ -258,28 +274,24 @@
         "type": "github"
       }
     },
-    "naersk": {
+    "lowdown-src": {
-      "inputs": {
+      "flake": false,
-        "nixpkgs": [
-          "latest"
-        ]
-      },
       "locked": {
-        "lastModified": 1622810282,
+        "lastModified": 1617481909,
-        "narHash": "sha256-4wmvM3/xfD0hCdNDIXVzRMfL4yB1J+DjH6Zte2xbAxk=",
+        "narHash": "sha256-SqnfOFuLuVRRNeVJr1yeEPJue/qWoCp5N6o5Kr///p4=",
-        "owner": "nmattia",
+        "owner": "kristapsdz",
-        "repo": "naersk",
+        "repo": "lowdown",
-        "rev": "e8061169e1495871b56be97c5c51d310fae01374",
+        "rev": "148f9b2f586c41b7e36e73009db43ea68c7a1a4d",
         "type": "github"
       },
       "original": {
-        "owner": "nmattia",
+        "owner": "kristapsdz",
-        "ref": "master",
+        "ref": "VERSION_0_8_4",
-        "repo": "naersk",
+        "repo": "lowdown",
         "type": "github"
       }
     },
-    "naersk_2": {
+    "naersk": {
       "inputs": {
         "nixpkgs": [
           "latest"
@@ -299,6 +311,28 @@
         "type": "github"
       }
     },
+    "nix": {
+      "inputs": {
+        "lowdown-src": "lowdown-src",
+        "nixpkgs": [
+          "digga",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1630335771,
+        "narHash": "sha256-eljjEPJdLK3aDskF7qX4YM/6KCq+w9nr+IKhrKW/AIQ=",
+        "owner": "nixos",
+        "repo": "nix",
+        "rev": "50a35860ee9237d341948437c5f70a7f0987d393",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nix",
+        "type": "github"
+      }
+    },
     "nix-dram": {
       "inputs": {
         "flake-utils": "flake-utils_2",
@@ -421,11 +455,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1627523399,
+        "lastModified": 1632700276,
-        "narHash": "sha256-j9CgnUQpWcb8OB4LRzPW8BdxvmoROJptgptDlPA8Heo=",
+        "narHash": "sha256-XABvQUq2qv+YcQxW93DnU8mgtVsGJWyhcznny/Lbp0Q=",
         "owner": "berberman",
         "repo": "nvfetcher",
-        "rev": "fb8f2cc770ad3dd3e29d7ba3004692d4d53fba9b",
+        "rev": "248fe98ed1bc352ce164d08a9e76fdc5f301ba2d",
         "type": "github"
       },
       "original": {
@@ -457,8 +491,8 @@
           "flake-utils-plus"
         ],
         "home": "home",
-        "latest": "latest",
+        "latest": "latest_2",
-        "naersk": "naersk_2",
+        "naersk": "naersk",
         "nix-dram": "nix-dram",
         "nixlib": [
           "digga",

flake.nix

@@ -81,12 +81,15 @@
               nur.overlay
               agenix.overlay
               nvfetcher.overlay
-              deploy.overlay
               nix-dram.overlay
               ./pkgs/default.nix
             ];
           };
-          latest = { };
+          latest = {
+            overlays = [
+              deploy.overlay
+            ];
+          };
         };
 
         lib = import ./lib { lib = digga.lib // nixos.lib; };
@@ -104,8 +107,8 @@
           hostDefaults = {
             system = "x86_64-linux";
             channelName = "nixos";
-            imports = [ (digga.lib.importModules ./modules) ];
+            imports = [ (digga.lib.importExportableModules ./modules) ];
-            externalModules = [
+            modules = [
               { lib.our = self.lib; }
               digga.nixosModules.bootstrapIso
               digga.nixosModules.nixConfig
@@ -133,8 +136,8 @@
         };
 
         home = {
-          imports = [ (digga.lib.importModules ./users/modules) ];
+          imports = [ (digga.lib.importExportableModules ./users/modules) ];
-          externalModules = [ ];
+          modules = [ ];
           importables = rec {
             profiles = digga.lib.rakeLeaves ./users/profiles;
             suites = with profiles; rec {

overlays/overrides.nix

@@ -12,7 +12,9 @@ channels: final: prev: {
     nixpkgs-fmt
     qutebrowser
     signal-desktop
-    starship;
+    starship
+    deploy-rs
+    ;
 
 
   haskellPackages = prev.haskellPackages.override

shell/default.nix

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

shell/devos.nix

@@ -41,7 +41,7 @@ in
       category = "devos";
       name = pkgs.nvfetcher-bin.pname;
       help = pkgs.nvfetcher-bin.meta.description;
-      command = "cd $DEVSHELL_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml --no-output $@";
+      command = "cd $PRJ_ROOT/pkgs; ${pkgs.nvfetcher-bin}/bin/nvfetcher -c ./sources.toml $@";
     }
     (linter nixpkgs-fmt)
     (linter editorconfig-checker)