From 0a4a0737ff53fd56ccee9c5f94bc244b375afccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elias=20Schr=C3=B6ter?= Date: Sun, 31 May 2026 08:35:22 +0200 Subject: [PATCH] update and adapt setup to changes --- configuration.nix | 2 +- flake.lock | 102 +++++++++--------- home/default.nix | 7 -- home/programs/eww/src/bar.yuck | 20 +++- home/programs/eww/src/scripts/ristate.sh | 8 -- home/programs/eww/src/scripts/ristate_read.sh | 39 +++---- home/programs/filebrowser/default.nix | 3 + home/programs/nixvim/default.nix | 5 +- home/programs/thunderbird.nix | 7 -- home/programs/vscode.nix | 2 +- home/programs/zoom.nix | 2 + home/services/gpg-agent.nix | 2 +- 12 files changed, 99 insertions(+), 100 deletions(-) delete mode 100755 home/programs/eww/src/scripts/ristate.sh diff --git a/configuration.nix b/configuration.nix index 479b313..dce7a42 100644 --- a/configuration.nix +++ b/configuration.nix @@ -184,10 +184,10 @@ in udisks2.enable = true; }; - # Set stateVersion. Leave it as set. nixpkgs.config = { allowUnfree = true; permittedInsecurePackages = [ "electron-32.3.3" ]; }; + system.stateVersion = "26.05"; } diff --git a/flake.lock b/flake.lock index a911c32..ef4174b 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1774799062, - "narHash": "sha256-U9RGxFsLeKivD1+7sVXj5TltHGfB4m/dkn3dENT2fSM=", + "lastModified": 1779876564, + "narHash": "sha256-0cPac2/hEW5hnfNaKd+fHVjWb3dScO2VyExme1vIZDQ=", "owner": "catppuccin", "repo": "nix", - "rev": "948a8ee84858d053b83f01c8c168f9f4347937e6", + "rev": "7d283dea9a4e25cfa9a544eb40933d256cb57957", "type": "github" }, "original": { @@ -26,11 +26,11 @@ ] }, "locked": { - "lastModified": 1772408722, - "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1775143651, - "narHash": "sha256-S0RqAyDPMTcv9vASMaE8eY1QexFysAOdnxUxFHIPOyE=", + "lastModified": 1779726696, + "narHash": "sha256-/p37CB5n6Wpw250b0Lq0CYwNq2D8uGKzDoBulyLcQqA=", "owner": "nix-community", "repo": "home-manager", - "rev": "d166a078541982a76f14d3e06e9665fa5c9ed85e", + "rev": "1a95e2efb477959b70b4a14c51035975c0481df6", "type": "github" }, "original": { @@ -126,11 +126,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1775138742, - "narHash": "sha256-cyipL9p0VzyZT0wa+3KkeJYvtEYzyI1PjBOnGU8z3gI=", + "lastModified": 1779840270, + "narHash": "sha256-bXW8ErSJJD1XnPvNrGvMYAOHqpH8uaIzovK6UWTIybM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "0fff256cfbc6978e711c43555df210d46940e943", + "rev": "145c6bcb4b6b34781827ca0ac8356cc5da08c098", "type": "github" }, "original": { @@ -142,11 +142,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1774915197, - "narHash": "sha256-yor+eo8CVi7wBp7CjAMQnVoK+m197gsl7MvUzaqicns=", + "lastModified": 1779837173, + "narHash": "sha256-JI/pXTMZA33WAlgsO7gEq23CeKIqKEyV25G5BqN7FDw=", "owner": "neovim", "repo": "neovim", - "rev": "dbc4800dda2b0dc3290dc79955f857256e0694e2", + "rev": "b3dfa86e02b0ce0f3ef9bc7b90dbbd790e7da31e", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1775098553, - "narHash": "sha256-OFWIVY1vzAbPE73ksKAMsFh11AXZ3MjIymRQ90Butnc=", + "lastModified": 1779855493, + "narHash": "sha256-03zI9JM/tz+APwMvVgKXSeLhAM0oev+58/Xs//4+Bbg=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "361b17a5b2f4536a119c794a367a29b07691f941", + "rev": "70518f6c1987061b291bb53abfd7846d6838c23f", "type": "github" }, "original": { @@ -177,11 +177,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1778869304, + "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "type": "github" }, "original": { @@ -193,11 +193,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1774701658, - "narHash": "sha256-CIS/4AMUSwUyC8X5g+5JsMRvIUL3YUfewe8K4VrbsSQ=", + "lastModified": 1779694939, + "narHash": "sha256-Ly4j75O8ICaSQx3uxPnwk2x7PMF0XQvn5r0c3yBA7FI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b63fe7f000adcfa269967eeff72c64cafecbbebe", + "rev": "f9d8b65950353691ab56561e7c73d2e1063d810b", "type": "github" }, "original": { @@ -209,11 +209,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1779560665, + "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "type": "github" }, "original": { @@ -225,11 +225,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1779560665, + "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", "type": "github" }, "original": { @@ -241,11 +241,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1772419343, - "narHash": "sha256-QU3Cd5DJH7dHyMnGEFfPcZDaCAsJQ6tUD+JuUsYqnKU=", + "lastModified": 1776329215, + "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "93178f6a00c22fcdee1c6f5f9ab92f2072072ea9", + "rev": "b86751bc4085f48661017fa226dee99fab6c651b", "type": "github" }, "original": { @@ -264,11 +264,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1774802402, - "narHash": "sha256-L1UJ/zxKTyyaGGmytH6OYlgQ0HGSMhvPkvU+iz4Mkb8=", + "lastModified": 1779816597, + "narHash": "sha256-Kgod3gZlhSp6WozZ2pFaclXbWpjs6kQLAtldoxb85Lc=", "owner": "nix-community", "repo": "nixvim", - "rev": "cbd8536a05d1aae2593cb5c9ace1010c8c5845cb", + "rev": "297f9341476ba7f821a42d7a2805e206ef8c6ef8", "type": "github" }, "original": { @@ -283,11 +283,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1775159663, - "narHash": "sha256-KES+OClaN0Vy/BkjW60UFo3dnQWpjkd1vIKEoynnlk0=", + "lastModified": 1779896237, + "narHash": "sha256-YzY59P/YrX3gEGqjFwtIUzgTQKZhbX/Wj4PgKm/u+bE=", "owner": "nix-community", "repo": "NUR", - "rev": "008b7b102054965988abf26ea261314a2e6672d5", + "rev": "4098cdd0f88012976d35c0c007194fd35eceb5c9", "type": "github" }, "original": { @@ -317,11 +317,11 @@ ] }, "locked": { - "lastModified": 1772420823, - "narHash": "sha256-q3oVwz1Rx41D1D+F6vg41kpOkk3Zi3KwnkHEZp7DCGs=", + "lastModified": 1776741231, + "narHash": "sha256-k9G98qzn+7npROUaks8VqCFm7cFtEG8ulQLBBo5lItg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "458eea8d905c609e9d889423e6b8a1c7bc2f792c", + "rev": "02061303f7c4c964f7b4584dabd9e985b4cd442b", "type": "github" }, "original": { @@ -337,11 +337,11 @@ ] }, "locked": { - "lastModified": 1774910634, - "narHash": "sha256-B+rZDPyktGEjOMt8PcHKYmgmKoF+GaNAFJhguktXAo0=", + "lastModified": 1777944972, + "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=", "owner": "Mic92", "repo": "sops-nix", - "rev": "19bf3d8678fbbfbc173beaa0b5b37d37938db301", + "rev": "c591bf665727040c6cc5cb409079acb22dcce33c", "type": "github" }, "original": { @@ -387,11 +387,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1775132067, - "narHash": "sha256-JFcGvXwV9O55bUDY9MilD2+/qUPqYg9IHsdH6oJzCGw=", + "lastModified": 1779676204, + "narHash": "sha256-/DLVKPqrU3WuY99jrHjYuIR0yGl98mGS6izK5rC1gZM=", "owner": "sxyazi", "repo": "yazi", - "rev": "86b8f0779ca5406fb6fead8c248d3ab23c9b1db0", + "rev": "cf8b54179ea0de392629d93081afca9e5587225e", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 9bad426..84547cc 100644 --- a/home/default.nix +++ b/home/default.nix @@ -56,11 +56,4 @@ }; programs.home-manager.enable = true; - - nixpkgs.config = { - allowUnfree = true; - permittedInsecurePackages = [ - "electron-32.3.3" - ]; - }; } diff --git a/home/programs/eww/src/bar.yuck b/home/programs/eww/src/bar.yuck index bf0dfda..3e53774 100644 --- a/home/programs/eww/src/bar.yuck +++ b/home/programs/eww/src/bar.yuck @@ -198,8 +198,18 @@ :text "${date}"))) ;; ── River State ───────────────────────────────────────────────────── +(deflisten river_tag + :initial "" + `ristate -t | jq -r '.tags.Unknown[0] // empty'`) + +(deflisten river_title + :initial "-" + `ristate -w | jq -r '.title // "-"'`) + +(deflisten river_layout + :initial "-" + `ristate -l | jq -r '.layout // "-"'`) - (defvar ws1 "ws-empty") (defvar ws2 "ws-empty") (defvar ws3 "ws-empty") (defvar ws4 "ws-empty") @@ -220,7 +230,7 @@ :orientation "horizontal" :class "workspace-buttons" - (button :onclick "riverctl set-focused-tags 1" :class "workspace-button ${ws1}" (label :text "1")) + (button :onclick "riverctl set-focused-tags 1" :class "workspace-button ${if river_tag == \"1\" {\"ws-current\"} {\"ws-empty\"}}" (label :text "1")) (label :text " ") (button :onclick "riverctl set-focused-tags 2" :class "workspace-button ${ws2}" (label :text "2")) (label :text " ") @@ -232,7 +242,7 @@ (label :text " ") (button :onclick "riverctl set-focused-tags 6" :class "workspace-button ${ws6}" (label :text "6")) (label :text " ") - (button :onclick "riverctl set-focused-tags 7" :class "workspace-button ${ws7}" (label :text "7")) + (button :onclick "riverctl set-focused-tags 7" :class "workspace-button {if river_tag == \"1\" {\"ws-current\"} {\"ws-empty\"}}" (label :text "s")) (label :text " ") (button :onclick "riverctl set-focused-tags 8" :class "workspace-button ${ws8}" (label :text "8")) (label :text " ") @@ -241,11 +251,11 @@ (defwidget widgetWindows [] (label - :text "${windows}")) + :text "${river_title}")) (defwidget widgetLayouts [] (label - :text "${layouts}")) + :text "${river_layout}")) (defwidget widgetLogSeperator [] (label diff --git a/home/programs/eww/src/scripts/ristate.sh b/home/programs/eww/src/scripts/ristate.sh deleted file mode 100755 index 4251f0e..0000000 --- a/home/programs/eww/src/scripts/ristate.sh +++ /dev/null @@ -1,8 +0,0 @@ -TEMP_FILE="/tmp/river-eww-status" - -while true; do - ristate -t >"$TEMP_FILE.tmp" - ristate -w >>"$TEMP_FILE.tmp" - mv "$TEMP_FILE.tmp" "$TEMP_FILE" - sleep 1 -done diff --git a/home/programs/eww/src/scripts/ristate_read.sh b/home/programs/eww/src/scripts/ristate_read.sh index 9db811f..ba30ff0 100755 --- a/home/programs/eww/src/scripts/ristate_read.sh +++ b/home/programs/eww/src/scripts/ristate_read.sh @@ -1,32 +1,35 @@ -TEMP_FILE="/tmp/river-eww-status" +layout=$(ristate -l 2>/dev/null | jq -r '.layout // ""') +title=$(ristate -w 2>/dev/null | jq -r '.title // ""') +tags_json=$(ristate -t 2>/dev/null) +views_json=$(ristate -vt 2>/dev/null) -# Read last two lines (layout/tags and focused window) -json=$(tail -n2 "$TEMP_FILE" | head -n1) -win_json=$(tail -n1 "$TEMP_FILE") +mapfile -t focused_tags < <( + printf '%s\n' "$views_json" | + jq -r '.viewstag.Unknown // [] | .[] | tostring' +) -# Extract layout -layout=$(echo "$json" | jq -r '.layout // ""') +if [ "${#focused_tags[@]}" -eq 0 ]; then + mapfile -t focused_tags < <( + printf '%s\n' "$tags_json" | + jq -r '.tags.Unknown // [] | .[] | tostring' + ) +fi -# Extract focused window title -windows=$(echo "$win_json" | jq -r '.title // ""') - -# Extract focused tags as array -mapfile -t focused_tags < <(echo "$json" | jq -r '.tags.BOE // [] | .[]') - -# Update workspace classes for i in $(seq 1 9); do class="ws-empty" for tag in "${focused_tags[@]}"; do if [[ "$tag" == "$i" ]]; then class="ws-current" + echo "$tag - current" break fi done - eww update ws$i="$class" + eww update "ws$i=$class" done -# Update layout -eww update layouts="$layout" - -# Output focused window for widget +eww update "layouts=$layout" +echo "$layouts" +eww update "windows=$title" echo "$windows" + +echo "$title" diff --git a/home/programs/filebrowser/default.nix b/home/programs/filebrowser/default.nix index 3b00b41..8b91693 100644 --- a/home/programs/filebrowser/default.nix +++ b/home/programs/filebrowser/default.nix @@ -76,17 +76,20 @@ in plugin = { prepend_previewers = [ { + group = "preview"; run = "exifaudio"; mime = "audio/*"; } ]; prepend_fetchers = [ { + group = "fetcher"; id = "git"; url = "*"; run = "git"; } { + group = "fetcher"; id = "git"; url = "*/"; run = "git"; diff --git a/home/programs/nixvim/default.nix b/home/programs/nixvim/default.nix index 53a2e3e..edd2f12 100644 --- a/home/programs/nixvim/default.nix +++ b/home/programs/nixvim/default.nix @@ -12,7 +12,10 @@ enable = true; defaultEditor = true; - nixpkgs.useGlobalPackages = false; + nixpkgs = { + useGlobalPackages = false; + config.allowUnfree = true; + }; clipboard.providers.wl-copy.enable = true; keymaps = [ diff --git a/home/programs/thunderbird.nix b/home/programs/thunderbird.nix index 5757569..787ef4c 100644 --- a/home/programs/thunderbird.nix +++ b/home/programs/thunderbird.nix @@ -54,13 +54,6 @@ tls.enable = true; }; realName = "Elias Schröter"; - signature = { - text = '' - Mit freundlichen Grüßen, - Elias Schröter. - ''; - showSignature = "append"; - }; passwordCommand = "mail-password"; smtp = { host = "postout.lrz.de"; diff --git a/home/programs/vscode.nix b/home/programs/vscode.nix index 1f52350..9a6bc2f 100644 --- a/home/programs/vscode.nix +++ b/home/programs/vscode.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { - programs.vscode = { + programs.vscodium = { enable = true; package = pkgs.vscodium; profiles.default = { diff --git a/home/programs/zoom.nix b/home/programs/zoom.nix index 8285284..a1dab67 100644 --- a/home/programs/zoom.nix +++ b/home/programs/zoom.nix @@ -1,5 +1,7 @@ { pkgs, ... }: { + nixpkgs.config.allowUnfree = true; + home.packages = with pkgs; [ zoom-us ]; } diff --git a/home/services/gpg-agent.nix b/home/services/gpg-agent.nix index 737b47d..7721c2d 100644 --- a/home/services/gpg-agent.nix +++ b/home/services/gpg-agent.nix @@ -52,7 +52,7 @@ in enableNushellIntegration = true; defaultCacheTtl = 60; maxCacheTtl = 120; - enableSshSupport = true; + # enableSshSupport = true; sshKeys = [ "8E42E6C65D5F9894CFFF294851AB0CEB5F0B1FAA" ]; pinentry.package = pkgs.pinentry-gnome3; # under extraConfig