From 929cfbf0d4620892e6ad1231c32c9c7b8c9265c4 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Thu, 25 Dec 2025 19:30:17 +0100 Subject: ... --- _sources/generated.json | 37 +++++++------------------------ _sources/generated.nix | 27 +++++++--------------- flake.lock | 48 ++++++++++++++++++++-------------------- hosts/sif/default.nix | 20 ++--------------- hosts/surtr/default.nix | 11 +-------- installer/default.nix | 2 +- nvfetcher.toml | 4 ---- overlays/freerdp.nix | 6 ++--- system-profiles/bcachefs.nix | 10 --------- system-profiles/core/default.nix | 5 +---- system-profiles/zfs.nix | 4 ++-- system-profiles/zswap.nix | 25 +++++++++++++++++++++ 12 files changed, 75 insertions(+), 124 deletions(-) create mode 100644 system-profiles/zswap.nix diff --git a/_sources/generated.json b/_sources/generated.json index 9faec86d..70f6e0e5 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -83,27 +83,6 @@ }, "version": "v2.7" }, - "freerdp": { - "cargoLock": null, - "date": null, - "extract": null, - "name": "freerdp", - "passthru": null, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "owner": "FreeRDP", - "repo": "FreeRDP", - "rev": "3.19.1", - "sha256": "sha256-DncfKh0r8k5XC3XdkgEWKxpb7ncgauJFyrfA11A4xW4=", - "sparseCheckout": [], - "type": "github" - }, - "version": "3.19.1" - }, "ldif2json": { "cargoLock": null, "date": "2025-03-29", @@ -314,7 +293,7 @@ }, "nix-output-monitor": { "cargoLock": null, - "date": "2025-12-02", + "date": "2025-12-17", "extract": null, "name": "nix-output-monitor", "passthru": null, @@ -324,13 +303,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "20ad9727e49bf686bea1c5e6769241234a56804b", - "sha256": "sha256-Llmi7oE0ayOupM7Cc1lnYv7O0mPKvRtFPI4M+eYaMew=", + "rev": "9a32f32f807a4f7bc97d95606465243f293650fe", + "sha256": "sha256-04ME0a3MUH/Y306dFWgOOCghzwcadTDpqJFkhLonIrw=", "sparseCheckout": [], "type": "git", "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git" }, - "version": "20ad9727e49bf686bea1c5e6769241234a56804b" + "version": "9a32f32f807a4f7bc97d95606465243f293650fe" }, "postfix-mta-sts-resolver": { "cargoLock": null, @@ -396,7 +375,7 @@ }, "quickshell": { "cargoLock": null, - "date": "2025-12-02", + "date": "2025-12-21", "extract": null, "name": "quickshell", "passthru": null, @@ -406,13 +385,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "26531fc46ef17e9365b03770edd3fb9206fcb460", - "sha256": "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs=", + "rev": "3918290c1bcd93ed81291844d9f1ed146672dbfc", + "sha256": "sha256-1uql4y229Rh+/2da99OVNe6DfsjObukXkf60TYRCvhI=", "sparseCheckout": [], "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell.git" }, - "version": "26531fc46ef17e9365b03770edd3fb9206fcb460" + "version": "3918290c1bcd93ed81291844d9f1ed146672dbfc" }, "scutiger": { "cargoLock": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index e07ecf22..d2422444 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -56,17 +56,6 @@ sha256 = "sha256-bUFh0Q7xcnKTBgVBUJU8BH6zzq1Y3krLfJJAgx5TqKs="; }; }; - freerdp = { - pname = "freerdp"; - version = "3.19.1"; - src = fetchFromGitHub { - owner = "FreeRDP"; - repo = "FreeRDP"; - rev = "3.19.1"; - fetchSubmodules = false; - sha256 = "sha256-DncfKh0r8k5XC3XdkgEWKxpb7ncgauJFyrfA11A4xW4="; - }; - }; ldif2json = { pname = "ldif2json"; version = "238c239985c688e879493a30a04f7195acb5120f"; @@ -196,17 +185,17 @@ }; nix-output-monitor = { pname = "nix-output-monitor"; - version = "20ad9727e49bf686bea1c5e6769241234a56804b"; + version = "9a32f32f807a4f7bc97d95606465243f293650fe"; src = fetchgit { url = "https://code.maralorn.de/maralorn/nix-output-monitor.git"; - rev = "20ad9727e49bf686bea1c5e6769241234a56804b"; + rev = "9a32f32f807a4f7bc97d95606465243f293650fe"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-Llmi7oE0ayOupM7Cc1lnYv7O0mPKvRtFPI4M+eYaMew="; + sha256 = "sha256-04ME0a3MUH/Y306dFWgOOCghzwcadTDpqJFkhLonIrw="; }; - date = "2025-12-02"; + date = "2025-12-17"; }; postfix-mta-sts-resolver = { pname = "postfix-mta-sts-resolver"; @@ -248,17 +237,17 @@ }; quickshell = { pname = "quickshell"; - version = "26531fc46ef17e9365b03770edd3fb9206fcb460"; + version = "3918290c1bcd93ed81291844d9f1ed146672dbfc"; src = fetchgit { url = "https://git.outfoxxed.me/quickshell/quickshell.git"; - rev = "26531fc46ef17e9365b03770edd3fb9206fcb460"; + rev = "3918290c1bcd93ed81291844d9f1ed146672dbfc"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-sHqLmm0wAt3PC4vczJeBozI1/f4rv9yp3IjkClHDXDs="; + sha256 = "sha256-1uql4y229Rh+/2da99OVNe6DfsjObukXkf60TYRCvhI="; }; - date = "2025-12-02"; + date = "2025-12-21"; }; scutiger = { pname = "scutiger"; diff --git a/flake.lock b/flake.lock index cfd51277..593cda36 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1762286984, - "narHash": "sha256-9I2H9x5We6Pl+DBYHjR1s3UT8wgwcpAH03kn9CqtdQc=", + "lastModified": 1766051518, + "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=", "owner": "serokell", "repo": "deploy-rs", - "rev": "9c870f63e28ec1e83305f7f6cb73c941e699f74f", + "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa", "type": "github" }, "original": { @@ -507,11 +507,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1765386897, - "narHash": "sha256-wmHtBM2Iuthw9DsTD9RUkkZqrmsSJYGgflSaskE+Rrc=", + "lastModified": 1766409779, + "narHash": "sha256-mDmnH0RFOeWJUNdC3V3fX82ZOIugmFKrZGRJHkkgcFI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "be7806f4fe2ead48eaf22e125f535d70a5ff2e3b", + "rev": "05f6806e04bda8d33d6015f8b303130feec8c28e", "type": "github" }, "original": { @@ -765,11 +765,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1765311797, - "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", + "lastModified": 1766201043, + "narHash": "sha256-eplAP+rorKKd0gNjV3rA6+0WMzb1X1i16F5m5pASnjA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", + "rev": "b3aad468604d3e488d627c0b43984eb60e75e782", "type": "github" }, "original": { @@ -813,11 +813,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1766309749, + "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816", "type": "github" }, "original": { @@ -856,11 +856,11 @@ ] }, "locked": { - "lastModified": 1760948256, - "narHash": "sha256-nIsrxp6n1nQ63n1JTDaO/18RjvYbW9GVkanTP4G6Y18=", + "lastModified": 1765698311, + "narHash": "sha256-78sPqekEDJiol2YD3Hx2zHu5E4AtrbNrUKi0032HMHo=", "owner": "berberman", "repo": "nvfetcher", - "rev": "cb958b35b647c8a79fbd9d79764accc5e5a9a430", + "rev": "dbae9626c46b93d9fd6b85c8b292939ae569c4fc", "type": "github" }, "original": { @@ -1148,11 +1148,11 @@ ] }, "locked": { - "lastModified": 1765231718, - "narHash": "sha256-qdBzo6puTgG4G2RHG0PkADg22ZnQo1JmSVFRxrD4QM4=", + "lastModified": 1766289575, + "narHash": "sha256-BOKCwOQQIP4p9z8DasT5r+qjri3x7sPCOq+FTjY8Z+o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "7fd1416aba1865eddcdec5bb11339b7222c2363e", + "rev": "9836912e37aef546029e48c8749834735a6b9dad", "type": "github" }, "original": { @@ -1223,11 +1223,11 @@ ] }, "locked": { - "lastModified": 1764992234, - "narHash": "sha256-qBbyM1Gnvs/ncbnWfbBboMyevelz+owIdSN5Sg89wzw=", + "lastModified": 1766021660, + "narHash": "sha256-UUfz7qWB1Rb2KjGVCimt//Jncv3TgJwffPqbzqpkmgY=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "1610e554e579c3d47b47c8a32d47042116d0e153", + "rev": "19fa99be3409f55ec05e823c66c9769df7a8dd17", "type": "github" }, "original": { @@ -1256,11 +1256,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1765343581, - "narHash": "sha256-HtTPbV6z6AJPg2d0bHaJKFrnNha+SEbHvbJafKAQ614=", + "lastModified": 1766363450, + "narHash": "sha256-buO37E9GTM4Qh1tvBjpSB/JGWN72EYKMUB/Lt8LrW7w=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "f0ad674b7009a6afd80cea59d4fbf975dd68ee95", + "rev": "bf738fffbb26669d0ba9d7a3ecdba3b47afa8a85", "type": "github" }, "original": { diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix index 258a83f7..2dcf5459 100644 --- a/hosts/sif/default.nix +++ b/hosts/sif/default.nix @@ -13,7 +13,7 @@ in { imports = with flake.nixosModules.systemProfiles; [ ./hw.nix ./email ./libvirt ./greetd - tmpfs-root bcachefs initrd-all-crypto-modules default-locale openssh rebuild-machines niri-unstable networkmanager lanzaboote + tmpfs-root bcachefs initrd-all-crypto-modules default-locale openssh rebuild-machines niri-unstable networkmanager lanzaboote zswap flakeInputs.nixos-hardware.nixosModules.lenovo-thinkpad-p1 flakeInputs.nixVirt.nixosModules.default ]; @@ -58,23 +58,7 @@ in { plymouth.enable = true; - kernelPackages = pkgs.linuxPackages_latest; - kernelPatches = [ - { name = "edac-config"; - patch = null; - structuredExtraConfig = with lib.kernel; { - EDAC = yes; - EDAC_IE31200 = yes; - }; - } - { name = "zswap-default"; - patch = null; - structuredExtraConfig = with lib.kernel; { - ZSWAP_DEFAULT_ON = yes; - ZSWAP_SHRINKER_DEFAULT_ON = yes; - }; - } - ]; + kernelPackages = pkgs.linuxPackages_6_18; consoleLogLevel = 3; kernelParams = [ "quiet" diff --git a/hosts/surtr/default.nix b/hosts/surtr/default.nix index 4a9bd6fe..815cf41a 100644 --- a/hosts/surtr/default.nix +++ b/hosts/surtr/default.nix @@ -4,7 +4,7 @@ with lib; { imports = with flake.nixosModules.systemProfiles; [ - tmpfs-root qemu-guest openssh rebuild-machines zfs + tmpfs-root qemu-guest openssh rebuild-machines zfs zswap ./zfs.nix ./dns ./tls ./http ./bifrost ./matrix ./postgresql ./prometheus ./email ./vpn ./borg.nix ./etebase ./immich.nix ./paperless.nix ./hledger.nix ./audiobookshelf.nix ./kimai.nix @@ -28,15 +28,6 @@ with lib; zfs.devNodes = "/dev"; # /dev/vda2 does not show up in /dev/disk/by-id kernelModules = ["ptp_kvm"]; - kernelPatches = [ - { name = "zswap-default"; - patch = null; - structuredExtraConfig = with lib.kernel; { - ZSWAP_DEFAULT_ON = yes; - ZSWAP_SHRINKER_DEFAULT_ON = yes; - }; - } - ]; }; fileSystems = { diff --git a/installer/default.nix b/installer/default.nix index 8c0082fa..69bc5efa 100644 --- a/installer/default.nix +++ b/installer/default.nix @@ -10,7 +10,7 @@ with lib; config = { boot = { initrd.kernelModules = [ "e1000e" "virtio_net" ]; - kernelPackages = pkgs.linuxPackages_6_17; + kernelPackages = pkgs.linuxPackages_6_18; zfs.package = pkgs.zfs_unstable; }; diff --git a/nvfetcher.toml b/nvfetcher.toml index 94c29db7..23f4c5dd 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -131,7 +131,3 @@ fetch.git = "https://code.maralorn.de/maralorn/nix-output-monitor.git" [ldif2json] src.git = "https://codeberg.org/joatca/ldif2json.git" fetch.git = "https://codeberg.org/joatca/ldif2json.git" - -[freerdp] -src.github = "FreeRDP/FreeRDP" -fetch.github = "FreeRDP/FreeRDP" diff --git a/overlays/freerdp.nix b/overlays/freerdp.nix index fafd0765..49acf14a 100644 --- a/overlays/freerdp.nix +++ b/overlays/freerdp.nix @@ -1,6 +1,6 @@ -{ final, prev, sources, ... }: +{ prev, ... }: { - freerdp = prev.freerdp.overrideAttrs (oldAttrs: { - inherit (sources.freerdp) pname version src; + freerdp = prev.freerdp.override (prev.lib.optionalAttrs (prev.lib.versionAtLeast prev.freerdp.version "3.20") { + withWaylandSupport = true; }); } diff --git a/system-profiles/bcachefs.nix b/system-profiles/bcachefs.nix index be12bf20..6090c56d 100644 --- a/system-profiles/bcachefs.nix +++ b/system-profiles/bcachefs.nix @@ -2,15 +2,5 @@ config = { boot.supportedFilesystems.bcachefs = true; environment.systemPackages = with pkgs; [ bcachefs-tools ]; - - boot.kernelPatches = [ - { - name = "bcachefs-casefold-fix"; - patch = null; - structuredExtraConfig = with lib.kernel; { - UNICODE = lib.mkOverride 90 no; - }; - } - ]; }; } diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix index e5f9dc16..258dd32d 100644 --- a/system-profiles/core/default.nix +++ b/system-profiles/core/default.nix @@ -180,10 +180,7 @@ in { }; environment.systemPackages = with pkgs; [ git-annex scutiger ]; } - ] ++ (optional (options ? system.rebuild.enableNg) { - system.rebuild.enableNg = lib.mkDefault true; - }) - ++ (optional (options ? services.userborn) { + ] ++ (optional (options ? services.userborn) { services.userborn = { enable = lib.mkDefault true; passwordFilesLocation = lib.mkDefault "/var/lib/nixos"; diff --git a/system-profiles/zfs.nix b/system-profiles/zfs.nix index d4a2175f..c20acb9a 100644 --- a/system-profiles/zfs.nix +++ b/system-profiles/zfs.nix @@ -1,8 +1,8 @@ { config, pkgs, lib, ... } : { config = { boot = { - kernelPackages = lib.mkDefault pkgs.linuxPackages_6_12; - zfs.package = lib.mkDefault pkgs.zfs_2_3; + kernelPackages = lib.mkDefault pkgs.linuxPackages_6_18; + zfs.package = lib.mkDefault pkgs.zfs_2_4; supportedFilesystems.zfs = true; }; diff --git a/system-profiles/zswap.nix b/system-profiles/zswap.nix new file mode 100644 index 00000000..ac141f55 --- /dev/null +++ b/system-profiles/zswap.nix @@ -0,0 +1,25 @@ +{ ... }: + +{ + config = { + boot.kernelParams = [ + "zswap.enabled=1" + "zswap.compressor=zstd" + "zswap.zpool=zsmalloc" + "zswap.max_pool_percent=25" + "zswap.accept_threshold_percent=90" + "zswap.shrinker_enabled=1" + ]; + + boot.initrd.kernelModules = [ "zstd" "zsmalloc" ]; + + boot.kernel.sysfs.module.zswap.parameters = { + enabled = true; + compressor = "zstd"; + zpool = "zsmalloc"; + max_pool_percent = 25; + accept_threshold_percent = 90; + shrinker_enabled = true; + }; + }; +} -- cgit v1.2.3