From 3c42fdedf8276bb67bda3aa8cc679948ae23f91d Mon Sep 17 00:00:00 2001 From: Martin Pander Date: Fri, 19 Jun 2026 13:14:58 +0200 Subject: [PATCH] Update to nixos 26.05 --- flake.lock | 40 +++++++++++++++++++-------------------- flake.nix | 10 +++++----- modules/home/common.nix | 2 +- modules/home/nvim.nix | 5 ++++- modules/home/opencode.nix | 2 ++ modules/home/task.nix | 2 +- 6 files changed, 33 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index e0391e1..1b508a3 100644 --- a/flake.lock +++ b/flake.lock @@ -59,16 +59,16 @@ ] }, "locked": { - "lastModified": 1779506708, - "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", + "lastModified": 1781319724, + "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", + "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } @@ -80,16 +80,16 @@ ] }, "locked": { - "lastModified": 1779506708, - "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", + "lastModified": 1781319724, + "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", + "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } @@ -143,16 +143,16 @@ ] }, "locked": { - "lastModified": 1780448639, - "narHash": "sha256-1s29/xP6iXwaEkTBxwbIQDnQzrLShlBcbnbTu0qJA0c=", + "lastModified": 1780705040, + "narHash": "sha256-pVadZqLm8RJcwLuDzJm7d2KO6e+RHPpIa/2qdqtn+B4=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "364422fc0bad4fd3be804c00cadcbd6fa3f305d8", + "rev": "add6b01c7ca72240046b5d541a74845423f1ee35", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "nixos-wsl", "type": "github" } @@ -206,32 +206,32 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1781509190, - "narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=", + "lastModified": 1781216227, + "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4", + "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-wsl-stable": { "locked": { - "lastModified": 1781509190, - "narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=", + "lastModified": 1781216227, + "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4", + "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 983b411..d8c336d 100644 --- a/flake.nix +++ b/flake.nix @@ -5,25 +5,25 @@ # Unstable for standalone configurations and overlays nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-26.05"; - nixpkgs-wsl-stable.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs-wsl-stable.url = "github:nixos/nixpkgs/nixos-26.05"; # Pinned nixpkgs for opencode 1.14.25 (latest unstable segfaults) nixpkgs-opencode.url = "github:nixos/nixpkgs/6368eda62c9775c38ef7f714b2555a741c20c72d"; nixos-wsl = { - url = "github:nix-community/nixos-wsl/release-25.11"; + url = "github:nix-community/nixos-wsl/release-26.05"; inputs.nixpkgs.follows = "nixpkgs-wsl-stable"; }; home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs-stable"; }; home-manager-wsl = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/release-26.05"; inputs.nixpkgs.follows = "nixpkgs-wsl-stable"; }; diff --git a/modules/home/common.nix b/modules/home/common.nix index cb4ea4b..15db05b 100644 --- a/modules/home/common.nix +++ b/modules/home/common.nix @@ -39,7 +39,7 @@ enable = true; enableDefaultConfig = false; includes = [ "config.local" ]; - matchBlocks = { + settings = { "*" = { addKeysToAgent = "yes"; }; diff --git a/modules/home/nvim.nix b/modules/home/nvim.nix index 621c44e..a604e94 100644 --- a/modules/home/nvim.nix +++ b/modules/home/nvim.nix @@ -78,7 +78,7 @@ in (nvim-treesitter.withPlugins (p: [ p.awk p.bash p.c p.c_sharp p.cpp p.css p.diff p.dockerfile p.doxygen p.git_config p.gitcommit p.go p.gomod p.gosum p.gotmpl p.helm p.haskell p.html p.http p.java p.javascript p.json p.latex p.lua p.markdown p.markdown_inline p.matlab p.nix p.printf p.python p.regex p.rust p.sql p.strace p.supercollider p.svelte p.swift p.terraform p.tmux p.toml p.typescript p.vim p.xml p.yaml p.zig ])) ]; - extraLuaConfig = '' + initLua = '' _G.is_work = ${if cfg.workMode then "true" else "false"} _G.is_mac = ${if pkgs.stdenv.isDarwin then "true" else "false"} _G.is_private_nixos = ${if !cfg.workMode && pkgs.stdenv.isLinux then "true" else "false"} @@ -88,6 +88,9 @@ in require('plugins') require('filetype') ''; + + withRuby = false; + withPython3 = false; }; # Allow for editing the lua modules without a nix rebuild diff --git a/modules/home/opencode.nix b/modules/home/opencode.nix index 5ac42ec..4d4bb50 100644 --- a/modules/home/opencode.nix +++ b/modules/home/opencode.nix @@ -41,6 +41,7 @@ in apiKey = config.sops.placeholder.langdock_api_key; }; models = { + "gpt-5.5" = { name = "GPT-5.5"; }; "gpt-5.4" = { name = "GPT-5.4"; }; "gpt-5.4-mini" = { name = "GPT-5.4 mini"; }; }; @@ -51,6 +52,7 @@ in apiKey = config.sops.placeholder.langdock_api_key; }; models = { + "claude-opus-4-8-default" = { name = "Opus 4.8"; }; "claude-opus-4-7-default" = { name = "Opus 4.7"; }; "claude-opus-4-6-default" = { name = "Opus 4.6"; }; "claude-sonnet-4-6-default" = { name = "Sonnet 4.6"; }; diff --git a/modules/home/task.nix b/modules/home/task.nix index 8e63f2e..0e12f85 100644 --- a/modules/home/task.nix +++ b/modules/home/task.nix @@ -63,7 +63,7 @@ home.packages = with pkgs; [ taskwarrior-tui unstable.timewarrior - inputs.tasksquire.packages.${pkgs.system}.default + inputs.tasksquire.packages.${pkgs.stdenv.hostPlatform.system}.default ]; home.shellAliases = lib.mkMerge [ {