From 39a03e4b2a40664a81660835fbc65f23f170bb13 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 26 Nov 2025 12:38:56 +0100 Subject: [PATCH 01/13] flake: switch to release-25.11 beta --- flake.lock | 22 +++++++++++----------- flake.nix | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 1f387d7..7256a1e 100644 --- a/flake.lock +++ b/flake.lock @@ -127,16 +127,16 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764135300, + "narHash": "sha256-5xOuutXM7UPTUcn3uDAD8UlPQsXmqPrX81cXoDOAGcA=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "f4cb25928fafa9ae68660fe71f730fc820a59028", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -230,16 +230,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1764152129, + "narHash": "sha256-WTopqlXb9qvfRFusytROSh8TBsqdTYyTmMtmav2po7k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "91341cd7352665ddaf2f234de2dcaa3be6573753", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "release-25.11", "repo": "nixpkgs", "type": "github" } @@ -264,11 +264,11 @@ ] }, "locked": { - "lastModified": 1755139244, - "narHash": "sha256-SN1BFA00m+siVAQiGLtTwjv9LV9TH5n8tQcSziV6Nv4=", + "lastModified": 1764124769, + "narHash": "sha256-vcoOEy3i8AGJi3Y2C48hrf6CuL2h8W1gLe1gNt72Kxg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "aeae248beb2a419e39d483dd9b7fec924aba8d4d", + "rev": "5da8c00313b4434f00aed6b4c94cd3b207bafdc5", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9a1ee4d..368790b 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-25.05"; + ref = "release-25.11"; }; nixpkgs-unstable-small = { @@ -25,7 +25,7 @@ type = "github"; owner = "nix-community"; repo = "home-manager"; - ref = "release-25.05"; + ref = "master"; inputs.nixpkgs.follows = "nixpkgs"; }; From b9cd66b3cd1e73d7160791f2f53315b46975fe8c Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 26 Nov 2025 12:38:56 +0100 Subject: [PATCH 02/13] base: programs: telegram was renamed --- base/gui-programs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/gui-programs.nix b/base/gui-programs.nix index 7057c85..0b129fd 100644 --- a/base/gui-programs.nix +++ b/base/gui-programs.nix @@ -71,7 +71,7 @@ in { obs-studio pavucontrol spotify - tdesktop + telegram-desktop thunderbird virt-manager xcolor From e0c3b553e34d86403d49c909d18fba264f0119f2 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 26 Nov 2025 12:38:56 +0100 Subject: [PATCH 03/13] talos: home: logind settings were renamed --- base/gui-programs.nix | 2 +- hosts/talos/home.nix | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/base/gui-programs.nix b/base/gui-programs.nix index 0b129fd..a3d86ab 100644 --- a/base/gui-programs.nix +++ b/base/gui-programs.nix @@ -47,7 +47,7 @@ in { }; }; - logind.lidSwitch = "suspend"; + logind.settings.Login.HandleLidSwitch = "suspend"; printing = { enable = true; diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index 8a189d3..ae73edc 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -207,12 +207,12 @@ in { # FIXME: belongs elsewhere services = { logind = { - lidSwitch = "suspend"; - lidSwitchExternalPower = "ignore"; - extraConfig = '' - IdleAction=suspend - IdleActionSec=10min - ''; + settings.Login = { + HandleLidSwitch = "suspend"; + HandleLidSwitchExternalPower = "ignore"; + IdleAction = "suspend"; + IdleActionSec = "10min"; + }; }; upower.enable = true; }; From f7e37941b60577f2b27c3962b5138f730ad9e420 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 26 Nov 2025 15:27:06 +0100 Subject: [PATCH 04/13] services: transmission: bump to v4 --- services/transmission.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/transmission.nix b/services/transmission.nix index 8f29018..05d8821 100644 --- a/services/transmission.nix +++ b/services/transmission.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, ... }: let inherit @@ -47,6 +48,7 @@ in { services.transmission = { enable = true; + package = pkgs.transmission_4; group = "media"; settings = { From fb1ce98514667838b98e811074d4841cd6f25432 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 26 Nov 2025 15:49:49 +0100 Subject: [PATCH 05/13] home: git: move settings around --- home/git.nix | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/home/git.nix b/home/git.nix index 11a57ae..a70301c 100644 --- a/home/git.nix +++ b/home/git.nix @@ -17,19 +17,18 @@ in { config = mkIf cfg.enable { programs.git = { enable = true; - - delta = { - enable = true; - options = { - syntax-theme = "Solarized (light)"; - }; - }; lfs.enable = true; - userEmail = "antoine@alarsyo.net"; - userName = "Antoine Martin"; - - extraConfig = { + settings = { + user = { + name = "Antoine Martin"; + email = "antoine@alarsyo.net"; + }; + alias = { + push-wip = "push -o ci.skip"; + push-merge = "push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds -o merge_request.remove_source_branch"; + push-mr = "push -o merge_request.create -o merge_request.remove_source_branch"; + }; commit = {verbose = true;}; core = {editor = "vim";}; init = {defaultBranch = "main";}; @@ -38,12 +37,6 @@ in { maintenance.prefetch.enabled = false; }; - aliases = { - push-wip = "push -o ci.skip"; - push-merge = "push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds -o merge_request.remove_source_branch"; - push-mr = "push -o merge_request.create -o merge_request.remove_source_branch"; - }; - includes = [ { condition = "gitdir:~/work/lrde/"; @@ -64,5 +57,13 @@ in { "/.envrc" ]; }; + + programs.delta = { + enable = true; + enableGitIntegration = true; + options = { + syntax-theme = "Solarized (light)"; + }; + }; }; } From 8a80f673c581934c5a7b88840f60d387e6304638 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 26 Nov 2025 15:49:49 +0100 Subject: [PATCH 06/13] home: ssh: disable deprecated default config --- home/ssh.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/ssh.nix b/home/ssh.nix index 12e11a2..5182bbf 100644 --- a/home/ssh.nix +++ b/home/ssh.nix @@ -18,6 +18,7 @@ in { config = mkIf cfg.enable { programs.ssh = { enable = true; + enableDefaultConfig = false; matchBlocks = let addGPGAgentForwarding = hostConf: From ae80dfcb92ff775244a0d983677b3a7764920af4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 26 Nov 2025 16:20:19 +0100 Subject: [PATCH 07/13] flake: remove jujutsu input The one from 25.11 is much more up to date, and I can always grab the one from unstable if I want a fresher one in a few months. --- flake.lock | 78 ------------------------------------------------------ flake.nix | 9 ------- 2 files changed, 87 deletions(-) diff --git a/flake.lock b/flake.lock index 7256a1e..7c50381 100644 --- a/flake.lock +++ b/flake.lock @@ -81,24 +81,6 @@ "type": "github" } }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -141,29 +123,6 @@ "type": "github" } }, - "jujutsu": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1762395739, - "narHash": "sha256-YUrjP2tzABdy4eAV1hPmgYWU8ChcJ5B4IlmQUGm95ro=", - "owner": "jj-vcs", - "repo": "jj", - "rev": "aa2b76978c4a23cb01c61629a11b1254af3ad0d9", - "type": "github" - }, - "original": { - "owner": "jj-vcs", - "ref": "v0.35.0", - "repo": "jj", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1762847253, @@ -250,33 +209,11 @@ "disko": "disko", "flake-utils": "flake-utils", "home-manager": "home-manager_2", - "jujutsu": "jujutsu", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_3", "nixpkgs-unstable-small": "nixpkgs-unstable-small" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "jujutsu", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764124769, - "narHash": "sha256-vcoOEy3i8AGJi3Y2C48hrf6CuL2h8W1gLe1gNt72Kxg=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "5da8c00313b4434f00aed6b4c94cd3b207bafdc5", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "systems": { "locked": { "lastModified": 1681028828, @@ -306,21 +243,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 368790b..13ad305 100644 --- a/flake.nix +++ b/flake.nix @@ -49,14 +49,6 @@ repo = "disko"; ref = "master"; }; - - jujutsu = { - type = "github"; - owner = "jj-vcs"; - repo = "jj"; - ref = "v0.35.0"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { @@ -99,7 +91,6 @@ }) agenix.overlays.default - inputs.jujutsu.overlays.default ] ++ builtins.attrValues self.overlays; sharedModules = From a11efa04ec836d53cd41fcefbe6fc667b5c78a03 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 1 Dec 2025 16:31:04 +0100 Subject: [PATCH 08/13] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9' (2025-11-11) → 'github:NixOS/nixos-hardware/9154f4569b6cdfd3c595851a6ba51bfaa472d9f3' (2025-11-29) --- flake.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 7c50381..0b5e66e 100644 --- a/flake.lock +++ b/flake.lock @@ -109,27 +109,27 @@ ] }, "locked": { - "lastModified": 1764135300, - "narHash": "sha256-5xOuutXM7UPTUcn3uDAD8UlPQsXmqPrX81cXoDOAGcA=", + "lastModified": 1764536451, + "narHash": "sha256-BgtcUkBfItu9/yU14IgUaj4rYOanTOUZjUfBP20/ZB4=", "owner": "nix-community", "repo": "home-manager", - "rev": "f4cb25928fafa9ae68660fe71f730fc820a59028", + "rev": "3fdd076e08049a9c7a83149b270440d9787d2df5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-25.11", "repo": "home-manager", "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": { @@ -189,16 +189,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764152129, - "narHash": "sha256-WTopqlXb9qvfRFusytROSh8TBsqdTYyTmMtmav2po7k=", + "lastModified": 1764522689, + "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "91341cd7352665ddaf2f234de2dcaa3be6573753", + "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-25.11", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } From ab2677dca56ac33e302585cb43704728ec96b039 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 1 Dec 2025 16:31:08 +0100 Subject: [PATCH 09/13] flake: 25.11 is now stable --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 13ad305..06a71ce 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "release-25.11"; + ref = "nixos-25.11"; }; nixpkgs-unstable-small = { @@ -25,7 +25,7 @@ type = "github"; owner = "nix-community"; repo = "home-manager"; - ref = "master"; + ref = "release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; From af8f630205ac2f4df7150d52199640d8c534aab4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 1 Dec 2025 17:25:42 +0100 Subject: [PATCH 10/13] hades: set mailaddr for mdadm --- hosts/hades/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hosts/hades/default.nix b/hosts/hades/default.nix index 5f5355b..111d188 100644 --- a/hosts/hades/default.nix +++ b/hosts/hades/default.nix @@ -24,6 +24,13 @@ in { devices = ["/dev/sda" "/dev/sdb"]; }; + # TODO: I've setup the address to avoid a spurious failure of the `mdmonitor` + # systemd unit, but sending email is not actually setup on this server. Might + # need to setup Postfix or msmtp + boot.swraid.mdadmConf = '' + MAILADDR=antoine@alarsyo.net + ''; + boot.tmp.useTmpfs = true; networking.hostName = "hades"; # Define your hostname. From 410a4811db54b1f14b8fca39214f65796edb7dd4 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 1 Dec 2025 17:36:45 +0100 Subject: [PATCH 11/13] hades: remove pleroma secrets --- hosts/hades/secrets.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hosts/hades/secrets.nix b/hosts/hades/secrets.nix index eb0fa3b..9b78412 100644 --- a/hosts/hades/secrets.nix +++ b/hosts/hades/secrets.nix @@ -36,10 +36,6 @@ "paperless/admin-password" = {}; "paperless/secret-key" = {}; - "pleroma/pleroma-config" = { - owner = "pleroma"; - }; - "restic-backup/hades-credentials" = {}; "restic-backup/hades-password" = {}; From fc43f9b5ecb21ca7916c1eebe15703cf13cc829b Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Mon, 1 Dec 2025 17:39:42 +0100 Subject: [PATCH 12/13] services: nextcloud: bump package to v32 --- services/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/nextcloud.nix b/services/nextcloud.nix index b46ab7a..9bd8bb5 100644 --- a/services/nextcloud.nix +++ b/services/nextcloud.nix @@ -62,7 +62,7 @@ in { hostName = "cloud.${domain}"; https = true; - package = pkgs.nextcloud31; + package = pkgs.nextcloud32; maxUploadSize = "1G"; From cd028aaf038f3608f2eba0cb84e269b1beaba038 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 4 Dec 2025 03:36:51 +0100 Subject: [PATCH 13/13] talos: home: use new Font Awesome name --- hosts/talos/home.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix index ae73edc..2d46892 100644 --- a/hosts/talos/home.nix +++ b/hosts/talos/home.nix @@ -95,7 +95,7 @@ in { }; }; fonts = { - names = ["Iosevka Fixed" "FontAwesome6Free"]; + names = ["Iosevka Fixed" "FontAwesome7FreeSolid"]; size = 9.0; }; bars = [];