From 26cb50de504b32e343689bb3b176eecab3c0c134 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Tue, 22 Sep 2026 17:48:01 +0200 Subject: bump --- _sources/generated.json | 32 ++++----- _sources/generated.nix | 32 ++++----- accounts/gkleen@skadhi/default.nix | 37 +++++++++- flake.lock | 102 +++++++++++++-------------- hosts/sif/default.nix | 4 +- hosts/skadhi/default.nix | 1 - hosts/skadhi/hw.nix | 8 ++- system-profiles/rebuild-machines/default.nix | 2 +- 8 files changed, 126 insertions(+), 92 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index 55f10ad2..2fbb50c5 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -111,11 +111,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-BgCeg0j0QTDma0refhQxwjv0olLauE4FoXyUyOUpIW4=", + "sha256": "sha256-LYDoTs7mZOHI85B7k59YZYGM30o9RSiNnQudF33zJ7c=", "type": "tarball", - "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.27.tar.gz" + "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.28.tar.gz" }, - "version": "2.27" + "version": "2.28" }, "mpv-autosave": { "cargoLock": null, @@ -193,12 +193,12 @@ "name": null, "owner": "hoyon", "repo": "mpv-mpris", - "rev": "1.2", - "sha256": "sha256-Q2kNaXZtI6U+x2f00x5CiHZq4o64xFTNC/3W4IiP0+4=", + "rev": "1.3", + "sha256": "sha256-jPncHlY2fIUzURhQ35ude1D8WkKQurAOdPedz1/osBU=", "sparseCheckout": [], "type": "github" }, - "version": "1.2" + "version": "1.3" }, "mpv-reload": { "cargoLock": null, @@ -270,11 +270,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-4PbBxZPh2grQg/nXoOOjWAhR9gJqNgR53oriAUrv0i8=", + "sha256": "sha256-Vrsh6fbXnq25R+cDGgiMmvzEiqHrmbJQLRYfCxxYaoI=", "type": "url", - "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.efi" + "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.3/netboot.xyz.efi" }, - "version": "3.0.2" + "version": "3.0.3" }, "netbootxyz-lkrn": { "cargoLock": null, @@ -285,11 +285,11 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-XuynuqxT/TVo+1FmhGmzPcQF8mF2TN+wxwxlp6HCSOE=", + "sha256": "sha256-uJNMT0plGVmRUSPt/ldDb695oKLzjIjDvDjtaTCxZdk=", "type": "url", - "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.lkrn" + "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.3/netboot.xyz.lkrn" }, - "version": "3.0.2" + "version": "3.0.3" }, "postfix-mta-sts-resolver": { "cargoLock": null, @@ -355,7 +355,7 @@ }, "quickshell": { "cargoLock": null, - "date": "2026-08-20", + "date": "2026-09-20", "extract": null, "name": "quickshell", "passthru": null, @@ -365,13 +365,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "9f807554e106f6b0670e60ead82b63f3c0c2ac26", - "sha256": "sha256-stV8Dxkrry6AbK8unyEjLNeDZcQtNE1TCgmjc8hdcxw=", + "rev": "fae96f1a5b7f53de9b7e40e5b53c0b7a2e97b1d7", + "sha256": "sha256-872tMDDYdjR983q7v2yDlnKOEBSPp5FXDdWF2q87gik=", "sparseCheckout": [], "type": "git", "url": "https://git.outfoxxed.me/quickshell/quickshell.git" }, - "version": "9f807554e106f6b0670e60ead82b63f3c0c2ac26" + "version": "fae96f1a5b7f53de9b7e40e5b53c0b7a2e97b1d7" }, "scutiger": { "cargoLock": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index deada91d..00f69bfd 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -72,10 +72,10 @@ }; lesspipe = { pname = "lesspipe"; - version = "2.27"; + version = "2.28"; src = fetchTarball { - url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.27.tar.gz"; - sha256 = "sha256-BgCeg0j0QTDma0refhQxwjv0olLauE4FoXyUyOUpIW4="; + url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.28.tar.gz"; + sha256 = "sha256-LYDoTs7mZOHI85B7k59YZYGM30o9RSiNnQudF33zJ7c="; }; }; mpv-autosave = { @@ -118,13 +118,13 @@ }; mpv-mpris = { pname = "mpv-mpris"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "hoyon"; repo = "mpv-mpris"; - rev = "1.2"; + rev = "1.3"; fetchSubmodules = false; - sha256 = "sha256-Q2kNaXZtI6U+x2f00x5CiHZq4o64xFTNC/3W4IiP0+4="; + sha256 = "sha256-jPncHlY2fIUzURhQ35ude1D8WkKQurAOdPedz1/osBU="; }; }; mpv-reload = { @@ -169,18 +169,18 @@ }; netbootxyz-efi = { pname = "netbootxyz-efi"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.efi"; - sha256 = "sha256-4PbBxZPh2grQg/nXoOOjWAhR9gJqNgR53oriAUrv0i8="; + url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.3/netboot.xyz.efi"; + sha256 = "sha256-Vrsh6fbXnq25R+cDGgiMmvzEiqHrmbJQLRYfCxxYaoI="; }; }; netbootxyz-lkrn = { pname = "netbootxyz-lkrn"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { - url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.lkrn"; - sha256 = "sha256-XuynuqxT/TVo+1FmhGmzPcQF8mF2TN+wxwxlp6HCSOE="; + url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.3/netboot.xyz.lkrn"; + sha256 = "sha256-uJNMT0plGVmRUSPt/ldDb695oKLzjIjDvDjtaTCxZdk="; }; }; postfix-mta-sts-resolver = { @@ -223,17 +223,17 @@ }; quickshell = { pname = "quickshell"; - version = "9f807554e106f6b0670e60ead82b63f3c0c2ac26"; + version = "fae96f1a5b7f53de9b7e40e5b53c0b7a2e97b1d7"; src = fetchgit { url = "https://git.outfoxxed.me/quickshell/quickshell.git"; - rev = "9f807554e106f6b0670e60ead82b63f3c0c2ac26"; + rev = "fae96f1a5b7f53de9b7e40e5b53c0b7a2e97b1d7"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-stV8Dxkrry6AbK8unyEjLNeDZcQtNE1TCgmjc8hdcxw="; + sha256 = "sha256-872tMDDYdjR983q7v2yDlnKOEBSPp5FXDdWF2q87gik="; }; - date = "2026-08-20"; + date = "2026-09-20"; }; scutiger = { pname = "scutiger"; diff --git a/accounts/gkleen@skadhi/default.nix b/accounts/gkleen@skadhi/default.nix index 97faf86c..4c0c4028 100644 --- a/accounts/gkleen@skadhi/default.nix +++ b/accounts/gkleen@skadhi/default.nix @@ -1,4 +1,4 @@ -{ flake, userName, config, lib, ... }: +{ flake, flakeInputs, userName, config, lib, ... }: let user = config.users.users.${userName}; in { @@ -9,7 +9,7 @@ in { config = { users.users.gkleen.group = "gkleen"; users.groups.gkleen = {}; - systemd.tmpfiles.settings.home-directories.${user.home} = lib.mkForce { + systemd.tmpfiles.settings.home-directories."/persistent/${user.home}" = lib.mkForce { v = { mode = user.homeMode; user = user.name; @@ -17,8 +17,39 @@ in { }; }; - home-manager.users.${userName} = { + home-manager.users.${userName} = let sysConfig = config; in { config, ... }: { + imports = [ + flakeInputs.nix-index-database.homeModules.nix-index + ]; + home.stateVersion = "26.05"; + + home.persistence."/persistent" = { + directories = [ + "Downloads" "documents" "screenshots" "media" + ]; + }; + + programs.zsh.dirHashes = let + flakeHashes = lib.mapAttrs' (n: v: lib.nameValuePair (inputNames.${n} or n) (toString v)) flakeInputs; + inputNames = { + self = "nixos"; + }; + in flakeHashes // { + docs = "$HOME/documents"; + dl = "$HOME/Downloads"; + scrot = "$HOME/screenshots"; + media = "$HOME/media"; + }; + programs.starship.settings = { + directory.substitutions = lib.mapAttrs' (name: value: let + value' = builtins.unsafeDiscardStringContext value; + value'' = if lib.hasPrefix "$HOME/" value' then "~" + lib.removePrefix "$HOME" value' else value'; + in lib.nameValuePair value'' "~${name}" + ) config.programs.zsh.dirHashes; + }; + + programs.nix-index.enable = true; }; }; } diff --git a/flake.lock b/flake.lock index 9d71635e..0b0817d2 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1786361680, - "narHash": "sha256-IxaZkb9rCGEZ+yGndxKXONeIEcKMzoFUsvLTB5G/caw=", + "lastModified": 1789404474, + "narHash": "sha256-UXFQ7tFiwn8sPz0EV4CBB2PCf/ZiGIHWn/6MXk81Lxs=", "owner": "serokell", "repo": "deploy-rs", - "rev": "16901271e5b30b591e56f7a84f25f186fb20f3e1", + "rev": "e760371d631165e7d8de5b0dcf148e21ec4c16f0", "type": "github" }, "original": { @@ -296,11 +296,11 @@ "flake-registry": { "flake": false, "locked": { - "lastModified": 1782548455, - "narHash": "sha256-Jjp/ZivVqZCLptwlSuwU8n0a8b8PXJqabxpSG7KRNuI=", + "lastModified": 1789428769, + "narHash": "sha256-qhIiRTjzwr65WpepkXWGmA4Wwl/PD/gfr3mQqeYORBY=", "owner": "NixOS", "repo": "flake-registry", - "rev": "10bd3d9e8eefb4725e346eddd3a505aa0aacf01b", + "rev": "46ea0f17cf6777e156a2be6ae802d9f95d93dd5e", "type": "github" }, "original": { @@ -352,11 +352,11 @@ ] }, "locked": { - "lastModified": 1784288435, - "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", + "lastModified": 1789514889, + "narHash": "sha256-PFD1nxptCXJyJoiYO1gf/5Vv43yqGpHtMC6LUhl9/pQ=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", + "rev": "59f4ca0d063a1a3ec722c88b51a33004862e5379", "type": "github" }, "original": { @@ -647,11 +647,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1787129251, - "narHash": "sha256-MauCXoXwhSGLMJiddBrUSHvPie8lUtCaohjKJgIReQE=", + "lastModified": 1790070480, + "narHash": "sha256-gLB/L3ggRwng88W3t4KygVBkIjB84zW1xQSIWiuRGWg=", "owner": "epireyn", "repo": "niri-flake", - "rev": "f9e02cd4674abefa210674cd28a993e5cfb33bfc", + "rev": "4edede7d2e876544cc1c1128e47d0e51278b1b9a", "type": "github" }, "original": { @@ -723,11 +723,11 @@ ] }, "locked": { - "lastModified": 1786852476, - "narHash": "sha256-IM5CYtf86W4w8eUPpKcY/LpdHElmVBtJhaKnoTKxZEA=", + "lastModified": 1789892076, + "narHash": "sha256-Dkg4VKPmDPqTwaiw2WH5br73tXoL1qrOO0xJnR4TlcA=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "c7962dc97b45129df8d751bedaf37beb5a17706e", + "rev": "9ad722673ab3b3f91f02135e53775825b240b869", "type": "github" }, "original": { @@ -769,11 +769,11 @@ ] }, "locked": { - "lastModified": 1786680260, - "narHash": "sha256-t/OKt1G1UnHTRRtNuJ/yC1oOV4Fn39HkNsKzyd3DlYQ=", + "lastModified": 1789705005, + "narHash": "sha256-kWGA2zNVrHZpKgeXA0urHvw7FWCTEp5rjyUAhCikXuc=", "ref": "refs/heads/main", - "rev": "b568a2584ed3619a6ebe41a2910e2bfc674bf836", - "revCount": 801, + "rev": "bcecf42740627e01376caea1edc3194f39857890", + "revCount": 814, "type": "git", "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git" }, @@ -807,11 +807,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1786867632, - "narHash": "sha256-ez+ubZlA1RtdjCB18a6zJ9M4u8qoPDy08EcnsW5M3Xw=", + "lastModified": 1789978172, + "narHash": "sha256-FIRXajv1pPZ+l6On6ekkmcQ6le0Zi0ncRUoR3nB0vKA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ff17823245ab9ff7bcae6acf950bd89cba82c38c", + "rev": "9ebcb7766700d7e006d9505247bd7ce0426f4232", "type": "github" }, "original": { @@ -932,11 +932,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1787042014, - "narHash": "sha256-lgnV/xeEatfEnPZG0RrXS0fhcr63p3tsVvL1GdaVkJQ=", + "lastModified": 1789998861, + "narHash": "sha256-62XMQD4WLdMAfdT0/8gJmPH2dKeTw908ryNloAplTr8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c69ae8fb8faeb3472fd11234ba55a70ac3601f9b", + "rev": "1e8bc658fc985ef27ccd66d107d767b32bb7ef98", "type": "github" }, "original": { @@ -1012,11 +1012,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "lastModified": 1789546076, + "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=", + "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1025,11 +1025,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1787001381, - "narHash": "sha256-Ue1Yo8gfHdD4TMtNewhA4tkSYeFqXThju0nCyJc3ALo=", + "lastModified": 1789921291, + "narHash": "sha256-Ft/BRnIqw1MywFoXydKobjjWmDFgDdYtSpJliE8+yUw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec2d622de0773551768cf98f3fc50cbcc003b9c5", + "rev": "44a91898084f46797b5fac650c7e8c9ac38c43d4", "type": "github" }, "original": { @@ -1295,11 +1295,11 @@ ] }, "locked": { - "lastModified": 1786936886, - "narHash": "sha256-8SFyOdmcG6Nsh/JzlH812lTI/v+ur06fpQhj/acNn8k=", + "lastModified": 1789963190, + "narHash": "sha256-mj5BLUKECIHv3rwkBXL6xQp45gIBJV7ZOYgT46LXwho=", "owner": "pyproject-nix", "repo": "build-system-pkgs", - "rev": "90ffdeee1a4929b231913df067448cd9803d3e07", + "rev": "14b45373ea9a14ed2fcd0abf3ed35c8e3c430020", "type": "github" }, "original": { @@ -1315,11 +1315,11 @@ ] }, "locked": { - "lastModified": 1786031528, - "narHash": "sha256-cROiHKO3UbIKqF5FG5NikvydzlfIj4EcR1Cty9qOVt4=", + "lastModified": 1788394333, + "narHash": "sha256-xYOP0Xym1eVGUaHFx+eJEaycFGoiCbst3fZf0xFHP78=", "owner": "pyproject-nix", "repo": "pyproject.nix", - "rev": "1b1485546d85f6f6c7aadb10c4923dbc09633263", + "rev": "6a8a7881d75b6f98967e7b8069f4ead331384301", "type": "github" }, "original": { @@ -1390,11 +1390,11 @@ ] }, "locked": { - "lastModified": 1786629091, - "narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=", + "lastModified": 1789890976, + "narHash": "sha256-GKwH3zpy7tartuJMG0Rv/xUsdetG1QLmTVv8UKgJLmA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f", + "rev": "7214124c20c1542c90deb54af50e2f53ae02711f", "type": "github" }, "original": { @@ -1465,11 +1465,11 @@ ] }, "locked": { - "lastModified": 1786615403, - "narHash": "sha256-U++y7nM/6xiEcWI7q4fQoPZjPvRaTwkSqzBOVoEBjUE=", + "lastModified": 1789383061, + "narHash": "sha256-+DkygIVr/+RtXnsjd07BzFFB0ihwmjjLuYh1fyc/bCg=", "owner": "pyproject-nix", "repo": "uv2nix", - "rev": "4b59abb2ae1896d2a0e1abfc47fbc9bf985ea730", + "rev": "079be4e68c529c4cbc44dbf1afc692e4b30695b3", "type": "github" }, "original": { @@ -1481,16 +1481,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1771195969, - "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=", + "lastModified": 1784679892, + "narHash": "sha256-Mb7jpqnrcYCfNSItIkkHpuR3YxWFxPuIBfcwNKlRBkk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "536bd32efc935bf876d6de385ec18a1b715c9358", + "rev": "8d135d3b2854b30fd01ea6cd6c27e523dd50a839", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.8.1", + "ref": "v0.8.2", "repo": "xwayland-satellite", "type": "github" } @@ -1498,11 +1498,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1786221058, - "narHash": "sha256-hF2atQzapHBLX5NFqJMcKZAWHfGkKQeNu1eQr46+AGg=", + "lastModified": 1788991189, + "narHash": "sha256-0TxfMgqW0/BLD4M942c5DCKYrtPvzsPJwvdcco4LQUM=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3bc915f09dd62bb2651a715114f9d140344bc6c1", + "rev": "add2795134593faafce60e404a0a75df68e9ee0c", "type": "github" }, "original": { diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix index 5ea9dfd2..e05566dc 100644 --- a/hosts/sif/default.nix +++ b/hosts/sif/default.nix @@ -589,9 +589,7 @@ in { MemoryMax = "75%"; }; - services.journald.extraConfig = '' - SystemMaxUse=100M - ''; + services.journald.settings.Journal.SystemMaxUse = "100M"; services.dbus.packages = with pkgs; [ dbus dconf diff --git a/hosts/skadhi/default.nix b/hosts/skadhi/default.nix index e9d5cc59..87d1e313 100644 --- a/hosts/skadhi/default.nix +++ b/hosts/skadhi/default.nix @@ -15,7 +15,6 @@ directories = [ "/nix" "/root" - "/home" "/var/log" "/var/lib/nixos" "/var/lib/sops-nix" diff --git a/hosts/skadhi/hw.nix b/hosts/skadhi/hw.nix index b95fc24c..dd2af18d 100644 --- a/hosts/skadhi/hw.nix +++ b/hosts/skadhi/hw.nix @@ -9,6 +9,12 @@ hardware.framework.laptop13.audioEnhancement.enable = true; services.fstrim.enable = false; + services.udev.extraRules = '' + ACTION=="add", SUBSYSTEM=="acpi", DRIVERS=="button", ATTRS{hid}=="PNP0C0D", ATTR{power/wakeup}="disabled" + ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled" + ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled" + ''; + nixpkgs.system = "x86_64-linux"; disko.devices = { @@ -43,7 +49,7 @@ content = { type = "btrfs"; extraArgs = let - subvols = ["/persistent"] ++ map (p: "/persistent/${p}") ["/nix" "/home" "/var/log"]; + subvols = ["/persistent"] ++ map (p: "/persistent/${p}") ["/nix" "/var/log"]; restricted = map (p: "/persistent/${p}") ["/root"]; in [ "--csum" "blake2" diff --git a/system-profiles/rebuild-machines/default.nix b/system-profiles/rebuild-machines/default.nix index de86cd74..c95602a4 100644 --- a/system-profiles/rebuild-machines/default.nix +++ b/system-profiles/rebuild-machines/default.nix @@ -158,7 +158,7 @@ in { }; nix.registry = mkIf (cfg.flake != null) { - ${cfg.flake.name} = { + ${cfg.flake.name} = lib.mkForce { exact = false; to = cfg.flake.flake; }; -- cgit v1.2.3