From 67714a08824e5d91df083db206bd62a94875c8e8 Mon Sep 17 00:00:00 2001 From: CramMK Date: Wed, 27 May 2020 14:09:40 +0200 Subject: [PATCH] Some changes --- dotfiles/X11/Xresources | 11 --- .../Xresources.themes/Xresources.afterglow | 44 ----------- .../Xresources.themes/Xresources.breeze-dark | 36 --------- .../Xresources.clean-and-green | 36 --------- .../X11/Xresources.themes/Xresources.onedark | 36 --------- .../Xresources.themes/Xresources.onedark-16 | 50 ------------ .../Xresources.themes/Xresources.solarized | 77 ------------------- dotfiles/polybar/config | 41 ++-------- dotfiles/polybar/{ => scripts}/load.sh | 0 dotfiles/polybar/{ => scripts}/spotify.sh | 0 dotfiles/polybar/start.sh | 6 +- 11 files changed, 7 insertions(+), 330 deletions(-) delete mode 100644 dotfiles/X11/Xresources.themes/Xresources.afterglow delete mode 100644 dotfiles/X11/Xresources.themes/Xresources.breeze-dark delete mode 100644 dotfiles/X11/Xresources.themes/Xresources.clean-and-green delete mode 100644 dotfiles/X11/Xresources.themes/Xresources.onedark delete mode 100644 dotfiles/X11/Xresources.themes/Xresources.onedark-16 delete mode 100644 dotfiles/X11/Xresources.themes/Xresources.solarized rename dotfiles/polybar/{ => scripts}/load.sh (100%) rename dotfiles/polybar/{ => scripts}/spotify.sh (100%) diff --git a/dotfiles/X11/Xresources b/dotfiles/X11/Xresources index f3744bb..8d1fb88 100644 --- a/dotfiles/X11/Xresources +++ b/dotfiles/X11/Xresources @@ -1,16 +1,5 @@ ! Colors -! more blue-ish #include ".Xresources.themes/Xresources.nord" -! more vibrant -!#include ".Xresources.themes/Xresources.afterglow" - -!#include ".Xresources.themes/Xresources.solarized" - -!others -!#include ".Xresources.themes/Xresources.clean-and-green" -!#include ".Xresources.themes/Xresources.breeze-dark" -!#include ".Xresources.themes/Xresources.onedark" -!#include ".Xresources.themes/Xresources.onedark-16" ! Font XTerm.vt100.faceName: xft:InconsolataLGC Nerd Font Mono:antialias=true diff --git a/dotfiles/X11/Xresources.themes/Xresources.afterglow b/dotfiles/X11/Xresources.themes/Xresources.afterglow deleted file mode 100644 index be2d0ae..0000000 --- a/dotfiles/X11/Xresources.themes/Xresources.afterglow +++ /dev/null @@ -1,44 +0,0 @@ -! -! Generated with : -! XRDB2Xreources.py -! -*.foreground: #d0d0d0 -*.background: #212121 -*.cursorColor: #d0d0d0 -! -! Black -*.color0: #151515 -*.color8: #505050 -! -! Red -*.color1: #ac4142 -*.color9: #ac4142 -! -! Green -*.color2: #7e8e50 -*.color10: #7e8e50 -! -! Yellow -*.color3: #e5b567 -*.color11: #e5b567 -! -! Blue -*.color4: #6c99bb -*.color12: #6c99bb -! -! Magenta -*.color5: #9f4e85 -*.color13: #9f4e85 -! -! Cyan -*.color6: #7dd6cf -*.color14: #7dd6cf -! -! White -*.color7: #d0d0d0 -*.color15: #f5f5f5 -! -! Bold, Italic, Underline -*.colorBD: #d0d0d0 -!*.colorIT: -!*.colorUL: diff --git a/dotfiles/X11/Xresources.themes/Xresources.breeze-dark b/dotfiles/X11/Xresources.themes/Xresources.breeze-dark deleted file mode 100644 index fa49ca1..0000000 --- a/dotfiles/X11/Xresources.themes/Xresources.breeze-dark +++ /dev/null @@ -1,36 +0,0 @@ -! special -*.foreground: #cfcfc2 -*.background: #232629 -*.cursorColor: #cfcfc2 - -! black -*.color0: #2a2e32 -*.color8: #31363b - -! red -*.color1: #c0392b -*.color9: #f44f4f - -! green -*.color2: #218058 -*.color10: #27ae60 - -! yellow -*.color3: #fdbc4b -*.color11: #fdbc4b - -! blue -*.color4: #2980b9 -*.color12: #0099ff - -! magenta -*.color5: #8e44ad -*.color13: #af81ff - -! cyan -*.color6: #27aeae -*.color14: #31dddd - -! white -*.color7: #acada1 -*.color15: #cfd0c2 diff --git a/dotfiles/X11/Xresources.themes/Xresources.clean-and-green b/dotfiles/X11/Xresources.themes/Xresources.clean-and-green deleted file mode 100644 index 5313432..0000000 --- a/dotfiles/X11/Xresources.themes/Xresources.clean-and-green +++ /dev/null @@ -1,36 +0,0 @@ -! special -*.foreground: #ffffff -*.background: #2e3440 -*.cursorColor: #ffffff - -! black -*.color0: #2e3440 -*.color8: #707f9c - -! red -*.color1: #84d498 -*.color9: #84d498 - -! green -*.color2: #1cfa67 -*.color10: #1cfa67 - -! yellow -*.color3: #85fa8d -*.color11: #85fa86 - -! blue -*.color4: #1aa662 -*.color12: #1aa662 - -! magenta -*.color5: #23ff77 -*.color13: #23ff77 - -! cyan -*.color6: #50fa7b -*.color14: #50fa7b - -! white -*.color7: #707f9c -*.color15: #ffffff diff --git a/dotfiles/X11/Xresources.themes/Xresources.onedark b/dotfiles/X11/Xresources.themes/Xresources.onedark deleted file mode 100644 index 8799a5e..0000000 --- a/dotfiles/X11/Xresources.themes/Xresources.onedark +++ /dev/null @@ -1,36 +0,0 @@ -! special -*.foreground: #ABB2BF -*.background: #282C34 -*.cursorColor: #ABB2BF - -! black -*.color0: #5C6370 -*.color8: #4B5263 - -! red -*.color1: #E06C75 -*.color9: #BE5046 - -! green -*.color2: #98C379 -*.color10: #98C379 - -! yellow -*.color3: #E5C07B -*.color11: #D19A66 - -! blue -*.color4: #61AFEF -*.color12: #61AFEF - -! magenta -*.color5: #C678DD -*.color13: #C678DD - -! cyan -*.color6: #56B6C2 -*.color14: #56B6C2 - -! white -*.color7: #ABB2BF -*.color15: #3E4452 diff --git a/dotfiles/X11/Xresources.themes/Xresources.onedark-16 b/dotfiles/X11/Xresources.themes/Xresources.onedark-16 deleted file mode 100644 index 8b85b92..0000000 --- a/dotfiles/X11/Xresources.themes/Xresources.onedark-16 +++ /dev/null @@ -1,50 +0,0 @@ -! Base16 OneDark -! Scheme: Lalit Magant (http://github.com/tilal6991) - -#define base00 #282c34 -#define base01 #353b45 -#define base02 #3e4451 -#define base03 #545862 -#define base04 #565c64 -#define base05 #abb2bf -#define base06 #b6bdca -#define base07 #c8ccd4 -#define base08 #e06c75 -#define base09 #d19a66 -#define base0A #e5c07b -#define base0B #98c379 -#define base0C #56b6c2 -#define base0D #61afef -#define base0E #c678dd -#define base0F #be5046 - -*foreground: base05 -*background: base00 -*cursorColor: base05 - -*color0: base00 -*color1: base08 -*color2: base0B -*color3: base0A -*color4: base0D -*color5: base0E -*color6: base0C -*color7: base05 - -*color8: base03 -*color9: base08 -*color10: base0B -*color11: base0A -*color12: base0D -*color13: base0E -*color14: base0C -*color15: base07 - -! Note: colors beyond 15 might not be loaded (e.g., xterm, urxvt), -! use 'shell' template to set these if necessary -*color16: base09 -*color17: base0F -*color18: base01 -*color19: base02 -*color20: base04 -*color21: base06 diff --git a/dotfiles/X11/Xresources.themes/Xresources.solarized b/dotfiles/X11/Xresources.themes/Xresources.solarized deleted file mode 100644 index 811cd46..0000000 --- a/dotfiles/X11/Xresources.themes/Xresources.solarized +++ /dev/null @@ -1,77 +0,0 @@ -!! #include "/mount/share/lib/skel/.Xresources" -!! drop in Solarized colorscheme for Xresources/Xdefaults - -! Solarized color scheme for the X Window System -! -! http://ethanschoonover.com/solarized - - -! Common - -#define S_yellow #b58900 -#define S_orange #cb4b16 -#define S_red #dc322f -#define S_magenta #d33682 -#define S_violet #6c71c4 -#define S_blue #268bd2 -#define S_cyan #2aa198 -#define S_green #859900 - - -! Dark - -#define S_base03 #002b36 -#define S_base02 #073642 -#define S_base01 #586e75 -#define S_base00 #657b83 -#define S_base0 #839496 -#define S_base1 #93a1a1 -#define S_base2 #eee8d5 -#define S_base3 #fdf6e3 - - -! Light - -! #define S_base03 #fdf6e3 -! #define S_base02 #eee8d5 -! #define S_base01 #93a1a1 -! #define S_base00 #839496 -! #define S_base0 #657b83 -! #define S_base1 #586e75 -! #define S_base2 #073642 -! #define S_base3 #002b36 - - -! To only apply colors to your terminal, for example, prefix -! the color assignment statement with its name. Example: -! -! URxvt*background: S_base03 - -xterm*background: S_base03 -xterm*foreground: S_base0 -xterm*fading: 40 -xterm*fadeColor: S_base03 -xterm*cursorColor: S_base1 -xterm*pointerColorBackground: S_base01 -xterm*pointerColorForeground: S_base1 - -xterm*color0: S_base02 -xterm*color1: S_red -xterm*color2: S_green -xterm*color3: S_yellow -xterm*color4: S_blue -xterm*color5: S_magenta -xterm*color6: S_cyan -xterm*color7: S_base2 -xterm*color9: S_orange -xterm*color8: S_base03 -xterm*color10: S_base01 -xterm*color11: S_base00 -xterm*color12: S_base0 -xterm*color13: S_violet -xterm*color14: S_base1 -xterm*color15: S_base3 - -xterm*scrollBar: false -XTerm*charClass: 33:48,37:48,45-46:48,47:48,38:48,58:48 -XTerm.vt100.faceName: Liberation Mono:size=9:antialias=true diff --git a/dotfiles/polybar/config b/dotfiles/polybar/config index 172cc9e..13ab897 100644 --- a/dotfiles/polybar/config +++ b/dotfiles/polybar/config @@ -1,8 +1,6 @@ ; vim: ft=dosini ############################################################################### [colors] -my_green = #00d3a8 - nord_red = #BF616A nord_orange = #D08770 nord_yellow = #EBCB8B @@ -36,7 +34,7 @@ inconsolata = "Inconsolata:pixelsize=11;2" inconsolata_nerd = "InconsolataLGC Nerd Font Mono:pixelsize=14;4" ############################################################################### -[bar/laptop_top] +[bar/laptop] monitor = "eDP-1" enable-ipc = false @@ -77,23 +75,8 @@ wm-restack = i3 #dpi-y = 96 ############################################################################### -[bar/laptop_bottom] -inherit = bar/laptop_top - -tray-position = right -tray-scale = 0.9 - -bottom = true - -monitor = "eDP-1" - -modules-left = title -modules-center = -modules-right = - -############################################################################### -[bar/external_top] -inherit = bar/laptop_top +[bar/external] +inherit = bar/laptop tray-position = right @@ -104,20 +87,6 @@ modules-center = modules-right = volume battery date time separator = -############################################################################### -[bar/external_bottom] -inherit = bar/laptop_top - -tray-position = none - -bottom = true - -monitor = ${env:MONITOR:} - -modules-left = title -modules-center = -modules-right = - ############################################################################### [module/i3tabs] type = internal/i3 @@ -274,7 +243,7 @@ bar-empty = - ############################################################################### [module/spotify] type = custom/script -exec = ~/.config/polybar/spotify.sh %artist% - %title% +exec = ~/.config/polybar/scripts/spotify.sh %artist% - %title% tail = true interval = 2 @@ -333,7 +302,7 @@ click-left = "pkill -n polybar" ############################################################################### [module/load] type = custom/script -exec = ~/.config/polybar/load.sh +exec = ~/.config/polybar/scripts/load.sh interval = 5.0 ############################################################################### diff --git a/dotfiles/polybar/load.sh b/dotfiles/polybar/scripts/load.sh similarity index 100% rename from dotfiles/polybar/load.sh rename to dotfiles/polybar/scripts/load.sh diff --git a/dotfiles/polybar/spotify.sh b/dotfiles/polybar/scripts/spotify.sh similarity index 100% rename from dotfiles/polybar/spotify.sh rename to dotfiles/polybar/scripts/spotify.sh diff --git a/dotfiles/polybar/start.sh b/dotfiles/polybar/start.sh index 8e35903..b79f8ee 100755 --- a/dotfiles/polybar/start.sh +++ b/dotfiles/polybar/start.sh @@ -4,11 +4,9 @@ while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done if type "xrandr"; then for mon in $(xrandr --query | grep " connected" | cut -d" " -f1); do if [[ ${mon} = *eDP-1* ]]; then - polybar --reload laptop_top & - #polybar --reload laptop_bottom & + polybar --reload laptop & else - MONITOR=$mon polybar --reload external_top & - #MONITOR=$mon polybar --reload external_bottom & + MONITOR=$mon polybar --reload external & fi done else