diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2026-09-22 17:48:01 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2026-09-22 17:48:01 +0200 |
| commit | 26cb50de504b32e343689bb3b176eecab3c0c134 (patch) | |
| tree | 183aeccc03f8bb11c8a75a5b95be4e4ea7e85283 | |
| parent | 037bee53a4e719ba3ed4ccc48b3c6a2edc52b883 (diff) | |
| download | nixos-26cb50de504b32e343689bb3b176eecab3c0c134.tar nixos-26cb50de504b32e343689bb3b176eecab3c0c134.tar.gz nixos-26cb50de504b32e343689bb3b176eecab3c0c134.tar.bz2 nixos-26cb50de504b32e343689bb3b176eecab3c0c134.tar.xz nixos-26cb50de504b32e343689bb3b176eecab3c0c134.zip | |
bump
| -rw-r--r-- | _sources/generated.json | 32 | ||||
| -rw-r--r-- | _sources/generated.nix | 32 | ||||
| -rw-r--r-- | accounts/gkleen@skadhi/default.nix | 37 | ||||
| -rw-r--r-- | flake.lock | 102 | ||||
| -rw-r--r-- | hosts/sif/default.nix | 4 | ||||
| -rw-r--r-- | hosts/skadhi/default.nix | 1 | ||||
| -rw-r--r-- | hosts/skadhi/hw.nix | 8 | ||||
| -rw-r--r-- | 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 @@ | |||
| 111 | "passthru": null, | 111 | "passthru": null, |
| 112 | "pinned": false, | 112 | "pinned": false, |
| 113 | "src": { | 113 | "src": { |
| 114 | "sha256": "sha256-BgCeg0j0QTDma0refhQxwjv0olLauE4FoXyUyOUpIW4=", | 114 | "sha256": "sha256-LYDoTs7mZOHI85B7k59YZYGM30o9RSiNnQudF33zJ7c=", |
| 115 | "type": "tarball", | 115 | "type": "tarball", |
| 116 | "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.27.tar.gz" | 116 | "url": "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.28.tar.gz" |
| 117 | }, | 117 | }, |
| 118 | "version": "2.27" | 118 | "version": "2.28" |
| 119 | }, | 119 | }, |
| 120 | "mpv-autosave": { | 120 | "mpv-autosave": { |
| 121 | "cargoLock": null, | 121 | "cargoLock": null, |
| @@ -193,12 +193,12 @@ | |||
| 193 | "name": null, | 193 | "name": null, |
| 194 | "owner": "hoyon", | 194 | "owner": "hoyon", |
| 195 | "repo": "mpv-mpris", | 195 | "repo": "mpv-mpris", |
| 196 | "rev": "1.2", | 196 | "rev": "1.3", |
| 197 | "sha256": "sha256-Q2kNaXZtI6U+x2f00x5CiHZq4o64xFTNC/3W4IiP0+4=", | 197 | "sha256": "sha256-jPncHlY2fIUzURhQ35ude1D8WkKQurAOdPedz1/osBU=", |
| 198 | "sparseCheckout": [], | 198 | "sparseCheckout": [], |
| 199 | "type": "github" | 199 | "type": "github" |
| 200 | }, | 200 | }, |
| 201 | "version": "1.2" | 201 | "version": "1.3" |
| 202 | }, | 202 | }, |
| 203 | "mpv-reload": { | 203 | "mpv-reload": { |
| 204 | "cargoLock": null, | 204 | "cargoLock": null, |
| @@ -270,11 +270,11 @@ | |||
| 270 | "pinned": false, | 270 | "pinned": false, |
| 271 | "src": { | 271 | "src": { |
| 272 | "name": null, | 272 | "name": null, |
| 273 | "sha256": "sha256-4PbBxZPh2grQg/nXoOOjWAhR9gJqNgR53oriAUrv0i8=", | 273 | "sha256": "sha256-Vrsh6fbXnq25R+cDGgiMmvzEiqHrmbJQLRYfCxxYaoI=", |
| 274 | "type": "url", | 274 | "type": "url", |
| 275 | "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.efi" | 275 | "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.3/netboot.xyz.efi" |
| 276 | }, | 276 | }, |
| 277 | "version": "3.0.2" | 277 | "version": "3.0.3" |
| 278 | }, | 278 | }, |
| 279 | "netbootxyz-lkrn": { | 279 | "netbootxyz-lkrn": { |
| 280 | "cargoLock": null, | 280 | "cargoLock": null, |
| @@ -285,11 +285,11 @@ | |||
| 285 | "pinned": false, | 285 | "pinned": false, |
| 286 | "src": { | 286 | "src": { |
| 287 | "name": null, | 287 | "name": null, |
| 288 | "sha256": "sha256-XuynuqxT/TVo+1FmhGmzPcQF8mF2TN+wxwxlp6HCSOE=", | 288 | "sha256": "sha256-uJNMT0plGVmRUSPt/ldDb695oKLzjIjDvDjtaTCxZdk=", |
| 289 | "type": "url", | 289 | "type": "url", |
| 290 | "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.lkrn" | 290 | "url": "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.3/netboot.xyz.lkrn" |
| 291 | }, | 291 | }, |
| 292 | "version": "3.0.2" | 292 | "version": "3.0.3" |
| 293 | }, | 293 | }, |
| 294 | "postfix-mta-sts-resolver": { | 294 | "postfix-mta-sts-resolver": { |
| 295 | "cargoLock": null, | 295 | "cargoLock": null, |
| @@ -355,7 +355,7 @@ | |||
| 355 | }, | 355 | }, |
| 356 | "quickshell": { | 356 | "quickshell": { |
| 357 | "cargoLock": null, | 357 | "cargoLock": null, |
| 358 | "date": "2026-08-20", | 358 | "date": "2026-09-20", |
| 359 | "extract": null, | 359 | "extract": null, |
| 360 | "name": "quickshell", | 360 | "name": "quickshell", |
| 361 | "passthru": null, | 361 | "passthru": null, |
| @@ -365,13 +365,13 @@ | |||
| 365 | "fetchSubmodules": false, | 365 | "fetchSubmodules": false, |
| 366 | "leaveDotGit": false, | 366 | "leaveDotGit": false, |
| 367 | "name": null, | 367 | "name": null, |
| 368 | "rev": "9f807554e106f6b0670e60ead82b63f3c0c2ac26", | 368 | "rev": "fae96f1a5b7f53de9b7e40e5b53c0b7a2e97b1d7", |
| 369 | "sha256": "sha256-stV8Dxkrry6AbK8unyEjLNeDZcQtNE1TCgmjc8hdcxw=", | 369 | "sha256": "sha256-872tMDDYdjR983q7v2yDlnKOEBSPp5FXDdWF2q87gik=", |
| 370 | "sparseCheckout": [], | 370 | "sparseCheckout": [], |
| 371 | "type": "git", | 371 | "type": "git", |
| 372 | "url": "https://git.outfoxxed.me/quickshell/quickshell.git" | 372 | "url": "https://git.outfoxxed.me/quickshell/quickshell.git" |
| 373 | }, | 373 | }, |
| 374 | "version": "9f807554e106f6b0670e60ead82b63f3c0c2ac26" | 374 | "version": "fae96f1a5b7f53de9b7e40e5b53c0b7a2e97b1d7" |
| 375 | }, | 375 | }, |
| 376 | "scutiger": { | 376 | "scutiger": { |
| 377 | "cargoLock": null, | 377 | "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 @@ | |||
| 72 | }; | 72 | }; |
| 73 | lesspipe = { | 73 | lesspipe = { |
| 74 | pname = "lesspipe"; | 74 | pname = "lesspipe"; |
| 75 | version = "2.27"; | 75 | version = "2.28"; |
| 76 | src = fetchTarball { | 76 | src = fetchTarball { |
| 77 | url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.27.tar.gz"; | 77 | url = "https://github.com/wofr06/lesspipe/archive/refs/tags/v2.28.tar.gz"; |
| 78 | sha256 = "sha256-BgCeg0j0QTDma0refhQxwjv0olLauE4FoXyUyOUpIW4="; | 78 | sha256 = "sha256-LYDoTs7mZOHI85B7k59YZYGM30o9RSiNnQudF33zJ7c="; |
| 79 | }; | 79 | }; |
| 80 | }; | 80 | }; |
| 81 | mpv-autosave = { | 81 | mpv-autosave = { |
| @@ -118,13 +118,13 @@ | |||
| 118 | }; | 118 | }; |
| 119 | mpv-mpris = { | 119 | mpv-mpris = { |
| 120 | pname = "mpv-mpris"; | 120 | pname = "mpv-mpris"; |
| 121 | version = "1.2"; | 121 | version = "1.3"; |
| 122 | src = fetchFromGitHub { | 122 | src = fetchFromGitHub { |
| 123 | owner = "hoyon"; | 123 | owner = "hoyon"; |
| 124 | repo = "mpv-mpris"; | 124 | repo = "mpv-mpris"; |
| 125 | rev = "1.2"; | 125 | rev = "1.3"; |
| 126 | fetchSubmodules = false; | 126 | fetchSubmodules = false; |
| 127 | sha256 = "sha256-Q2kNaXZtI6U+x2f00x5CiHZq4o64xFTNC/3W4IiP0+4="; | 127 | sha256 = "sha256-jPncHlY2fIUzURhQ35ude1D8WkKQurAOdPedz1/osBU="; |
| 128 | }; | 128 | }; |
| 129 | }; | 129 | }; |
| 130 | mpv-reload = { | 130 | mpv-reload = { |
| @@ -169,18 +169,18 @@ | |||
| 169 | }; | 169 | }; |
| 170 | netbootxyz-efi = { | 170 | netbootxyz-efi = { |
| 171 | pname = "netbootxyz-efi"; | 171 | pname = "netbootxyz-efi"; |
| 172 | version = "3.0.2"; | 172 | version = "3.0.3"; |
| 173 | src = fetchurl { | 173 | src = fetchurl { |
| 174 | url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.efi"; | 174 | url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.3/netboot.xyz.efi"; |
| 175 | sha256 = "sha256-4PbBxZPh2grQg/nXoOOjWAhR9gJqNgR53oriAUrv0i8="; | 175 | sha256 = "sha256-Vrsh6fbXnq25R+cDGgiMmvzEiqHrmbJQLRYfCxxYaoI="; |
| 176 | }; | 176 | }; |
| 177 | }; | 177 | }; |
| 178 | netbootxyz-lkrn = { | 178 | netbootxyz-lkrn = { |
| 179 | pname = "netbootxyz-lkrn"; | 179 | pname = "netbootxyz-lkrn"; |
| 180 | version = "3.0.2"; | 180 | version = "3.0.3"; |
| 181 | src = fetchurl { | 181 | src = fetchurl { |
| 182 | url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.2/netboot.xyz.lkrn"; | 182 | url = "https://github.com/netbootxyz/netboot.xyz/releases/download/3.0.3/netboot.xyz.lkrn"; |
| 183 | sha256 = "sha256-XuynuqxT/TVo+1FmhGmzPcQF8mF2TN+wxwxlp6HCSOE="; | 183 | sha256 = "sha256-uJNMT0plGVmRUSPt/ldDb695oKLzjIjDvDjtaTCxZdk="; |
| 184 | }; | 184 | }; |
| 185 | }; | 185 | }; |
| 186 | postfix-mta-sts-resolver = { | 186 | postfix-mta-sts-resolver = { |
| @@ -223,17 +223,17 @@ | |||
| 223 | }; | 223 | }; |
| 224 | quickshell = { | 224 | quickshell = { |
| 225 | pname = "quickshell"; | 225 | pname = "quickshell"; |
| 226 | version = "9f807554e106f6b0670e60ead82b63f3c0c2ac26"; | 226 | version = "fae96f1a5b7f53de9b7e40e5b53c0b7a2e97b1d7"; |
| 227 | src = fetchgit { | 227 | src = fetchgit { |
| 228 | url = "https://git.outfoxxed.me/quickshell/quickshell.git"; | 228 | url = "https://git.outfoxxed.me/quickshell/quickshell.git"; |
| 229 | rev = "9f807554e106f6b0670e60ead82b63f3c0c2ac26"; | 229 | rev = "fae96f1a5b7f53de9b7e40e5b53c0b7a2e97b1d7"; |
| 230 | fetchSubmodules = false; | 230 | fetchSubmodules = false; |
| 231 | deepClone = false; | 231 | deepClone = false; |
| 232 | leaveDotGit = false; | 232 | leaveDotGit = false; |
| 233 | sparseCheckout = [ ]; | 233 | sparseCheckout = [ ]; |
| 234 | sha256 = "sha256-stV8Dxkrry6AbK8unyEjLNeDZcQtNE1TCgmjc8hdcxw="; | 234 | sha256 = "sha256-872tMDDYdjR983q7v2yDlnKOEBSPp5FXDdWF2q87gik="; |
| 235 | }; | 235 | }; |
| 236 | date = "2026-08-20"; | 236 | date = "2026-09-20"; |
| 237 | }; | 237 | }; |
| 238 | scutiger = { | 238 | scutiger = { |
| 239 | pname = "scutiger"; | 239 | 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 @@ | |||
| 1 | { flake, userName, config, lib, ... }: | 1 | { flake, flakeInputs, userName, config, lib, ... }: |
| 2 | let | 2 | let |
| 3 | user = config.users.users.${userName}; | 3 | user = config.users.users.${userName}; |
| 4 | in { | 4 | in { |
| @@ -9,7 +9,7 @@ in { | |||
| 9 | config = { | 9 | config = { |
| 10 | users.users.gkleen.group = "gkleen"; | 10 | users.users.gkleen.group = "gkleen"; |
| 11 | users.groups.gkleen = {}; | 11 | users.groups.gkleen = {}; |
| 12 | systemd.tmpfiles.settings.home-directories.${user.home} = lib.mkForce { | 12 | systemd.tmpfiles.settings.home-directories."/persistent/${user.home}" = lib.mkForce { |
| 13 | v = { | 13 | v = { |
| 14 | mode = user.homeMode; | 14 | mode = user.homeMode; |
| 15 | user = user.name; | 15 | user = user.name; |
| @@ -17,8 +17,39 @@ in { | |||
| 17 | }; | 17 | }; |
| 18 | }; | 18 | }; |
| 19 | 19 | ||
| 20 | home-manager.users.${userName} = { | 20 | home-manager.users.${userName} = let sysConfig = config; in { config, ... }: { |
| 21 | imports = [ | ||
| 22 | flakeInputs.nix-index-database.homeModules.nix-index | ||
| 23 | ]; | ||
| 24 | |||
| 21 | home.stateVersion = "26.05"; | 25 | home.stateVersion = "26.05"; |
| 26 | |||
| 27 | home.persistence."/persistent" = { | ||
| 28 | directories = [ | ||
| 29 | "Downloads" "documents" "screenshots" "media" | ||
| 30 | ]; | ||
| 31 | }; | ||
| 32 | |||
| 33 | programs.zsh.dirHashes = let | ||
| 34 | flakeHashes = lib.mapAttrs' (n: v: lib.nameValuePair (inputNames.${n} or n) (toString v)) flakeInputs; | ||
| 35 | inputNames = { | ||
| 36 | self = "nixos"; | ||
| 37 | }; | ||
| 38 | in flakeHashes // { | ||
| 39 | docs = "$HOME/documents"; | ||
| 40 | dl = "$HOME/Downloads"; | ||
| 41 | scrot = "$HOME/screenshots"; | ||
| 42 | media = "$HOME/media"; | ||
| 43 | }; | ||
| 44 | programs.starship.settings = { | ||
| 45 | directory.substitutions = lib.mapAttrs' (name: value: let | ||
| 46 | value' = builtins.unsafeDiscardStringContext value; | ||
| 47 | value'' = if lib.hasPrefix "$HOME/" value' then "~" + lib.removePrefix "$HOME" value' else value'; | ||
| 48 | in lib.nameValuePair value'' "~${name}" | ||
| 49 | ) config.programs.zsh.dirHashes; | ||
| 50 | }; | ||
| 51 | |||
| 52 | programs.nix-index.enable = true; | ||
| 22 | }; | 53 | }; |
| 23 | }; | 54 | }; |
| 24 | } | 55 | } |
| @@ -91,11 +91,11 @@ | |||
| 91 | ] | 91 | ] |
| 92 | }, | 92 | }, |
| 93 | "locked": { | 93 | "locked": { |
| 94 | "lastModified": 1786361680, | 94 | "lastModified": 1789404474, |
| 95 | "narHash": "sha256-IxaZkb9rCGEZ+yGndxKXONeIEcKMzoFUsvLTB5G/caw=", | 95 | "narHash": "sha256-UXFQ7tFiwn8sPz0EV4CBB2PCf/ZiGIHWn/6MXk81Lxs=", |
| 96 | "owner": "serokell", | 96 | "owner": "serokell", |
| 97 | "repo": "deploy-rs", | 97 | "repo": "deploy-rs", |
| 98 | "rev": "16901271e5b30b591e56f7a84f25f186fb20f3e1", | 98 | "rev": "e760371d631165e7d8de5b0dcf148e21ec4c16f0", |
| 99 | "type": "github" | 99 | "type": "github" |
| 100 | }, | 100 | }, |
| 101 | "original": { | 101 | "original": { |
| @@ -296,11 +296,11 @@ | |||
| 296 | "flake-registry": { | 296 | "flake-registry": { |
| 297 | "flake": false, | 297 | "flake": false, |
| 298 | "locked": { | 298 | "locked": { |
| 299 | "lastModified": 1782548455, | 299 | "lastModified": 1789428769, |
| 300 | "narHash": "sha256-Jjp/ZivVqZCLptwlSuwU8n0a8b8PXJqabxpSG7KRNuI=", | 300 | "narHash": "sha256-qhIiRTjzwr65WpepkXWGmA4Wwl/PD/gfr3mQqeYORBY=", |
| 301 | "owner": "NixOS", | 301 | "owner": "NixOS", |
| 302 | "repo": "flake-registry", | 302 | "repo": "flake-registry", |
| 303 | "rev": "10bd3d9e8eefb4725e346eddd3a505aa0aacf01b", | 303 | "rev": "46ea0f17cf6777e156a2be6ae802d9f95d93dd5e", |
| 304 | "type": "github" | 304 | "type": "github" |
| 305 | }, | 305 | }, |
| 306 | "original": { | 306 | "original": { |
| @@ -352,11 +352,11 @@ | |||
| 352 | ] | 352 | ] |
| 353 | }, | 353 | }, |
| 354 | "locked": { | 354 | "locked": { |
| 355 | "lastModified": 1784288435, | 355 | "lastModified": 1789514889, |
| 356 | "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", | 356 | "narHash": "sha256-PFD1nxptCXJyJoiYO1gf/5Vv43yqGpHtMC6LUhl9/pQ=", |
| 357 | "owner": "cachix", | 357 | "owner": "cachix", |
| 358 | "repo": "git-hooks.nix", | 358 | "repo": "git-hooks.nix", |
| 359 | "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", | 359 | "rev": "59f4ca0d063a1a3ec722c88b51a33004862e5379", |
| 360 | "type": "github" | 360 | "type": "github" |
| 361 | }, | 361 | }, |
| 362 | "original": { | 362 | "original": { |
| @@ -647,11 +647,11 @@ | |||
| 647 | "xwayland-satellite-unstable": "xwayland-satellite-unstable" | 647 | "xwayland-satellite-unstable": "xwayland-satellite-unstable" |
| 648 | }, | 648 | }, |
| 649 | "locked": { | 649 | "locked": { |
| 650 | "lastModified": 1787129251, | 650 | "lastModified": 1790070480, |
| 651 | "narHash": "sha256-MauCXoXwhSGLMJiddBrUSHvPie8lUtCaohjKJgIReQE=", | 651 | "narHash": "sha256-gLB/L3ggRwng88W3t4KygVBkIjB84zW1xQSIWiuRGWg=", |
| 652 | "owner": "epireyn", | 652 | "owner": "epireyn", |
| 653 | "repo": "niri-flake", | 653 | "repo": "niri-flake", |
| 654 | "rev": "f9e02cd4674abefa210674cd28a993e5cfb33bfc", | 654 | "rev": "4edede7d2e876544cc1c1128e47d0e51278b1b9a", |
| 655 | "type": "github" | 655 | "type": "github" |
| 656 | }, | 656 | }, |
| 657 | "original": { | 657 | "original": { |
| @@ -723,11 +723,11 @@ | |||
| 723 | ] | 723 | ] |
| 724 | }, | 724 | }, |
| 725 | "locked": { | 725 | "locked": { |
| 726 | "lastModified": 1786852476, | 726 | "lastModified": 1789892076, |
| 727 | "narHash": "sha256-IM5CYtf86W4w8eUPpKcY/LpdHElmVBtJhaKnoTKxZEA=", | 727 | "narHash": "sha256-Dkg4VKPmDPqTwaiw2WH5br73tXoL1qrOO0xJnR4TlcA=", |
| 728 | "owner": "nix-community", | 728 | "owner": "nix-community", |
| 729 | "repo": "nix-index-database", | 729 | "repo": "nix-index-database", |
| 730 | "rev": "c7962dc97b45129df8d751bedaf37beb5a17706e", | 730 | "rev": "9ad722673ab3b3f91f02135e53775825b240b869", |
| 731 | "type": "github" | 731 | "type": "github" |
| 732 | }, | 732 | }, |
| 733 | "original": { | 733 | "original": { |
| @@ -769,11 +769,11 @@ | |||
| 769 | ] | 769 | ] |
| 770 | }, | 770 | }, |
| 771 | "locked": { | 771 | "locked": { |
| 772 | "lastModified": 1786680260, | 772 | "lastModified": 1789705005, |
| 773 | "narHash": "sha256-t/OKt1G1UnHTRRtNuJ/yC1oOV4Fn39HkNsKzyd3DlYQ=", | 773 | "narHash": "sha256-kWGA2zNVrHZpKgeXA0urHvw7FWCTEp5rjyUAhCikXuc=", |
| 774 | "ref": "refs/heads/main", | 774 | "ref": "refs/heads/main", |
| 775 | "rev": "b568a2584ed3619a6ebe41a2910e2bfc674bf836", | 775 | "rev": "bcecf42740627e01376caea1edc3194f39857890", |
| 776 | "revCount": 801, | 776 | "revCount": 814, |
| 777 | "type": "git", | 777 | "type": "git", |
| 778 | "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git" | 778 | "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git" |
| 779 | }, | 779 | }, |
| @@ -807,11 +807,11 @@ | |||
| 807 | "nixpkgs": "nixpkgs_4" | 807 | "nixpkgs": "nixpkgs_4" |
| 808 | }, | 808 | }, |
| 809 | "locked": { | 809 | "locked": { |
| 810 | "lastModified": 1786867632, | 810 | "lastModified": 1789978172, |
| 811 | "narHash": "sha256-ez+ubZlA1RtdjCB18a6zJ9M4u8qoPDy08EcnsW5M3Xw=", | 811 | "narHash": "sha256-FIRXajv1pPZ+l6On6ekkmcQ6le0Zi0ncRUoR3nB0vKA=", |
| 812 | "owner": "NixOS", | 812 | "owner": "NixOS", |
| 813 | "repo": "nixos-hardware", | 813 | "repo": "nixos-hardware", |
| 814 | "rev": "ff17823245ab9ff7bcae6acf950bd89cba82c38c", | 814 | "rev": "9ebcb7766700d7e006d9505247bd7ce0426f4232", |
| 815 | "type": "github" | 815 | "type": "github" |
| 816 | }, | 816 | }, |
| 817 | "original": { | 817 | "original": { |
| @@ -932,11 +932,11 @@ | |||
| 932 | }, | 932 | }, |
| 933 | "nixpkgs-stable_2": { | 933 | "nixpkgs-stable_2": { |
| 934 | "locked": { | 934 | "locked": { |
| 935 | "lastModified": 1787042014, | 935 | "lastModified": 1789998861, |
| 936 | "narHash": "sha256-lgnV/xeEatfEnPZG0RrXS0fhcr63p3tsVvL1GdaVkJQ=", | 936 | "narHash": "sha256-62XMQD4WLdMAfdT0/8gJmPH2dKeTw908ryNloAplTr8=", |
| 937 | "owner": "NixOS", | 937 | "owner": "NixOS", |
| 938 | "repo": "nixpkgs", | 938 | "repo": "nixpkgs", |
| 939 | "rev": "c69ae8fb8faeb3472fd11234ba55a70ac3601f9b", | 939 | "rev": "1e8bc658fc985ef27ccd66d107d767b32bb7ef98", |
| 940 | "type": "github" | 940 | "type": "github" |
| 941 | }, | 941 | }, |
| 942 | "original": { | 942 | "original": { |
| @@ -1012,11 +1012,11 @@ | |||
| 1012 | }, | 1012 | }, |
| 1013 | "nixpkgs_4": { | 1013 | "nixpkgs_4": { |
| 1014 | "locked": { | 1014 | "locked": { |
| 1015 | "lastModified": 1767892417, | 1015 | "lastModified": 1789546076, |
| 1016 | "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", | 1016 | "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=", |
| 1017 | "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", | 1017 | "rev": "b1b875982b17dabde9b4a37f3e229e74913e6db3", |
| 1018 | "type": "tarball", | 1018 | "type": "tarball", |
| 1019 | "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" | 1019 | "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1074753.b1b875982b17/nixexprs.tar.xz" |
| 1020 | }, | 1020 | }, |
| 1021 | "original": { | 1021 | "original": { |
| 1022 | "type": "tarball", | 1022 | "type": "tarball", |
| @@ -1025,11 +1025,11 @@ | |||
| 1025 | }, | 1025 | }, |
| 1026 | "nixpkgs_5": { | 1026 | "nixpkgs_5": { |
| 1027 | "locked": { | 1027 | "locked": { |
| 1028 | "lastModified": 1787001381, | 1028 | "lastModified": 1789921291, |
| 1029 | "narHash": "sha256-Ue1Yo8gfHdD4TMtNewhA4tkSYeFqXThju0nCyJc3ALo=", | 1029 | "narHash": "sha256-Ft/BRnIqw1MywFoXydKobjjWmDFgDdYtSpJliE8+yUw=", |
| 1030 | "owner": "NixOS", | 1030 | "owner": "NixOS", |
| 1031 | "repo": "nixpkgs", | 1031 | "repo": "nixpkgs", |
| 1032 | "rev": "ec2d622de0773551768cf98f3fc50cbcc003b9c5", | 1032 | "rev": "44a91898084f46797b5fac650c7e8c9ac38c43d4", |
| 1033 | "type": "github" | 1033 | "type": "github" |
| 1034 | }, | 1034 | }, |
| 1035 | "original": { | 1035 | "original": { |
| @@ -1295,11 +1295,11 @@ | |||
| 1295 | ] | 1295 | ] |
| 1296 | }, | 1296 | }, |
| 1297 | "locked": { | 1297 | "locked": { |
| 1298 | "lastModified": 1786936886, | 1298 | "lastModified": 1789963190, |
| 1299 | "narHash": "sha256-8SFyOdmcG6Nsh/JzlH812lTI/v+ur06fpQhj/acNn8k=", | 1299 | "narHash": "sha256-mj5BLUKECIHv3rwkBXL6xQp45gIBJV7ZOYgT46LXwho=", |
| 1300 | "owner": "pyproject-nix", | 1300 | "owner": "pyproject-nix", |
| 1301 | "repo": "build-system-pkgs", | 1301 | "repo": "build-system-pkgs", |
| 1302 | "rev": "90ffdeee1a4929b231913df067448cd9803d3e07", | 1302 | "rev": "14b45373ea9a14ed2fcd0abf3ed35c8e3c430020", |
| 1303 | "type": "github" | 1303 | "type": "github" |
| 1304 | }, | 1304 | }, |
| 1305 | "original": { | 1305 | "original": { |
| @@ -1315,11 +1315,11 @@ | |||
| 1315 | ] | 1315 | ] |
| 1316 | }, | 1316 | }, |
| 1317 | "locked": { | 1317 | "locked": { |
| 1318 | "lastModified": 1786031528, | 1318 | "lastModified": 1788394333, |
| 1319 | "narHash": "sha256-cROiHKO3UbIKqF5FG5NikvydzlfIj4EcR1Cty9qOVt4=", | 1319 | "narHash": "sha256-xYOP0Xym1eVGUaHFx+eJEaycFGoiCbst3fZf0xFHP78=", |
| 1320 | "owner": "pyproject-nix", | 1320 | "owner": "pyproject-nix", |
| 1321 | "repo": "pyproject.nix", | 1321 | "repo": "pyproject.nix", |
| 1322 | "rev": "1b1485546d85f6f6c7aadb10c4923dbc09633263", | 1322 | "rev": "6a8a7881d75b6f98967e7b8069f4ead331384301", |
| 1323 | "type": "github" | 1323 | "type": "github" |
| 1324 | }, | 1324 | }, |
| 1325 | "original": { | 1325 | "original": { |
| @@ -1390,11 +1390,11 @@ | |||
| 1390 | ] | 1390 | ] |
| 1391 | }, | 1391 | }, |
| 1392 | "locked": { | 1392 | "locked": { |
| 1393 | "lastModified": 1786629091, | 1393 | "lastModified": 1789890976, |
| 1394 | "narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=", | 1394 | "narHash": "sha256-GKwH3zpy7tartuJMG0Rv/xUsdetG1QLmTVv8UKgJLmA=", |
| 1395 | "owner": "Mic92", | 1395 | "owner": "Mic92", |
| 1396 | "repo": "sops-nix", | 1396 | "repo": "sops-nix", |
| 1397 | "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f", | 1397 | "rev": "7214124c20c1542c90deb54af50e2f53ae02711f", |
| 1398 | "type": "github" | 1398 | "type": "github" |
| 1399 | }, | 1399 | }, |
| 1400 | "original": { | 1400 | "original": { |
| @@ -1465,11 +1465,11 @@ | |||
| 1465 | ] | 1465 | ] |
| 1466 | }, | 1466 | }, |
| 1467 | "locked": { | 1467 | "locked": { |
| 1468 | "lastModified": 1786615403, | 1468 | "lastModified": 1789383061, |
| 1469 | "narHash": "sha256-U++y7nM/6xiEcWI7q4fQoPZjPvRaTwkSqzBOVoEBjUE=", | 1469 | "narHash": "sha256-+DkygIVr/+RtXnsjd07BzFFB0ihwmjjLuYh1fyc/bCg=", |
| 1470 | "owner": "pyproject-nix", | 1470 | "owner": "pyproject-nix", |
| 1471 | "repo": "uv2nix", | 1471 | "repo": "uv2nix", |
| 1472 | "rev": "4b59abb2ae1896d2a0e1abfc47fbc9bf985ea730", | 1472 | "rev": "079be4e68c529c4cbc44dbf1afc692e4b30695b3", |
| 1473 | "type": "github" | 1473 | "type": "github" |
| 1474 | }, | 1474 | }, |
| 1475 | "original": { | 1475 | "original": { |
| @@ -1481,16 +1481,16 @@ | |||
| 1481 | "xwayland-satellite-stable": { | 1481 | "xwayland-satellite-stable": { |
| 1482 | "flake": false, | 1482 | "flake": false, |
| 1483 | "locked": { | 1483 | "locked": { |
| 1484 | "lastModified": 1771195969, | 1484 | "lastModified": 1784679892, |
| 1485 | "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=", | 1485 | "narHash": "sha256-Mb7jpqnrcYCfNSItIkkHpuR3YxWFxPuIBfcwNKlRBkk=", |
| 1486 | "owner": "Supreeeme", | 1486 | "owner": "Supreeeme", |
| 1487 | "repo": "xwayland-satellite", | 1487 | "repo": "xwayland-satellite", |
| 1488 | "rev": "536bd32efc935bf876d6de385ec18a1b715c9358", | 1488 | "rev": "8d135d3b2854b30fd01ea6cd6c27e523dd50a839", |
| 1489 | "type": "github" | 1489 | "type": "github" |
| 1490 | }, | 1490 | }, |
| 1491 | "original": { | 1491 | "original": { |
| 1492 | "owner": "Supreeeme", | 1492 | "owner": "Supreeeme", |
| 1493 | "ref": "v0.8.1", | 1493 | "ref": "v0.8.2", |
| 1494 | "repo": "xwayland-satellite", | 1494 | "repo": "xwayland-satellite", |
| 1495 | "type": "github" | 1495 | "type": "github" |
| 1496 | } | 1496 | } |
| @@ -1498,11 +1498,11 @@ | |||
| 1498 | "xwayland-satellite-unstable": { | 1498 | "xwayland-satellite-unstable": { |
| 1499 | "flake": false, | 1499 | "flake": false, |
| 1500 | "locked": { | 1500 | "locked": { |
| 1501 | "lastModified": 1786221058, | 1501 | "lastModified": 1788991189, |
| 1502 | "narHash": "sha256-hF2atQzapHBLX5NFqJMcKZAWHfGkKQeNu1eQr46+AGg=", | 1502 | "narHash": "sha256-0TxfMgqW0/BLD4M942c5DCKYrtPvzsPJwvdcco4LQUM=", |
| 1503 | "owner": "Supreeeme", | 1503 | "owner": "Supreeeme", |
| 1504 | "repo": "xwayland-satellite", | 1504 | "repo": "xwayland-satellite", |
| 1505 | "rev": "3bc915f09dd62bb2651a715114f9d140344bc6c1", | 1505 | "rev": "add2795134593faafce60e404a0a75df68e9ee0c", |
| 1506 | "type": "github" | 1506 | "type": "github" |
| 1507 | }, | 1507 | }, |
| 1508 | "original": { | 1508 | "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 { | |||
| 589 | MemoryMax = "75%"; | 589 | MemoryMax = "75%"; |
| 590 | }; | 590 | }; |
| 591 | 591 | ||
| 592 | services.journald.extraConfig = '' | 592 | services.journald.settings.Journal.SystemMaxUse = "100M"; |
| 593 | SystemMaxUse=100M | ||
| 594 | ''; | ||
| 595 | 593 | ||
| 596 | services.dbus.packages = with pkgs; | 594 | services.dbus.packages = with pkgs; |
| 597 | [ dbus dconf | 595 | [ 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 @@ | |||
| 15 | directories = [ | 15 | directories = [ |
| 16 | "/nix" | 16 | "/nix" |
| 17 | "/root" | 17 | "/root" |
| 18 | "/home" | ||
| 19 | "/var/log" | 18 | "/var/log" |
| 20 | "/var/lib/nixos" | 19 | "/var/lib/nixos" |
| 21 | "/var/lib/sops-nix" | 20 | "/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 @@ | |||
| 9 | hardware.framework.laptop13.audioEnhancement.enable = true; | 9 | hardware.framework.laptop13.audioEnhancement.enable = true; |
| 10 | services.fstrim.enable = false; | 10 | services.fstrim.enable = false; |
| 11 | 11 | ||
| 12 | services.udev.extraRules = '' | ||
| 13 | ACTION=="add", SUBSYSTEM=="acpi", DRIVERS=="button", ATTRS{hid}=="PNP0C0D", ATTR{power/wakeup}="disabled" | ||
| 14 | ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled" | ||
| 15 | ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled" | ||
| 16 | ''; | ||
| 17 | |||
| 12 | nixpkgs.system = "x86_64-linux"; | 18 | nixpkgs.system = "x86_64-linux"; |
| 13 | 19 | ||
| 14 | disko.devices = { | 20 | disko.devices = { |
| @@ -43,7 +49,7 @@ | |||
| 43 | content = { | 49 | content = { |
| 44 | type = "btrfs"; | 50 | type = "btrfs"; |
| 45 | extraArgs = let | 51 | extraArgs = let |
| 46 | subvols = ["/persistent"] ++ map (p: "/persistent/${p}") ["/nix" "/home" "/var/log"]; | 52 | subvols = ["/persistent"] ++ map (p: "/persistent/${p}") ["/nix" "/var/log"]; |
| 47 | restricted = map (p: "/persistent/${p}") ["/root"]; | 53 | restricted = map (p: "/persistent/${p}") ["/root"]; |
| 48 | in [ | 54 | in [ |
| 49 | "--csum" "blake2" | 55 | "--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 { | |||
| 158 | }; | 158 | }; |
| 159 | 159 | ||
| 160 | nix.registry = mkIf (cfg.flake != null) { | 160 | nix.registry = mkIf (cfg.flake != null) { |
| 161 | ${cfg.flake.name} = { | 161 | ${cfg.flake.name} = lib.mkForce { |
| 162 | exact = false; | 162 | exact = false; |
| 163 | to = cfg.flake.flake; | 163 | to = cfg.flake.flake; |
| 164 | }; | 164 | }; |
