Upgrade

Sweet relief.

flake.lock

@@ -154,11 +154,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713406758,
+        "lastModified": 1714103775,
-        "narHash": "sha256-kwZvhmx+hSZvjzemKxsAqzEqWmXZS47VVwQhNrINORQ=",
+        "narHash": "sha256-kcBiIrmqzt3bNTr2GMBfAyA+on8BEKO1iKzzDFQZkjI=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "1efd500e9805a9efbce401ed5999006d397b9f11",
+        "rev": "285e26465a0bae510897ca04da26ce6307c652b4",
         "type": "github"
       },
       "original": {
@@ -279,11 +279,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712386041,
+        "lastModified": 1714043624,
-        "narHash": "sha256-dA82pOMQNnCJMAsPG7AXG35VmCSMZsJHTFlTHizpKWQ=",
+        "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d6bb9f934f2870e5cbc5b94c79e9db22246141ff",
+        "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411",
         "type": "github"
       },
       "original": {
@@ -365,11 +365,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1713521961,
+        "lastModified": 1714201532,
-        "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=",
+        "narHash": "sha256-nk0W4rH7xYdDeS7k1SqqNtBaNrcgIBYNmOVc8P2puEY=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2",
+        "rev": "53db5e1070d07e750030bf65f1b9963df8f0c678",
         "type": "github"
       },
       "original": {
@@ -379,11 +379,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1713344939,
+        "lastModified": 1714272655,
-        "narHash": "sha256-jpHkAt0sG2/J7ueKnG7VvLLkBYUMQbXQ2L8OBpVG53s=",
+        "narHash": "sha256-3/ghIWCve93ngkx5eNPdHIKJP/pMzSr5Wc4rNKE1wOc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e402c3eb6d88384ca6c52ef1c53e61bdc9b84ddd",
+        "rev": "12430e43bd9b81a6b4e79e64f87c624ade701eaf",
         "type": "github"
       },
       "original": {
@@ -497,11 +497,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1713596844,
+        "lastModified": 1714383054,
-        "narHash": "sha256-NiAbUyrQsNUFDRRGuu9KEpvjMfm+KKOFJGhy3+wNFdg=",
+        "narHash": "sha256-zUDP3ykEnDpvqeDOwqZxjufjeMgzkbf0DLwHBeSNZbA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "ff4cc8ed94a223e86b385bf4fb878fa1090407ba",
+        "rev": "25549d720af8d5ff6c7e76c09e8bdbcb8a383b03",
         "type": "github"
       },
       "original": {
@@ -612,11 +612,11 @@
     },
     "unixpkgs": {
       "locked": {
-        "lastModified": 1713562564,
+        "lastModified": 1714280680,
-        "narHash": "sha256-NQpYhgoy0M89g9whRixSwsHb8RFIbwlxeYiVSDwSXJg=",
+        "narHash": "sha256-eNTZCX/vK/BQOpY+6n5a6oGxBBe7qfSbtcppepCLAAQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "92d295f588631b0db2da509f381b4fb1e74173c5",
+        "rev": "9516f3c963708933abe984df94a925af38916237",
         "type": "github"
       },
       "original": {

hm/desktop/browser/default.nix

@@ -113,13 +113,15 @@
           github = "https://github.com/search?q={}";
           google = "https://www.google.fr/search?q={}";
           hm = homemanager;
-          homemanager = "https://mipmip.github.io/home-manager-option-search/?query={}";
+          homemanager = "https://home-manager-options.extranix.com/?query={}&release=${config.home.version.release}";
           invidious = "https://invidious.frogeye.fr/search?q={}";
           inv = invidious;
           nixos = "https://search.nixos.org/options?channel=${config.home.version.release}&query={}";
+          nixoswiki = "https://wiki.nixos.org/w/index.php?search={}";
           nixpkgs = "https://search.nixos.org/packages?channel=${config.home.version.release}&query={}";
           noogle = "https://noogle.dev/q?term={}";
           npm = "https://www.npmjs.com/search?q={}";
+          nw = nixoswiki;
           os = nixos;
           pkgs = nixpkgs;
           q = qwant;

hm/gpg/default.nix

@@ -34,13 +34,17 @@
         trust = "ultimate";
       }];
     };
-    services.gpg-agent = {
+    services.gpg-agent = rec {
       enableBashIntegration = true;
       enableZshIntegration = true;
       pinentryFlavor = "gnome3";
       # gnome3 is nicer, but requires gcr as a dbus package.
       # Which is in my NixOS config, and on non-NixOS too.
       # It will fall back to ncurses when running in non-graphics mode.
+      defaultCacheTtl = 3600;
+      defaultCacheTtlSsh = defaultCacheTtl;
+      maxCacheTtl = 3*3600;
+      maxCacheTtlSsh = maxCacheTtl;
     };
   };
 }

os/default.nix

@@ -8,6 +8,7 @@
     ./ccc
     ./common.nix
     ./desktop.nix
+    ./dev
     ./diff
     ./gaming
     ./geoffrey.nix

os/dev/default.nix

@@ -0,0 +1,7 @@
+{ pkgs, lib, config, ... }:
+{
+  config = lib.mkIf config.frogeye.dev.docker {
+    virtualisation.docker.enable = true;
+    users.users.geoffrey.extraGroups = [ "docker" ];
+  };
+}