From 1e8123fef6fafbde52aa657738e9fbe49dbc967f Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 7 Dec 2025 12:38:30 +0100 Subject: [PATCH 1/9] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/f3902b5d8767985680875ad86d028371100faeb3' (2025-12-01) → 'github:nix-community/home-manager/f63d0fe9d81d36e5fc95497217a72e02b8b7bcab' (2025-12-04) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/2d293cbfa5a793b4c50d17c05ef9e385b90edf6c' (2025-11-30) → 'github:NixOS/nixpkgs/f61125a668a320878494449750330ca58b78c557' (2025-12-05) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f' (2025-11-30) → 'github:NixOS/nixpkgs/c97c47f2bac4fa59e2cbdeba289686ae615f8ed4' (2025-12-04) • Updated input 'nur': 'github:nix-community/NUR/d5697e876963198dd304489e88cff538d6c5b2e7' (2025-12-01) → 'github:nix-community/NUR/902c2223fc433b82d7149a33e1bb729fdba1a898' (2025-12-07) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/2d293cbfa5a793b4c50d17c05ef9e385b90edf6c' (2025-11-30) → 'github:nixos/nixpkgs/f61125a668a320878494449750330ca58b78c557' (2025-12-05) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index fa233a0..464dd07 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1764613336, - "narHash": "sha256-L979az28t/+SXvYw9qhOno5HLlDwkZOpz6LzCLnjmRM=", + "lastModified": 1764866045, + "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "f3902b5d8767985680875ad86d028371100faeb3", + "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -227,11 +227,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1764517877, - "narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -263,11 +263,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1764629053, - "narHash": "sha256-RcxVqrd5i70Tk4ydefdwf8DFJc41KA4wxLLrMsnnBjE=", + "lastModified": 1765105806, + "narHash": "sha256-drH4w3MzlQXDtseWX82n3nkuXAuDN/uJdTP5KOc2Tlo=", "owner": "nix-community", "repo": "NUR", - "rev": "d5697e876963198dd304489e88cff538d6c5b2e7", + "rev": "902c2223fc433b82d7149a33e1bb729fdba1a898", "type": "github" }, "original": { From 8a08f506ab6b218393428e49239ea498d8cd29db Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 7 Dec 2025 12:41:40 +0100 Subject: [PATCH 2/9] Revert "home/packages: scriv build fixes" This reverts commit 5feaaf0b3f61049604fb20014382bb1589297d43. --- home/modules/packages.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/home/modules/packages.nix b/home/modules/packages.nix index 6ff5bed..c267b3a 100644 --- a/home/modules/packages.nix +++ b/home/modules/packages.nix @@ -104,14 +104,7 @@ let ripgrep fd pre-commit - (scriv.overridePythonAttrs (old: { - patches = old.patches or [ ] ++ [ - (fetchpatch { - url = "https://github.com/nedbat/scriv/commit/04ac45da9e1adb24a95ad9643099fe537b3790fd.diff"; - hash = "sha256-Gle3zWC/WypGHsKmVlqedRAZVWsBjGpzMq3uKuG9+SY="; - }) - ]; - })) + scriv # Haskell ghc From 76d3ffde1cbe86d1ee5b65492ea590d1d6d05f8e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 4 Dec 2025 13:05:30 +0100 Subject: [PATCH 3/9] home/workmac: ssh-root-loop shell function --- home/scripts/ssh-loop-fc.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/home/scripts/ssh-loop-fc.nix b/home/scripts/ssh-loop-fc.nix index a632477..2508de6 100644 --- a/home/scripts/ssh-loop-fc.nix +++ b/home/scripts/ssh-loop-fc.nix @@ -8,6 +8,15 @@ for x in $1; do echo $x; ${pkgs.openssh}/bin/ssh $x.fcio.net -o StrictHostKeyChecking=no -C "$2"; done } + ssh-root-loop () { + setopt shwordsplit + local hosts=$1 + local cmd=$2 + + for x in $1; do echo $x; ${pkgs.openssh}/bin/ssh root@$x.fcio.net -o StrictHostKeyChecking=no -C "$2"; done + } + + ssh-loop-parallel () { setopt shwordsplit local hosts=$1 From 0b36532ed3ea379e102c31340bd826386caf9bce Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 8 Dec 2025 19:25:26 +0100 Subject: [PATCH 4/9] nixos/kde-pim: install standalone versions of programs --- common/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/default.nix b/common/default.nix index b672069..73d5200 100644 --- a/common/default.nix +++ b/common/default.nix @@ -160,6 +160,12 @@ in kontact = true; merkuro = true; }; + # additional standalone versions of kontact components + environment.systemPackages = with pkgs.kdePackages; [ + korganizer + kaddressbook + pkgs.ktimetracker + ]; programs.kdeconnect.enable = true; # enable wayland for Chromium and Electron environment.sessionVariables.NIXOS_OZONE_WL = "1"; From 3672286b574377a0404c921d1ae1ad1fd58736a4 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 8 Dec 2025 19:26:18 +0100 Subject: [PATCH 5/9] nixfmt --- common/nix-settings.nix | 2 +- home/workmac.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/nix-settings.nix b/common/nix-settings.nix index beb5ca0..6199694 100644 --- a/common/nix-settings.nix +++ b/common/nix-settings.nix @@ -31,7 +31,7 @@ in cores = 0; #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 + 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 = '' diff --git a/home/workmac.nix b/home/workmac.nix index 3845488..e378da3 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -22,7 +22,7 @@ in pythonTools = true; }; targets.darwin = { - linkApps.enable = false; # spotlight ignores symlinks + linkApps.enable = false; # spotlight ignores symlinks copyApps.enable = true; }; From 2c0a40c03d6bbd2f289fe866a5a2054a2a8a4d2f Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 9 Dec 2025 11:06:41 +0100 Subject: [PATCH 6/9] hosts/framenix: no need for 3rd party Framework kernel module --- hosts/framenix/hardware-configuration.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/framenix/hardware-configuration.nix b/hosts/framenix/hardware-configuration.nix index 868c352..7c8d896 100644 --- a/hosts/framenix/hardware-configuration.nix +++ b/hosts/framenix/hardware-configuration.nix @@ -32,4 +32,5 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.framework.enableKmod = false; # should work with upstream kernel >= 6.12 } From ed13a0fbbf8dd7cee0d55ac09317709fbfcacb5e Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Thu, 11 Dec 2025 08:48:44 +0100 Subject: [PATCH 7/9] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/f63d0fe9d81d36e5fc95497217a72e02b8b7bcab?narHash=sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM%3D' (2025-12-04) → 'github:nix-community/home-manager/44777152652bc9eacf8876976fa72cc77ca8b9d8?narHash=sha256-FuFtkJrW1Z7u%2B3lhzPRau69E0CNjADku1mLQQflUORo%3D' (2025-12-10) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/e95de00a471d07435e0527ff4db092c84998698e?narHash=sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE%3D' (2025-11-26) → 'github:LnL7/nix-darwin/688427b1aab9afb478ca07989dc754fa543e03d5?narHash=sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4%3D' (2025-12-07) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/f61125a668a320878494449750330ca58b78c557?narHash=sha256-BmPWzogsG2GsXZtlT%2BMTcAWeDK5hkbGRZTeZNW42fwA%3D' (2025-12-05) → 'github:NixOS/nixpkgs/addf7cf5f383a3101ecfba091b98d0a1263dc9b8?narHash=sha256-hM20uyap1a0M9d344I692r%2Bik4gTMyj60cQWO%2BhAYP8%3D' (2025-12-08) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/c97c47f2bac4fa59e2cbdeba289686ae615f8ed4?narHash=sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA%3D' (2025-12-04) → 'github:NixOS/nixpkgs/09eb77e94fa25202af8f3e81ddc7353d9970ac1b?narHash=sha256-mSD5Ob7a%2BT2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo%3D' (2025-12-09) --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 464dd07..b9b485a 100644 --- a/flake.lock +++ b/flake.lock @@ -102,11 +102,11 @@ ] }, "locked": { - "lastModified": 1764866045, - "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", + "lastModified": 1765384171, + "narHash": "sha256-FuFtkJrW1Z7u+3lhzPRau69E0CNjADku1mLQQflUORo=", "owner": "nix-community", "repo": "home-manager", - "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", + "rev": "44777152652bc9eacf8876976fa72cc77ca8b9d8", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1764161084, - "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", + "lastModified": 1765066094, + "narHash": "sha256-0YSU35gfRFJzx/lTGgOt6ubP8K6LeW0vaywzNNqxkl4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "e95de00a471d07435e0527ff4db092c84998698e", + "rev": "688427b1aab9afb478ca07989dc754fa543e03d5", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1765186076, + "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", "type": "github" }, "original": { @@ -227,11 +227,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1764831616, - "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", + "lastModified": 1765311797, + "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", + "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", "type": "github" }, "original": { From bfdc36458ae66f24b8c7c6ba2df69b1bee78cc50 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 12 Dec 2025 09:04:29 +0100 Subject: [PATCH 8/9] home/ssh: set package --- home/desktop.nix | 1 + home/workmac.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/home/desktop.nix b/home/desktop.nix index 7fa7840..5387fad 100644 --- a/home/desktop.nix +++ b/home/desktop.nix @@ -76,6 +76,7 @@ programs.ssh = { enable = true; + package = pkgs.openssh; # ssh host config matchBlocks = (import "${inputs.mysecrets}/ssh_hosts.nix").privateHosts; }; diff --git a/home/workmac.nix b/home/workmac.nix index e378da3..1e50dab 100644 --- a/home/workmac.nix +++ b/home/workmac.nix @@ -38,6 +38,7 @@ in programs.ssh = { enable = true; + package = pkgs.openssh; # defaults in bottom match block "*" # TODO: common config for desktop as well serverAliveInterval = 10; From 4e8fb63d815ef4edd46b99cbef9cc0fc6b7ad112 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Mon, 15 Dec 2025 22:36:44 +0100 Subject: [PATCH 9/9] reporsync: ignore .git also as file .git is just a file for worktree checkout working directories. --- home/scripts/reporsync.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/scripts/reporsync.nix b/home/scripts/reporsync.nix index ed2e9f0..cf4ebee 100644 --- a/home/scripts/reporsync.nix +++ b/home/scripts/reporsync.nix @@ -10,7 +10,7 @@ # reset pre-defined variables that are read and manipulated throughout this function unset JUMPHOST # arrays are bash or zsh specific - RSYNC_OPTS=("-rlptzv" "--progress" "--delete" "--exclude=.git/" "--exclude=.direnv/" "--exclude=.vscode/" "--exclude=result" "--exclude=channels/" "--exclude=.mypy_cache/" "--exclude=__pycache__") + RSYNC_OPTS=("-rlptzv" "--progress" "--delete" "--exclude=.git" "--exclude=.direnv/" "--exclude=.vscode/" "--exclude=result" "--exclude=channels/" "--exclude=.mypy_cache/" "--exclude=__pycache__") while getopts ':Jj:' OPT; do case $OPT in