refactor

TARGETS.sh

@@ -1,7 +1,7 @@
 readonly TARGETS="\
 colors:.config/terminal-colors.d
 less:.lesskey .infokey
-tmux:.config/tmux .tmux .config/systemd/user/tmux.service .local/bin/tmux_start_session.sh .local/bin/tmux_list_sessions.sh .local/bin/tmux_attach_session.sh .local/bin/tmux_kill_sessions.sh .local/bin/tmux_start_projects.sh %copypasta
+tmux:.config/tmux .tmux .config/systemd/user/tmux.service %copypasta
 t:
 note:
 psw:
@@ -12,7 +12,7 @@ ssh:
 git:.config/git .local/bin/ga
 ranger:.config/ranger
 gpg:
-sway:.config/sway .config/i3blocks .config/mako .config/mimeapps.list .config/rofi .local/bin/screenshot .local/bin/i3blocks_helper .local/bin/layout_change_handler .config/swaylock .Xresources .local/bin/sway_swap_workspaces .local/bin/slm .local/bin/slm_rofi %copypasta %pomodoro
+sway:.config/sway .config/i3blocks .config/mako .config/mimeapps.list .config/rofi .local/bin/screenshot .config/swaylock .Xresources .local/bin/slm .local/bin/slm_rofi %copypasta %pomodoro
 pomodoro:
 bat:.config/bat
 font:

home/user/.config/i3blocks/config

@@ -6,59 +6,59 @@ color=#FFFFFF
 interval=5
 
 [wireless]
-command=i3blocks_helper wireless
+command=~/.config/i3blocks/scripts/builder.sh wireless
 interval=10
 
 [ethernet]
-command=i3blocks_helper ethernet
+command=~/.config/i3blocks/scripts/builder.sh ethernet
 interval=10
 
 [diskroot]
-command=i3blocks_helper disk_root
+command=~/.config/i3blocks/scripts/builder.sh disk_root
 interval=30
 
 [diskhome]
-command=i3blocks_helper disk_home
+command=~/.config/i3blocks/scripts/builder.sh disk_home
 interval=30
 
 [memory]
-command=i3blocks_helper memory
+command=~/.config/i3blocks/scripts/builder.sh memory
 interval=5
 
 [cpu_usage]
-command=i3blocks_helper cpu_usage
+command=~/.config/i3blocks/scripts/builder.sh cpu_usage
 interval=5
 
 [cpu_temp]
-command=i3blocks_helper cpu_temp
+command=~/.config/i3blocks/scripts/builder.sh cpu_temp
 interval=5
 
 [bluetooth]
-command=i3blocks_helper bluetooth_battery
+command=~/.config/i3blocks/scripts/builder.sh bluetooth_battery
 interval=5
 
 [battery]
-command=i3blocks_helper battery
+command=~/.config/i3blocks/scripts/builder.sh battery
 interval=30
 
 [volume]
-command=i3blocks_helper volume
+command=~/.config/i3blocks/scripts/builder.sh volume
 interval=1
 signal=1
 
 [pomodoro]
-command=i3blocks_helper pomodoro
+command=~/.config/i3blocks/scripts/builder.sh pomodoro
 interval=1
 signal=2
 
 [language]
-command=i3blocks_helper language
+command=~/.config/i3blocks/scripts/builder.sh language
 signal=1
 
 [userhost]
-command=i3blocks_helper userhost
+command=~/.config/i3blocks/scripts/builder.sh userhost
 signal=1
 
 [time]
-command=i3blocks_helper time
+command=~/.config/i3blocks/scripts/builder.sh time
 interval=30

home/user/.config/sway/bar.conf

@@ -14,4 +14,4 @@ bar {
     modifier $mod
 }
 
-exec --no-startup-id layout_change_handler
+exec ~/.config/i3blocks/scripts/layout_change_handler.sh

home/user/.config/sway/bindings.conf

@@ -30,7 +30,7 @@ bindsym --release XF86Go exec --no-startup-id pactl set-source-mute @DEFAULT_SOU
 
 bindsym $mod+XF86AudioMicMute exec --no-startup-id pactl list short sources | awk '/input.*RUNNING/ {system("pactl set-source-mute " $1 " toggle")}'     ## Find and mute mics
 
-bindsym --to-code $mod+s exec sway_swap_workspaces
+bindsym --to-code $mod+s exec ~/.config/sway/scripts/swap_workspaces.sh
 
 bindsym --to-code $mod+Shift+q kill
 bindsym --to-code $mod+Shift+r reload

home/user/.config/tmux/mappings.conf

@@ -214,7 +214,7 @@ bind-key f copy-mode \; send-keys -X search-backward \
 
 
 # Session managment
-bind a display-popup -EE -w 80% -h 80% -B '~/.local/bin/tmux_attach_session.sh'
-bind s display-popup -EE -w 80% -h 80% -B '~/.local/bin/tmux_start_session.sh'
-bind S display-popup -EE -w 40% -h 80% -B '~/.local/bin/tmux_start_projects.sh'
-bind k display-popup -EE -w 80% -h 80% -B '~/.local/bin/tmux_kill_sessions.sh'
+bind a display-popup -EE -w 80% -h 80% -B '~/.config/tmux/scripts/tmux_attach_session.sh'
+bind s display-popup -EE -w 80% -h 80% -B '~/.config/tmux/scripts/tmux_start_session.sh'
+bind S display-popup -EE -w 40% -h 80% -B '~/.config/tmux/scripts/tmux_start_projects.sh'
+bind k display-popup -EE -w 80% -h 80% -B '~/.config/tmux/scripts/tmux_kill_sessions.sh'

home/user/.config/tmux/scripts/tmux_attach_session.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 
-readonly tmux_list_sessions_script="${HOME}/.local/bin/tmux_list_sessions.sh"
+readonly tmux_list_sessions_script="${HOME}/.config/tmux/scripts/tmux_list_sessions.sh"
 
 export FZF_DEFAULT_OPTS="\
 ${FZF_DEFAULT_OPTS}

home/user/.config/tmux/scripts/tmux_kill_sessions.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 
-readonly tmux_list_sessions_script="${HOME}/.local/bin/tmux_list_sessions.sh"
+readonly tmux_list_sessions_script="${HOME}/.config/tmux/scripts/tmux_list_sessions.sh"
 
 export FZF_DEFAULT_OPTS="\
 ${FZF_DEFAULT_OPTS}
@@ -16,9 +16,9 @@ ${FZF_DEFAULT_OPTS}
 ctrl-x:execute\(tmux\ kill-session\ -t\ {1}\)+reload\(${tmux_list_sessions_script}\)\
 "
 
-sessions_to_kill="$(~/.local/bin/tmux_list_sessions.sh | fzf | awk '{printf $1"\n"}')"
+sessions_to_kill="$(~/.config/tmux/scripts/tmux_list_sessions.sh | fzf | awk '{printf $1"\n"}')"
 readonly sessions_to_kill
 
 if [ -n "${sessions_to_kill}" ]; then
     echo "${sessions_to_kill}" | xargs -n 1 tmux kill-session -t
-fi
+fi

home/user/.config/tmux/scripts/tmux_list_sessions.sh

@@ -12,4 +12,4 @@ sessions="$(echo "${sessions}" | sed "s/^${current_session} /${current_session}
 sessions="$(echo "${sessions}" | sed "s/^${last_session} /${last_session} (last) /")"
 readonly sessions
 
-echo "${sessions}"
+echo "${sessions}"

home/user/.local/bin/power_rofi.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-
-eval "$(echo "i3-msg exit
-reboot
-shutdown -h now
-systemctl suspend
-i3lock -enf -c 1e1e1e
-convert canvas:none PNG:- | feh -YF -" | rofi -dmenu -m -1 -i -p "Power")"