9 files changed, 56 insertions, 60 deletions

diff --git a/bin/.bin/shut b/bin/.bin/shut
index 1fb1295..2d24299 100755
--- a/bin/.bin/shut
+++ b/bin/.bin/shut
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-RET=$(echo -e "shutdown\nreboot\nsleep\nlock\ncancel" | dmenu -l 5 -p "Sayonara" -nb "#000000" -nf "#bfbfbf" -sb "#84a0c6" -sf "#000000" -fn "Hermit:size=10:antialias=true:autohint=true")
+RET=$(echo -e "shutdown\nreboot\nsleep\nlock\ncancel" | dmenu -p "Sayonara" -fn "JetBrains Mono Nerd Font Mono:style=medium:size=9" -nb "#171a1f" -nf "#f3f4f5" -sb "#c6c8d1" -sf "#171a1f")
 
 case $RET in
-        shutdown) doas poweroff ;;
-        reboot) doas reboot ;;
-        sleep) xset s activate & doas zzz;;
+        shutdown) systemctl poweroff ;;
+        reboot) systemctl reboot ;;
+        sleep) systemctl suspend ;;
         lock) xset s activate ;;
         *) ;;
 esac
diff --git a/bin/.bin/sysinfo b/bin/.bin/sysinfo
index 4f9f456..b121b97 100755
--- a/bin/.bin/sysinfo
+++ b/bin/.bin/sysinfo
@@ -4,7 +4,7 @@
 
 wm="$(echo $XDG_CURRENT_DESKTOP)"
 distro="$(cat /etc/*-release | grep PRETTY_NAME | cut -d '=' -f2 | tr -d '"')"
-packages="$(xbps-query -l | wc -l)"
+packages="$(pacman -Q | wc -l)"
 font="jetbrains mono"
 colors="pencil"
 
diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index 52529ba..770eab4 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -2,13 +2,18 @@
 
 # bspwm
 bspc monitor -d 1 2 3 4 5 6
-bspc config border_width         0
+bspc config border_width        3
 bspc config window_gap          8
 bspc config split_ratio          0.50
 bspc config focus_follows_pointer true
 bspc config borderless_monocle   true
 bspc config gapless_monocle      true
 
+# borders
+bspc config normal_border_color       '#171a1f'
+bspc config active_border_color       '#171a1f'
+bspc config focused_border_color      '#20242a'
+
 # rules
 bspc rule -a firefox desktop='^2'
 bspc rule -a Steam desktop='^6'
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 71e4054..aa2d709 100755
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -33,7 +33,7 @@ set shiftwidth=4    " number of spaces to use for autoindent
 set expandtab       " tabs are space
 set autoindent
 set copyindent      " copy indent from the previous line
-colorscheme plain
+colorscheme pencil
 "hi Normal ctermbg=16 guibg=#000000
 "hi LineNr ctermbg=16 guibg=#000000
 
@@ -108,9 +108,9 @@ scriptencoding utf-8
 autocmd BufNewFile * silent! 0r $HOME/.config/nvim/templates/skelton.%:e
 
 " statusline
-hi PrimaryBlock   ctermbg=NONE ctermfg=8
+hi PrimaryBlock   ctermbg=NONE ctermfg=237
 hi ModeBlock      ctermbg=NONE ctermfg=2
-hi SecondaryBlock ctermbg=NONE ctermfg=8
+hi SecondaryBlock ctermbg=NONE ctermfg=237
 hi TeritaryBlock  ctermbg=NONE ctermfg=9
 hi Blanks         ctermbg=NONE
 hi statusline     ctermbg=NONE
diff --git a/picom/.config/picom.conf b/picom/.config/picom.conf
index 39afec2..6728dcd 100755
--- a/picom/.config/picom.conf
+++ b/picom/.config/picom.conf
@@ -34,9 +34,8 @@ blur-background-exclude = [
     "_GTK_FRAME_EXTENTS@:c"
 ];
 opacity-rule = [ 
-    "40:class_g = 'Bspwm' && class_i = 'presel_feedback'",
     "100:class_g = 'URxvt' && focused",
-    "90:class_g = 'URxvt' && !focused"
+    "90:class_g = 'URxvt' && !focused",
 ];
 
 ## FADING
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index bf137a6..43c3086 100755
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -3,10 +3,10 @@ screenchange-reload = true
 
 [colors]
 ;background = ${xrdb:background:#060808}
-background = #00000000
+background = #00b7b7b7
 background-alt = ${xrdb:color0:#000}
 ;foreground = ${xrdb:foreground:#c5c8c6}
-foreground = #a3a1a1
+foreground = #b7b7b7
 foreground-alt = ${xrdb:colorBD:#444}
 primary = ${xrdb:color4:#ffb52a}
 secondary = ${xrdb:color3:#e60053}
@@ -63,18 +63,18 @@ ws-icon-6 = chat;
 ws-icon-7 = game;戮
 ws-icon-default = 
 
-label-focused = ���
+label-focused = ���
 label-focused-foreground = #79ffe1
 label-focused-padding = 1
 ;label-focused-font = 10
 
 label-occupied = 
 ;label-occupied-foreground = ${xrdb:color15:#85befd}
-label-occupied-foreground = #5e5c5c
+label-occupied-foreground = #b7b7b7
 label-occupied-padding = 1
 
 label-empty = 
-label-empty-foreground = #5e5c5c
+label-empty-foreground = #b7b7b7
 label-empty-padding = 1
 
 ; urgent = Workspace with urgency hint set
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
index c8db3df..b1b0e59 100755
--- a/sxhkd/.config/sxhkd/sxhkdrc
+++ b/sxhkd/.config/sxhkd/sxhkdrc
@@ -3,7 +3,9 @@ super + Return
 super + shift + Return
         bspc rule -a \* -o state=floating && urxvtc
 super + @space
-        dmenu_run -i -fn "JetBrains Mono Nerd Font Mono:style=medium:size=9" -nb "#000000" -nf "#f3f4f5" -sb "#EEFFFF" -sf "#000000"
+        dmenu_run -i -fn "JetBrains Mono Nerd Font Mono:style=medium:size=9" -nb "#171a1f" -nf "#f3f4f5" -sb "#c6c8d1" -sf "#171a1f"
+super + x
+    ~/.bin/shut
 super + shift + w 
     firefox
 control + alt + l
diff --git a/x/.Xresources b/x/.Xresources
index c0e0def..8d821aa 100755
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -1,50 +1,39 @@
-! ------------------------------------------------------------------------------
-!  Colors
-! ------------------------------------------------------------------------------
-!
-!------------------------------------------------------------------------------
+! special
+*.foreground:   #FFF
+*.background:   #171a1f
+*.cursorColor:  #F8F8F2
 
-#define base00 #101010
-#define base01 #303030
-#define base02 #353535
-#define base03 #4A4A4A
-#define base04 #787878
-#define base05 #EEFFFF
-#define base06 #EEFFFF
-#define base07 #FFFFFF
-#define base08 #D75F5F
-#define base09 #F78C6C
-#define base0A #353531
-#define base0B #13CA91
-#define base0C #79ffe1
-#define base0D #6987e0
-#define base0E #e59595
-#define base0F #FF5370
+! black
+*.color0:       #171a1f
+*.color8:       #20242a
 
-!  URxvt
-! ------------------------------------------------------------------------------
+! red
+*.color1:       #EE4F84
+*.color9:       #F48FB1
 
-*foreground:   base05
-*background:   base00
-*cursorColor:  base05
+! green
+*.color2:       #53E2AE
+*.color10:      #A1EFD3
 
-*color0:       base00
-*color1:       base08
-*color2:       base0B
-*color3:       base0A
-*color4:       base0D
-*color5:       base0E
-*color6:       base0C
-*color7:       base05
+! yellow
+*.color3:       #F1FF52
+*.color11:      #F1FA8C
 
-*color8:       base03
-*color9:       base09
-*color10:      base01
-*color11:      base02
-*color12:      base04
-*color13:      base06
-*color14:      base0F
-*color15:      base07
+! blue
+*.color4:       #6498EF
+*.color12:      #92B6F4
+
+! magenta
+*.color5:       #985EFF
+*.color13:      #BD99FF
+
+! cyan
+*.color6:       #24D1E7
+*.color14:      #87DFEB
+
+! white
+*.color7:       #E5E5E5
+*.color15:      #F8F8F2
 
 URxvt.cursorBlink : 1
 URxvt.font       :xft:JetBrainsMono Nerd Font Mono:size=10:style=Regular \
@@ -69,7 +58,7 @@ URxvt.keysym.M-Escape      : perl:keyboard-select:activate
 URxvt.keysym.M-s      : perl:keyboard-select:search
 URxvt.keyboard-select.clipboard: true
 URxvt.font-size.step  : 1
-URxvt.url-launcher    : chromium
+URxvt.url-launcher    : firefox
 URxvt.matcher.button  : 1
 
 Xft.antialias:  1
diff --git a/x/.xinitrc b/x/.xinitrc
index c2969ee..8b16e09 100755
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -2,4 +2,5 @@
 xrdb -merge ~/.Xresources &
 setxkbmap -layout us -option caps:ctrl_modifier &
 xcape -e 'Caps_Lock=Escape' &
+xinput --disable 13
 exec dbus-run-session bspwm