chore: upgrade to 26.05

flake.nix

@@ -1,23 +1,23 @@
 {
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11?shallow=true";
-    nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.11-darwin?shallow=true";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05?shallow=true";
+    nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-26.05-darwin?shallow=true";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable?shallow=true";
 
     nixos-facter-modules.url = "github:nix-community/nixos-facter-modules?shallow=true";
     # nixos-facter-modules.inputs.nixpkgs.follows = "nixpkgs";
 
-    darwin.url = "github:lnl7/nix-darwin/nix-darwin-25.11?shallow=true";
+    darwin.url = "github:lnl7/nix-darwin/nix-darwin-26.05?shallow=true";
     darwin.inputs.nixpkgs.follows = "nixpkgs-darwin";
 
     devenv.url = "github:cachix/devenv?shallow=true";
     devenv.inputs.nixpkgs.follows = "nixpkgs-unstable";
 
-    home-manager.url = "github:nix-community/home-manager/master?shallow=true";
+    home-manager.url = "github:nix-community/home-manager/release-26.05?shallow=true";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
-    nixvim.url = "github:nix-community/nixvim/main?shallow=true";
-    nixvim.inputs.nixpkgs.follows = "nixpkgs-unstable";
+    nixvim.url = "github:nix-community/nixvim/nixos-26.05?shallow=true";
+    # nixvim.inputs.nixpkgs.follows = "nixpkgs";
 
     impermanence.url = "github:nix-community/impermanence?shallow=true";
     # impermanence.inputs.nixpkgs.follows = "nixpkgs";

home/features/cli/ssh.nix

@@ -12,47 +12,45 @@
       StreamLocalBindUnlink yes
     '';
 
-    matchBlocks = {
+    settings = {
       "*" = {
-        setEnv.TERM = "xterm-256color";
-        forwardAgent = true;
-        compression = true;
-        serverAliveInterval = 0;
-        serverAliveCountMax = 3;
-        hashKnownHosts = false;
-        userKnownHostsFile = "~/.ssh/known_hosts";
+        SetEnv.TERM = "xterm-256color";
+        ForwardAgent = true;
+        Compression = true;
+        ServerAliveInterval = 0;
+        ServerAliveCountMax = 3;
+        HashKnownHosts = false;
+        UserKnownHostsFile = "~/.ssh/known_hosts";
       };
 
-      "github.com".user = "git";
-      "codeberg.org".user = "git";
+      "github.com".User = "git";
+      "codeberg.org".User = "git";
 
-      github.hostname = "github.com";
-      codeberg.hostname = "codeberg.org";
+      github.Hostname = "github.com";
+      codeberg.Hostname = "codeberg.org";
 
       git = {
-        hostname = "192.168.1.3";
-        port = 2222;
-        user = "forgejo";
-        proxyJump = "odin";
-        forwardAgent = true;
+        Hostname = "192.168.1.3";
+        Port = 2222;
+        User = "forgejo";
+        ProxyJump = "odin";
+        ForwardAgent = true;
       };
 
       "git.odin.t5.st" = {
-        hostname = "192.168.1.3";
-        proxyJump = "odin";
-        forwardAgent = true;
+        Hostname = "192.168.1.3";
+        ProxyJump = "odin";
+        ForwardAgent = true;
       };
 
       odin = {
-        hostname = "odin.taild019.ts.net";
-        user = "thomas";
-        forwardAgent = true;
-        remoteForwards = [
-          {
-            bind.address = "/run/user/1000/gnupg/d.o6jzqfigwppq1eps4nhng6n5/S.gpg-agent";
-            host.address = "/Users/thomas/.config/gnupg/S.gpg-agent.extra";
-          }
-        ];
+        Hostname = "odin.taild019.ts.net";
+        User = "thomas";
+        ForwardAgent = true;
+        RemoteForward = {
+          bind.address = "/run/user/1000/gnupg/d.o6jzqfigwppq1eps4nhng6n5/S.gpg-agent";
+          host.address = "/Users/thomas/.config/gnupg/S.gpg-agent.extra";
+        };
       };
     };
   };

home/features/cli/tmux.nix

@@ -42,26 +42,26 @@ in
       vim-tmux-navigator
       yank
       {
-        plugin = kanagawa;
+        plugin = ukiyo;
         extraConfig = ''
           set -g status-position top
-          set -g @kanagawa-theme 'dragon'
-          set -g @kanagawa-refresh-rate 60
-          set -g @kanagawa-show-left-icon window
-          set -g @kanagawa-show-battery true
-          set -g @kanagawa-show-powerline true
-          # set -g @kanagawa-show-left-sep 
-          # set -g @kanagawa-show-right-sep 
-          # set -g @kanagawa-show-left-sep 
-          # set -g @kanagawa-show-right-sep 
-          # set -g @kanagawa-show-left-sep 
-          # set -g @kanagawa-show-right-sep 
-          # set -g @kanagawa-show-left-sep 
-          # set -g @kanagawa-show-right-sep 
-          set -g @kanagawa-show-left-sep 
-          set -g @kanagawa-show-right-sep 
-          set -g @kanagawa-show-location false
-          set -g @kanagawa-ignore-window-colors true
+          set -g @ukiyo-theme "kanagawa/dragon"
+          set -g @ukiyo-refresh-rate 60
+          set -g @ukiyo-show-left-icon window
+          set -g @ukiyo-show-battery true
+          set -g @ukiyo-show-powerline true
+          # set -g @ukiyo-show-left-sep 
+          # set -g @ukiyo-show-right-sep 
+          # set -g @ukiyo-show-left-sep 
+          # set -g @ukiyo-show-right-sep 
+          # set -g @ukiyo-show-left-sep 
+          # set -g @ukiyo-show-right-sep 
+          # set -g @ukiyo-show-left-sep 
+          # set -g @ukiyo-show-right-sep 
+          set -g @ukiyo-show-left-sep 
+          set -g @ukiyo-show-right-sep 
+          set -g @ukiyo-show-location false
+          set -g @ukiyo-ignore-window-colors true
         '';
       }
     ];

home/features/desktop/default.nix

@@ -3,9 +3,10 @@
   imports = [
     ./fonts.nix
     ./ghostty.nix
+    ./logseq.nix
     # ./thunderbird.nix
     ./yubikey.nix
-    ./zen-browser.nix
+    # ./zen-browser.nix
   ]
   ++ lib.optionals (isDarwin) [
     ./aerospace.nix

home/features/desktop/logseq.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = with pkgs; [ logseq ];
+  # WARN: allowing this for logseq
+  nixpkgs.config.permittedInsecurePackages = [
+    "electron-39.8.10"
+  ];
+}

home/features/nvim/configs/default.nix

@@ -87,5 +87,6 @@
 
     tmux-navigator.enable = true;
     todo-comments.enable = true;
+    typescript-tools.enable = true;
   };
 }

hosts/meili/default.nix

@@ -12,6 +12,7 @@
   # NOTE: this seems to be needed to make nix work in fish
   programs.fish = {
     enable = true;
+    useBabelfish = true;
     vendor = {
       completions.enable = true;
       config.enable = true;

hosts/meili/software.nix

@@ -26,6 +26,7 @@
       "brave-browser"
       # "docker-desktop"
       # "deepl"
+      "freecad"
       "ghostty"
       # "hot"
       # "kanata"