Merge branch 'main' into teutat3s

.drone.yml

@@ -4,25 +4,6 @@ type: docker
 name: Upstreaming
 
 steps:
-  - name: "Setup git repos and SSH access"
-    image: alpine/git
-    when:
-      event:
-        - cron
-      cron:
-        - sync-main-with-upstream
-        - sync-b12f-with-main
-        - sync-teutat3s-with-main
-    environment:
-      GITEA_SSH_KEY:
-        from_secret: gitea_ssh_key
-    commands:
-      - ./.drone/setup_ssh.sh
-      - git fetch
-      - git remote add devos git@git.b12f.io:pub-solar/devos
-      - git remote set-url origin git@git.b12f.io:pub-solar/os
-      - git fetch --all
-
   - name: "Sync 'devos' branch with upstream"
     image: alpine/git
     when:
@@ -35,7 +16,10 @@ steps:
         from_secret: gitea_ssh_key
     commands:
       - ./.drone/setup_ssh.sh
-      - git checkout origin/devos
+      - git remote add devos git@git.b12f.io:pub-solar/devos
+      - git remote set-url origin git@git.b12f.io:pub-solar/os
+      - git fetch --all
+      - git checkout -b devos --track origin/devos
       - git merge -X theirs devos/main
       - git push origin devos
 

.gitignore

@@ -10,3 +10,4 @@ doi
 pkgs/_sources/.shake*
 
 tags
+/owners

flake.lock

@@ -106,10 +106,9 @@
     "deploy": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "naersk": "naersk",
         "nixpkgs": [
           "digga",
-          "nixpkgs"
+          "latest"
         ],
         "utils": [
           "digga",
@@ -117,11 +116,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1628752686,
+        "lastModified": 1632822684,
-        "narHash": "sha256-Lzh9MYUJDsjgif+YEyOErXtj1IH+ci8J1C30g1ms69s=",
+        "narHash": "sha256-lt7eayYmgsD5OQwpb1XYfHpxttn43bWo7G7hIJs+zJw=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "e5546f9c2503c26d175f08a81fc0a0f330be4cbe",
+        "rev": "9a02de4373e0ec272d08a417b269a28ac8b961b4",
         "type": "github"
       },
       "original": {
@@ -132,11 +131,11 @@
     },
     "devshell": {
       "locked": {
-        "lastModified": 1629275356,
+        "lastModified": 1632436039,
-        "narHash": "sha256-R17M69EKXP6q8/mNHaK53ECwjFo1pdF+XaJC9Qq8zjg=",
+        "narHash": "sha256-OtITeVWcKXn1SpVEnImpTGH91FycCskGBPqmlxiykv4=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "26f25a12265f030917358a9632cd600b51af1d97",
+        "rev": "7a7a7aa0adebe5488e5abaec688fd9ae0f8ea9c6",
         "type": "github"
       },
       "original": {
@@ -155,6 +154,7 @@
         "home-manager": [
           "home"
         ],
+        "latest": "latest",
         "nix": "nix",
         "nixlib": [
           "nixos"
@@ -165,11 +165,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1630957535,
+        "lastModified": 1632959483,
-        "narHash": "sha256-586Gbm5pok33UaxvQKlFrAKDYeXKXc0Hry/6PiVzOz8=",
+        "narHash": "sha256-jXogai6e+QRtiZFBOrMmYdeLXejzVT91kuDKu2RuJ10=",
         "owner": "divnix",
         "repo": "digga",
-        "rev": "7115e02b64f86a78e47477c16a121629269f3988",
+        "rev": "6549cf4c87d1a77138cbecbc6bb9483c20572cd7",
         "type": "github"
       },
       "original": {
@@ -181,11 +181,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": {
@@ -283,8 +283,24 @@
     },
     "latest": {
       "locked": {
-        "lastModified": 1630850248,
+        "lastModified": 1632660378,
-        "narHash": "sha256-OzJi6Olf7mSVhGt3W7qOMVP5Qk1lH60zlHeCcITzfv0=",
+        "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=",
         "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "23d5823337f4502dfa17e192d8c53a47cabcb6b4",
@@ -323,37 +339,38 @@
         ]
       },
       "locked": {
-        "lastModified": 1622810282,
+        "lastModified": 1623927034,
-        "narHash": "sha256-4wmvM3/xfD0hCdNDIXVzRMfL4yB1J+DjH6Zte2xbAxk=",
+        "narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=",
         "owner": "nmattia",
         "repo": "naersk",
-        "rev": "e8061169e1495871b56be97c5c51d310fae01374",
+        "rev": "e09c320446c5c2516d430803f7b19f5833781337",
         "type": "github"
       },
       "original": {
         "owner": "nmattia",
-        "ref": "master",
         "repo": "naersk",
         "type": "github"
       }
     },
-    "naersk_2": {
+    "nix": {
       "inputs": {
+        "lowdown-src": "lowdown-src",
         "nixpkgs": [
-          "latest"
+          "digga",
+          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1629707199,
+        "lastModified": 1630335771,
-        "narHash": "sha256-sGxlmfp5eXL5sAMNqHSb04Zq6gPl+JeltIZ226OYN0w=",
+        "narHash": "sha256-eljjEPJdLK3aDskF7qX4YM/6KCq+w9nr+IKhrKW/AIQ=",
-        "owner": "nmattia",
+        "owner": "nixos",
-        "repo": "naersk",
+        "repo": "nix",
-        "rev": "df71f5e4babda41cd919a8684b72218e2e809fa9",
+        "rev": "50a35860ee9237d341948437c5f70a7f0987d393",
         "type": "github"
       },
       "original": {
-        "owner": "nmattia",
+        "owner": "nixos",
-        "repo": "naersk",
+        "repo": "nix",
         "type": "github"
       }
     },
@@ -500,12 +517,12 @@
         ]
       },
       "locked": {
-        "lastModified": 1628690139,
+        "lastModified": 1632700276,
-        "narHash": "sha256-9bk59V0YjZnMfSQMCHuYVPA/Bc3enjTtoyTWt1B3/zE=",
+        "narHash": "sha256-XABvQUq2qv+YcQxW93DnU8mgtVsGJWyhcznny/Lbp0Q=",
         "owner": "berberman",
         "repo": "nvfetcher",
-        "rev": "e9600782adbf6fb8217087bd2f05335cad96e542",
+        "rev": "248fe98ed1bc352ce164d08a9e76fdc5f301ba2d",
-       "type": "github"
+        "type": "github"
       },
       "original": {
         "owner": "berberman",
@@ -563,8 +580,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
@@ -137,8 +140,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)