From 31ab1c84a4da06d1bf029c462fd9adeadb601c8c Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 16 Mar 2025 11:53:01 +0100 Subject: ... --- _sources/generated.json | 44 +++++++++++----------- _sources/generated.nix | 44 +++++++++++----------- accounts/gkleen@sif/default.nix | 7 +++- flake.lock | 76 +++++++++++++++++++------------------- hosts/surtr/postgresql/default.nix | 4 ++ overlays/swayosd/default.nix | 2 +- user-profiles/mpv/default.nix | 2 +- user-profiles/zsh/default.nix | 2 +- user-profiles/zsh/zshrc | 4 +- 9 files changed, 97 insertions(+), 88 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index b3d09fc4..ed2c5d34 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -99,7 +99,7 @@ }, "mako": { "cargoLocks": null, - "date": "2025-01-19", + "date": "2025-03-01", "extract": null, "name": "mako", "passthru": null, @@ -109,13 +109,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "57a258c1f8861200e0623153f1b79065d4ddabd8", - "sha256": "sha256-9PcZLpIfGR8SmZf5e2rDZhF+y3kfSaFw5DneDXHMGTc=", + "rev": "5321a4c61b2c23caa39337cd36065384bfcb3ace", + "sha256": "sha256-QplCniTBCoZV+R8hspsDcj3MhHcXkMjMoYC4mZyq3nM=", "sparseCheckout": [], "type": "git", "url": "https://github.com/emersion/mako" }, - "version": "57a258c1f8861200e0623153f1b79065d4ddabd8" + "version": "5321a4c61b2c23caa39337cd36065384bfcb3ace" }, "mpv-autosave": { "cargoLocks": null, @@ -202,7 +202,7 @@ }, "mpv-reload": { "cargoLocks": null, - "date": "2024-03-22", + "date": "2025-02-07", "extract": null, "name": "mpv-reload", "passthru": null, @@ -214,12 +214,12 @@ "name": null, "owner": "4e6", "repo": "mpv-reload", - "rev": "1a6a9383ba1774708fddbd976e7a9b72c3eec938", - "sha256": "sha256-BshxCjec/UNGyiC0/g1Rai2NvG2qOIHXDDEUYwwdij0=", + "rev": "60e6fb1c578aa9af80d725857dac8e439095b033", + "sha256": "sha256-elA9bi5ov5MbehLD1kyS4Z8zKgTc+8dcOPq32muRGcE=", "sparseCheckout": [], "type": "github" }, - "version": "1a6a9383ba1774708fddbd976e7a9b72c3eec938" + "version": "60e6fb1c578aa9af80d725857dac8e439095b033" }, "mpv-subselect": { "cargoLocks": null, @@ -269,11 +269,11 @@ "passthru": null, "pinned": false, "src": { - "sha256": "sha256-wpBbT/KXd2iU6Jn6Y/6i5C+Wv3OsUTjFcJDhUm6w46I=", + "sha256": "sha256-DrPWxAlzdtb5K0Z+yVi+rL1h7CyLj0/Fiio8B2H/Ssg=", "type": "tarball", - "url": "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.4.0.tar.gz" + "url": "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.5.0.tar.gz" }, - "version": "1.4.0" + "version": "1.5.0" }, "postfwd": { "cargoLocks": null, @@ -367,7 +367,7 @@ }, "swayosd": { "cargoLocks": null, - "date": "2025-01-27", + "date": "2025-03-03", "extract": null, "name": "swayosd", "passthru": null, @@ -377,13 +377,13 @@ "fetchSubmodules": false, "leaveDotGit": false, "name": null, - "rev": "993180b5e7db1dfc453a556bf208f05b04283c8f", - "sha256": "sha256-qwtGkRJlCYu+dO3xCmnRexX+E4QvXRAHXUslLO7mrAI=", + "rev": "b3c78fce3d90be2ce6a6ffee0e22a50379952e2b", + "sha256": "sha256-V3V18BoBRJU8mtvwWXvdYPbKBDIHdu5LzVSkDkGJjFU=", "sparseCheckout": [], "type": "git", "url": "https://github.com/ErikReider/SwayOSD" }, - "version": "993180b5e7db1dfc453a556bf208f05b04283c8f" + "version": "b3c78fce3d90be2ce6a6ffee0e22a50379952e2b" }, "tomorrow-night-paradise-theme": { "cargoLocks": null, @@ -407,7 +407,7 @@ }, "v4l2loopback": { "cargoLocks": null, - "date": "2025-02-03", + "date": "2025-02-28", "extract": null, "name": "v4l2loopback", "passthru": null, @@ -419,12 +419,12 @@ "name": null, "owner": "umlaeute", "repo": "v4l2loopback", - "rev": "7164d6e6b9aad52a27652c8bb8bd3c3d7a5b336b", - "sha256": "sha256-1f4+pIbPM/TOJOc7Ns2VDXlBCGyrXiNpmKfThl5kZfk=", + "rev": "60a0315c6db154597dc733ea42139cf159644a7a", + "sha256": "sha256-GymBIScU4sg3ofVb9R4/Abq9OZZ+IqLKv/6y32wFLm8=", "sparseCheckout": [], "type": "github" }, - "version": "7164d6e6b9aad52a27652c8bb8bd3c3d7a5b336b" + "version": "60a0315c6db154597dc733ea42139cf159644a7a" }, "xcompose": { "cargoLocks": null, @@ -456,10 +456,10 @@ "pinned": false, "src": { "name": null, - "sha256": "sha256-HJc4JmkhrUPFaK0BrDNi+3x69Uknb77JK9cvFA2hYkA=", + "sha256": "sha256-8zynbfLk2zGIDy/kCNRPUFjZ8TUBWxPlBhDfvngkW+o=", "type": "url", - "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.1.26.tar.gz" + "url": "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.2.19.tar.gz" }, - "version": "2025.1.26" + "version": "2025.2.19" } } \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index 63c464bb..47944d09 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -61,17 +61,17 @@ }; mako = { pname = "mako"; - version = "57a258c1f8861200e0623153f1b79065d4ddabd8"; + version = "5321a4c61b2c23caa39337cd36065384bfcb3ace"; src = fetchgit { url = "https://github.com/emersion/mako"; - rev = "57a258c1f8861200e0623153f1b79065d4ddabd8"; + rev = "5321a4c61b2c23caa39337cd36065384bfcb3ace"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-9PcZLpIfGR8SmZf5e2rDZhF+y3kfSaFw5DneDXHMGTc="; + sha256 = "sha256-QplCniTBCoZV+R8hspsDcj3MhHcXkMjMoYC4mZyq3nM="; }; - date = "2025-01-19"; + date = "2025-03-01"; }; mpv-autosave = { pname = "mpv-autosave"; @@ -124,15 +124,15 @@ }; mpv-reload = { pname = "mpv-reload"; - version = "1a6a9383ba1774708fddbd976e7a9b72c3eec938"; + version = "60e6fb1c578aa9af80d725857dac8e439095b033"; src = fetchFromGitHub { owner = "4e6"; repo = "mpv-reload"; - rev = "1a6a9383ba1774708fddbd976e7a9b72c3eec938"; + rev = "60e6fb1c578aa9af80d725857dac8e439095b033"; fetchSubmodules = false; - sha256 = "sha256-BshxCjec/UNGyiC0/g1Rai2NvG2qOIHXDDEUYwwdij0="; + sha256 = "sha256-elA9bi5ov5MbehLD1kyS4Z8zKgTc+8dcOPq32muRGcE="; }; - date = "2024-03-22"; + date = "2025-02-07"; }; mpv-subselect = { pname = "mpv-subselect"; @@ -164,10 +164,10 @@ }; postfix-mta-sts-resolver = { pname = "postfix-mta-sts-resolver"; - version = "1.4.0"; + version = "1.5.0"; src = fetchTarball { - url = "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.4.0.tar.gz"; - sha256 = "sha256-wpBbT/KXd2iU6Jn6Y/6i5C+Wv3OsUTjFcJDhUm6w46I="; + url = "https://github.com/Snawoot/postfix-mta-sts-resolver/archive/refs/tags/v1.5.0.tar.gz"; + sha256 = "sha256-DrPWxAlzdtb5K0Z+yVi+rL1h7CyLj0/Fiio8B2H/Ssg="; }; }; postfwd = { @@ -226,17 +226,17 @@ }; swayosd = { pname = "swayosd"; - version = "993180b5e7db1dfc453a556bf208f05b04283c8f"; + version = "b3c78fce3d90be2ce6a6ffee0e22a50379952e2b"; src = fetchgit { url = "https://github.com/ErikReider/SwayOSD"; - rev = "993180b5e7db1dfc453a556bf208f05b04283c8f"; + rev = "b3c78fce3d90be2ce6a6ffee0e22a50379952e2b"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ ]; - sha256 = "sha256-qwtGkRJlCYu+dO3xCmnRexX+E4QvXRAHXUslLO7mrAI="; + sha256 = "sha256-V3V18BoBRJU8mtvwWXvdYPbKBDIHdu5LzVSkDkGJjFU="; }; - date = "2025-01-27"; + date = "2025-03-03"; }; tomorrow-night-paradise-theme = { pname = "tomorrow-night-paradise-theme"; @@ -254,15 +254,15 @@ }; v4l2loopback = { pname = "v4l2loopback"; - version = "7164d6e6b9aad52a27652c8bb8bd3c3d7a5b336b"; + version = "60a0315c6db154597dc733ea42139cf159644a7a"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; - rev = "7164d6e6b9aad52a27652c8bb8bd3c3d7a5b336b"; + rev = "60a0315c6db154597dc733ea42139cf159644a7a"; fetchSubmodules = true; - sha256 = "sha256-1f4+pIbPM/TOJOc7Ns2VDXlBCGyrXiNpmKfThl5kZfk="; + sha256 = "sha256-GymBIScU4sg3ofVb9R4/Abq9OZZ+IqLKv/6y32wFLm8="; }; - date = "2025-02-03"; + date = "2025-02-28"; }; xcompose = { pname = "xcompose"; @@ -278,10 +278,10 @@ }; yt-dlp = { pname = "yt-dlp"; - version = "2025.1.26"; + version = "2025.2.19"; src = fetchurl { - url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.1.26.tar.gz"; - sha256 = "sha256-HJc4JmkhrUPFaK0BrDNi+3x69Uknb77JK9cvFA2hYkA="; + url = "https://pypi.org/packages/source/y/yt_dlp/yt_dlp-2025.2.19.tar.gz"; + sha256 = "sha256-8zynbfLk2zGIDy/kCNRPUFjZ8TUBWxPlBhDfvngkW+o="; }; }; } diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index 3da5ee6c..6f720bbf 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix @@ -155,7 +155,7 @@ in { emacs = { enable = true; - package = pkgs.emacs29-pgtk; + package = pkgs.emacs-pgtk; extraPackages = epkgs: with epkgs; [ evil evil-dvorak undo-tree magit haskell-tng-mode nix-mode yaml-mode json-mode shakespeare-mode smart-mode-line @@ -306,7 +306,10 @@ in { grab ''; }; - xembed-sni-proxy.enable = true; + xembed-sni-proxy = { + enable = true; + package = pkgs.kdePackages.plasma-workspace; + }; udiskie = { enable = true; automount = false; diff --git a/flake.lock b/flake.lock index 99ea7468..007dd5eb 100644 --- a/flake.lock +++ b/flake.lock @@ -397,11 +397,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1739339370, - "narHash": "sha256-kvuVhsaVa8j0P9Genf96CLX2cNjForojX5aB1BN+Bwk=", + "lastModified": 1741281866, + "narHash": "sha256-e/Zok3cRBtBOYMxNDEA62rWue4BRcR92DGCwttbnanE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "498e8bbc149b38fd14d4ff7fbf31c49fdaa23282", + "rev": "40ba2c0eced1de1f4bdfb11f368de24932339e6c", "type": "github" }, "original": { @@ -414,16 +414,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1736614405, - "narHash": "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=", + "lastModified": 1740117926, + "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", "owner": "YaLTeR", "repo": "niri", - "rev": "e05bc269e678ecf828b96ae79c991c13b00b38a5", + "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.01", + "ref": "v25.02", "repo": "niri", "type": "github" } @@ -431,11 +431,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1739336386, - "narHash": "sha256-H9E3lfJibzWwqV9C1pI81uhav1RLWRA8JbH3ADv3X/4=", + "lastModified": 1741260996, + "narHash": "sha256-uKWfBwNLZEsDnICY7immZn/oLhQos227SDiEnDQwTI4=", "owner": "YaLTeR", "repo": "niri", - "rev": "7e552333a993e83a2dba52392109617e486f5f60", + "rev": "88fcf0c2a996ef61bb1f51cb02afa7686de1bbe1", "type": "github" }, "original": { @@ -472,11 +472,11 @@ ] }, "locked": { - "lastModified": 1739071773, - "narHash": "sha256-/Ak+Quinhmdxa9m3shjm4lwwwqmzG8zzGhhhhgR1k9I=", + "lastModified": 1740886574, + "narHash": "sha256-jN6kJ41B6jUVDTebIWeebTvrKP6YiLd1/wMej4uq4Sk=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "895d81b6228bbd50a6ef22f5a58a504ca99763ea", + "rev": "26a0f969549cf4d56f6e9046b9e0418b3f3b94a5", "type": "github" }, "original": { @@ -493,11 +493,11 @@ ] }, "locked": { - "lastModified": 1739078428, - "narHash": "sha256-9Q8lxL99vaTtK/myj+I6vQvzt3uJiCpazq0jovQswGs=", + "lastModified": 1740362141, + "narHash": "sha256-1eSoFF0derndmAU1xq4PPuSzO7rlkUDBo2ncjyVgc30=", "owner": "AshleyYakeley", "repo": "NixVirt", - "rev": "f2e4e9ad0b02bbd80c509b63d27a2f11359c16a8", + "rev": "3fc706593a35583863f8634a8fd2d7cfad7f1263", "type": "github" }, "original": { @@ -508,11 +508,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1740646007, + "narHash": "sha256-dMReDQobS3kqoiUCQIYI9c0imPXRZnBubX20yX/G5LE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "009b764ac98a3602d41fc68072eeec5d24fc0e49", "type": "github" }, "original": { @@ -630,11 +630,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1739206421, - "narHash": "sha256-PwQASeL2cGVmrtQYlrBur0U20Xy07uSWVnFup2PHnDs=", + "lastModified": 1741196730, + "narHash": "sha256-0Sj6ZKjCpQMfWnN0NURqRCQn2ob7YtXTAOTwCuz7fkA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44534bc021b85c8d78e465021e21f33b856e2540", + "rev": "48913d8f9127ea6530a2a2f1bd4daa1b8685d8a3", "type": "github" }, "original": { @@ -678,11 +678,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1741173522, + "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049", "type": "github" }, "original": { @@ -748,11 +748,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1738741221, - "narHash": "sha256-UiTOA89yQV5YNlO1ZAp4IqJUGWOnTyBC83netvt8rQE=", + "lastModified": 1741163974, + "narHash": "sha256-QehWX1ik9vqkylkbvdpO5XZKaqf2fsE92iMEyRBW2qI=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "be1fe795035d3d36359ca9135b26dcc5321b31fb", + "rev": "98293f0b368f24c48e05aaa2359dcc0de15e976f", "type": "github" }, "original": { @@ -891,11 +891,11 @@ ] }, "locked": { - "lastModified": 1739262228, - "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", + "lastModified": 1741043164, + "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", + "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", "type": "github" }, "original": { @@ -983,16 +983,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1730166465, - "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=", + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.5", + "ref": "v0.5.1", "repo": "xwayland-satellite", "type": "github" } @@ -1000,11 +1000,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1739246919, - "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", + "lastModified": 1741140299, + "narHash": "sha256-Y2bPO92Yg5HcH5ORvrVOQb4wRGEapGEteHXGtNvboxk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", + "rev": "10cb041a80bb815cc1789cfa305923f1f9e3713d", "type": "github" }, "original": { diff --git a/hosts/surtr/postgresql/default.nix b/hosts/surtr/postgresql/default.nix index 583e4443..059f4088 100644 --- a/hosts/surtr/postgresql/default.nix +++ b/hosts/surtr/postgresql/default.nix @@ -89,6 +89,10 @@ in { "d /var/spool/pgbackrest 0750 postgres postgres - -" ]; + systemd.services.postgresql.serviceConfig = { + ReadWritePaths = [ "/var/spool/pgbackrest" "/var/lib/pgbackrest/archive/surtr" ]; + }; + systemd.services.migrate-postgresql = { after = [ "postgresql.service" ]; bindsTo = [ "postgresql.service" ]; diff --git a/overlays/swayosd/default.nix b/overlays/swayosd/default.nix index 28c8f1b9..d8807b41 100644 --- a/overlays/swayosd/default.nix +++ b/overlays/swayosd/default.nix @@ -4,7 +4,7 @@ cargoDeps = prev.rustPlatform.fetchCargoTarball { inherit (oldAttrs) pname; inherit version src; - hash = "sha256-Anrk8p76HKZcNavYdi9l1oYahduLrb7Lf7knQK7Hy5E="; + hash = "sha256-s2vgyQP6J3i0q2o/Tt8dYoamBH3vrI/FNJYteHO8v5Q="; }; nativeBuildInputs = with final; [ wrapGAppsHook4 diff --git a/user-profiles/mpv/default.nix b/user-profiles/mpv/default.nix index 83eba2a9..94f241c8 100644 --- a/user-profiles/mpv/default.nix +++ b/user-profiles/mpv/default.nix @@ -10,7 +10,7 @@ (pkgs.stdenv.mkDerivation (sources.mpv-reload // rec { installPhase = '' install -d $out/share/mpv/scripts - install -m 0644 reload.lua $out/share/mpv/scripts/${passthru.scriptName} + install -m 0644 main.lua $out/share/mpv/scripts/${passthru.scriptName} ''; passthru.scriptName = "reload.lua"; diff --git a/user-profiles/zsh/default.nix b/user-profiles/zsh/default.nix index daeb7e82..428e2459 100644 --- a/user-profiles/zsh/default.nix +++ b/user-profiles/zsh/default.nix @@ -10,7 +10,7 @@ in { enable = true; autocd = true; enableCompletion = true; - + plugins = [ { name = "powerlevel10k"; file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme"; diff --git a/user-profiles/zsh/zshrc b/user-profiles/zsh/zshrc index a83a8069..7d0c1a16 100644 --- a/user-profiles/zsh/zshrc +++ b/user-profiles/zsh/zshrc @@ -27,4 +27,6 @@ bindkey ';5D' emacs-backward-word autoload -Uz url-quote-magic bracketed-paste-magic zle -N self-insert url-quote-magic -zle -N bracketed-paste bracketed-paste-magic \ No newline at end of file +zle -N bracketed-paste bracketed-paste-magic + +setopt extended_glob -- cgit v1.2.3