From 213bd8059467fd04282a40b2229fb21d0d1d7c7c Mon Sep 17 00:00:00 2001 From: DTB Date: Fri, 8 Sep 2023 08:12:19 -0400 Subject: [PATCH] working on configs and stuffz --- trinitystuff/.config/sxhkd/sxhkdrc | 64 --------------- trinitystuff/.config/ytfeed-config.txt | 8 -- trinitystuff/Makefile | 13 ++++ trinitystuff/{.config => }/bspwm/bspwmrc | 6 +- trinitystuff/{.config => }/i3/config | 0 trinitystuff/{.config => }/i3status/config | 0 trinitystuff/sh/aliases | 7 +- trinitystuff/sh/profile | 3 +- trinitystuff/sxhkd/sxhkdrc | 91 +++++++++++++++++++++- trinitystuff/xinit/xinitrc | 1 + 10 files changed, 113 insertions(+), 80 deletions(-) delete mode 100755 trinitystuff/.config/sxhkd/sxhkdrc delete mode 100644 trinitystuff/.config/ytfeed-config.txt rename trinitystuff/{.config => }/bspwm/bspwmrc (59%) rename trinitystuff/{.config => }/i3/config (100%) rename trinitystuff/{.config => }/i3status/config (100%) mode change 100644 => 100755 trinitystuff/sxhkd/sxhkdrc diff --git a/trinitystuff/.config/sxhkd/sxhkdrc b/trinitystuff/.config/sxhkd/sxhkdrc deleted file mode 100755 index 9e31052..0000000 --- a/trinitystuff/.config/sxhkd/sxhkdrc +++ /dev/null @@ -1,64 +0,0 @@ -# thanks patrickbolle, weedsmokingjew -XF86AudioMicMute - pactl set-source-mute @DEFAULT_SOURCE@ toggle -XF86AudioMute - volume m -XF86Audio{Lower,Raise}Volume - volume r {-5,5} -XF86Audio{Play,Pause,Next,Prev} - playerctl {play,pause,next,previous} -XF86Launch1 - $TERMINAL - -control + shift + Escape - $TERMINAL -e htop -Print - scrot - -mod1 + {_,shift +}F4 - bspc node -{c,k} || i3-msg kill -mod1 + {_,shift +}q - bspc node -{c,k} || i3-msg kill - -mod1 + {_,shift +}{1-4} - bspc {desktop -f,node -d} '^{1-4}' - -mod1 + equal - light -A 5 -mod1 + shift + equal - light -A 1 -mod1 + minus - light -U 5 -mod1 + shift + minus - light -U 1 - -mod1 + shift + e - if [ "Yes." = $(printf "No.\nYes." | dmenu -fn unscii -nb '#000' -nf '#FFDBDB' -p '$' -sb '#FFDBDB' -sf '#000' -p "You pressed the exit shortcut. Do you really want to exit? This will end your X session.") ]; \ - then bspc quit || i3-msg exit || pkill X; fi - -mod1 + shift + r - bspc wm -r; pkill -USR1 -x sxhkd - -mod1 + d - dmenu_run -fn unscii -nb '#000' -nf '#FFDBDB' -p '$' -sb '#FFDBDB' -sf '#000' - -mod1 + f - bspc node -t '~fullscreen' || i3-msg fullscreen toggle - -mod1 + {h,j,k,l} - bspc node -f {west,south,north,east} || i3-msg focus {left,down,up,right} - -mod1 + shift + {h,j,k,l} - bspc node -s {west,south,north,east} || i3-msg move {left,down,up,right} - -mod1 + Return - $TERMINAL - -mod1 + v - $TERMINAL -e aiomixer - -mod1 + b - $BROWSER - -mod1 + m - volume m diff --git a/trinitystuff/.config/ytfeed-config.txt b/trinitystuff/.config/ytfeed-config.txt deleted file mode 100644 index 5cc802f..0000000 --- a/trinitystuff/.config/ytfeed-config.txt +++ /dev/null @@ -1,8 +0,0 @@ -auto_refresh_feeds: -1 -cap: 200 -consumption_file_name: /home/trinity/.ytfeed/consumption.txt -feed_directory: /home/trinity/.ytfeed/feeds/ -xml_storage_directory: /home/trinity/.ytfeed/feeds/ -video_downloader: youtube-dlp -viewer: youtube-dl-mpv -web_browser: firefox-developer-edition diff --git a/trinitystuff/Makefile b/trinitystuff/Makefile index cc13c5e..2100128 100644 --- a/trinitystuff/Makefile +++ b/trinitystuff/Makefile @@ -6,6 +6,7 @@ all: $(TARGETS) TARGETS = \ $(HOME)/.aliases \ + $(HOME)/.config/bspwm/bspwmrc \ $(HOME)/.config/sxhkd/sxhkdrc \ $(HOME)/.config/sxmo/profile \ $(HOME)/.ctwmrc \ @@ -21,6 +22,18 @@ TARGETS = \ $(HOME)/.aliases: sh/aliases cp sh/aliases $(HOME)/.aliases +$(HOME)/.config/bspwm/bspwmrc: bspwm/bspwmrc + mkdir -p $(HOME)/.config/bspwm/ + cp bspwm/bspwmrc $(HOME)/.config/bspwm/bspwmrc + +$(HOME)/.config/i3/config: i3/config + mkdir -p $(HOME)/.config/i3/ + cp i3/config $(HOME)/.config/i3/config + +$(HOME)/.config/i3status/config: i3status/config + mkdir -p $(HOME)/.config/i3status/ + cp i3status/config $(HOME)/.config/i3status/config + $(HOME)/.config/sxhkd/sxhkdrc: sxhkd/sxhkdrc mkdir -p $(HOME)/.config/sxhkd/ cp sxhkd/sxhkdrc $(HOME)/.config/sxhkd/sxhkdrc diff --git a/trinitystuff/.config/bspwm/bspwmrc b/trinitystuff/bspwm/bspwmrc similarity index 59% rename from trinitystuff/.config/bspwm/bspwmrc rename to trinitystuff/bspwm/bspwmrc index 7bdebab..506a841 100755 --- a/trinitystuff/.config/bspwm/bspwmrc +++ b/trinitystuff/bspwm/bspwmrc @@ -4,12 +4,8 @@ bspc config focus_follows_pointer true bspc config focused_border_color '#FFFFFF' bspc config normal_border_color '#FFDBDB' bspc config window_gap 0 -bspc monitor LVDS1 -d 1 2 3 4 -xrandr | grep ' connected ' | awk '{print $1}' | grep VGA >/dev/null 2>&1 \ - && bspc monitor VGA1 -d 5 6 7 8 \ - || true +bspc monitor HDMI-1 -d 1 2 3 4 bspc rule -a XClock manage=off # thanks emanuele6 bspc rule -a xload manage=off xdo lower -NXClock xdo lower -Nxload -data | lemonbar -bf '-*-unscii-*-*-*-*-*-*-*-*-*-*-*-*' -F '#FFDBDB' diff --git a/trinitystuff/.config/i3/config b/trinitystuff/i3/config similarity index 100% rename from trinitystuff/.config/i3/config rename to trinitystuff/i3/config diff --git a/trinitystuff/.config/i3status/config b/trinitystuff/i3status/config similarity index 100% rename from trinitystuff/.config/i3status/config rename to trinitystuff/i3status/config diff --git a/trinitystuff/sh/aliases b/trinitystuff/sh/aliases index 12a443e..61478c9 100644 --- a/trinitystuff/sh/aliases +++ b/trinitystuff/sh/aliases @@ -8,10 +8,15 @@ alias b="$BROWSER" alias cls="clear" alias cp="cp -iv" alias doas="$SUDO" +alias dots="\ +cp -f ~/src/trinitystuff/sxhkd/sxhkdrc ~/.config/sxhkd/sxhkdrc && \ +pkill -USR1 -x sxhkd && \ +cp -f ~/src/trinitystuff/bspwm/bspwmrc ~/.config/bspwm/bspwmrc" alias e="$EDITOR" alias ipconfig="ifconfig" #alias ls="9 ls" -alias ls="ls -1A" +#alias ls="ls -1A" +alias ls="lsd -1A --icon-theme unicode --long" alias mpv="LIBGL_ALWAYS_SOFTWARE=1 mpv --vo=x11" alias mullvad="curl https://am.i.mullvad.net/connected" alias mv="mv -iv" diff --git a/trinitystuff/sh/profile b/trinitystuff/sh/profile index 4ff8dc3..4a29d0e 100644 --- a/trinitystuff/sh/profile +++ b/trinitystuff/sh/profile @@ -16,10 +16,11 @@ PATH="\ /usr/pkg/qt5/bin:\ /usr/X11R7/bin:\ $HOME/bin/:\ +$HOME/src/dist:\ $PLAN9/bin:\ $PATH"; export PATH PAGER="less"; export PAGER -TERMINAL=uxterm; export TERMINAL +TERMINAL=urxvt; export TERMINAL UNITS_SYSTEM=si; export UNITS_SYSTEM VISUAL=vi; export VISUAL WALLPAPER="$HOME/Pictures/Wallpapers/ghibli_wars.jpg"; export WALLPAPER diff --git a/trinitystuff/sxhkd/sxhkdrc b/trinitystuff/sxhkd/sxhkdrc old mode 100644 new mode 100755 index a81532f..1cea657 --- a/trinitystuff/sxhkd/sxhkdrc +++ b/trinitystuff/sxhkd/sxhkdrc @@ -1,3 +1,92 @@ -super + t: +# thanks patrickbolle, weedsmokingjew +XF86AudioMicMute + pactl set-source-mute @DEFAULT_SOURCE@ toggle +XF86AudioMute + volume m +XF86Audio{Lower,Raise}Volume + volume r {-5,5} +XF86Audio{Play,Pause,Next,Prev} + playerctl {play,pause,next,previous} +XF86Launch1 + $TERMINAL + +control + shift + Escape + $TERMINAL -e htop +Print + scrot + +mod1 + {_,shift +}F4 + bspc node -{c,k} || i3-msg kill +mod1 + {_,shift +}q + bspc node -{c,k} || i3-msg kill + +mod1 + {_,shift +}{1-4} + bspc {desktop -f,node -d} '^{1-4}' + +alt + {_,shift +}{1-4} + bspc {desktop -f,node -d} '^{1-4}' --follow + +mod1 + equal + light -A 5 +mod1 + shift + equal + light -A 1 +mod1 + minus + light -U 5 +mod1 + shift + minus + light -U 1 + +super + shift + q + bspc quit + +mod1 + shift + e + if [ "Yes." = $(printf "No.\nYes." | dmenu -fn unscii -nb '#000' -nf '#FFDBDB' -p '$' -sb '#FFDBDB' -sf '#000' -p "You pressed the exit shortcut. Do you really want to exit? This will end your X session.") ]; \ + then bspc quit || i3-msg exit || pkill X; fi + +mod1 + shift + r + bspc wm -r; pkill -USR1 -x sxhkd + +super + shift + r + bspc wm -r + +alt + t urxvt +alt + d + rofi -show drun +mod1 + d + dmenu_run -fn unscii -nb '#000' -nf '#FFDBDB' -p '$' -sb '#FFDBDB' -sf '#000' + +mod1 + f + bspc node -t '~fullscreen' || i3-msg fullscreen toggle + +mod1 + {h,j,k,l} + bspc node -f {west,south,north,east} || i3-msg focus {left,down,up,right} + +alt + {_,shift +}{h,j,k,l} + bspc node -{f,s} {west,south,north,east} + +mod1 + shift + {h,j,k,l} + bspc node -s {west,south,north,east} || i3-msg move {left,down,up,right} + +super + shift + k + pkill -USR1 -x sxhkd + +mod1 + Return + $TERMINAL +alt + Return + uxrvt +super + Return + urxvt + +mod1 + v + $TERMINAL -e aiomixer + +mod1 + b + $BROWSER + +mod1 + m + volume m +alt +{_,shift +} F4 + bspc node -{c,k} + + diff --git a/trinitystuff/xinit/xinitrc b/trinitystuff/xinit/xinitrc index 72085e9..f765654 100755 --- a/trinitystuff/xinit/xinitrc +++ b/trinitystuff/xinit/xinitrc @@ -1,2 +1,3 @@ +xrdb -load .Xresources sxhkd & exec bspwm