all: Rework system structureHEADmain

35 files changed, 8 insertions, 220 deletions

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/.config/kitty/kitty.conf b/desktop/Config/kitty/kitty.conf
index 8fd84e5..8fd84e5 100644
--- a/desktop/.config/kitty/kitty.conf
+++ b/desktop/Config/kitty/kitty.conf
diff --git a/desktop/.config/kitty/quick-access-terminal.conf b/desktop/Config/kitty/quick-access-terminal.conf
index 80a6f0c..80a6f0c 100644
--- a/desktop/.config/kitty/quick-access-terminal.conf
+++ b/desktop/Config/kitty/quick-access-terminal.conf
diff --git a/desktop/.local/bin/barstatus b/desktop/Local/bin/barstatus
index 9a8d79f..ecb461c 100755
--- a/desktop/.local/bin/barstatus
+++ b/desktop/Local/bin/barstatus
@@ -1,5 +1,5 @@
 #!/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 "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
diff --git a/desktop/.local/bin/kittenbar b/desktop/Local/bin/kittenbar
index a2b14c2..a2b14c2 100755
--- a/desktop/.local/bin/kittenbar
+++ b/desktop/Local/bin/kittenbar
diff --git a/desktop/.local/share/barmodules/battery.sh b/desktop/Local/share/barmodules/battery.sh
index 9ff7330..9ff7330 100755
--- a/desktop/.local/share/barmodules/battery.sh
+++ b/desktop/Local/share/barmodules/battery.sh
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
index ae04fcc..ae04fcc 100755
--- a/desktop/.local/share/barmodules/ice.sh
+++ b/desktop/Local/share/barmodules/ice.sh
diff --git a/desktop/.local/share/barmodules/mpv.sh b/desktop/Local/share/barmodules/mpv.sh
index 78b2f7a..a3fe2ec 100755
--- a/desktop/.local/share/barmodules/mpv.sh
+++ b/desktop/Local/share/barmodules/mpv.sh
@@ -3,4 +3,6 @@
 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
index a0ec01e..a0ec01e 100755
--- a/desktop/.local/share/barmodules/qmmp.sh
+++ b/desktop/Local/share/barmodules/qmmp.sh
diff --git a/fish/.config/fish/config.fish b/fish/Config/fish/config.fish
index f7b919a..af29a37 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/Config/fish/config.fish
@@ -13,6 +13,9 @@ if status is-interactive
     alias :ytdlp "yt-dlp (wl-paste)"
     alias :download "curl -SL (wl-paste) -o"
     alias :play "mpv --keep-open (wl-paste) > /tmp/mpvout"
+    if test (hostname) = "cherryblossom"
+	alias :phone "sshfs defaultuser@tulip:/home/defaultuser Phone -o allow_other"
+    end
     if test (hostname) = "bamboo"
         alias :vm vm.sh
 	alias :launchvm launchvm.sh
diff --git a/fish/.config/fish/fish_variables b/fish/Config/fish/fish_variables
index 72fe39c..72fe39c 100644
--- a/fish/.config/fish/fish_variables
+++ b/fish/Config/fish/fish_variables
diff --git a/fish/.config/fish/functions/fish_greeting.fish b/fish/Config/fish/functions/fish_greeting.fish
index 3b024f3..3b024f3 100644
--- a/fish/.config/fish/functions/fish_greeting.fish
+++ b/fish/Config/fish/functions/fish_greeting.fish
diff --git a/fish/.config/fish/functions/fish_prompt.fish b/fish/Config/fish/functions/fish_prompt.fish
index 3a5c04d..3a5c04d 100644
--- a/fish/.config/fish/functions/fish_prompt.fish
+++ b/fish/Config/fish/functions/fish_prompt.fish
diff --git a/fish/.local/bin/git.sh b/fish/Local/bin/git.sh
index 2d4eb43..2d4eb43 100755
--- a/fish/.local/bin/git.sh
+++ b/fish/Local/bin/git.sh
diff --git a/fish/.local/bin/launch.sh b/fish/Local/bin/launch.sh
index 169b911..169b911 100755
--- a/fish/.local/bin/launch.sh
+++ b/fish/Local/bin/launch.sh
diff --git a/fish/.local/bin/launchvm.sh b/fish/Local/bin/launchvm.sh
index bd71fb4..bd71fb4 100755
--- a/fish/.local/bin/launchvm.sh
+++ b/fish/Local/bin/launchvm.sh
diff --git a/fish/.local/bin/mediactl.sh b/fish/Local/bin/mediactl.sh
index 40ef71a..40ef71a 100755
--- a/fish/.local/bin/mediactl.sh
+++ b/fish/Local/bin/mediactl.sh
diff --git a/fish/.local/bin/sysctls.sh b/fish/Local/bin/sysctls.sh
index ab72c13..ab72c13 100755
--- a/fish/.local/bin/sysctls.sh
+++ b/fish/Local/bin/sysctls.sh
diff --git a/fish/.local/bin/upload.sh b/fish/Local/bin/upload.sh
index 1ec895a..1ec895a 100755
--- a/fish/.local/bin/upload.sh
+++ b/fish/Local/bin/upload.sh
diff --git a/fish/.local/bin/vm.sh b/fish/Local/bin/vm.sh
index d56d201..d56d201 100755
--- a/fish/.local/bin/vm.sh
+++ b/fish/Local/bin/vm.sh
diff --git a/foot/.config/foot/foot.ini b/foot/Config/foot/foot.ini
index 77326a8..77326a8 100644
--- a/foot/.config/foot/foot.ini
+++ b/foot/Config/foot/foot.ini
diff --git a/mpv/.config/mpv/mpv.conf b/mpv/Config/mpv/mpv.conf
index 8394adf..8394adf 100644
--- a/mpv/.config/mpv/mpv.conf
+++ b/mpv/Config/mpv/mpv.conf
diff --git a/rc/.config/rc/rc.conf b/rc/Config/rc/rc.conf
index 239bd8d..239bd8d 100644
--- a/rc/.config/rc/rc.conf
+++ b/rc/Config/rc/rc.conf
diff --git a/rc/.config/rc/runlevels/gui/autodarkmode b/rc/Config/rc/runlevels/gui/autodarkmode
index 7b342a9..7b342a9 100755
--- a/rc/.config/rc/runlevels/gui/autodarkmode
+++ b/rc/Config/rc/runlevels/gui/autodarkmode
diff --git a/rc/.config/rc/runlevels/gui/footserver b/rc/Config/rc/runlevels/gui/footserver
index d1a54cf..d1a54cf 100755
--- a/rc/.config/rc/runlevels/gui/footserver
+++ b/rc/Config/rc/runlevels/gui/footserver
diff --git a/rc/.config/rc/runlevels/gui/himitsu-secret-service b/rc/Config/rc/runlevels/gui/himitsu-secret-service
index 5d01cdb..5d01cdb 120000
--- a/rc/.config/rc/runlevels/gui/himitsu-secret-service
+++ b/rc/Config/rc/runlevels/gui/himitsu-secret-service
diff --git a/rc/.config/rc/runlevels/gui/himitsud b/rc/Config/rc/runlevels/gui/himitsud
index 949b50b..949b50b 120000
--- a/rc/.config/rc/runlevels/gui/himitsud
+++ b/rc/Config/rc/runlevels/gui/himitsud
diff --git a/rc/.config/rc/runlevels/gui/hissh-agent b/rc/Config/rc/runlevels/gui/hissh-agent
index 9c20203..9c20203 120000
--- a/rc/.config/rc/runlevels/gui/hissh-agent
+++ b/rc/Config/rc/runlevels/gui/hissh-agent
diff --git a/rc/.config/rc/runlevels/gui/kittenbar b/rc/Config/rc/runlevels/gui/kittenbar
index 1139517..1139517 100755
--- a/rc/.config/rc/runlevels/gui/kittenbar
+++ b/rc/Config/rc/runlevels/gui/kittenbar
diff --git a/rc/.config/rc/runlevels/gui/pipewire b/rc/Config/rc/runlevels/gui/pipewire
index 76a0f19..76a0f19 100755
--- a/rc/.config/rc/runlevels/gui/pipewire
+++ b/rc/Config/rc/runlevels/gui/pipewire
diff --git a/rc/.config/rc/runlevels/gui/pipewire-pulse b/rc/Config/rc/runlevels/gui/pipewire-pulse
index af7de86..af7de86 100755
--- a/rc/.config/rc/runlevels/gui/pipewire-pulse
+++ b/rc/Config/rc/runlevels/gui/pipewire-pulse
diff --git a/rc/.config/rc/runlevels/gui/swaybg b/rc/Config/rc/runlevels/gui/swaybg
index 37fbcb2..37fbcb2 100755
--- a/rc/.config/rc/runlevels/gui/swaybg
+++ b/rc/Config/rc/runlevels/gui/swaybg
diff --git a/rc/.config/rc/runlevels/gui/wireplumber b/rc/Config/rc/runlevels/gui/wireplumber
index ea4c6f2..ea4c6f2 100755
--- a/rc/.config/rc/runlevels/gui/wireplumber
+++ b/rc/Config/rc/runlevels/gui/wireplumber