martin/dot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to nixos 26.05

Browse Source
This commit is contained in:
Martin Pander
2026-06-19 13:14:58 +02:00
parent 1e0bc5d2b8
commit 3c42fdedf8
6 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
flake.lock generated
View File

@@ -59,16 +59,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779506708, "lastModified": 1781319724,
"narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.11", "ref": "release-26.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -80,16 +80,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779506708, "lastModified": 1781319724,
"narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.11", "ref": "release-26.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -143,16 +143,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1780448639, "lastModified": 1780705040,
"narHash": "sha256-1s29/xP6iXwaEkTBxwbIQDnQzrLShlBcbnbTu0qJA0c=", "narHash": "sha256-pVadZqLm8RJcwLuDzJm7d2KO6e+RHPpIa/2qdqtn+B4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-wsl", "repo": "nixos-wsl",
"rev": "364422fc0bad4fd3be804c00cadcbd6fa3f305d8", "rev": "add6b01c7ca72240046b5d541a74845423f1ee35",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.11", "ref": "release-26.05",
"repo": "nixos-wsl", "repo": "nixos-wsl",
"type": "github" "type": "github"
} }
@@ -206,32 +206,32 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1781509190, "lastModified": 1781216227,
"narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=", "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4", "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.11", "ref": "nixos-26.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-wsl-stable": { "nixpkgs-wsl-stable": {
"locked": { "locked": {
"lastModified": 1781509190, "lastModified": 1781216227,
"narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=", "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4", "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.11", "ref": "nixos-26.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

10
flake.nix
View File

@@ -5,25 +5,25 @@
# Unstable for standalone configurations and overlays # Unstable for standalone configurations and overlays
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; 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) # Pinned nixpkgs for opencode 1.14.25 (latest unstable segfaults)
nixpkgs-opencode.url = "github:nixos/nixpkgs/6368eda62c9775c38ef7f714b2555a741c20c72d"; nixpkgs-opencode.url = "github:nixos/nixpkgs/6368eda62c9775c38ef7f714b2555a741c20c72d";
nixos-wsl = { 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"; inputs.nixpkgs.follows = "nixpkgs-wsl-stable";
}; };
home-manager = { 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"; inputs.nixpkgs.follows = "nixpkgs-stable";
}; };
home-manager-wsl = { 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"; inputs.nixpkgs.follows = "nixpkgs-wsl-stable";
}; };

2
modules/home/common.nix
View File

@@ -39,7 +39,7 @@
enable = true; enable = true;
enableDefaultConfig = false; enableDefaultConfig = false;
includes = [ "config.local" ]; includes = [ "config.local" ];
matchBlocks = { settings = {
"*" = { "*" = {
addKeysToAgent = "yes"; addKeysToAgent = "yes";
}; };

5
modules/home/nvim.nix
View File

@@ -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 ])) (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_work = ${if cfg.workMode then "true" else "false"}
_G.is_mac = ${if pkgs.stdenv.isDarwin 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"} _G.is_private_nixos = ${if !cfg.workMode && pkgs.stdenv.isLinux then "true" else "false"}
@@ -88,6 +88,9 @@ in
require('plugins') require('plugins')
require('filetype') require('filetype')
''; '';
withRuby = false;
withPython3 = false;
}; };
# Allow for editing the lua modules without a nix rebuild # Allow for editing the lua modules without a nix rebuild

2
modules/home/opencode.nix
View File

@@ -41,6 +41,7 @@ in
apiKey = config.sops.placeholder.langdock_api_key; apiKey = config.sops.placeholder.langdock_api_key;
}; };
models = { models = {
"gpt-5.5" = { name = "GPT-5.5"; };
"gpt-5.4" = { name = "GPT-5.4"; }; "gpt-5.4" = { name = "GPT-5.4"; };
"gpt-5.4-mini" = { name = "GPT-5.4 mini"; }; "gpt-5.4-mini" = { name = "GPT-5.4 mini"; };
}; };
@@ -51,6 +52,7 @@ in
apiKey = config.sops.placeholder.langdock_api_key; apiKey = config.sops.placeholder.langdock_api_key;
}; };
models = { models = {
"claude-opus-4-8-default" = { name = "Opus 4.8"; };
"claude-opus-4-7-default" = { name = "Opus 4.7"; }; "claude-opus-4-7-default" = { name = "Opus 4.7"; };
"claude-opus-4-6-default" = { name = "Opus 4.6"; }; "claude-opus-4-6-default" = { name = "Opus 4.6"; };
"claude-sonnet-4-6-default" = { name = "Sonnet 4.6"; }; "claude-sonnet-4-6-default" = { name = "Sonnet 4.6"; };

2
modules/home/task.nix
View File

@@ -63,7 +63,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
taskwarrior-tui taskwarrior-tui
unstable.timewarrior unstable.timewarrior
inputs.tasksquire.packages.${pkgs.system}.default inputs.tasksquire.packages.${pkgs.stdenv.hostPlatform.system}.default
]; ];
home.shellAliases = lib.mkMerge [ { home.shellAliases = lib.mkMerge [ {