jump to nixpkgs 26.05

3 files changed, 37 insertions, 36 deletions

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