fix: nvfetcher, use docker_24, 1password

flake.lock

@@ -30,11 +30,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1683754942,
+        "lastModified": 1692248770,
-        "narHash": "sha256-L+Bj8EL4XLmODRIuOkk9sI6FDECVzK+C8jeZFv7q6eY=",
+        "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "252541bd05a7f55f3704a3d014ad1badc1e3360d",
+        "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b",
         "type": "github"
       },
       "original": {
@@ -54,11 +54,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1683779844,
+        "lastModified": 1686747123,
-        "narHash": "sha256-sIeOU0GsCeQEn5TpqE/jFRN4EGsPsjqVRsPdrzIDABM=",
+        "narHash": "sha256-XUQK9kwHpTeilHoad7L4LjMCCyY13Oq383CoFADecRE=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "c80189917086e43d49eece2bd86f56813500a0eb",
+        "rev": "724463b5a94daa810abfc64a4f87faef4e00f984",
         "type": "github"
       },
       "original": {
@@ -249,6 +249,22 @@
         "type": "github"
       }
     },
+    "fork": {
+      "locked": {
+        "lastModified": 1692960587,
+        "narHash": "sha256-39SKGdhn8jKKkdqhULbCvQOpdUPE9NNJpy5HTB++Jvg=",
+        "owner": "teutat3s",
+        "repo": "nixpkgs",
+        "rev": "312709dd70684f52496580e533d58645526b1c90",
+        "type": "github"
+      },
+      "original": {
+        "owner": "teutat3s",
+        "ref": "nvfetcher-fix",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "home": {
       "inputs": {
         "nixpkgs": [
@@ -256,11 +272,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1686582345,
+        "lastModified": 1693208669,
-        "narHash": "sha256-z4wLfa++k1d7Y/tQpQYub1D0K0OO9Wju0FZ8U53KUE0=",
+        "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e753d659c64c7d158433d87ef7d6151ca1d1817a",
+        "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
         "type": "github"
       },
       "original": {
@@ -272,11 +288,11 @@
     },
     "latest": {
       "locked": {
-        "lastModified": 1692447944,
+        "lastModified": 1693844670,
-        "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=",
+        "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e",
+        "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1",
         "type": "github"
       },
       "original": {
@@ -304,11 +320,11 @@
     },
     "nixos": {
       "locked": {
-        "lastModified": 1692414505,
+        "lastModified": 1693953029,
-        "narHash": "sha256-sSTuyR9JYSxmUcYcj0Jvw1hIq1tz/Canw9mK0hEJvnE=",
+        "narHash": "sha256-1+28KQl4YC4IBzKo/epvEyK5KH4MlgoYueJ8YwLGbOc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "4cdad15f34e6321a2f789b99d42815b9142ac2ba",
+        "rev": "4077a0e4ac3356222bc1f0a070af7939c3098535",
         "type": "github"
       },
       "original": {
@@ -336,11 +352,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1683965003,
+        "lastModified": 1693718952,
-        "narHash": "sha256-DrzSdOnLv/yFBvS2FqmwBA2xIbN/Lny/WlxHyoLR9zE=",
+        "narHash": "sha256-+nGdJlgTk0MPN7NygopipmyylVuAVi7OItIwTlwtGnw=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "81cd886719e10d4822b2a6caa96e95d56cc915ef",
+        "rev": "793de77d9f83418b428e8ba70d1e42c6507d0d35",
         "type": "github"
       },
       "original": {
@@ -388,6 +404,7 @@
         "deploy": "deploy",
         "digga": "digga",
         "flake-compat": "flake-compat",
+        "fork": "fork",
         "home": "home",
         "latest": "latest",
         "master": "master",
@@ -437,11 +454,11 @@
       },
       "locked": {
         "dir": "vmtools",
-        "lastModified": 1678877061,
+        "lastModified": 1689935541,
-        "narHash": "sha256-8s4UlwrpXfrpXsN7VSP5og4Sf21OoLn90YLTtp/duE0=",
+        "narHash": "sha256-+tIHC0d9m3rHUNGBKLv7+ZTadm2L+/3S9hNDCVj2za0=",
         "ref": "main",
-        "rev": "b06e8ae5560724c64bd4fc2533ebe2e27c6a333f",
+        "rev": "107809454b450c05d83571ccb37df31f59cd6e06",
-        "revCount": 52,
+        "revCount": 67,
         "type": "git",
         "url": "https://git.pub.solar/pub-solar/infra?dir=vmtools"
       },

flake.nix

@@ -10,6 +10,8 @@
     latest.url = "github:nixos/nixpkgs/nixos-unstable";
     master.url = "github:nixos/nixpkgs/master";
 
+    fork.url = "github:teutat3s/nixpkgs/nvfetcher-fix";
+
     flake-compat.url = "github:edolstra/flake-compat";
     flake-compat.flake = false;
 
@@ -81,6 +83,7 @@
         nixos-22-05 = {};
         latest = {};
         master = {};
+        fork = {};
       };
 
       lib = import ./lib {lib = digga.lib // nixos.lib;};

modules/docker/default.nix

@@ -14,6 +14,7 @@ in {
 
   config = mkIf cfg.enable {
     virtualisation.docker.enable = true;
+    virtualisation.docker.package = pkgs.docker_24;
     users.users = with pkgs;
       pkgs.lib.setAttrByPath [psCfg.user.name] {
         extraGroups = ["docker"];

overlays/overrides.nix

@@ -3,9 +3,16 @@ channels: final: prev: {
 
   inherit
     (channels.latest)
+    _1password
+    _1password-gui
     nixd
-    nvfetcher
     thunderbird
+    docker_24
+    ;
+
+  inherit
+    (channels.fork)
+    nvfetcher
     ;
 
   inherit