diff options
| author | Gregor Kleen <gkleen@yggdrasil.li> | 2026-08-20 17:31:15 +0200 |
|---|---|---|
| committer | Gregor Kleen <gkleen@yggdrasil.li> | 2026-08-20 17:31:15 +0200 |
| commit | 91061f7aa842983b5206641b346d3fbc9a9acc67 (patch) | |
| tree | dff099410d91eee6d88ddb02fe77d97ddc658d56 | |
| parent | c6fb54d897ebd83ba27f3c78aafafe65c4a4338e (diff) | |
| download | nixos-91061f7aa842983b5206641b346d3fbc9a9acc67.tar nixos-91061f7aa842983b5206641b346d3fbc9a9acc67.tar.gz nixos-91061f7aa842983b5206641b346d3fbc9a9acc67.tar.bz2 nixos-91061f7aa842983b5206641b346d3fbc9a9acc67.tar.xz nixos-91061f7aa842983b5206641b346d3fbc9a9acc67.zip | |
bump
| -rw-r--r-- | _sources/generated.json | 56 | ||||
| -rw-r--r-- | _sources/generated.nix | 50 | ||||
| -rw-r--r-- | accounts/gkleen@sif/default.nix | 8 | ||||
| -rw-r--r-- | flake.lock | 120 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | hosts/sif/default.nix | 2 | ||||
| -rw-r--r-- | hosts/sif/greetd/default.nix | 6 | ||||
| -rw-r--r-- | hosts/vidhar/network/pppoe/default.nix | 4 | ||||
| -rw-r--r-- | overlays/FinanceQuote/default.nix | 11 | ||||
| -rw-r--r-- | overlays/FinanceQuote/tradegate.patch | 18 | ||||
| -rw-r--r-- | overlays/niri.nix | 8 | ||||
| -rw-r--r-- | overlays/prometheus-lvm-exporter.nix | 2 | ||||
| -rw-r--r-- | overlays/spice-record.nix | 15 | ||||
| -rw-r--r-- | overlays/yt-dlp.nix | 8 |
14 files changed, 124 insertions, 186 deletions
diff --git a/_sources/generated.json b/_sources/generated.json index df25df57..55f10ad2 100644 --- a/_sources/generated.json +++ b/_sources/generated.json | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | }, | 22 | }, |
| 23 | "bpf-examples": { | 23 | "bpf-examples": { |
| 24 | "cargoLock": null, | 24 | "cargoLock": null, |
| 25 | "date": "2026-07-13", | 25 | "date": "2026-08-10", |
| 26 | "extract": null, | 26 | "extract": null, |
| 27 | "name": "bpf-examples", | 27 | "name": "bpf-examples", |
| 28 | "passthru": null, | 28 | "passthru": null, |
| @@ -34,12 +34,12 @@ | |||
| 34 | "name": null, | 34 | "name": null, |
| 35 | "owner": "xdp-project", | 35 | "owner": "xdp-project", |
| 36 | "repo": "bpf-examples", | 36 | "repo": "bpf-examples", |
| 37 | "rev": "659ce29ebfc40ff1819b23a9c4b3a5d14b44ece3", | 37 | "rev": "1769d51faeb96a1d94d68affcc06f5c71de03de5", |
| 38 | "sha256": "sha256-GMU07jroyT4dckTqfip1WgBjfSXNO7vmueb0VmcVE30=", | 38 | "sha256": "sha256-FQEyyZ9A4c1mgdTO9CvIAFyscP44A3+aR5Xu6DCqG8E=", |
| 39 | "sparseCheckout": [], | 39 | "sparseCheckout": [], |
| 40 | "type": "github" | 40 | "type": "github" |
| 41 | }, | 41 | }, |
| 42 | "version": "659ce29ebfc40ff1819b23a9c4b3a5d14b44ece3" | 42 | "version": "1769d51faeb96a1d94d68affcc06f5c71de03de5" |
| 43 | }, | 43 | }, |
| 44 | "emacs-scratch_el": { | 44 | "emacs-scratch_el": { |
| 45 | "cargoLock": null, | 45 | "cargoLock": null, |
| @@ -291,26 +291,6 @@ | |||
| 291 | }, | 291 | }, |
| 292 | "version": "3.0.2" | 292 | "version": "3.0.2" |
| 293 | }, | 293 | }, |
| 294 | "nix-output-monitor": { | ||
| 295 | "cargoLock": null, | ||
| 296 | "date": "2026-07-14", | ||
| 297 | "extract": null, | ||
| 298 | "name": "nix-output-monitor", | ||
| 299 | "passthru": null, | ||
| 300 | "pinned": false, | ||
| 301 | "src": { | ||
| 302 | "deepClone": false, | ||
| 303 | "fetchSubmodules": false, | ||
| 304 | "leaveDotGit": false, | ||
| 305 | "name": null, | ||
| 306 | "rev": "030658cd63512887c74652261079ca8bbb636c23", | ||
| 307 | "sha256": "sha256-Ok5wLwYcQvM4u4zS1b7aP72sFH/bWlowWvBPvx+LPqs=", | ||
| 308 | "sparseCheckout": [], | ||
| 309 | "type": "git", | ||
| 310 | "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git" | ||
| 311 | }, | ||
| 312 | "version": "030658cd63512887c74652261079ca8bbb636c23" | ||
| 313 | }, | ||
| 314 | "postfix-mta-sts-resolver": { | 294 | "postfix-mta-sts-resolver": { |
| 315 | "cargoLock": null, | 295 | "cargoLock": null, |
| 316 | "date": null, | 296 | "date": null, |
| @@ -347,11 +327,11 @@ | |||
| 347 | "passthru": null, | 327 | "passthru": null, |
| 348 | "pinned": false, | 328 | "pinned": false, |
| 349 | "src": { | 329 | "src": { |
| 350 | "sha256": "sha256-Ra/Lo8RQQQz8UaiOzQd2FF7i+SDt4Mcj1gsk2WRh6KA=", | 330 | "sha256": "sha256-aW18QPkAxIWctRIPXY+9ZPURrN+axSA/mURMb61ESOA=", |
| 351 | "type": "tarball", | 331 | "type": "tarball", |
| 352 | "url": "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.6.2.tar.gz" | 332 | "url": "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.6.3.tar.gz" |
| 353 | }, | 333 | }, |
| 354 | "version": "0.6.2" | 334 | "version": "0.6.3" |
| 355 | }, | 335 | }, |
| 356 | "psql-versioning": { | 336 | "psql-versioning": { |
| 357 | "cargoLock": null, | 337 | "cargoLock": null, |
| @@ -375,7 +355,7 @@ | |||
| 375 | }, | 355 | }, |
| 376 | "quickshell": { | 356 | "quickshell": { |
| 377 | "cargoLock": null, | 357 | "cargoLock": null, |
| 378 | "date": "2026-07-10", | 358 | "date": "2026-08-20", |
| 379 | "extract": null, | 359 | "extract": null, |
| 380 | "name": "quickshell", | 360 | "name": "quickshell", |
| 381 | "passthru": null, | 361 | "passthru": null, |
| @@ -385,13 +365,13 @@ | |||
| 385 | "fetchSubmodules": false, | 365 | "fetchSubmodules": false, |
| 386 | "leaveDotGit": false, | 366 | "leaveDotGit": false, |
| 387 | "name": null, | 367 | "name": null, |
| 388 | "rev": "4df562dfb2475a9057f0f33a8db75808efad8670", | 368 | "rev": "9f807554e106f6b0670e60ead82b63f3c0c2ac26", |
| 389 | "sha256": "sha256-cFG5vnmjJcZRVCSUaqQLOdwkX6iqF6bY8IvvmBSGSRs=", | 369 | "sha256": "sha256-stV8Dxkrry6AbK8unyEjLNeDZcQtNE1TCgmjc8hdcxw=", |
| 390 | "sparseCheckout": [], | 370 | "sparseCheckout": [], |
| 391 | "type": "git", | 371 | "type": "git", |
| 392 | "url": "https://git.outfoxxed.me/quickshell/quickshell.git" | 372 | "url": "https://git.outfoxxed.me/quickshell/quickshell.git" |
| 393 | }, | 373 | }, |
| 394 | "version": "4df562dfb2475a9057f0f33a8db75808efad8670" | 374 | "version": "9f807554e106f6b0670e60ead82b63f3c0c2ac26" |
| 395 | }, | 375 | }, |
| 396 | "scutiger": { | 376 | "scutiger": { |
| 397 | "cargoLock": null, | 377 | "cargoLock": null, |
| @@ -457,7 +437,7 @@ | |||
| 457 | }, | 437 | }, |
| 458 | "v4l2loopback": { | 438 | "v4l2loopback": { |
| 459 | "cargoLock": null, | 439 | "cargoLock": null, |
| 460 | "date": "2026-06-24", | 440 | "date": "2026-08-18", |
| 461 | "extract": null, | 441 | "extract": null, |
| 462 | "name": "v4l2loopback", | 442 | "name": "v4l2loopback", |
| 463 | "passthru": null, | 443 | "passthru": null, |
| @@ -469,12 +449,12 @@ | |||
| 469 | "name": null, | 449 | "name": null, |
| 470 | "owner": "umlaeute", | 450 | "owner": "umlaeute", |
| 471 | "repo": "v4l2loopback", | 451 | "repo": "v4l2loopback", |
| 472 | "rev": "9ef83fb9bc88e8f841786753c362ac52c580defc", | 452 | "rev": "e27cd86c924112ab1fb5e792a7ea43a37ab2903f", |
| 473 | "sha256": "sha256-MdiK5o0b0DTRRGnZn/u/904jRY/oFNRRx+fKXPzvzNE=", | 453 | "sha256": "sha256-kCarEHsYxXyZSDVh+z/H7WIJ5EtJ3GT2jH67NuKEfB0=", |
| 474 | "sparseCheckout": [], | 454 | "sparseCheckout": [], |
| 475 | "type": "github" | 455 | "type": "github" |
| 476 | }, | 456 | }, |
| 477 | "version": "9ef83fb9bc88e8f841786753c362ac52c580defc" | 457 | "version": "e27cd86c924112ab1fb5e792a7ea43a37ab2903f" |
| 478 | }, | 458 | }, |
| 479 | "xcompose": { | 459 | "xcompose": { |
| 480 | "cargoLock": null, | 460 | "cargoLock": null, |
| @@ -511,12 +491,12 @@ | |||
| 511 | "name": null, | 491 | "name": null, |
| 512 | "owner": "yt-dlp", | 492 | "owner": "yt-dlp", |
| 513 | "repo": "yt-dlp", | 493 | "repo": "yt-dlp", |
| 514 | "rev": "2026.07.04", | 494 | "rev": "2026.08.19", |
| 515 | "sha256": "sha256-+oHcVylLXFJTRR6jXF6IXvgntXJz0tRdtnwTruRPkoc=", | 495 | "sha256": "sha256-BM5ZeGTmHq+1xH6G/zsuCtjLgYgfRA11ya0zIHK5p4g=", |
| 516 | "sparseCheckout": [], | 496 | "sparseCheckout": [], |
| 517 | "type": "github" | 497 | "type": "github" |
| 518 | }, | 498 | }, |
| 519 | "version": "2026.07.04" | 499 | "version": "2026.08.19" |
| 520 | }, | 500 | }, |
| 521 | "yt-dlp-ejs": { | 501 | "yt-dlp-ejs": { |
| 522 | "cargoLock": null, | 502 | "cargoLock": null, |
diff --git a/_sources/generated.nix b/_sources/generated.nix index bc46d643..deada91d 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix | |||
| @@ -23,15 +23,15 @@ | |||
| 23 | }; | 23 | }; |
| 24 | bpf-examples = { | 24 | bpf-examples = { |
| 25 | pname = "bpf-examples"; | 25 | pname = "bpf-examples"; |
| 26 | version = "659ce29ebfc40ff1819b23a9c4b3a5d14b44ece3"; | 26 | version = "1769d51faeb96a1d94d68affcc06f5c71de03de5"; |
| 27 | src = fetchFromGitHub { | 27 | src = fetchFromGitHub { |
| 28 | owner = "xdp-project"; | 28 | owner = "xdp-project"; |
| 29 | repo = "bpf-examples"; | 29 | repo = "bpf-examples"; |
| 30 | rev = "659ce29ebfc40ff1819b23a9c4b3a5d14b44ece3"; | 30 | rev = "1769d51faeb96a1d94d68affcc06f5c71de03de5"; |
| 31 | fetchSubmodules = true; | 31 | fetchSubmodules = true; |
| 32 | sha256 = "sha256-GMU07jroyT4dckTqfip1WgBjfSXNO7vmueb0VmcVE30="; | 32 | sha256 = "sha256-FQEyyZ9A4c1mgdTO9CvIAFyscP44A3+aR5Xu6DCqG8E="; |
| 33 | }; | 33 | }; |
| 34 | date = "2026-07-13"; | 34 | date = "2026-08-10"; |
| 35 | }; | 35 | }; |
| 36 | emacs-scratch_el = { | 36 | emacs-scratch_el = { |
| 37 | pname = "emacs-scratch_el"; | 37 | pname = "emacs-scratch_el"; |
| @@ -183,20 +183,6 @@ | |||
| 183 | sha256 = "sha256-XuynuqxT/TVo+1FmhGmzPcQF8mF2TN+wxwxlp6HCSOE="; | 183 | sha256 = "sha256-XuynuqxT/TVo+1FmhGmzPcQF8mF2TN+wxwxlp6HCSOE="; |
| 184 | }; | 184 | }; |
| 185 | }; | 185 | }; |
| 186 | nix-output-monitor = { | ||
| 187 | pname = "nix-output-monitor"; | ||
| 188 | version = "030658cd63512887c74652261079ca8bbb636c23"; | ||
| 189 | src = fetchgit { | ||
| 190 | url = "https://code.maralorn.de/maralorn/nix-output-monitor.git"; | ||
| 191 | rev = "030658cd63512887c74652261079ca8bbb636c23"; | ||
| 192 | fetchSubmodules = false; | ||
| 193 | deepClone = false; | ||
| 194 | leaveDotGit = false; | ||
| 195 | sparseCheckout = [ ]; | ||
| 196 | sha256 = "sha256-Ok5wLwYcQvM4u4zS1b7aP72sFH/bWlowWvBPvx+LPqs="; | ||
| 197 | }; | ||
| 198 | date = "2026-07-14"; | ||
| 199 | }; | ||
| 200 | postfix-mta-sts-resolver = { | 186 | postfix-mta-sts-resolver = { |
| 201 | pname = "postfix-mta-sts-resolver"; | 187 | pname = "postfix-mta-sts-resolver"; |
| 202 | version = "1.5.1"; | 188 | version = "1.5.1"; |
| @@ -215,10 +201,10 @@ | |||
| 215 | }; | 201 | }; |
| 216 | prometheus-lvm-exporter = { | 202 | prometheus-lvm-exporter = { |
| 217 | pname = "prometheus-lvm-exporter"; | 203 | pname = "prometheus-lvm-exporter"; |
| 218 | version = "0.6.2"; | 204 | version = "0.6.3"; |
| 219 | src = fetchTarball { | 205 | src = fetchTarball { |
| 220 | url = "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.6.2.tar.gz"; | 206 | url = "https://github.com/hansmi/prometheus-lvm-exporter/archive/refs/tags/v0.6.3.tar.gz"; |
| 221 | sha256 = "sha256-Ra/Lo8RQQQz8UaiOzQd2FF7i+SDt4Mcj1gsk2WRh6KA="; | 207 | sha256 = "sha256-aW18QPkAxIWctRIPXY+9ZPURrN+axSA/mURMb61ESOA="; |
| 222 | }; | 208 | }; |
| 223 | }; | 209 | }; |
| 224 | psql-versioning = { | 210 | psql-versioning = { |
| @@ -237,17 +223,17 @@ | |||
| 237 | }; | 223 | }; |
| 238 | quickshell = { | 224 | quickshell = { |
| 239 | pname = "quickshell"; | 225 | pname = "quickshell"; |
| 240 | version = "4df562dfb2475a9057f0f33a8db75808efad8670"; | 226 | version = "9f807554e106f6b0670e60ead82b63f3c0c2ac26"; |
| 241 | src = fetchgit { | 227 | src = fetchgit { |
| 242 | url = "https://git.outfoxxed.me/quickshell/quickshell.git"; | 228 | url = "https://git.outfoxxed.me/quickshell/quickshell.git"; |
| 243 | rev = "4df562dfb2475a9057f0f33a8db75808efad8670"; | 229 | rev = "9f807554e106f6b0670e60ead82b63f3c0c2ac26"; |
| 244 | fetchSubmodules = false; | 230 | fetchSubmodules = false; |
| 245 | deepClone = false; | 231 | deepClone = false; |
| 246 | leaveDotGit = false; | 232 | leaveDotGit = false; |
| 247 | sparseCheckout = [ ]; | 233 | sparseCheckout = [ ]; |
| 248 | sha256 = "sha256-cFG5vnmjJcZRVCSUaqQLOdwkX6iqF6bY8IvvmBSGSRs="; | 234 | sha256 = "sha256-stV8Dxkrry6AbK8unyEjLNeDZcQtNE1TCgmjc8hdcxw="; |
| 249 | }; | 235 | }; |
| 250 | date = "2026-07-10"; | 236 | date = "2026-08-20"; |
| 251 | }; | 237 | }; |
| 252 | scutiger = { | 238 | scutiger = { |
| 253 | pname = "scutiger"; | 239 | pname = "scutiger"; |
| @@ -289,15 +275,15 @@ | |||
| 289 | }; | 275 | }; |
| 290 | v4l2loopback = { | 276 | v4l2loopback = { |
| 291 | pname = "v4l2loopback"; | 277 | pname = "v4l2loopback"; |
| 292 | version = "9ef83fb9bc88e8f841786753c362ac52c580defc"; | 278 | version = "e27cd86c924112ab1fb5e792a7ea43a37ab2903f"; |
| 293 | src = fetchFromGitHub { | 279 | src = fetchFromGitHub { |
| 294 | owner = "umlaeute"; | 280 | owner = "umlaeute"; |
| 295 | repo = "v4l2loopback"; | 281 | repo = "v4l2loopback"; |
| 296 | rev = "9ef83fb9bc88e8f841786753c362ac52c580defc"; | 282 | rev = "e27cd86c924112ab1fb5e792a7ea43a37ab2903f"; |
| 297 | fetchSubmodules = true; | 283 | fetchSubmodules = true; |
| 298 | sha256 = "sha256-MdiK5o0b0DTRRGnZn/u/904jRY/oFNRRx+fKXPzvzNE="; | 284 | sha256 = "sha256-kCarEHsYxXyZSDVh+z/H7WIJ5EtJ3GT2jH67NuKEfB0="; |
| 299 | }; | 285 | }; |
| 300 | date = "2026-06-24"; | 286 | date = "2026-08-18"; |
| 301 | }; | 287 | }; |
| 302 | xcompose = { | 288 | xcompose = { |
| 303 | pname = "xcompose"; | 289 | pname = "xcompose"; |
| @@ -313,13 +299,13 @@ | |||
| 313 | }; | 299 | }; |
| 314 | yt-dlp = { | 300 | yt-dlp = { |
| 315 | pname = "yt-dlp"; | 301 | pname = "yt-dlp"; |
| 316 | version = "2026.07.04"; | 302 | version = "2026.08.19"; |
| 317 | src = fetchFromGitHub { | 303 | src = fetchFromGitHub { |
| 318 | owner = "yt-dlp"; | 304 | owner = "yt-dlp"; |
| 319 | repo = "yt-dlp"; | 305 | repo = "yt-dlp"; |
| 320 | rev = "2026.07.04"; | 306 | rev = "2026.08.19"; |
| 321 | fetchSubmodules = false; | 307 | fetchSubmodules = false; |
| 322 | sha256 = "sha256-+oHcVylLXFJTRR6jXF6IXvgntXJz0tRdtnwTruRPkoc="; | 308 | sha256 = "sha256-BM5ZeGTmHq+1xH6G/zsuCtjLgYgfRA11ya0zIHK5p4g="; |
| 323 | }; | 309 | }; |
| 324 | }; | 310 | }; |
| 325 | yt-dlp-ejs = { | 311 | yt-dlp-ejs = { |
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index c97147e5..e7fe521b 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix | |||
| @@ -414,7 +414,7 @@ in { | |||
| 414 | enable = true; | 414 | enable = true; |
| 415 | enableSshSupport = true; | 415 | enableSshSupport = true; |
| 416 | extraConfig = '' | 416 | extraConfig = '' |
| 417 | pinentry-program ${lib.getExe' pkgs.pinentry-gtk2 "pinentry"} | 417 | pinentry-program ${lib.getExe' pkgs.pinentry-gnome3 "pinentry"} |
| 418 | grab | 418 | grab |
| 419 | ''; | 419 | ''; |
| 420 | }; | 420 | }; |
| @@ -495,8 +495,8 @@ in { | |||
| 495 | size = 10; | 495 | size = 10; |
| 496 | }; | 496 | }; |
| 497 | theme = { | 497 | theme = { |
| 498 | package = pkgs.equilux-theme; | 498 | package = pkgs.kdePackages.breeze-gtk; |
| 499 | name = "Equilux-compact"; | 499 | name = "Breeze-dark"; |
| 500 | }; | 500 | }; |
| 501 | iconTheme = { | 501 | iconTheme = { |
| 502 | package = pkgs.paper-icon-theme; | 502 | package = pkgs.paper-icon-theme; |
| @@ -525,7 +525,7 @@ in { | |||
| 525 | thunderbird zoom-us xdg-desktop-portal steam steam-run | 525 | thunderbird zoom-us xdg-desktop-portal steam steam-run |
| 526 | wireshark virt-manager rclone cached-nix-shell worktime | 526 | wireshark virt-manager rclone cached-nix-shell worktime |
| 527 | fira-code-symbols libreoffice xournalpp | 527 | fira-code-symbols libreoffice xournalpp |
| 528 | nixos-shell virt-viewer freerdp gnome-icon-theme | 528 | nixos-shell virt-viewer freerdp # gnome-icon-theme |
| 529 | paper-icon-theme sshpassSecret weechat element-desktop | 529 | paper-icon-theme sshpassSecret weechat element-desktop |
| 530 | sieve-connect gimp3 inkscape udiskie glab | 530 | sieve-connect gimp3 inkscape udiskie glab |
| 531 | gtklock wlrctl remmina openscad spice-record | 531 | gtklock wlrctl remmina openscad spice-record |
| @@ -91,11 +91,11 @@ | |||
| 91 | ] | 91 | ] |
| 92 | }, | 92 | }, |
| 93 | "locked": { | 93 | "locked": { |
| 94 | "lastModified": 1781627888, | 94 | "lastModified": 1786361680, |
| 95 | "narHash": "sha256-5yHuAh9k7rT7rtf3uRaXkiUyYvQE9oaCgzhprLm2mr8=", | 95 | "narHash": "sha256-IxaZkb9rCGEZ+yGndxKXONeIEcKMzoFUsvLTB5G/caw=", |
| 96 | "owner": "serokell", | 96 | "owner": "serokell", |
| 97 | "repo": "deploy-rs", | 97 | "repo": "deploy-rs", |
| 98 | "rev": "6d3087eedff75a715b40c0e124ba15d2dd7bec28", | 98 | "rev": "16901271e5b30b591e56f7a84f25f186fb20f3e1", |
| 99 | "type": "github" | 99 | "type": "github" |
| 100 | }, | 100 | }, |
| 101 | "original": { | 101 | "original": { |
| @@ -331,11 +331,11 @@ | |||
| 331 | ] | 331 | ] |
| 332 | }, | 332 | }, |
| 333 | "locked": { | 333 | "locked": { |
| 334 | "lastModified": 1783008725, | 334 | "lastModified": 1784288435, |
| 335 | "narHash": "sha256-jGiy6+sxjNWXSjp25uoJuNfyH9zBK1PEDY0lVoL4ibQ=", | 335 | "narHash": "sha256-ReRHaLgr/uVqdD8afFSn+myXIfpHeOhP0yYe0TJqAA8=", |
| 336 | "owner": "cachix", | 336 | "owner": "cachix", |
| 337 | "repo": "git-hooks.nix", | 337 | "repo": "git-hooks.nix", |
| 338 | "rev": "bca82caa46d5ec0f5d422c61fb1e30bc51313cbe", | 338 | "rev": "43b3c1ab9d40fb1dbb008f451988a91e375825e9", |
| 339 | "type": "github" | 339 | "type": "github" |
| 340 | }, | 340 | }, |
| 341 | "original": { | 341 | "original": { |
| @@ -601,11 +601,11 @@ | |||
| 601 | "pre-commit-hooks": "pre-commit-hooks" | 601 | "pre-commit-hooks": "pre-commit-hooks" |
| 602 | }, | 602 | }, |
| 603 | "locked": { | 603 | "locked": { |
| 604 | "lastModified": 1783168812, | 604 | "lastModified": 1784472151, |
| 605 | "narHash": "sha256-MIbPzNH0ZjQVrpmhvfp6+VHIoGx4/SFJ4C8OYDrzWIQ=", | 605 | "narHash": "sha256-fCP7nG0yLb4sDWClF0X1+TvDRSQEsrFc7G5TFRtNVpM=", |
| 606 | "ref": "refs/heads/main", | 606 | "ref": "refs/heads/main", |
| 607 | "rev": "0b3ca2661ecdb36f9b61499d94e80b8f47b528ca", | 607 | "rev": "f9ea1e7bea532f1fb223f0a1955db6549c944a87", |
| 608 | "revCount": 8, | 608 | "revCount": 10, |
| 609 | "type": "git", | 609 | "type": "git", |
| 610 | "url": "https://codeberg.org/debugloop/niri-autoselect-portal.git" | 610 | "url": "https://codeberg.org/debugloop/niri-autoselect-portal.git" |
| 611 | }, | 611 | }, |
| @@ -626,15 +626,15 @@ | |||
| 626 | "xwayland-satellite-unstable": "xwayland-satellite-unstable" | 626 | "xwayland-satellite-unstable": "xwayland-satellite-unstable" |
| 627 | }, | 627 | }, |
| 628 | "locked": { | 628 | "locked": { |
| 629 | "lastModified": 1784043058, | 629 | "lastModified": 1787129251, |
| 630 | "narHash": "sha256-/LXa/IHpH6zqcxrfhtUaZOPZHfk0WXi5YUTICaslMCI=", | 630 | "narHash": "sha256-MauCXoXwhSGLMJiddBrUSHvPie8lUtCaohjKJgIReQE=", |
| 631 | "owner": "sodiboo", | 631 | "owner": "epireyn", |
| 632 | "repo": "niri-flake", | 632 | "repo": "niri-flake", |
| 633 | "rev": "24728b7da2cde86eb119a771c16b214f0751f91e", | 633 | "rev": "f9e02cd4674abefa210674cd28a993e5cfb33bfc", |
| 634 | "type": "github" | 634 | "type": "github" |
| 635 | }, | 635 | }, |
| 636 | "original": { | 636 | "original": { |
| 637 | "owner": "sodiboo", | 637 | "owner": "epireyn", |
| 638 | "ref": "main", | 638 | "ref": "main", |
| 639 | "repo": "niri-flake", | 639 | "repo": "niri-flake", |
| 640 | "type": "github" | 640 | "type": "github" |
| @@ -643,16 +643,16 @@ | |||
| 643 | "niri-stable": { | 643 | "niri-stable": { |
| 644 | "flake": false, | 644 | "flake": false, |
| 645 | "locked": { | 645 | "locked": { |
| 646 | "lastModified": 1756556321, | 646 | "lastModified": 1777115961, |
| 647 | "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", | 647 | "narHash": "sha256-ehSMsSpE+0k8r+2Vseu8kangsYxToZv3vinynsDp9zs=", |
| 648 | "owner": "YaLTeR", | 648 | "owner": "niri-wm", |
| 649 | "repo": "niri", | 649 | "repo": "niri", |
| 650 | "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", | 650 | "rev": "8ed0da44d974c32c6877d2f4630c314da0717ecb", |
| 651 | "type": "github" | 651 | "type": "github" |
| 652 | }, | 652 | }, |
| 653 | "original": { | 653 | "original": { |
| 654 | "owner": "YaLTeR", | 654 | "owner": "niri-wm", |
| 655 | "ref": "v25.08", | 655 | "ref": "v26.04", |
| 656 | "repo": "niri", | 656 | "repo": "niri", |
| 657 | "type": "github" | 657 | "type": "github" |
| 658 | } | 658 | } |
| @@ -660,11 +660,11 @@ | |||
| 660 | "niri-unstable": { | 660 | "niri-unstable": { |
| 661 | "flake": false, | 661 | "flake": false, |
| 662 | "locked": { | 662 | "locked": { |
| 663 | "lastModified": 1784188820, | 663 | "lastModified": 1787137621, |
| 664 | "narHash": "sha256-7v8TuMV5ns5DType3nSmW/gWn/rCcH6tAD6qQz4fL8I=", | 664 | "narHash": "sha256-Brg8uuW8g2b5sr9HKYjW2P49ZQq7JhQPEJs/zmRUGko=", |
| 665 | "owner": "gkleen", | 665 | "owner": "gkleen", |
| 666 | "repo": "niri", | 666 | "repo": "niri", |
| 667 | "rev": "d37ad88eb9222c1163bb050b00dc4b663cf1d433", | 667 | "rev": "fd66d564956584a3cca0e1ff7fd57d3b7fddfa70", |
| 668 | "type": "github" | 668 | "type": "github" |
| 669 | }, | 669 | }, |
| 670 | "original": { | 670 | "original": { |
| @@ -702,11 +702,11 @@ | |||
| 702 | ] | 702 | ] |
| 703 | }, | 703 | }, |
| 704 | "locked": { | 704 | "locked": { |
| 705 | "lastModified": 1783864904, | 705 | "lastModified": 1786852476, |
| 706 | "narHash": "sha256-BQxN5UMg9FOevAsgBRwPxfxlh51Puj+dNn/8Dsi3sPM=", | 706 | "narHash": "sha256-IM5CYtf86W4w8eUPpKcY/LpdHElmVBtJhaKnoTKxZEA=", |
| 707 | "owner": "nix-community", | 707 | "owner": "nix-community", |
| 708 | "repo": "nix-index-database", | 708 | "repo": "nix-index-database", |
| 709 | "rev": "1111b9bc836afb7e31a7014e8d1272de9b1c917d", | 709 | "rev": "c7962dc97b45129df8d751bedaf37beb5a17706e", |
| 710 | "type": "github" | 710 | "type": "github" |
| 711 | }, | 711 | }, |
| 712 | "original": { | 712 | "original": { |
| @@ -748,11 +748,11 @@ | |||
| 748 | ] | 748 | ] |
| 749 | }, | 749 | }, |
| 750 | "locked": { | 750 | "locked": { |
| 751 | "lastModified": 1784058796, | 751 | "lastModified": 1786680260, |
| 752 | "narHash": "sha256-Ok5wLwYcQvM4u4zS1b7aP72sFH/bWlowWvBPvx+LPqs=", | 752 | "narHash": "sha256-t/OKt1G1UnHTRRtNuJ/yC1oOV4Fn39HkNsKzyd3DlYQ=", |
| 753 | "ref": "refs/heads/main", | 753 | "ref": "refs/heads/main", |
| 754 | "rev": "030658cd63512887c74652261079ca8bbb636c23", | 754 | "rev": "b568a2584ed3619a6ebe41a2910e2bfc674bf836", |
| 755 | "revCount": 793, | 755 | "revCount": 801, |
| 756 | "type": "git", | 756 | "type": "git", |
| 757 | "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git" | 757 | "url": "https://code.maralorn.de/maralorn/nix-output-monitor.git" |
| 758 | }, | 758 | }, |
| @@ -786,11 +786,11 @@ | |||
| 786 | "nixpkgs": "nixpkgs_4" | 786 | "nixpkgs": "nixpkgs_4" |
| 787 | }, | 787 | }, |
| 788 | "locked": { | 788 | "locked": { |
| 789 | "lastModified": 1784100666, | 789 | "lastModified": 1786867632, |
| 790 | "narHash": "sha256-HF/mrw5NYQfKFZgkfV2h1UL5/E3ccfsE2XJ1AbbLLJ0=", | 790 | "narHash": "sha256-ez+ubZlA1RtdjCB18a6zJ9M4u8qoPDy08EcnsW5M3Xw=", |
| 791 | "owner": "NixOS", | 791 | "owner": "NixOS", |
| 792 | "repo": "nixos-hardware", | 792 | "repo": "nixos-hardware", |
| 793 | "rev": "fccfa9031a85b78a437f2f153c1f6449f3bc3185", | 793 | "rev": "ff17823245ab9ff7bcae6acf950bd89cba82c38c", |
| 794 | "type": "github" | 794 | "type": "github" |
| 795 | }, | 795 | }, |
| 796 | "original": { | 796 | "original": { |
| @@ -911,16 +911,16 @@ | |||
| 911 | }, | 911 | }, |
| 912 | "nixpkgs-stable_2": { | 912 | "nixpkgs-stable_2": { |
| 913 | "locked": { | 913 | "locked": { |
| 914 | "lastModified": 1782847189, | 914 | "lastModified": 1787042014, |
| 915 | "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", | 915 | "narHash": "sha256-lgnV/xeEatfEnPZG0RrXS0fhcr63p3tsVvL1GdaVkJQ=", |
| 916 | "owner": "NixOS", | 916 | "owner": "NixOS", |
| 917 | "repo": "nixpkgs", | 917 | "repo": "nixpkgs", |
| 918 | "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41", | 918 | "rev": "c69ae8fb8faeb3472fd11234ba55a70ac3601f9b", |
| 919 | "type": "github" | 919 | "type": "github" |
| 920 | }, | 920 | }, |
| 921 | "original": { | 921 | "original": { |
| 922 | "owner": "NixOS", | 922 | "owner": "NixOS", |
| 923 | "ref": "nixos-25.11", | 923 | "ref": "nixos-26.05", |
| 924 | "repo": "nixpkgs", | 924 | "repo": "nixpkgs", |
| 925 | "type": "github" | 925 | "type": "github" |
| 926 | } | 926 | } |
| @@ -1004,11 +1004,11 @@ | |||
| 1004 | }, | 1004 | }, |
| 1005 | "nixpkgs_5": { | 1005 | "nixpkgs_5": { |
| 1006 | "locked": { | 1006 | "locked": { |
| 1007 | "lastModified": 1784120854, | 1007 | "lastModified": 1787001381, |
| 1008 | "narHash": "sha256-KesHgItiZPgGX740axSiQLcIQ8D24MDqNpkKYWIek8k=", | 1008 | "narHash": "sha256-Ue1Yo8gfHdD4TMtNewhA4tkSYeFqXThju0nCyJc3ALo=", |
| 1009 | "owner": "NixOS", | 1009 | "owner": "NixOS", |
| 1010 | "repo": "nixpkgs", | 1010 | "repo": "nixpkgs", |
| 1011 | "rev": "753cc8a3a87467296ddd1fa93f0cc3e81120ee46", | 1011 | "rev": "ec2d622de0773551768cf98f3fc50cbcc003b9c5", |
| 1012 | "type": "github" | 1012 | "type": "github" |
| 1013 | }, | 1013 | }, |
| 1014 | "original": { | 1014 | "original": { |
| @@ -1274,11 +1274,11 @@ | |||
| 1274 | ] | 1274 | ] |
| 1275 | }, | 1275 | }, |
| 1276 | "locked": { | 1276 | "locked": { |
| 1277 | "lastModified": 1782093830, | 1277 | "lastModified": 1786936886, |
| 1278 | "narHash": "sha256-6gmEVe69+KlRkZD4PEEV5xAlB9CB0Y9TiuEgQjDrKTQ=", | 1278 | "narHash": "sha256-8SFyOdmcG6Nsh/JzlH812lTI/v+ur06fpQhj/acNn8k=", |
| 1279 | "owner": "pyproject-nix", | 1279 | "owner": "pyproject-nix", |
| 1280 | "repo": "build-system-pkgs", | 1280 | "repo": "build-system-pkgs", |
| 1281 | "rev": "430680a19bc85a3bda55f12e4cc1a1aadcf2e478", | 1281 | "rev": "90ffdeee1a4929b231913df067448cd9803d3e07", |
| 1282 | "type": "github" | 1282 | "type": "github" |
| 1283 | }, | 1283 | }, |
| 1284 | "original": { | 1284 | "original": { |
| @@ -1294,11 +1294,11 @@ | |||
| 1294 | ] | 1294 | ] |
| 1295 | }, | 1295 | }, |
| 1296 | "locked": { | 1296 | "locked": { |
| 1297 | "lastModified": 1782905613, | 1297 | "lastModified": 1786031528, |
| 1298 | "narHash": "sha256-SvXJcAemihifkTn4BGvyE5K1FJX9bl4U8DQ5pqKvD0s=", | 1298 | "narHash": "sha256-cROiHKO3UbIKqF5FG5NikvydzlfIj4EcR1Cty9qOVt4=", |
| 1299 | "owner": "pyproject-nix", | 1299 | "owner": "pyproject-nix", |
| 1300 | "repo": "pyproject.nix", | 1300 | "repo": "pyproject.nix", |
| 1301 | "rev": "7af23cfe91064865ecf2e835da28b45b3c6f49fd", | 1301 | "rev": "1b1485546d85f6f6c7aadb10c4923dbc09633263", |
| 1302 | "type": "github" | 1302 | "type": "github" |
| 1303 | }, | 1303 | }, |
| 1304 | "original": { | 1304 | "original": { |
| @@ -1368,11 +1368,11 @@ | |||
| 1368 | ] | 1368 | ] |
| 1369 | }, | 1369 | }, |
| 1370 | "locked": { | 1370 | "locked": { |
| 1371 | "lastModified": 1783174389, | 1371 | "lastModified": 1786629091, |
| 1372 | "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=", | 1372 | "narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=", |
| 1373 | "owner": "Mic92", | 1373 | "owner": "Mic92", |
| 1374 | "repo": "sops-nix", | 1374 | "repo": "sops-nix", |
| 1375 | "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9", | 1375 | "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f", |
| 1376 | "type": "github" | 1376 | "type": "github" |
| 1377 | }, | 1377 | }, |
| 1378 | "original": { | 1378 | "original": { |
| @@ -1443,11 +1443,11 @@ | |||
| 1443 | ] | 1443 | ] |
| 1444 | }, | 1444 | }, |
| 1445 | "locked": { | 1445 | "locked": { |
| 1446 | "lastModified": 1783511944, | 1446 | "lastModified": 1786615403, |
| 1447 | "narHash": "sha256-Z/Ss9rWw9QYcRK+Qqkmty7PB1pIik5XGbrtit+ad2qs=", | 1447 | "narHash": "sha256-U++y7nM/6xiEcWI7q4fQoPZjPvRaTwkSqzBOVoEBjUE=", |
| 1448 | "owner": "pyproject-nix", | 1448 | "owner": "pyproject-nix", |
| 1449 | "repo": "uv2nix", | 1449 | "repo": "uv2nix", |
| 1450 | "rev": "83995ef5e4ece3c9c704aa645bbff439e15a0ac3", | 1450 | "rev": "4b59abb2ae1896d2a0e1abfc47fbc9bf985ea730", |
| 1451 | "type": "github" | 1451 | "type": "github" |
| 1452 | }, | 1452 | }, |
| 1453 | "original": { | 1453 | "original": { |
| @@ -1459,16 +1459,16 @@ | |||
| 1459 | "xwayland-satellite-stable": { | 1459 | "xwayland-satellite-stable": { |
| 1460 | "flake": false, | 1460 | "flake": false, |
| 1461 | "locked": { | 1461 | "locked": { |
| 1462 | "lastModified": 1755491097, | 1462 | "lastModified": 1771195969, |
| 1463 | "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", | 1463 | "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=", |
| 1464 | "owner": "Supreeeme", | 1464 | "owner": "Supreeeme", |
| 1465 | "repo": "xwayland-satellite", | 1465 | "repo": "xwayland-satellite", |
| 1466 | "rev": "388d291e82ffbc73be18169d39470f340707edaa", | 1466 | "rev": "536bd32efc935bf876d6de385ec18a1b715c9358", |
| 1467 | "type": "github" | 1467 | "type": "github" |
| 1468 | }, | 1468 | }, |
| 1469 | "original": { | 1469 | "original": { |
| 1470 | "owner": "Supreeeme", | 1470 | "owner": "Supreeeme", |
| 1471 | "ref": "v0.7", | 1471 | "ref": "v0.8.1", |
| 1472 | "repo": "xwayland-satellite", | 1472 | "repo": "xwayland-satellite", |
| 1473 | "type": "github" | 1473 | "type": "github" |
| 1474 | } | 1474 | } |
| @@ -1476,11 +1476,11 @@ | |||
| 1476 | "xwayland-satellite-unstable": { | 1476 | "xwayland-satellite-unstable": { |
| 1477 | "flake": false, | 1477 | "flake": false, |
| 1478 | "locked": { | 1478 | "locked": { |
| 1479 | "lastModified": 1783895132, | 1479 | "lastModified": 1786221058, |
| 1480 | "narHash": "sha256-Dl0Gvrig3EpE962hzF3ETPhUztlfuRhcmlpd8ioHN54=", | 1480 | "narHash": "sha256-hF2atQzapHBLX5NFqJMcKZAWHfGkKQeNu1eQr46+AGg=", |
| 1481 | "owner": "Supreeeme", | 1481 | "owner": "Supreeeme", |
| 1482 | "repo": "xwayland-satellite", | 1482 | "repo": "xwayland-satellite", |
| 1483 | "rev": "a2b5c635d8c8c99b286967658d0d177044887eb8", | 1483 | "rev": "3bc915f09dd62bb2651a715114f9d140344bc6c1", |
| 1484 | "type": "github" | 1484 | "type": "github" |
| 1485 | }, | 1485 | }, |
| 1486 | "original": { | 1486 | "original": { |
| @@ -203,7 +203,7 @@ | |||
| 203 | }; | 203 | }; |
| 204 | niri-flake = { | 204 | niri-flake = { |
| 205 | type = "github"; | 205 | type = "github"; |
| 206 | owner = "sodiboo"; | 206 | owner = "epireyn"; |
| 207 | repo = "niri-flake"; | 207 | repo = "niri-flake"; |
| 208 | ref = "main"; | 208 | ref = "main"; |
| 209 | inputs = { | 209 | inputs = { |
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix index bf6ac3c4..6e5571b5 100644 --- a/hosts/sif/default.nix +++ b/hosts/sif/default.nix | |||
| @@ -58,7 +58,7 @@ in { | |||
| 58 | 58 | ||
| 59 | plymouth.enable = true; | 59 | plymouth.enable = true; |
| 60 | 60 | ||
| 61 | kernelPackages = pkgs.linuxPackages_7_1; | 61 | kernelPackages = pkgs.linuxPackages_7_2; |
| 62 | consoleLogLevel = 3; | 62 | consoleLogLevel = 3; |
| 63 | kernelParams = [ | 63 | kernelParams = [ |
| 64 | "quiet" | 64 | "quiet" |
diff --git a/hosts/sif/greetd/default.nix b/hosts/sif/greetd/default.nix index 081b6346..1e4089e8 100644 --- a/hosts/sif/greetd/default.nix +++ b/hosts/sif/greetd/default.nix | |||
| @@ -23,7 +23,7 @@ in { | |||
| 23 | runtimeInputs = [ pkgs.sway pkgs.fontconfig ]; | 23 | runtimeInputs = [ pkgs.sway pkgs.fontconfig ]; |
| 24 | runtimeEnv = { | 24 | runtimeEnv = { |
| 25 | XDG_DATA_DIRS = lib.makeSearchPath "share" [ | 25 | XDG_DATA_DIRS = lib.makeSearchPath "share" [ |
| 26 | pkgs.equilux-theme pkgs.paper-icon-theme pkgs.fira | 26 | pkgs.kdePackages.breeze-gtk pkgs.paper-icon-theme pkgs.fira |
| 27 | ]; | 27 | ]; |
| 28 | QT_PLUGIN_PATH = lib.makeSearchPath (pkgs.qt6.qtbase.qtPluginPrefix) [ | 28 | QT_PLUGIN_PATH = lib.makeSearchPath (pkgs.qt6.qtbase.qtPluginPrefix) [ |
| 29 | pkgs.qt6Packages.qtbase | 29 | pkgs.qt6Packages.qtbase |
| @@ -38,7 +38,7 @@ in { | |||
| 38 | (pkgs.writeTextDir "gtk-3.0/settings.ini" (toIni { | 38 | (pkgs.writeTextDir "gtk-3.0/settings.ini" (toIni { |
| 39 | Settings = { | 39 | Settings = { |
| 40 | gtk-font-name = "Fira Sans 10"; | 40 | gtk-font-name = "Fira Sans 10"; |
| 41 | gtk-theme-name = "Equilux-compact"; | 41 | gtk-theme-name = "Breeze-dark"; |
| 42 | gtk-icon-theme-name = "Paper-Mono-Dark"; | 42 | gtk-icon-theme-name = "Paper-Mono-Dark"; |
| 43 | }; | 43 | }; |
| 44 | })) | 44 | })) |
| @@ -57,7 +57,7 @@ in { | |||
| 57 | "org/gnome/desktop/interface" = { | 57 | "org/gnome/desktop/interface" = { |
| 58 | "color-scheme" = "prefer-dark"; | 58 | "color-scheme" = "prefer-dark"; |
| 59 | "font-name" = "Fira Sans 10"; | 59 | "font-name" = "Fira Sans 10"; |
| 60 | "gtk-theme" = "Equilux-compact"; | 60 | "gtk-theme" = "Breeze-dark"; |
| 61 | "icon-theme" = "Paper-Mono-Dark"; | 61 | "icon-theme" = "Paper-Mono-Dark"; |
| 62 | }; | 62 | }; |
| 63 | })} | 63 | })} |
diff --git a/hosts/vidhar/network/pppoe/default.nix b/hosts/vidhar/network/pppoe/default.nix index 4fe8ff1f..0134559d 100644 --- a/hosts/vidhar/network/pppoe/default.nix +++ b/hosts/vidhar/network/pppoe/default.nix | |||
| @@ -123,8 +123,8 @@ in { | |||
| 123 | 123 | ||
| 124 | tc qdisc add dev "$1" handle ffff: ingress | 124 | tc qdisc add dev "$1" handle ffff: ingress |
| 125 | tc filter add dev "$1" parent ffff: basic action ctinfo dscp 0x0000003f 0x00000040 action mirred egress redirect dev "ifb4$1" | 125 | tc filter add dev "$1" parent ffff: basic action ctinfo dscp 0x0000003f 0x00000040 action mirred egress redirect dev "ifb4$1" |
| 126 | tc qdisc replace dev "ifb4$1" root cake memlimit 128Mb overhead 35 mpu 74 regional diffserv4 bandwidth 175mbit | 126 | tc qdisc replace dev "ifb4$1" root cake memlimit 128Mb pppoe-ptm nat diffserv4 ingress bandwidth 110mbit |
| 127 | tc qdisc replace dev "$1" root cake memlimit 128Mb overhead 35 mpu 74 regional nat diffserv4 wash bandwidth 40mbit | 127 | tc qdisc replace dev "$1" root cake memlimit 128Mb pppoe-ptm nat diffserv4 wash bandwidth 28mbit |
| 128 | ''; | 128 | ''; |
| 129 | "ppp/ip-up".source = pkgs.resholve.writeScript "ip-up" { | 129 | "ppp/ip-up".source = pkgs.resholve.writeScript "ip-up" { |
| 130 | interpreter = pkgs.runtimeShell; | 130 | interpreter = pkgs.runtimeShell; |
diff --git a/overlays/FinanceQuote/default.nix b/overlays/FinanceQuote/default.nix deleted file mode 100644 index 45c7d833..00000000 --- a/overlays/FinanceQuote/default.nix +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | { prev, final, ... }: { | ||
| 2 | perlPackages = (final.perl.override { | ||
| 3 | overrides = p: { | ||
| 4 | FinanceQuote = prev.perl.pkgs.FinanceQuote.overrideAttrs (oldAttrs: { | ||
| 5 | patches = (oldAttrs.patches or []) ++ [ | ||
| 6 | ./tradegate.patch | ||
| 7 | ]; | ||
| 8 | }); | ||
| 9 | }; | ||
| 10 | }).pkgs; | ||
| 11 | } | ||
diff --git a/overlays/FinanceQuote/tradegate.patch b/overlays/FinanceQuote/tradegate.patch deleted file mode 100644 index f1081fc4..00000000 --- a/overlays/FinanceQuote/tradegate.patch +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | --- old/lib/Finance/Quote/Tradegate.pm | ||
| 2 | +++ new/lib/Finance/Quote/Tradegate.pm | ||
| 3 | @@ -98,12 +98,13 @@ | ||
| 4 | @child = $td1->content_list; | ||
| 5 | my $exchange = $child[0]; | ||
| 6 | |||
| 7 | $td1 = ($lastvalue->look_down('_tag'=>'td'))[7]; | ||
| 8 | @child = $td1->content_list; | ||
| 9 | - my $date = substr($child[0], 0, 8); | ||
| 10 | - my $time = substr($child[0], 9, 5); # CE(S)T | ||
| 11 | + $child[0] =~ /(?<date>\d{2}\.\d{2}\.\d{2,4})\s*\/\s*(?<time>\d{2}:\d{2})/; | ||
| 12 | + my $date = $+{date}; | ||
| 13 | + my $time = $+{time}; | ||
| 14 | |||
| 15 | $td1 = ($lastvalue->look_down('_tag'=>'td'))[9]; | ||
| 16 | @child = $td1->content_list; | ||
| 17 | my $price = $child[0]; | ||
| 18 | $price =~ s/\.//g; | ||
diff --git a/overlays/niri.nix b/overlays/niri.nix index 95a918b0..d484d8f8 100644 --- a/overlays/niri.nix +++ b/overlays/niri.nix | |||
| @@ -1,9 +1,3 @@ | |||
| 1 | { final, prev, flakeInputs, ... }: prev.lib.composeExtensions | 1 | { final, prev, flakeInputs, ... }: |
| 2 | flakeInputs.niri-flake.overlays.niri | 2 | flakeInputs.niri-flake.overlays.niri |
| 3 | (final: prev: { | ||
| 4 | niri-unstable = prev.niri-unstable.overrideAttrs (oldAttrs: { | ||
| 5 | buildInputs = (oldAttrs.buildInputs or []) ++ [ final.libgbm ]; | ||
| 6 | doCheck = false; | ||
| 7 | }); | ||
| 8 | }) | ||
| 9 | final prev | 3 | final prev |
diff --git a/overlays/prometheus-lvm-exporter.nix b/overlays/prometheus-lvm-exporter.nix index 72d9c7ca..5a27e826 100644 --- a/overlays/prometheus-lvm-exporter.nix +++ b/overlays/prometheus-lvm-exporter.nix | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | pname = "prometheus-lvm-exporter"; | 3 | pname = "prometheus-lvm-exporter"; |
| 4 | inherit (sources.prometheus-lvm-exporter) version src; | 4 | inherit (sources.prometheus-lvm-exporter) version src; |
| 5 | 5 | ||
| 6 | vendorHash = "sha256-CoTNTCBBugbHWDsOuZY1t8HrpdmEbbSMyVb3+1u0q+g="; | 6 | vendorHash = "sha256-TAXaGCUZFg7o+rRgZkfHBf7u4u9qGN3yWnX72/yLuwE="; |
| 7 | 7 | ||
| 8 | doCheck = false; | 8 | doCheck = false; |
| 9 | 9 | ||
diff --git a/overlays/spice-record.nix b/overlays/spice-record.nix index 2d37079b..0ec2799d 100644 --- a/overlays/spice-record.nix +++ b/overlays/spice-record.nix | |||
| @@ -1,14 +1,15 @@ | |||
| 1 | { final, prev, sources, ... }: { | 1 | { final, prev, sources, ... }: { |
| 2 | spice-record = prev.python3Packages.buildPythonPackage rec { | 2 | spice-record = final.python3Packages.buildPythonPackage rec { |
| 3 | inherit (sources.spice-record) src version pname; | 3 | pname = "spicerecord"; |
| 4 | propagatedBuildInputs = with prev.python3Packages; [ libvirt pygobject3 ]; | 4 | inherit (sources.spice-record) src version; |
| 5 | buildInputs = with prev; [ spice-gtk gst_all_1.gst-plugins-base ]; | 5 | propagatedBuildInputs = with final.python3Packages; [ libvirt pygobject3 ]; |
| 6 | nativeBuildInputs = with prev; [ gobject-introspection wrapGAppsHook3 makeWrapper ]; | 6 | buildInputs = with final; [ spice-gtk gst_all_1.gst-plugins-base ]; |
| 7 | nativeBuildInputs = with final; [ gobject-introspection wrapGAppsHook3 makeWrapper ]; | ||
| 7 | postInstall = '' | 8 | postInstall = '' |
| 8 | wrapProgram $out/bin/spice-record \ | 9 | wrapProgram $out/bin/spice-record \ |
| 9 | --prefix PATH : ${prev.lib.makeBinPath (with prev; [ ffmpeg-full ])} | 10 | --prefix PATH : ${final.lib.makeBinPath (with final; [ ffmpeg-headless ])} |
| 10 | ''; | 11 | ''; |
| 11 | pyproject = true; | 12 | pyproject = true; |
| 12 | build-system = [ prev.python3Packages.setuptools ]; | 13 | build-system = [ final.python3Packages.setuptools ]; |
| 13 | }; | 14 | }; |
| 14 | } | 15 | } |
diff --git a/overlays/yt-dlp.nix b/overlays/yt-dlp.nix index 1c9f77d8..e4348ded 100644 --- a/overlays/yt-dlp.nix +++ b/overlays/yt-dlp.nix | |||
| @@ -5,7 +5,13 @@ | |||
| 5 | python3 = prev.python3.override { | 5 | python3 = prev.python3.override { |
| 6 | packageOverrides = python-self: python-super: { | 6 | packageOverrides = python-self: python-super: { |
| 7 | yt-dlp-ejs = python-super.yt-dlp-ejs.overridePythonAttrs (oldAttrs: { | 7 | yt-dlp-ejs = python-super.yt-dlp-ejs.overridePythonAttrs (oldAttrs: { |
| 8 | inherit (sources.yt-dlp-ejs) pname version src; | 8 | inherit (sources.yt-dlp-ejs) pname src version; |
| 9 | pnpmDeps = final.fetchPnpmDeps { | ||
| 10 | inherit (sources.yt-dlp-ejs) pname version src; | ||
| 11 | pnpm = final.pnpm_10; | ||
| 12 | fetcherVersion = 3; | ||
| 13 | hash = "sha256-4qMOAl9Dbe1oYSRIeP7oPcV/+P8NLdIYvSNxaz0h+Z0="; | ||
| 14 | }; | ||
| 9 | }); | 15 | }); |
| 10 | }; | 16 | }; |
| 11 | }; | 17 | }; |
