From b7dfa5fdb2330f1e1cd222365055c3d45ad473be Mon Sep 17 00:00:00 2001 From: Rose Date: Fri, 10 Oct 2025 11:29:10 +0200 Subject: all: Rework system structure --- desktop/.config/kitty/kitty.conf | 10 -- desktop/.config/kitty/quick-access-terminal.conf | 8 - desktop/.config/niri/config.kdl | 219 ----------------------- desktop/.local/bin/barstatus | 8 - desktop/.local/bin/kittenbar | 4 - desktop/.local/share/barmodules/battery.sh | 3 - desktop/.local/share/barmodules/ice.sh | 21 --- desktop/.local/share/barmodules/mpv.sh | 6 - desktop/.local/share/barmodules/qmmp.sh | 13 -- desktop/Config/kitty/kitty.conf | 10 ++ desktop/Config/kitty/quick-access-terminal.conf | 8 + desktop/Local/bin/barstatus | 8 + desktop/Local/bin/kittenbar | 4 + desktop/Local/share/barmodules/battery.sh | 3 + desktop/Local/share/barmodules/enabled/mpv.sh | 1 + desktop/Local/share/barmodules/enabled/qmmp.sh | 1 + desktop/Local/share/barmodules/ice.sh | 21 +++ desktop/Local/share/barmodules/mpv.sh | 8 + desktop/Local/share/barmodules/qmmp.sh | 13 ++ 19 files changed, 77 insertions(+), 292 deletions(-) delete mode 100644 desktop/.config/kitty/kitty.conf delete mode 100644 desktop/.config/kitty/quick-access-terminal.conf delete mode 100644 desktop/.config/niri/config.kdl delete mode 100755 desktop/.local/bin/barstatus delete mode 100755 desktop/.local/bin/kittenbar delete mode 100755 desktop/.local/share/barmodules/battery.sh delete mode 100755 desktop/.local/share/barmodules/ice.sh delete mode 100755 desktop/.local/share/barmodules/mpv.sh delete mode 100755 desktop/.local/share/barmodules/qmmp.sh create mode 100644 desktop/Config/kitty/kitty.conf create mode 100644 desktop/Config/kitty/quick-access-terminal.conf create mode 100755 desktop/Local/bin/barstatus create mode 100755 desktop/Local/bin/kittenbar create mode 100755 desktop/Local/share/barmodules/battery.sh create mode 120000 desktop/Local/share/barmodules/enabled/mpv.sh create mode 120000 desktop/Local/share/barmodules/enabled/qmmp.sh create mode 100755 desktop/Local/share/barmodules/ice.sh create mode 100755 desktop/Local/share/barmodules/mpv.sh create mode 100755 desktop/Local/share/barmodules/qmmp.sh (limited to 'desktop') diff --git a/desktop/.config/kitty/kitty.conf b/desktop/.config/kitty/kitty.conf deleted file mode 100644 index 8fd84e5..0000000 --- a/desktop/.config/kitty/kitty.conf +++ /dev/null @@ -1,10 +0,0 @@ -# font_family Misc Fixed -font_size 13.0 - - -# BEGIN_KITTY_FONTS -font_family family="OG Courier Zero Slash" -bold_font auto -italic_font auto -bold_italic_font auto -# END_KITTY_FONTS \ No newline at end of file diff --git a/desktop/.config/kitty/quick-access-terminal.conf b/desktop/.config/kitty/quick-access-terminal.conf deleted file mode 100644 index 80a6f0c..0000000 --- a/desktop/.config/kitty/quick-access-terminal.conf +++ /dev/null @@ -1,8 +0,0 @@ -lines 30 -columns 100 -edge top -background_opacity 0.90 -hide_on_focus_loss yes -grab_keyboard no -start_as_hidden yes -shell /usr/bin/fish diff --git a/desktop/.config/niri/config.kdl b/desktop/.config/niri/config.kdl deleted file mode 100644 index ae8bdb1..0000000 --- a/desktop/.config/niri/config.kdl +++ /dev/null @@ -1,219 +0,0 @@ -cursor { - xcursor-theme "whiteglass" - xcursor-size 21 -} - -input { - keyboard { - xkb { - layout "us" - variant "altgr-intl" - // variant "colemak" - // options "grp:win_space_toggle,compose:ralt,ctrl:nocaps" - } - numlock - } - - tablet { - map-to-output "DP-7" - } -} - -output "eDP-1" { - off -} - -output "DP-4" { - mode "1920x1080" - position x=0 y=0 -} - -output "DP-5" { - mode "1920x1080" - position x=0 y=0 -} - -output "DP-6" { - transform "90" - position x=-1080 y=-390 -} - -output "DP-7" { - mode "1920x1080" - position x=0 y=0 -} - -output "DP-8" { - transform "90" - position x=-1080 y=-390 -} - -output "DP-9" { - transform "90" - position x=-1080 y=-390 -} - -layout { - gaps 0 - - center-focused-column "never" - - preset-column-widths { - proportion 0.33333 - proportion 0.5 - proportion 0.66667 - } - - default-column-width { proportion 0.5; } - - focus-ring { - off - } - - border { - width 4 - active-color "#aa85e1" - inactive-color "#21222d" - urgent-color "#9b0000" - } - - tab-indicator { - width 9 - gap 0 - place-within-column - length total-proportion=1.0 - position "left" - active-color "#e78a4e" - } -} - -spawn-at-startup "openrc" "--user" "gui" -spawn-at-startup "kdeconnectd" -spawn-at-startup "kitten" "quick-access-terminal" -screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" - -prefer-no-csd - -animations { - slowdown 0.75 -} - -window-rule { - match app-id=r#"firefox$"# title="^Picture-in-Picture$" - open-floating true -} - -window-rule { - match app-id=r#"^org\.keepassxc\.KeePassXC$"# - match app-id=r#"^org\.gnome\.World\.Secrets$"# - block-out-from "screen-capture" -} - -hotkey-overlay { - skip-at-startup -} - -environment { - QT_QPA_PLATFORM "wayland" -} - -binds { - Mod+T hotkey-overlay-title="Open a Terminal: foot" { spawn "footclient"; } - Mod+D hotkey-overlay-title="Run an Application: kitten" { spawn "kitten" "quick-access-terminal"; } - Mod+E hotkey-overlay-title="Open emoji picker" { spawn "/home/lain/.local/bin/wofi-emoji"; } - Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; } - - XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.025+"; } - XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.025-"; } - XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } - XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; } - - Mod+O repeat=false { toggle-overview; } - - Mod+Q { close-window; } - - Mod+Left { focus-column-left; } - Mod+Down { focus-window-or-workspace-down; } - Mod+Up { focus-window-or-workspace-up; } - Mod+Right { focus-column-right; } - - Mod+Ctrl+Left { move-column-left; } - Mod+Ctrl+Down { move-window-down-or-to-workspace-down; } - Mod+Ctrl+Up { move-window-up-or-to-workspace-up; } - Mod+Ctrl+Right { move-column-right; } - - Mod+Home { focus-column-first; } - Mod+End { focus-column-last; } - Mod+Ctrl+Home { move-column-to-first; } - Mod+Ctrl+End { move-column-to-last; } - - Mod+Shift+Left { focus-monitor-left; } - Mod+Shift+Down { focus-monitor-down; } - Mod+Shift+Up { focus-monitor-up; } - Mod+Shift+Right { focus-monitor-right; } - - Mod+Shift+Ctrl+Left { move-column-to-monitor-left; } - Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } - Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } - Mod+Shift+Ctrl+Right { move-column-to-monitor-right; } - - Mod+Page_Down { focus-workspace-down; } - Mod+Page_Up { focus-workspace-up; } - Mod+U { focus-workspace-down; } - Mod+I { focus-workspace-up; } - Mod+Ctrl+Page_Down { move-column-to-workspace-down; } - Mod+Ctrl+Page_Up { move-column-to-workspace-up; } - Mod+Ctrl+U { move-column-to-workspace-down; } - Mod+Ctrl+I { move-column-to-workspace-up; } - - Mod+Shift+Page_Down { move-workspace-down; } - Mod+Shift+Page_Up { move-workspace-up; } - Mod+Shift+U { move-workspace-down; } - Mod+Shift+I { move-workspace-up; } - - Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } - Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } - Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } - Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } - Mod+Shift+WheelScrollDown { focus-column-right; } - Mod+Shift+WheelScrollUp { focus-column-left; } - Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } - Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } - - Mod+BracketLeft { consume-or-expel-window-left; } - Mod+BracketRight { consume-or-expel-window-right; } - Mod+Comma { consume-window-into-column; } - Mod+Period { expel-window-from-column; } - - Mod+R { switch-preset-column-width; } - Mod+Shift+R { switch-preset-window-height; } - Mod+Ctrl+R { reset-window-height; } - Mod+F { maximize-column; } - Mod+Shift+F { fullscreen-window; } - - Mod+Ctrl+F { expand-column-to-available-width; } - - Mod+C { center-column; } - Mod+Ctrl+C { center-visible-columns; } - - Mod+k { set-column-width "-10%"; } - Mod+m { set-column-width "+10%"; } - - Mod+Shift+k { set-window-height "-10%"; } - Mod+Shift+m { set-window-height "+10%"; } - - Mod+V { toggle-window-floating; } - Mod+Shift+V { switch-focus-between-floating-and-tiling; } - - Mod+W { toggle-column-tabbed-display; } - - Print { screenshot; } - Ctrl+Print { screenshot-screen; } - Alt+Print { screenshot-window; } - - Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } - - Mod+Shift+E { quit; } - Ctrl+Alt+Delete { quit; } - Mod+Shift+P { power-off-monitors; } -} diff --git a/desktop/.local/bin/barstatus b/desktop/.local/bin/barstatus deleted file mode 100755 index 9a8d79f..0000000 --- a/desktop/.local/bin/barstatus +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -echo -n "SPKR: $(wpctl get-volume @DEFAULT_AUDIO_SINK@ 2> /dev/null | sed 's/\.//g' )% ; MIC: $(wpctl get-volume @DEFAULT_AUDIO_SOURCE@ 2> /dev/null | sed 's/\.//g')%" -echo -n " | " -echo -n "$(date)" -for f in ${HOME}/.local/share/barmodules/enabled/*; do - echo -n " | " - [ -x "$f" ] && [ ! -d "$f" ] && "$f" -done diff --git a/desktop/.local/bin/kittenbar b/desktop/.local/bin/kittenbar deleted file mode 100755 index a2b14c2..0000000 --- a/desktop/.local/bin/kittenbar +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -kitten panel -o allow_remote_control=socket-only \ - --lines=1 \ - --listen-on=unix:${XDG_RUNTIME_DIR}/kittenbar watch -t -n1 /home/lain/.local/bin/barstatus diff --git a/desktop/.local/share/barmodules/battery.sh b/desktop/.local/share/barmodules/battery.sh deleted file mode 100755 index 9ff7330..0000000 --- a/desktop/.local/share/barmodules/battery.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -echo -n "BATTERY: $(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep 'percentage' | tr -d ' ' | sed 's/:/: /g'); " -echo -n "$(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep 'state' | tr -d ' ' | sed 's/:/: /g')" diff --git a/desktop/.local/share/barmodules/ice.sh b/desktop/.local/share/barmodules/ice.sh deleted file mode 100755 index ae04fcc..0000000 --- a/desktop/.local/share/barmodules/ice.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/bash - -iceStatus=$(curl https://iceportal.de/api1/rs/status 2>/dev/null) -iceTrip=$(curl https://iceportal.de/api1/rs/tripInfo/trip 2> /dev/null) - -nextStopID=$(echo ${iceTrip} | jq -r .trip.stopInfo.actualNext) -nextStopObject=$(echo ${iceTrip} | jq -c ".trip.stops | map(select(.station.evaNr == \"${nextStopID}\"))") - -scheduledArrival=$(echo ${nextStopObject} | jq -r ".[0].timetable.scheduledDepartureTime/1000") -actualArrival=$(echo ${nextStopObject} | jq -r ".[0].timetable.actualArrivalTime/1000") -arrivalDelay=$(echo ${nextStopObject} | jq -r ".[0].timetable.arrivalDelay") - -trainDistanceSinceStop=$(echo ${iceTrip} | jq -r ".trip.distanceFromLastStop") -nextStopDistance=$(echo ${nextStopObject} | jq -r "(.[0].info.distance-${trainDistanceSinceStop})/1000") - - -echo -n "ICE $(echo ${iceTrip} | jq -r '.trip.vzn'): " -echo -n "Speed: $(echo ${iceStatus} | jq -r '.speed')km/h; " -echo -n "Next Stop: $(echo ${nextStopObject} | jq -r '.[0].station.name') " -echo -n $(date --date="@${actualArrival}" +"%H:%M")" (${arrivalDelay}) " -echo -n "${nextStopDistance}km" diff --git a/desktop/.local/share/barmodules/mpv.sh b/desktop/.local/share/barmodules/mpv.sh deleted file mode 100755 index 78b2f7a..0000000 --- a/desktop/.local/share/barmodules/mpv.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -if [ -f /tmp/mpvout ]; then - echo -n "mpv: " - tail -1 /tmp/mpvout | tr -d '\n' -fi diff --git a/desktop/.local/share/barmodules/qmmp.sh b/desktop/.local/share/barmodules/qmmp.sh deleted file mode 100755 index a0ec01e..0000000 --- a/desktop/.local/share/barmodules/qmmp.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -pidof qmmp 2> /dev/null > /dev/null -if [ $? -eq 0 ]; then - nowplaying=$(qmmp --nowplaying '%p - %a: %t') - if [ ${#nowplaying} -gt 80 ]; then - echo -n "${nowplaying:0:77}... " - else - echo -n "$nowplaying" - fi - echo -n "$(qmmp --status | head -1)" -else - echo -n "qmmp: Exited" -fi diff --git a/desktop/Config/kitty/kitty.conf b/desktop/Config/kitty/kitty.conf new file mode 100644 index 0000000..8fd84e5 --- /dev/null +++ b/desktop/Config/kitty/kitty.conf @@ -0,0 +1,10 @@ +# font_family Misc Fixed +font_size 13.0 + + +# BEGIN_KITTY_FONTS +font_family family="OG Courier Zero Slash" +bold_font auto +italic_font auto +bold_italic_font auto +# END_KITTY_FONTS \ No newline at end of file diff --git a/desktop/Config/kitty/quick-access-terminal.conf b/desktop/Config/kitty/quick-access-terminal.conf new file mode 100644 index 0000000..80a6f0c --- /dev/null +++ b/desktop/Config/kitty/quick-access-terminal.conf @@ -0,0 +1,8 @@ +lines 30 +columns 100 +edge top +background_opacity 0.90 +hide_on_focus_loss yes +grab_keyboard no +start_as_hidden yes +shell /usr/bin/fish diff --git a/desktop/Local/bin/barstatus b/desktop/Local/bin/barstatus new file mode 100755 index 0000000..ecb461c --- /dev/null +++ b/desktop/Local/bin/barstatus @@ -0,0 +1,8 @@ +#!/bin/sh +echo -n "SPKR: $(wpctl get-volume @DEFAULT_AUDIO_SINK@ 2> /dev/null | sed 's/0\.//g' | sed 's/\.//g' )% ; MIC: $(wpctl get-volume @DEFAULT_AUDIO_SOURCE@ 2> /dev/null | sed 's/0\.//g' | sed 's/\.//g')%" +echo -n " | " +echo -n "$(date)" +for f in ${HOME}/.local/share/barmodules/enabled/*; do + echo -n " | " + [ -x "$f" ] && [ ! -d "$f" ] && "$f" +done diff --git a/desktop/Local/bin/kittenbar b/desktop/Local/bin/kittenbar new file mode 100755 index 0000000..a2b14c2 --- /dev/null +++ b/desktop/Local/bin/kittenbar @@ -0,0 +1,4 @@ +#!/bin/sh +kitten panel -o allow_remote_control=socket-only \ + --lines=1 \ + --listen-on=unix:${XDG_RUNTIME_DIR}/kittenbar watch -t -n1 /home/lain/.local/bin/barstatus diff --git a/desktop/Local/share/barmodules/battery.sh b/desktop/Local/share/barmodules/battery.sh new file mode 100755 index 0000000..9ff7330 --- /dev/null +++ b/desktop/Local/share/barmodules/battery.sh @@ -0,0 +1,3 @@ +#!/bin/sh +echo -n "BATTERY: $(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep 'percentage' | tr -d ' ' | sed 's/:/: /g'); " +echo -n "$(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep 'state' | tr -d ' ' | sed 's/:/: /g')" diff --git a/desktop/Local/share/barmodules/enabled/mpv.sh b/desktop/Local/share/barmodules/enabled/mpv.sh new file mode 120000 index 0000000..d0c9416 --- /dev/null +++ b/desktop/Local/share/barmodules/enabled/mpv.sh @@ -0,0 +1 @@ +../mpv.sh \ No newline at end of file diff --git a/desktop/Local/share/barmodules/enabled/qmmp.sh b/desktop/Local/share/barmodules/enabled/qmmp.sh new file mode 120000 index 0000000..7a7bc04 --- /dev/null +++ b/desktop/Local/share/barmodules/enabled/qmmp.sh @@ -0,0 +1 @@ +../qmmp.sh \ No newline at end of file diff --git a/desktop/Local/share/barmodules/ice.sh b/desktop/Local/share/barmodules/ice.sh new file mode 100755 index 0000000..ae04fcc --- /dev/null +++ b/desktop/Local/share/barmodules/ice.sh @@ -0,0 +1,21 @@ +#!/usr/bin/bash + +iceStatus=$(curl https://iceportal.de/api1/rs/status 2>/dev/null) +iceTrip=$(curl https://iceportal.de/api1/rs/tripInfo/trip 2> /dev/null) + +nextStopID=$(echo ${iceTrip} | jq -r .trip.stopInfo.actualNext) +nextStopObject=$(echo ${iceTrip} | jq -c ".trip.stops | map(select(.station.evaNr == \"${nextStopID}\"))") + +scheduledArrival=$(echo ${nextStopObject} | jq -r ".[0].timetable.scheduledDepartureTime/1000") +actualArrival=$(echo ${nextStopObject} | jq -r ".[0].timetable.actualArrivalTime/1000") +arrivalDelay=$(echo ${nextStopObject} | jq -r ".[0].timetable.arrivalDelay") + +trainDistanceSinceStop=$(echo ${iceTrip} | jq -r ".trip.distanceFromLastStop") +nextStopDistance=$(echo ${nextStopObject} | jq -r "(.[0].info.distance-${trainDistanceSinceStop})/1000") + + +echo -n "ICE $(echo ${iceTrip} | jq -r '.trip.vzn'): " +echo -n "Speed: $(echo ${iceStatus} | jq -r '.speed')km/h; " +echo -n "Next Stop: $(echo ${nextStopObject} | jq -r '.[0].station.name') " +echo -n $(date --date="@${actualArrival}" +"%H:%M")" (${arrivalDelay}) " +echo -n "${nextStopDistance}km" diff --git a/desktop/Local/share/barmodules/mpv.sh b/desktop/Local/share/barmodules/mpv.sh new file mode 100755 index 0000000..a3fe2ec --- /dev/null +++ b/desktop/Local/share/barmodules/mpv.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if [ -f /tmp/mpvout ]; then + echo -n "mpv: " + tail -1 /tmp/mpvout | tr -d '\n' +else + echo -n "mpv: stopped" +fi diff --git a/desktop/Local/share/barmodules/qmmp.sh b/desktop/Local/share/barmodules/qmmp.sh new file mode 100755 index 0000000..a0ec01e --- /dev/null +++ b/desktop/Local/share/barmodules/qmmp.sh @@ -0,0 +1,13 @@ +#!/bin/sh +pidof qmmp 2> /dev/null > /dev/null +if [ $? -eq 0 ]; then + nowplaying=$(qmmp --nowplaying '%p - %a: %t') + if [ ${#nowplaying} -gt 80 ]; then + echo -n "${nowplaying:0:77}... " + else + echo -n "$nowplaying" + fi + echo -n "$(qmmp --status | head -1)" +else + echo -n "qmmp: Exited" +fi -- cgit v1.2.3