From 03ae1479afb9d61b1520a11e191190616143e80b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Dec 2025 23:49:19 +0100 Subject: [PATCH 01/12] inputs: upgrade 25.05 -> 25.11 --- flake.lock | 117 +++++++++++++++++++++++------------------------------ flake.nix | 8 ++-- 2 files changed, 54 insertions(+), 71 deletions(-) diff --git a/flake.lock b/flake.lock index c30c713..fa233a0 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1731098351, - "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", + "lastModified": 1754269165, + "narHash": "sha256-0tcS8FHd4QjbCVoxN9jI+PjHgA4vc/IjkUSp+N3zy0U=", "owner": "ipetkov", "repo": "crane", - "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", + "rev": "444e81206df3f7d92780680e45858e31d2f07a08", "type": "github" }, "original": { @@ -18,11 +18,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1754091436, + "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd", "type": "github" }, "original": { @@ -102,16 +102,16 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764613336, + "narHash": "sha256-L979az28t/+SXvYw9qhOno5HLlDwkZOpz6LzCLnjmRM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "f3902b5d8767985680875ad86d028371100faeb3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -126,16 +126,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1737639419, - "narHash": "sha256-AEEDktApTEZ5PZXNDkry2YV2k6t0dTgLPEmAZbnigXU=", + "lastModified": 1762205063, + "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "a65905a09e2c43ff63be8c0e86a93712361f871e", + "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05", "type": "github" }, "original": { "owner": "nix-community", - "ref": "v0.4.2", + "ref": "v0.4.3", "repo": "lanzaboote", "type": "github" } @@ -163,27 +163,27 @@ ] }, "locked": { - "lastModified": 1762912391, - "narHash": "sha256-4hpBE7bGd24SfD28rzMdUGXsLsNEYxCCrTipFdoqoNM=", + "lastModified": 1764161084, + "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "d76299b2cd01837c4c271a7b5186e3d5d8ebd126", + "rev": "e95de00a471d07435e0527ff4db092c84998698e", "type": "github" }, "original": { "owner": "LnL7", - "ref": "nix-darwin-25.05", + "ref": "nix-darwin-25.11", "repo": "nix-darwin", "type": "github" } }, "nixos-hardware": { "locked": { - "lastModified": 1762847253, - "narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=", + "lastModified": 1764440730, + "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9", + "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -211,11 +211,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731919951, - "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=", + "lastModified": 1754243818, + "narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe", + "rev": "c460617dfb709a67d18bb31e15e455390ee4ee1c", "type": "github" }, "original": { @@ -225,45 +225,29 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1763678758, - "narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=", + "lastModified": 1764517877, + "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b", + "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", "type": "github" }, "original": { @@ -279,11 +263,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1763926732, - "narHash": "sha256-oC8EjqK7nnvJL/uRLMXBw5hOmopypGzF9bZHEnv00q4=", + "lastModified": 1764629053, + "narHash": "sha256-RcxVqrd5i70Tk4ydefdwf8DFJc41KA4wxLLrMsnnBjE=", "owner": "nix-community", "repo": "NUR", - "rev": "0912016ed69160333b4fe1ed61eb6cfd196578c1", + "rev": "d5697e876963198dd304489e88cff538d6c5b2e7", "type": "github" }, "original": { @@ -302,15 +286,14 @@ "nixpkgs": [ "lanzaboote", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -341,11 +324,11 @@ ] }, "locked": { - "lastModified": 1731897198, - "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", + "lastModified": 1761791894, + "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", + "rev": "59c45eb69d9222a4362673141e00ff77842cd219", "type": "github" }, "original": { @@ -376,11 +359,11 @@ ] }, "locked": { - "lastModified": 1748243702, - "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", + "lastModified": 1762938485, + "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", + "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cb177ff..0241e2d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,15 +2,15 @@ description = "NixOS system flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager/release-25.05"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { - url = "github:nix-community/lanzaboote/v0.4.2"; + url = "github:nix-community/lanzaboote/v0.4.3"; # deliberately do _not_ follow the nixpkgs input here, because paranoia and test coverage }; utils.url = "github:numtide/flake-utils"; @@ -19,7 +19,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nix-darwin = { - url = "github:LnL7/nix-darwin/nix-darwin-25.05"; + url = "github:LnL7/nix-darwin/nix-darwin-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; From 30cd2d42fd98d5c9b631c3ef80c21dd6015a41f5 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Dec 2025 23:51:34 +0100 Subject: [PATCH 02/12] nixos/networkmanager: explicitly configure VPN plugins required after NixOS 25.11 upgrade --- common/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/default.nix b/common/default.nix index 4616f93..b672069 100644 --- a/common/default.nix +++ b/common/default.nix @@ -109,6 +109,9 @@ in }; }; }; + plugins = with pkgs; [ + networkmanager-openvpn + ]; }; services.avahi.enable = true; From 89f2374309630d7effe91a54b3d373503fc951c4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Dec 2025 23:52:23 +0100 Subject: [PATCH 03/12] home/packages: drop `thefuck` dropped from nixpkgs in 25.11 --- home/common.nix | 2 -- home/modules/packages.nix | 1 - 2 files changed, 3 deletions(-) diff --git a/home/common.nix b/home/common.nix index 3a631e8..5e57d1c 100644 --- a/home/common.nix +++ b/home/common.nix @@ -122,8 +122,6 @@ # automatic rehash of path completion zstyle ':completion:*' rehash true - eval "$(${pkgs.thefuck}/bin/thefuck --alias)" - ## helper functions nixify() { if [ ! -e ./.envrc ]; then diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 32b6ce9..cfdfb5e 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -62,7 +62,6 @@ let sshfs-fuse sshuttle cryfs - thefuck gnupg unar lzop From 0e520c30d6fe5302b992725867be33cdd9c36936 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Dec 2025 23:53:18 +0100 Subject: [PATCH 04/12] home/packages: drop soundkonverter Dropped in nixpkgs 25.11 as part of the KDE5 removal :'( --- home/modules/packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index cfdfb5e..373bd6c 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -42,7 +42,6 @@ let kdePackages.elisa musescore tenacity - soundkonverter #nur.repos.fooker.studio-link ]; From 737e643df65891e25df2f40d0067718dd43a381b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Dec 2025 23:53:58 +0100 Subject: [PATCH 05/12] home/packages: adjust several changed package names --- home/modules/fonts.nix | 2 +- home/modules/packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home/modules/fonts.nix b/home/modules/fonts.nix index 6ce1185..5bcdf53 100644 --- a/home/modules/fonts.nix +++ b/home/modules/fonts.nix @@ -11,7 +11,7 @@ source-sans-pro source-code-pro source-serif-pro - ubuntu_font_family + ubuntu-classic twemoji-color-font open-sans (iosevka-bin.override { variant = "CurlySlab"; }) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 373bd6c..04ade57 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -163,7 +163,7 @@ let libreoffice-qt6 # still with KDE integration anki signal-desktop - (tor-browser-bundle-bin.override { + (tor-browser.override { mediaSupport = true; pulseaudioSupport = pkgs.stdenv.isLinux; }) @@ -183,7 +183,7 @@ let logseq # for Hibiscus banking software - unstable.jameica + jameica #ToDo: which of these drivers is actually used? geckodriver chromedriver From 11db2738c94ece778c13e5b2ede7617ca2ce83dc Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Dec 2025 23:54:40 +0100 Subject: [PATCH 06/12] home/common: adjust git and delta config to home-manager changes --- home/common.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/home/common.nix b/home/common.nix index 5e57d1c..afeadbf 100644 --- a/home/common.nix +++ b/home/common.nix @@ -43,7 +43,7 @@ programs.git = { enable = true; - extraConfig = { + settings = { credential.helper = "cache"; push.default = "simple"; push.forceIfIncludes = true; # avoid accidental force overrides when remote is autofetched in background @@ -75,13 +75,14 @@ rerere.enabled = true; }; lfs.enable = true; - delta = { - enable = true; - options = { - line-numbers = true; - side-by-side = true; - #dark = true; - }; + }; + programs.delta = { + enable = true; + enableGitIntegration = true; + options = { + line-numbers = true; + side-by-side = true; + #dark = true; }; }; programs.lazygit = { From 5feaaf0b3f61049604fb20014382bb1589297d43 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 2 Dec 2025 23:54:59 +0100 Subject: [PATCH 07/12] home/packages: scriv build fixes will be upstreamed later --- home/modules/packages.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 04ade57..6f5b756 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -105,7 +105,14 @@ let fd gitui pre-commit - scriv + (scriv.overridePythonAttrs (old: { + patches = old.patches or [ ] ++ [ + (fetchpatch { + url = "https://github.com/nedbat/scriv/commit/04ac45da9e1adb24a95ad9643099fe537b3790fd.diff"; + hash = "sha256-Gle3zWC/WypGHsKmVlqedRAZVWsBjGpzMq3uKuG9+SY="; + }) + ]; + })) # Haskell ghc From ea5ed13d1c4e0a47f7120e1497a396ecfa830a1b Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 3 Dec 2025 11:36:01 +0100 Subject: [PATCH 08/12] nix settings: temporarily use regular store optimisation instead of integrated one --- common/nix-settings.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/nix-settings.nix b/common/nix-settings.nix index eb32daf..beb5ca0 100644 --- a/common/nix-settings.nix +++ b/common/nix-settings.nix @@ -29,8 +29,9 @@ in ]; # use all cores for building cores = 0; - auto-optimise-store = true; + #auto-optimise-store = true; }; + nix.optimise.automatic = true; # temporary workaround until Lix/ Nix bug is fixed https://github.com/nix-darwin/nix-darwin/blob/e95de00a471d07435e0527ff4db092c84998698e/modules/nix/default.nix#L817C39-L817C78 # TODO: manage access token with sops instead of manual deployment # permissions: needs to be readable by the user invoking nix and root (for nix daemon) nix.extraOptions = '' From 1c4d30b542824bb97fc1322bc1420940782b8556 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 3 Dec 2025 11:36:57 +0100 Subject: [PATCH 09/12] home/workmac/packages: make darktable linux-only long compile times, and I have not really used it on workmac --- home/modules/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 6f5b756..731decc 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -14,7 +14,6 @@ let graphicsApps = [ inkscape - darktable exiftool ] ++ (with gimp3Plugins; [ @@ -22,6 +21,7 @@ let #lqrPlugin # broken ]) ++ lib.optionals pkgs.stdenv.isLinux [ + darktable gimp3 hugin #luminanceHDR # FIXME, build failure From e4a9502d07d6242260806c57c1debb3f35f2ae87 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 3 Dec 2025 11:37:27 +0100 Subject: [PATCH 10/12] hom/workmac/packages: gimp2 is not gimp anymore --- home/modules/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 731decc..0bade9a 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -28,7 +28,7 @@ let xournalpp ] ++ lib.optionals pkgs.stdenv.isDarwin [ - gimp + gimp2 ]; multimediaApps = [ From 17e34212a3ae1667095f2074ceba8559f24d8e1e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 3 Dec 2025 11:37:48 +0100 Subject: [PATCH 11/12] home/packages: drop gitui broken under darwin, and not really used anymore --- home/modules/packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 0bade9a..6ff5bed 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -103,7 +103,6 @@ let mtr ripgrep fd - gitui pre-commit (scriv.overridePythonAttrs (old: { patches = old.patches or [ ] ++ [ From 1d753aa6a6e60c3d3e0483f64b23ca79909f2ac1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Wed, 3 Dec 2025 11:57:41 +0100 Subject: [PATCH 12/12] home/wormac: fix application appearance in Spotlight --- home/workmac.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/home/workmac.nix b/home/workmac.nix index bf2ae5c..3845488 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -21,8 +21,10 @@ in devTools = true; pythonTools = true; }; - # TODO: enable when on 25.11 - #targets.darwin.copyApps.enable = true; + targets.darwin = { + linkApps.enable = false; # spotlight ignores symlinks + copyApps.enable = true; + }; home.packages = [ wireshark # on NixOS systems enabled via system config