From 10aad3f6990c78e88917f5546ba1c0af7694e794 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 1 Jul 2025 21:38:33 +0200 Subject: [PATCH 1/3] Revert "framenix: switch to LTS kernel" This reverts commit 718ca8c60b5f393277928a4cb3b681f93f36bc49. --- hosts/framenix/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hosts/framenix/default.nix b/hosts/framenix/default.nix index f1e62cd..166f4ee 100644 --- a/hosts/framenix/default.nix +++ b/hosts/framenix/default.nix @@ -23,6 +23,9 @@ in # override tmpdir for daemon systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; + # try newer kernels + boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelParams = [ # powersave "amd_pstate=active" From 2adf23410c228bed6df4d973973c5f6bef84053c Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 1 Jul 2025 21:39:19 +0200 Subject: [PATCH 2/3] 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/98236410ea0fe204d0447149537a924fb71a6d4f' (2025-06-25) → 'github:NixOS/nixos-hardware/f49bb3b4107a0917ee144337bb02d311033ee1ba' (2025-07-01) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/30e2e2857ba47844aa71991daa6ed1fc678bcbb7' (2025-06-27) → 'github:NixOS/nixpkgs/3016b4b15d13f3089db8a41ef937b13a9e33a8df' (2025-06-30) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a676066377a2fe7457369dd37c31fd2263b662f4' (2025-06-26) → 'github:NixOS/nixpkgs/b43c397f6c213918d6cfe6e3550abfe79b5d1c51' (2025-06-29) • Updated input 'nur': 'github:nix-community/NUR/873e573a93300046272a0b3dec82b0f9e732458f' (2025-06-29) → 'github:nix-community/NUR/326860af7a41ac4d1ab8055bf88fdc8e79b82acf' (2025-07-01) • Updated input 'nur/nixpkgs': 'github:nixos/nixpkgs/30e2e2857ba47844aa71991daa6ed1fc678bcbb7' (2025-06-27) → 'github:nixos/nixpkgs/3016b4b15d13f3089db8a41ef937b13a9e33a8df' (2025-06-30) --- flake.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.lock b/flake.lock index 4c04d3b..22c05c5 100644 --- a/flake.lock +++ b/flake.lock @@ -179,11 +179,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750837715, - "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", + "lastModified": 1751393906, + "narHash": "sha256-I1x6K61ZcdFlqc07weRBy3erCAB0lVkX10i0c9eXjDI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", + "rev": "f49bb3b4107a0917ee144337bb02d311033ee1ba", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -243,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1750969886, - "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", + "lastModified": 1751211869, + "narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a676066377a2fe7457369dd37c31fd2263b662f4", + "rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51", "type": "github" }, "original": { @@ -259,11 +259,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1751011381, - "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { @@ -280,11 +280,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1751219288, - "narHash": "sha256-IQJosUJhcfIVnEiQtMkeUS0klh97CjxqgPXE//xFDNg=", + "lastModified": 1751397775, + "narHash": "sha256-LMe/4mpv23Lkk9tLsTrxAB5nvLbQd92dkDz/MPqlvqM=", "owner": "nix-community", "repo": "NUR", - "rev": "873e573a93300046272a0b3dec82b0f9e732458f", + "rev": "326860af7a41ac4d1ab8055bf88fdc8e79b82acf", "type": "github" }, "original": { From 205de75f076cfba659ecac21c7d62e2fc19b83c1 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Tue, 1 Jul 2025 21:47:05 +0200 Subject: [PATCH 3/3] nixpkgs: remove keepassxc patch after PR has reached channel --- flake.nix | 2 +- patches/keepassxc-fix-darwin-build.patch | 26 ------------------------ 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 patches/keepassxc-fix-darwin-build.patch diff --git a/flake.nix b/flake.nix index bf73948..cb177ff 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ (import nixpkgs { inherit system; }).applyPatches { name = "nixpkgs-patched"; src = nixpkgs; - patches = [ ./patches/keepassxc-fix-darwin-build.patch ]; + patches = [ ]; }; # necessary to make the top-level inputs available to system configuration diff --git a/patches/keepassxc-fix-darwin-build.patch b/patches/keepassxc-fix-darwin-build.patch deleted file mode 100644 index 3684a24..0000000 --- a/patches/keepassxc-fix-darwin-build.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 49b7ae226cedb0adb403758e0c63d09762297a22 Mon Sep 17 00:00:00 2001 -From: Fernando Rodrigues -Date: Wed, 28 May 2025 14:06:23 -0300 -Subject: [PATCH] keepassxc: remove unecessary dependency - -KIO no longer seems necessary for KeePassXC, so removing it should -decrease the closure size significantly. - -Reported-by: chopper2000uk <> -Signed-off-by: Fernando Rodrigues ---- - pkgs/by-name/ke/keepassxc/package.nix | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/pkgs/by-name/ke/keepassxc/package.nix b/pkgs/by-name/ke/keepassxc/package.nix -index 170cc7bfe8e384..40b6dc15170f5b 100644 ---- a/pkgs/by-name/ke/keepassxc/package.nix -+++ b/pkgs/by-name/ke/keepassxc/package.nix -@@ -142,7 +142,6 @@ stdenv.mkDerivation (finalAttrs: { - libXi - libXtst - libargon2 -- libsForQt5.kio - libsForQt5.qtbase - libsForQt5.qtsvg - minizip