diff --git a/linux/.config/bspwm/colorscheme b/linux/.config/bspwm/colorscheme index e973db0..72334fa 100644 --- a/linux/.config/bspwm/colorscheme +++ b/linux/.config/bspwm/colorscheme @@ -1 +1 @@ -lovelace +tokyonight diff --git a/linux/.config/polybar/config b/linux/.config/polybar/config index 4c88ed1..f2e6e5a 100644 --- a/linux/.config/polybar/config +++ b/linux/.config/polybar/config @@ -41,7 +41,7 @@ font-2 = unifont:size=8;1 modules-left = workspace modules-center = polywins -modules-right = music cpu ram volume bclock +modules-right = music cpu ram volume date tray-position = right tray-padding = 1 @@ -122,7 +122,7 @@ label-foreground = ${colors.5} type = internal/xwindow label =  %title% -label-empty = +label-empty = [module/workspace] type = internal/bspwm diff --git a/linux/.config/polybar/scripts/binaryclock-polybar.sh b/linux/.config/polybar/scripts/binaryclock-polybar.sh old mode 100644 new mode 100755 diff --git a/linux/.config/polybar/scripts/cmus-polybar.sh b/linux/.config/polybar/scripts/cmus-polybar.sh old mode 100644 new mode 100755 diff --git a/linux/.config/polybar/scripts/polywins.sh b/linux/.config/polybar/scripts/polywins.sh old mode 100644 new mode 100755 index 805b505..d7f23bd --- a/linux/.config/polybar/scripts/polywins.sh +++ b/linux/.config/polybar/scripts/polywins.sh @@ -7,7 +7,7 @@ active_text_color="$(xrdb -query | awk '/*.color7:/ { print substr($2,1) }')" active_bg= active_underline= -inactive_text_color="$(xrdb -query | awk '/*.cursorColor2:/ { print substr($2,1) }')" +inactive_text_color="$(xrdb -query | awk '/*.color0:/ { print substr($2,1) }')" inactive_bg= inactive_underline= @@ -16,7 +16,7 @@ show="window_title" # options: window_title, window_class, window_classname forbidden_classes="Polybar Conky Gmrun" empty_desktop_message="" -char_limit=10 +char_limit=16 max_windows=15 char_case="normal" # normal, upper, lower add_spaces="true" @@ -167,14 +167,14 @@ generate_window_list() { window_count=$(( window_count + 1 )) continue fi - + # Show the user-selected window property case "$show" in "window_class") w_name="$cls" ;; "window_classname") w_name="$cname" ;; "window_title") w_name="$title" ;; esac - + # Use user-selected character case case "$char_case" in "lower") w_name=$( @@ -232,7 +232,7 @@ generate_window_list() { if [ "$window_count" = 0 ]; then printf "%s" "$empty_desktop_message" fi - + # Print newline echo "" } diff --git a/linux/.config/xrdb/colors/cherry_blossom.xrdb b/linux/.config/xrdb/colors/cherry_blossom.xrdb deleted file mode 100644 index f83c728..0000000 --- a/linux/.config/xrdb/colors/cherry_blossom.xrdb +++ /dev/null @@ -1,22 +0,0 @@ -*.background: #02131a -*.foreground: #a9b1d6 -*.cursorColor: #B5E8E0 - -*.color0: #1a1b26 -*.color1: #f7768e -*.color2: #9ece6a -*.color3: #e0af68 -*.color4: #7aa2f7 -*.color5: #ad8ee6 -*.color6: #449dab -*.color7: #787c99 - -*.color8: #444b6a -*.color9: #ff7a93 -*.color10: #b9f27c -*.color11: #ff9e64 -*.color12: #7da6ff -*.color13: #bb9af7 -*.color14: #0db9d7 -*.color15: #acb0d0 - diff --git a/linux/.config/xrdb/colors/tokyonight.xrdb b/linux/.config/xrdb/colors/tokyonight.xrdb new file mode 100644 index 0000000..e322ef1 --- /dev/null +++ b/linux/.config/xrdb/colors/tokyonight.xrdb @@ -0,0 +1,23 @@ +! special +*.foreground: #a9b1d6 +*.background: #1a1b26 +*.cursorColor: #444b6a + +! colors +*.color0: #32344a +*.color1: #f7768e +*.color2: #9ece6a +*.color3: #e0af68 +*.color4: #7aa2f7 +*.color5: #ad8ee6 +*.color6: #449dab +*.color7: #787c99 + +*.color8: #444b6a +*.color9: #ff7a93 +*.color10: #b9f27c +*.color11: #ff9e64 +*.color12: #7da6ff +*.color13: #bb9af7 +*.color14: #0db9d7 +*.color15: #acb0d0 diff --git a/linux/download.sh b/linux/download.sh index b21a28b..c40cfc4 100755 --- a/linux/download.sh +++ b/linux/download.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash function download { - if [[ -x "$(command -v curl)" ]]; then - curl -fsSL "$1" -o "$2" - return $? - elif [[ -x "$(command -v wget)" ]]; then + if [[ -x "$(command -v wget)" ]]; then wget -qo "$2" "$1" return $? + elif [[ -x "$(command -v curl)" ]]; then + curl -fsSL "$1" -o "$2" + return $? fi echo "Failed to download $1. curl or wget not installed" return 1 diff --git a/linux/install.sh b/linux/install.sh index bf5af69..3b597f5 100755 --- a/linux/install.sh +++ b/linux/install.sh @@ -15,9 +15,9 @@ cp -rf "${PWD}/.config/xrdb" "${HOME}/.config/xrdb" #cp "${PWD}/.config/xrdb/main.xrdb" "${HOME}/.Xresources" echo "Installing xrdb-replace and config" -download "https://raw.githubusercontent.com/palmdrop/xrdb-replace/main/xrdb-replace" "${HOME}/.local/bin" +download "https://raw.githubusercontent.com/palmdrop/xrdb-replace/main/xrdb-replace" "${HOME}/.local/bin/xrdb-replace" chmod +x "${HOME}/.local/bin/xrdb-replace" -cp -rf "${PWD}/.config/xrdb-replace" +cp -rf "${PWD}/.config/xrdb-replace" "${HOME}/.config/xrdb-replace" echo "Installing bspwm config" cp -rf "${PWD}/.config/bspwm" "${HOME}/.config/bspwm"