jump to nixpkgs 26.05

9 files changed, 99 insertions, 91 deletions

diff --git a/common/common.nix b/common/common.nix
index 02fec64..e10fbf1 100644
--- a/common/common.nix
+++ b/common/common.nix
@@ -37,7 +37,7 @@
 
   documentation = {
     dev.enable = true;
-    man.generateCaches = true;
+    man.cache.enable = true;
     nixos.includeAllModules = true;
     nixos.options.warningsAreErrors = false;
   };
diff --git a/common/desktop.nix b/common/desktop.nix
index 902b235..cfe636c 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -42,7 +42,6 @@
   };
 
   # graphics and stuff
-  programs.light.enable = true;
   programs.slock.enable = true;
 
   environment.systemPackages = with pkgs; [
diff --git a/flora/services/akkoma.nix b/flora/services/akkoma.nix
index 6864a29..44b5528 100644
--- a/flora/services/akkoma.nix
+++ b/flora/services/akkoma.nix
@@ -203,8 +203,18 @@ in
 
       networking.firewall.allowedTCPPorts = [ 4000 ];
 
-      environment.etc."resolv.conf".text =
-        "nameserver 1.1.1.1";
+      # environment.etc."resolv.conf".text =
+      #   "nameserver 1.1.1.1";
+      #
+      # TODO: Possibly?
+      # services.coredns = {
+      #   enable = true;
+      #   config = ''
+      #   .:53 {
+      #     forward . 1.1.1.1
+      #   }
+      #   '';
+      # };
     };
   };
 
diff --git a/flora/services/blog.nix b/flora/services/blog.nix
index e77cc7c..5b4912f 100644
--- a/flora/services/blog.nix
+++ b/flora/services/blog.nix
@@ -6,7 +6,7 @@ let
     src = pkgs.fetchgit {
       url = "https://stuebinm.eu/git/forks/lux";
       rev = "refs/heads/master";
-      sha256 = "sha256-L2y5SEGOaoWl+jQGP3TmpQQLojjkRAjiRjbwhGKOg14=";
+      hash = "sha256-ooRgRhs50D6TEFVpL9QfsCUKX/R7dUoETIorJoS9FNY=";
     };
     buildInputs = [ pkgs.mdbook ];
     buildPhase = ''
@@ -27,8 +27,8 @@ let
     '';
     installPhase = ''
       mkdir -p $out
-      mv gtfs-book-html $out/gtfs
-      mv gtfs-realtime-book-html $out/gtfs-realtime
+      mv /build/gtfs-book-html $out/gtfs
+      mv /build/gtfs-realtime-book-html $out/gtfs-realtime
       cp -r ${lux.outPath} $out/lux
     '';
   };
@@ -48,5 +48,7 @@ in
       '';
     });
     locations."/bookshelf/".alias = "${gtfsBooks.outPath}/";
+
+    locations."/steno/".alias = "${pkgs.copyPathToStore ./dist}/";
   };
 }
diff --git a/flora/services/mail.nix b/flora/services/mail.nix
index 0ee8418..4705e25 100644
--- a/flora/services/mail.nix
+++ b/flora/services/mail.nix
@@ -12,15 +12,11 @@
 
     # A list of all login accounts. To create the password hashes, use
     # nix run nixpkgs.apacheHttpd -c htpasswd -nbB "" "super secret password" | cut -d: -f2
-    loginAccounts = {
+    accounts = {
         "hello@stuebinm.eu" = {
             hashedPasswordFile = "/run/secrets/mail/hashedPassword";
             aliases = ["postmaster@stuebinm.eu" "abuse@stuebinm.eu"];
         };
     };
-
-    # Use Let's Encrypt certificates. Note that this needs to set up a stripped
-    # down nginx and opens port 80.
-    certificateScheme = "acme-nginx";
   };
 }
diff --git a/home/home.nix b/home/home.nix
index eaf1dee..a3bf335 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -180,6 +180,8 @@
   programs.neovim = {
     enable = true;
     viAlias = true;
+    withRuby = false;
+    withPython3 = false;
     plugins = with pkgs; [
       (vimPlugins.nvim-treesitter.withPlugins 
         (plugins: [ tree-sitter-grammars.tree-sitter-nix ]))
@@ -288,62 +290,63 @@
   programs.ssh = {
     # forwardAgent = true;
     enable = true;
+    enableDefaultConfig = true;
 
     extraConfig = ''
       SetEnv TERM=xterm-256color
     '';
-    matchBlocks = let
+    settings = let
       keydir = config.home.homeDirectory + "/.ssh";
-      hetznerlogin = match: {user = "root"; identityFile = keydir + "/hetzner.pub";} // match;
-      vpslogin = hostname: hetznerlogin {inherit hostname;};
+      hetznerlogin = match: { User = "root"; IdentityFile = keydir + "/hetzner.pub";} // match;
+      vpslogin = hostname: hetznerlogin { inherit hostname; };
     in {
       "flora" = vpslogin "flora.stuebinm.eu";
       "chaski" = vpslogin "chaski.stuebinm.eu";
       "cgit" = vpslogin "flora.stuebinm.eu" // {user = "git";};
       "mate" = {
-        hostname = "192.168.69.174";
-        user = "root";
-        identityFile = keydir + "/hetzner.pub";
+        Hostname = "192.168.69.174";
+        User = "root";
+        IdentityFile = keydir + "/hetzner.pub";
       };
       "c3voc" = {
-        hostname = "git.c3voc.de";
-        user = "git";
-        identityFile = keydir + "/id_surltesh-echer";
+        Hostname = "git.c3voc.de";
+        User = "git";
+        IdentityFile = keydir + "/id_surltesh-echer";
       };
       "encoder* mixer* atem* minion*" = {
         # hostname = "%h.lan.c3voc.de";
-        user = "voc";
-        extraOptions.StrictHostKeyChecking = "no";
+        User = "voc";
+        StrictHostKeyChecking = "no";
       };
       "nobelium" = {
-        hostname = "no.colorspace.club";
-        user = "root";
-        identityFile = keydir + "/id_ed25519";
+        Hostname = "no.colorspace.club";
+        User = "root";
+        IdentityFile = keydir + "/id_ed25519";
       };
       "colorspace-git" = {
-        hostname = "no.colorspace.club";
-        user = "git";
-        identityFile = keydir + "/id_ed25519";
+        Hostname = "no.colorspace.club";
+        User = "git";
+        IdentityFile = keydir + "/id_ed25519";
       };
       "git.infra4future.de" = {
-        hostname = "git.infra4future.de";
-        user = "gitea";
-        identityFile = keydir + "/id_ed25519";
-        addressFamily = "inet";
+        Hostname = "git.infra4future.de";
+        User = "gitea";
+        IdentityFile = keydir + "/id_ed25519";
+        AddressFamily = "inet";
       };
       "namauh" = {
-        hostname = "10.11.99.1";
-        user = "root";
-        identityFile = keydir + "/id_ed25519";
+        Hostname = "10.11.99.1";
+        User = "root";
+        IdentityFile = keydir + "/id_ed25519";
       };
       "billy" = {
-        hostname = "billy.books.exposed";
-        user = "root";
-        identityFile = keydir + "/id_ed25519";
+        Hostname = "billy.books.exposed";
+        User = "root";
+        IdentityFile = keydir + "/id_ed25519";
       };
       "regiolis" = {
-        hostname = "regiolis.erpu.eu";
-        user = "terru";
+        Hostname = "regiolis.erpu.eu";
+        User = "terru";
       };
     };
   };
diff --git a/home/packages-minimal.nix b/home/packages-minimal.nix
index 20eb6df..baf15e4 100644
--- a/home/packages-minimal.nix
+++ b/home/packages-minimal.nix
@@ -19,10 +19,8 @@
     git-annex git-bug git-appraise mergiraf
     # other things
     gauche
-    # html, js & co
-    jq html-tidy nodePackages.stylelint nodePackages.js-beautify zola
-    lowdown
+    jq ijq lowdown
     # nix things
-    nixfmt-rfc-style deploy-rs.deploy-rs
+    nixfmt deploy-rs.deploy-rs
   ];
 }
diff --git a/home/packages.nix b/home/packages.nix
index e9e6090..724efc1 100644
--- a/home/packages.nix
+++ b/home/packages.nix
@@ -12,7 +12,7 @@ in
     plover
     # internet apps & clients
     firefox keepassxc mumble lynx offpunk
-    openconnect telegram-desktop monolith magic-wormhole-rs
+    openconnect monolith magic-wormhole-rs
     dino
     # graphics & audio
     audacity blender darktable ffmpeg-full
@@ -29,7 +29,7 @@ in
     almanac libnotify grim slurp (zbar.override { enableVideo = false; withXorg = false; })
     wl-clipboard showrt
     kijetesantakaluotokieni mpc dufs progress hledger
-    wineWowPackages.full sops xdg-utils exiftool
+    wineWow64Packages.full sops xdg-utils exiftool
     mercurial darcs git-annex-remote-remarkable2 # git-who
     rlwrap
     inputs.ocaml-forester.legacyPackages.${system}.forester
@@ -52,7 +52,7 @@ in
     (agda.withPackages (p: [ p.standard-library p.cubical p.agda-categories ]))
 
     # html, js & co
-    jq ijq html-tidy nodePackages.stylelint nodePackages.js-beautify zola
+    html-tidy # nodePackages.stylelint nodePackages.js-beautify
     libxml2 fq htmlq
     # rust
     rust-bin.stable.latest.minimal rust-analyzer rustfmt
diff --git a/npins/sources.json b/npins/sources.json
index 1c80707..3fe0fe9 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -9,9 +9,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "f420408eee6c6a8c4eaf3536d6f9c926c9b01fa4",
-      "url": "https://github.com/ai-robots-txt/ai.robots.txt/archive/f420408eee6c6a8c4eaf3536d6f9c926c9b01fa4.tar.gz",
-      "hash": "0b9sv1y3bkpy29fh35kam7zirvx2kdwf8yngfn1zx7qwm6ylxr0a"
+      "revision": "a0fed45f0eb6723597028b49d5e0990dd4c41920",
+      "url": "https://github.com/ai-robots-txt/ai.robots.txt/archive/a0fed45f0eb6723597028b49d5e0990dd4c41920.tar.gz",
+      "hash": "1289abmqwyw7d2zg2yh5jf9ab78zhdf42kcih9sa0hb313yk6amc"
     },
     "almanac": {
       "type": "Git",
@@ -45,9 +45,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "bc81eb5833227b97bda1d7c35c5feefab539d1f4",
+      "revision": "9758e92c4786f28d59a4b4bee90410142095097d",
       "url": null,
-      "hash": "0c1ndlha08n5m34gmkd6kq9m9f5nc2f7qzxijadwjs2gnqkni31z"
+      "hash": "1l4n0fld1szz38axnhiw38wshrbm09v715vvs6mqlcqpnygqzgcs"
     },
     "deploy-rs": {
       "type": "Git",
@@ -101,9 +101,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "2a9d4fcf48b872aef1343f71dfddf44946fd8eb5",
+      "revision": "51ac2f45a806496e384a2a58b8a8604afb687759",
       "url": null,
-      "hash": "077xjxaisjqcnqwjpq8cfg34y27cv5aidvzwv4d5736rz9v96bak"
+      "hash": "0frsi43kbm56qlicjvdnbvd86pz4krcs8w18dhym9yx37lilxddb"
     },
     "home-manager": {
       "type": "Git",
@@ -112,11 +112,11 @@
         "owner": "nix-community",
         "repo": "home-manager"
       },
-      "branch": "release-25.11",
+      "branch": "release-26.05",
       "submodules": false,
-      "revision": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f",
-      "url": "https://github.com/nix-community/home-manager/archive/3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f.tar.gz",
-      "hash": "13fmry1jd0na71fxhzms9qf3ybj6shgvnphq4p1akxxmv44gzq20"
+      "revision": "4ce190229c73d44536caa7072f6308fb2d8feeb3",
+      "url": "https://github.com/nix-community/home-manager/archive/4ce190229c73d44536caa7072f6308fb2d8feeb3.tar.gz",
+      "hash": "1cqangi17i4nfkjpzpzpsavcgnaqdvarjjsjg09sbj5mnhnv6v35"
     },
     "isabelle-utils": {
       "type": "Git",
@@ -138,9 +138,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "daa2bc82bc0ddc17fd2b72781f1c740a5a7b264c",
+      "revision": "9b23a5d3be58d76a4897bc4bf942a99c093d839c",
       "url": null,
-      "hash": "0agd9vizn0lqvpz2fzdricry8kbbg2zw6aj2hyg80ibg732bcw2j"
+      "hash": "19wj42axrg7qz77br01s215bjz23m0cbsr74fxgwvi3cn9vp26qm"
     },
     "lix-nixos-module": {
       "type": "Git",
@@ -163,9 +163,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "eddcd1bc7e035392596b603d23dde67a88e6f6bc",
-      "url": "https://github.com/dune-universe/mirage-opam-overlays/archive/eddcd1bc7e035392596b603d23dde67a88e6f6bc.tar.gz",
-      "hash": "09cwhnnmphicm4j6figds2ckagbnypdmcqmbgcszjn6zzll5fymx"
+      "revision": "5ae850a5cb00d570dc7c1c2d7c2995c1b50e674f",
+      "url": "https://github.com/dune-universe/mirage-opam-overlays/archive/5ae850a5cb00d570dc7c1c2d7c2995c1b50e674f.tar.gz",
+      "hash": "0pvv1khmq6ajrv3918pi29bagy0nd77ssnfrrx428wssi65jzanq"
     },
     "nixos-mailserver": {
       "type": "Git",
@@ -174,11 +174,11 @@
         "repo_path": "simple-nixos-mailserver/nixos-mailserver",
         "server": "https://gitlab.com/"
       },
-      "branch": "nixos-25.11",
+      "branch": "nixos-26.05",
       "submodules": false,
-      "revision": "25e6dbb8fca3b6e779c5a46fd03bd760b2165bb5",
-      "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=25e6dbb8fca3b6e779c5a46fd03bd760b2165bb5",
-      "hash": "0f1mq2gdmx9wd0k89f6w61sbfzpd1wwz857l2xvyp1x0msmd2z20"
+      "revision": "9e3c3510ced1cb278e3522a6a0f6fe302cc805eb",
+      "url": "https://gitlab.com/api/v4/projects/simple-nixos-mailserver%2Fnixos-mailserver/repository/archive.tar.gz?sha=9e3c3510ced1cb278e3522a6a0f6fe302cc805eb",
+      "hash": "1i2d9v2is1sfacaxyxncagyxlppipqmw554f1gfvq5b164djws5q"
     },
     "nixpkgs": {
       "type": "Git",
@@ -187,11 +187,11 @@
         "owner": "NixOS",
         "repo": "nixpkgs"
       },
-      "branch": "nixos-25.11",
+      "branch": "nixos-26.05",
       "submodules": false,
-      "revision": "535f3e6942cb1cead3929c604320d3db54b542b9",
-      "url": "https://github.com/NixOS/nixpkgs/archive/535f3e6942cb1cead3929c604320d3db54b542b9.tar.gz",
-      "hash": "0f9137a4dggpm5p6ikzh5zvigjnlyfwpi3ssskhx5rwsii7nbzys"
+      "revision": "597283ad8aa0b331c788e97c4c262d58877074ef",
+      "url": "https://github.com/NixOS/nixpkgs/archive/597283ad8aa0b331c788e97c4c262d58877074ef.tar.gz",
+      "hash": "102vwf86cjx5c4bki98f7as62j69189qbh892vv8hylfkvap3q17"
     },
     "nixpkgs-unstable": {
       "type": "Git",
@@ -202,9 +202,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73",
-      "url": "https://github.com/NixOS/nixpkgs/archive/cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73.tar.gz",
-      "hash": "005lz0rdsj188j63zyim4pkxadqcq276x7w9727ymb2av7awczi1"
+      "revision": "38affae6a5768f9b61f81355c7558ee971b2afb1",
+      "url": "https://github.com/NixOS/nixpkgs/archive/38affae6a5768f9b61f81355c7558ee971b2afb1.tar.gz",
+      "hash": "0l9g2wacnaccl7wvymfn9g1iqkdx1i142fpbc9q3gx9msa027411"
     },
     "ntfy-matrix-bot": {
       "type": "Git",
@@ -242,9 +242,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "2e20bbbe8130d1880338291446fd4e710a4db9a1",
-      "url": "https://github.com/tweag/opam-nix/archive/2e20bbbe8130d1880338291446fd4e710a4db9a1.tar.gz",
-      "hash": "150swry9dsix1w727rg89r6yv4vh6xx51nxvg2xbyxi409skqb2x"
+      "revision": "edd1b7bc8574f2242b759b0c4def186af2ab4a70",
+      "url": "https://github.com/tweag/opam-nix/archive/edd1b7bc8574f2242b759b0c4def186af2ab4a70.tar.gz",
+      "hash": "0cm4yy78h1z803kgpj3q41gmp8k1acic6yjsb87fxbn5lmwmr3wm"
     },
     "opam-overlays": {
       "type": "Git",
@@ -255,9 +255,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "efd742d67b0d49b2d6f491ffbbf205ca42977a6e",
-      "url": "https://github.com/dune-universe/opam-overlays/archive/efd742d67b0d49b2d6f491ffbbf205ca42977a6e.tar.gz",
-      "hash": "1f41bfr187kv8r3my41a56czlpj34b3yxl1wlbg4m37yhxns4yyd"
+      "revision": "d3aca134ac032e7522e95a18f1ef72c63f45459b",
+      "url": "https://github.com/dune-universe/opam-overlays/archive/d3aca134ac032e7522e95a18f1ef72c63f45459b.tar.gz",
+      "hash": "0dj80psfwm1h687irahfc2kiyh9z4xyb0l7sa79y56sh06f9b3hf"
     },
     "opam-repository": {
       "type": "GitRelease",
@@ -286,10 +286,10 @@
       "version_upper_bound": null,
       "release_prefix": null,
       "submodules": false,
-      "version": "v0.4",
-      "revision": "562752a30aaff8985890ef5a2049a82247fc4b0f",
-      "url": "https://api.github.com/repos/tweag/opam2json/tarball/v0.4",
-      "hash": "00z4iqyl1x27nhkn89y771jl0iyqi2kfk8mq55nh0m798xnxz5g6"
+      "version": "v0.5",
+      "revision": "03f27d131c97327ed7db91c6dc903101bec08fec",
+      "url": "https://api.github.com/repos/tweag/opam2json/tarball/v0.5",
+      "hash": "14ss8hazhhf7l093rb8glr1blqvszmgpnkg8i7bk600i67sqs4dc"
     },
     "playground": {
       "type": "Git",
@@ -312,9 +312,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "7d5f8d75fc195a236b46633d7679139698aeb35f",
-      "url": "https://github.com/oxalica/rust-overlay/archive/7d5f8d75fc195a236b46633d7679139698aeb35f.tar.gz",
-      "hash": "02m17jzmpym1gh7rj94pf4fsb4ma90sdjz334xd464145cb0yi1i"
+      "revision": "fe2124391e739e7b3e8720cd8a73f06edd0aceba",
+      "url": "https://github.com/oxalica/rust-overlay/archive/fe2124391e739e7b3e8720cd8a73f06edd0aceba.tar.gz",
+      "hash": "0bmc52db2a94l4aq51axhw2nh24vcwli05xnpf6hjxnbhxrpy4bs"
     },
     "showrt": {
       "type": "Git",
@@ -337,9 +337,9 @@
       },
       "branch": "master",
       "submodules": false,
-      "revision": "9ed65852b6257fbeae4355bc24ecfea307ca759a",
-      "url": "https://github.com/Mic92/sops-nix/archive/9ed65852b6257fbeae4355bc24ecfea307ca759a.tar.gz",
-      "hash": "0jm1xzqp508avayvnx2q7qiw7wj1kqz6m2g1vr0i1vj03qvhmbqs"
+      "revision": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9",
+      "url": "https://github.com/Mic92/sops-nix/archive/f1406619a3884cd5c47992a70b8b35c9c0fcb4c9.tar.gz",
+      "hash": "1iswdpzlyngqlipy14mjmpazx9yybvidpm4sfk74ww9jg3r849b8"
     },
     "tracktrain": {
       "type": "Git",