shifted to void

29 files changed, 140 insertions, 367 deletions

diff --git a/README.md b/README.md
deleted file mode 100644
index 04999ab..0000000
--- a/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# dot-files
-Dot files for my setup (bspwm, rofi, compton, neovim, i3blocks, polybar, lockscreen, i3[not using anymore])
-
-![alt text](arch.png)
-
-# To replicate
-```shell
-$ git clone https://github.com/anon6405/dotfiles.git
-$ sudo pacman -S stow (use your choice of package manager)
-$ cd dotfiles
-$ stow *
-```
-That's all
diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index 21ee0f5..c0f41f2 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -36,7 +36,7 @@ font:
     #   - (macOS) Menlo
     #   - (Linux) monospace
     #   - (Windows) Consolas
-    family: 'Hermit'
+    family: 'Fantasque Sans Mono'
 
     # The `style` can be specified to pick a specific face.
     style: Regular
diff --git a/arch.png b/arch.png
deleted file mode 100644
index c7f54c2..0000000
--- a/arch.png
+++ /dev/null
diff --git a/bin/.local/bin/fetch b/bin/.local/bin/fetch
index 609850c..05cb71e 100755
--- a/bin/.local/bin/fetch
+++ b/bin/.local/bin/fetch
@@ -1,63 +1,76 @@
 #!/bin/sh
 #
-# ufetch-arch - tiny system info for arch
+# ufetch-void - tiny system info for void
 
 ## INFO
 
 # user is already defined
 host="$(hostname)"
-os='Arch Linux'
+os='Void Linux'
 kernel="$(uname -sr)"
 uptime="$(uptime -p | sed 's/up //')"
-packages="$(pacman -Q | wc -l)"
-shell="$(basename ${SHELL})"
-
-if [ -z "${WM}" ]; then
-        if [ "${XDG_CURRENT_DESKTOP}" ]; then
-                envtype='DE'
-                WM="${XDG_CURRENT_DESKTOP}"
-        elif [ "${DESKTOP_SESSION}" ]; then
-                envtype='DE'
-                WM="${DESKTOP_SESSION}"
-        else
-                envtype='WM'
-                WM="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
-        fi
+packages="$(xbps-query -l | wc -l)"
+shell="$(basename "$SHELL")"
+
+## UI DETECTION
+
+if [ -n "${DE}" ]; then
+        ui="${DE}"
+        uitype='DE'
+elif [ -n "${WM}" ]; then
+        ui="${WM}"
+        uitype='WM'
+elif [ -n "${XDG_CURRENT_DESKTOP}" ]; then
+        ui="${XDG_CURRENT_DESKTOP}"
+        uitype='DE'
+elif [ -n "${DESKTOP_SESSION}" ]; then
+        ui="${DESKTOP_SESSION}"
+        uitype='DE'
+elif [ -f "${HOME}/.xinitrc" ]; then
+        ui="$(tail -n 1 "${HOME}/.xinitrc" | cut -d ' ' -f 2)"
+        uitype='WM'
+elif [ -f "${HOME}/.xsession" ]; then
+        ui="$(tail -n 1 "${HOME}/.xsession" | cut -d ' ' -f 2)"
+        uitype='WM'
 else
-        envtype='WM'
+        ui='unknown'
+        uitype='UI'
 fi
 
 ## DEFINE COLORS
 
 # probably don't change these
-bold="$(tput bold)"
-black="$(tput setaf 0)"
-red="$(tput setaf 1)"
-green="$(tput setaf 2)"
-yellow="$(tput setaf 3)"
-blue="$(tput setaf 4)"
-magenta="$(tput setaf 5)"
-cyan="$(tput setaf 6)"
-white="$(tput setaf 7)"
-reset="$(tput sgr0)"
+if [ -x "$(command -v tput)" ]; then
+        bold="$(tput bold)"
+        black="$(tput setaf 0)"
+        red="$(tput setaf 1)"
+        green="$(tput setaf 2)"
+        yellow="$(tput setaf 3)"
+        blue="$(tput setaf 4)"
+        magenta="$(tput setaf 5)"
+        cyan="$(tput setaf 6)"
+        white="$(tput setaf 7)"
+        reset="$(tput sgr0)"
+fi
 
 # you can change these
-lc="${reset}${bold}${cyan}"             # labels
-nc="${reset}${bold}${cyan}"             # user and hostname
-ic="${reset}${bold}${white}"    # info
-c0="${reset}${bold}${cyan}"             # first color
-c1="${reset}${cyan}"                    # second color
+lc="${reset}${bold}${green}"        # labels
+nc="${reset}${bold}${green}"        # user and hostname
+ic="${reset}"                       # info
+c0="${reset}${bold}${green}"        # first color
+c1="${reset}${green}"               # second color
 
 ## OUTPUT
 
 cat <<EOF
 
-${c0}        /\        ${nc}${USER}${ic}@${nc}${host}${reset}
-${c0}       /^^\       ${lc}OS:        ${ic}${os}${reset}
-${c0}      /\   \      ${lc}KERNEL:    ${ic}${kernel}${reset}
-${c0}     /  ${c1}__  \     ${lc}UPTIME:    ${ic}${uptime}${reset}
-${c1}    /  (  )  \    ${lc}PACKAGES:  ${ic}${packages}${reset}
-${c1}   / __|  |__\\\\   ${lc}SHELL:     ${ic}${shell}${reset}
-${c1}  ///        \\\\\  ${lc}${envtype}:        ${ic}${WM}${reset}
+${c0}      _______      ${nc}${USER}${ic}@${nc}${host}${reset}
+${c1}      ${c0}\_____ \`-    ${lc}OS:        ${ic}${os}${reset}
+${c1}   /\   ${c0}___ \`- \   ${lc}KERNEL:    ${ic}${kernel}${reset}
+${c1}  | |  ${c0}/   \  | |  ${lc}UPTIME:    ${ic}${uptime}${reset}
+${c1}  | |  ${c0}\___/  | |  ${lc}PACKAGES:  ${ic}${packages}${reset}
+${c1}   \ \`-_____  ${c0}\/   ${lc}SHELL:     ${ic}${shell}${reset}
+${c1}    \`-______\      ${lc}${uitype}:        ${ic}${ui}${reset}
 
 EOF
+
diff --git a/bin/.local/bin/lock b/bin/.local/bin/lock
new file mode 100755
index 0000000..d7dc632
--- /dev/null
+++ b/bin/.local/bin/lock
@@ -0,0 +1,6 @@
+#!/bin/bash
+scrot /tmp/screen.png
+convert /tmp/screen.png -scale 10% -scale 1000% /tmp/screen.png
+[[ -f $1 ]] && convert /tmp/screen.png $1 -gravity center -composite -matte /tmp/screen.png
+i3lock -u -i /tmp/screen.png
+rm /tmp/screen.png
diff --git a/bin/.local/bin/unblock b/bin/.local/bin/unblock
index cf3aa81..1d0ea7f 100755
--- a/bin/.local/bin/unblock
+++ b/bin/.local/bin/unblock
@@ -4,6 +4,6 @@ set -e
 printf "\033[0;35mSetting wlo1 down....\033[0m\n"
 sudo ip link set wlo1 down
 printf "\033[0;36mChanging MAC address....\033[0m\n"
-sudo macchanger --mac=60:8E:08:B2:38:77 wlo1
+sudo macchanger -a wlo1
 printf "\033[0;32mEnjoy....\033[0m\n"
 
diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index c3a5cb4..5f664f6 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -5,12 +5,10 @@ dunst &
 xset b off &
 unclutter &
 light-locker &
-/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
-picom --config ~/.config/picom.conf &
+compton --config ~/.config/compton.conf &
 ~/scrypts/bat_check.sh &
 redshift -l 13.082680:80.270718 &
-xbacklight -set 30 & 
-feh --bg-fill ~/Pictures/heli.jpg &
+feh --bg-fill ~/Pictures/beach.jpg &
 urxvtd &
 
 bspc monitor -d term web music files code virt chat game IX X
@@ -22,8 +20,7 @@ bspc config split_ratio          0.52
 bspc config borderless_monocle   true
 bspc config gapless_monocle      true
 
-bspc rule -a firefox desktop='^2'
-bspc rule -a Brave-browser desktop='^2'
+bspc rule -a Firefox desktop='^2'
 bspc rule -a Spotify desktop='^3'
 bspc rule -a telegram-desktop desktop='^7'
 bspc rule -a Pcmanfm desktop='^4'
diff --git a/compton/.config/compton.conf b/compton/.config/compton.conf
index e177591..58a96ef 100644
--- a/compton/.config/compton.conf
+++ b/compton/.config/compton.conf
@@ -1,234 +1,58 @@
-# Thank you code_nomad: http://9m.no/ꪯ鵞
-# Found on https://git.archlinux.org/svntogit/community.git/tree/trunk/compton.conf?h=packages/compton#n80 
-
-#################################
-#
-# Backend
-#
-#################################
-
-# Backend to use: "xrender" or "glx".
-# GLX backend is typically much faster but depends on a sane driver.
-backend = "glx";
-
-#################################
-#
-# GLX backend
-#
-#################################
-
-glx-no-stencil = true;
-
-# GLX backend: Copy unmodified regions from front buffer instead of redrawing them all.
-# My tests with nvidia-drivers show a 10% decrease in performance when the whole screen is modified,
-# but a 20% increase when only 1/4 is.
-# My tests on nouveau show terrible slowdown.
-# Useful with --glx-swap-method, as well.
-glx-copy-from-front = false;
-
-# GLX backend: Use MESA_copy_sub_buffer to do partial screen update.
-# My tests on nouveau shows a 200% performance boost when only 1/4 of the screen is updated.
-# May break VSync and is not available on some drivers.
-# Overrides --glx-copy-from-front.
-# glx-use-copysubbuffermesa = true;
-
-# GLX backend: Avoid rebinding pixmap on window damage.
-# Probably could improve performance on rapid window content changes, but is known to break things on some drivers (LLVMpipe).
-# Recommended if it works.
-# glx-no-rebind-pixmap = true;
-
-
-# GLX backend: GLX buffer swap method we assume.
-# Could be undefined (0), copy (1), exchange (2), 3-6, or buffer-age (-1).
-# undefined is the slowest and the safest, and the default value.
-# copy is fastest, but may fail on some drivers,
-# 2-6 are gradually slower but safer (6 is still faster than 0).
-# Usually, double buffer means 2, triple buffer means 3.
-# buffer-age means auto-detect using GLX_EXT_buffer_age, supported by some drivers.
-# Useless with --glx-use-copysubbuffermesa.
-# Partially breaks --resize-damage.
-# Defaults to undefined.
-glx-swap-method = "undefined";
-
-#################################
-#
-# Shadows
-#
-#################################
-
-# Enabled client-side shadows on windows.
+# Shadow
 shadow = true;
-# Don't draw shadows on DND windows.
 no-dnd-shadow = true;
-# Avoid drawing shadows on dock/panel windows.
 no-dock-shadow = true;
-# Zero the part of the shadow's mask behind the window. Fix some weirdness with ARGB windows.
 clear-shadow = true;
-# The blur radius for shadows. (default 12)
-shadow-radius = 5;
-# The left offset for shadows. (default -15)
-shadow-offset-x = -5;
-# The top offset for shadows. (default -15)
-shadow-offset-y = -5;
-# The translucency for shadows. (default .75)
+shadow-radius = 7;
+shadow-offset-x = -7;
+shadow-offset-y = -7;
 shadow-opacity = 0.5;
+shadow-exclude = [ "class_g = 'Firefox' && argb", "bounding_shaped" ];
 
-# Set if you want different colour shadows
-# shadow-red = 0.0;
-# shadow-green = 0.0;
-# shadow-blue = 0.0;
-
-# The shadow exclude options are helpful if you have shadows enabled. Due to the way compton draws its shadows, certain applications will have visual glitches
-# (most applications are fine, only apps that do weird things with xshapes or argb are affected).
-# This list includes all the affected apps I found in my testing. The "! name~=''" part excludes shadows on any "Unknown" windows, this prevents a visual glitch with the XFWM alt tab switcher.
-shadow-exclude = [
-    "! name~=''",
-    "name = 'Notification'",
-    "name = 'Plank'",
-    "name = 'Docky'",
-    "name = 'Kupfer'",
-    "name = 'xfce4-notifyd'",
-    "name *= 'VLC'",
-    "name *= 'compton'",
-    "name *= 'Chromium'",
-    "name *= 'Chrome'",
-    "class_g = 'Conky'",
-    "class_g = 'Kupfer'",
-    "class_g = 'Synapse'",
-    "class_g ?= 'Notify-osd'",
-    "class_g ?= 'Cairo-dock'",
-    "class_g ?= 'Xfce4-notifyd'",
-    "class_g ?= 'Xfce4-power-manager'",
-    "_GTK_FRAME_EXTENTS@:c"
-];
-# Avoid drawing shadow on all shaped windows (see also: --detect-rounded-corners)
-shadow-ignore-shaped = false;
-
-#################################
-#
 # Opacity
-#
-#################################
-
-menu-opacity = 0.9;
-inactive-opacity = 0.9;
-active-opacity = 1;
-frame-opacity = 1;
-inactive-opacity-override = false;
+menu-opacity = 1.0;
+inactive-opacity = 1.0;
 alpha-step = 0.06;
-
-# Dim inactive windows. (0.0 - 1.0)
-inactive-dim = 0.1;
-# Do not let dimness adjust based on window opacity.
-# inactive-dim-fixed = true;
-# Blur background of transparent windows. Bad performance with X Render backend. GLX backend is preferred.
-# blur-background = true;
-# Blur background of opaque windows with transparent frames as well.
-# blur-background-frame = true;
-# Do not let blur radius adjust based on window opacity.
+blur-background = false;
+blur-kern = "3x3box";
 blur-background-fixed = false;
-blur-background-exclude = [
-    "window_type = 'dock'",
-    "window_type = 'desktop'"
-];
+blur-background-exclude = [ "window_type = 'dock'", "window_type = 'desktop'" ];
 
-#################################
-#
 # Fading
-#
-#################################
-
-# Fade windows during opacity changes.
 fading = true;
-# The time between steps in a fade in milliseconds. (default 10).
-fade-delta = 4;
-# Opacity change between steps while fading in. (default 0.028).
+fade-delta = 5;
 fade-in-step = 0.03;
-# Opacity change between steps while fading out. (default 0.03).
 fade-out-step = 0.03;
-# Fade windows in/out when opening/closing
-# no-fading-openclose = true;
-
-# Specify a list of conditions of windows that should not be faded.
 fade-exclude = [ ];
 
-#################################
-#
 # Other
-#
-#################################
-
-# Try to detect WM windows and mark them as active.
+backend = "glx";
 mark-wmwin-focused = true;
-# Mark all non-WM but override-redirect windows active (e.g. menus).
 mark-ovredir-focused = true;
-# Use EWMH _NET_WM_ACTIVE_WINDOW to determine which window is focused instead of using FocusIn/Out events.
-# Usually more reliable but depends on a EWMH-compliant WM.
-use-ewmh-active-win = true;
-# Detect rounded corners and treat them as rectangular when --shadow-ignore-shaped is on.
+use-ewmh-active-win = false;
 detect-rounded-corners = true;
-
-# Detect _NET_WM_OPACITY on client windows, useful for window managers not passing _NET_WM_OPACITY of client windows to frame windows.
-# This prevents opacity being ignored for some apps.
-# For example without this enabled my xfce4-notifyd is 100% opacity no matter what.
 detect-client-opacity = true;
-
-# Specify refresh rate of the screen.
-# If not specified or 0, compton will try detecting this with X RandR extension.
 refresh-rate = 0;
-
-# Set VSync method. VSync methods currently available:
-# none: No VSync
-# drm: VSync with DRM_IOCTL_WAIT_VBLANK. May only work on some drivers.
-# opengl: Try to VSync with SGI_video_sync OpenGL extension. Only work on some drivers.
-# opengl-oml: Try to VSync with OML_sync_control OpenGL extension. Only work on some drivers.
-# opengl-swc: Try to VSync with SGI_swap_control OpenGL extension. Only work on some drivers. Works only with GLX backend. Known to be most effective on many drivers. Does not actually control paint timing, only buffer swap is affected, so it doesn’t have the effect of --sw-opti unlike other methods. Experimental.
-# opengl-mswc: Try to VSync with MESA_swap_control OpenGL extension. Basically the same as opengl-swc above, except the extension we use.
-# (Note some VSync methods may not be enabled at compile time.)
-vsync = "opengl-swc";
-
-# Enable DBE painting mode, intended to use with VSync to (hopefully) eliminate tearing.
-# Reported to have no effect, though.
+vsync = "none";
 dbe = false;
-# Painting on X Composite overlay window. Recommended.
 paint-on-overlay = true;
-
-# Limit compton to repaint at most once every 1 / refresh_rate second to boost performance.
-# This should not be used with --vsync drm/opengl/opengl-oml as they essentially does --sw-opti's job already,
-# unless you wish to specify a lower refresh rate than the actual value.
-sw-opti = true;
-
-# Unredirect all windows if a full-screen opaque window is detected, to maximize performance for full-screen windows, like games.
-# Known to cause flickering when redirecting/unredirecting windows.
-# paint-on-overlay may make the flickering less obvious.
-unredir-if-possible = true;
-
-# Specify a list of conditions of windows that should always be considered focused.
+sw-opti = false;
+unredir-if-possible = false;
 focus-exclude = [ ];
-
-# Use WM_TRANSIENT_FOR to group windows, and consider windows in the same group focused at the same time.
 detect-transient = true;
-# Use WM_CLIENT_LEADER to group windows, and consider windows in the same group focused at the same time.
-# WM_TRANSIENT_FOR has higher priority if --detect-transient is enabled, too.
 detect-client-leader = true;
+invert-color-include = [ ];
 
-#################################
-#
-# Window type settings
-#
-#################################
+# GLX backend
+glx-no-stencil = true;
+glx-copy-from-front = false;
+glx-use-copysubbuffermesa = false;
+glx-no-rebind-pixmap = false;
+glx-swap-method = "undefined";
 
+# Window type settings
 wintypes:
 {
-    tooltip =
-    {
-        # fade: Fade the particular type of windows.
-        fade = true;
-        # shadow: Give those windows shadow
-        shadow = false;
-        # opacity: Default opacity for the type of windows.
-        opacity = 0.85;
-        # focus: Whether to always consider windows of this type focused.
-        focus = true;
-    };
+    tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; };
 };
+
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 59ce2b3..a95b92b 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -106,27 +106,27 @@ if !exists('g:airline_symbols')
 endif
 
 " unicode symbols
-let g:airline_left_sep = '»'
-let g:airline_left_sep = '▶'
-let g:airline_right_sep = '«'
-let g:airline_right_sep = '◀'
-let g:airline_symbols.linenr = '␊'
-let g:airline_symbols.linenr = '␤'
-let g:airline_symbols.linenr = '¶'
-let g:airline_symbols.branch = '⎇'
-let g:airline_symbols.paste = 'ρ'
-let g:airline_symbols.paste = 'Þ'
-let g:airline_symbols.paste = '∥'
-let g:airline_symbols.whitespace = 'Ξ'
+"let g:airline_left_sep = '»'
+"let g:airline_left_sep = '▶'
+"let g:airline_right_sep = '«'
+"let g:airline_right_sep = '◀'
+"let g:airline_symbols.linenr = '␊'
+"let g:airline_symbols.linenr = '␤'
+"let g:airline_symbols.linenr = '¶'
+"let g:airline_symbols.branch = '⎇'
+"let g:airline_symbols.paste = 'ρ'
+"let g:airline_symbols.paste = 'Þ'
+"let g:airline_symbols.paste = '∥'
+"let g:airline_symbols.whitespace = 'Ξ'
 
 " airline symbols
-let g:airline_left_sep = ''
-let g:airline_left_alt_sep = ''
-let g:airline_right_sep = ''
-let g:airline_right_alt_sep = ''
-let g:airline_symbols.branch = ''
-let g:airline_symbols.readonly = ''
-let g:airline_symbols.linenr = ''
+"let g:airline_left_sep = ''
+"let g:airline_left_alt_sep = ''
+"let g:airline_right_sep = ''
+"let g:airline_right_alt_sep = ''
+"let g:airline_symbols.branch = ''
+"let g:airline_symbols.readonly = ''
+"let g:airline_symbols.linenr = ''
 
 "Airline Themes
 "let g:airline_theme='dark'
diff --git a/nvim/.config/nvim/plugged/deol.nvim b/nvim/.config/nvim/plugged/deol.nvim
new file mode 160000
+Subproject 856041638e98fc3bf4d4de5d90dee525f3dfa9a
diff --git a/nvim/.config/nvim/plugged/deoplete-clangx b/nvim/.config/nvim/plugged/deoplete-clangx
new file mode 160000
+Subproject 197738ed344f4b1709b726a08cc5f3231fff2f1
diff --git a/nvim/.config/nvim/plugged/deoplete-jedi b/nvim/.config/nvim/plugged/deoplete-jedi
new file mode 160000
+Subproject 2d2ff2382fd67574c233d0ce48150b26eb7f680
diff --git a/nvim/.config/nvim/plugged/deoplete-zsh b/nvim/.config/nvim/plugged/deoplete-zsh
new file mode 160000
+Subproject 92b7afc3804dd17a849b207e184359558ab8f44
diff --git a/nvim/.config/nvim/plugged/deoplete.nvim b/nvim/.config/nvim/plugged/deoplete.nvim
new file mode 160000
+Subproject 6e01000280edc9c9c56ef7b1d59977fc93e3bf4
diff --git a/nvim/.config/nvim/plugged/goyo.vim b/nvim/.config/nvim/plugged/goyo.vim
new file mode 160000
+Subproject 6b6ed2734084fdbb6315357ddcaecf9c8e6f143
diff --git a/nvim/.config/nvim/plugged/nerdtree b/nvim/.config/nvim/plugged/nerdtree
new file mode 160000
+Subproject 07612557ebb4118ef4a337faa7033d0270773c7
diff --git a/nvim/.config/nvim/plugged/rainbow b/nvim/.config/nvim/plugged/rainbow
new file mode 160000
+Subproject c876f4bc6e737241d53669415f88cb5f2afd8ad
diff --git a/nvim/.config/nvim/plugged/tabular b/nvim/.config/nvim/plugged/tabular
new file mode 160000
+Subproject 339091ac4dd1f17e225fe7d57b48aff55f99b23
diff --git a/nvim/.config/nvim/plugged/vim-airline b/nvim/.config/nvim/plugged/vim-airline
new file mode 160000
+Subproject 099dd92eebe09ab27a483e381f2a708945e3433
diff --git a/nvim/.config/nvim/plugged/vim-airline-themes b/nvim/.config/nvim/plugged/vim-airline-themes
new file mode 160000
+Subproject 6270e7d58828999da7239785ad4269899fab99b
diff --git a/nvim/.config/nvim/plugged/vim-css-color b/nvim/.config/nvim/plugged/vim-css-color
new file mode 160000
+Subproject 1f9fe5c1f9e0a6bfc41b14d070f4d878d445ae9
diff --git a/nvim/.config/nvim/plugged/vim-eunuch b/nvim/.config/nvim/plugged/vim-eunuch
new file mode 160000
+Subproject 33e875b31c8b811a0a47908884a5e2339106bbe
diff --git a/nvim/.config/nvim/plugged/vim-gitgutter b/nvim/.config/nvim/plugged/vim-gitgutter
new file mode 160000
+Subproject da2c785221810b3d57479bb4b3678aabf32f3b8
diff --git a/nvim/.config/nvim/plugged/vim-markdown b/nvim/.config/nvim/plugged/vim-markdown
new file mode 160000
+Subproject da5a7ac96f517e0fd6f886bc3fbe27156ca1f94
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index 3348954..6710ac1 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -5,7 +5,6 @@ screenchange-reload = true
 #background = ${xrdb:color0:#222}
 background = ${xrdb:background:#0d0f14}
 background-alt = ${xrdb:color0:#000}
-;foreground = ${xrdb:color7:#222}
 foreground = ${xrdb:foreground:#c5c8c6}
 foreground-alt = ${xrdb:colorBD:#444}
 primary = ${xrdb:color4:#ffb52a}
@@ -32,10 +31,7 @@ padding-right = 2
 module-margin-left = 1.5
 module-margin-right = 1.5
 font-0 = Hermit:style=medium:pixelsize=10;1
-font-1 = SauceCodePro Nerd Font:style=medium:pixelsize=10;1
-font-2 = FontAwesome5Free:style=Solid:size=10;1
-font-3 = FontAwesome5Free:style=Regular:size=10;1
-font-4 = FontAwesome5Brands:style=Regular:size=10;1
+font-1 = FontAwesome:style=Regular:size=10;1
 modules-left = pulseaudio battery date time bspwm
 modules-center = 
 modules-right = spotify cmus xwindow
@@ -129,7 +125,7 @@ full-at = 98
 label-discharging = %percentage%%
 label-charging = %percentage%%
 label-full = %percentage%%
-format-discharging = <ramp-capacity>  <label-discharging>
+format-discharging = <ramp-capacity> <label-discharging>
 format-full = <ramp-capacity> <label-full>
 format-charging =  <label-charging>
 ramp-capacity-0 = 
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
index 7e91465..c333197 100644
--- a/sxhkd/.config/sxhkd/sxhkdrc
+++ b/sxhkd/.config/sxhkd/sxhkdrc
@@ -30,7 +30,7 @@ super + Escape
 super + shift + w 
         firefox
 control + alt + l
-        light-locker-command -l
+        ~/.local/bin/lock
 super + shift + f
         pcmanfm
 Print
@@ -163,4 +163,4 @@ XF86Audio{Play,Next,Prev}
 
 #light
 XF86MonBrightness{Down,Up}
-        xbacklight {-dec 3,-inc 3}
+        light {-U 3,-A 3}
diff --git a/x/.Xresources b/x/.Xresources
index 569a360..54e7237 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -35,56 +35,25 @@ URxvt*fading: 0
 URxvt*tintColor: #ffffff
 URxvt*shading: 0
 URxvt*inheritPixmap: False
-!Tomorrow
-#define t_background        #ffffff
-#define t_current_line      #efefef
-#define t_selection             #d6d6d6
-#define t_foreground            #4d4d4c
-#define t_comment               #8e908c
-#define t_red                   #c82829
-#define t_orange                #f5871f
-#define t_yellow                #eab700
-#define t_green                 #718c00
-#define t_aqua                  #3e999f
-#define t_blue                  #4271ae
-#define t_purple                #8959a8
 
-
-*.foreground:   t_foreground
-*.background:   t_background
-*.cursorColor:  #aeafad
-
-! Black / Grey
-*.color0:       #000000
-*.color8:       #666666
-
-! Red / Bright Red
-*.color1:       t_red
-*.color9:       #FF3334
-
-! Green + Bright Green
-*.color2:       t_green
-*.color10:      #9ec400
-
-! Yellow (Orange) + Bright Yellow (Yellow)
-*.color3:       t_orange
-*.color11:      t_yellow
-
-! Blue + Bright Blue
-*.color4:       t_blue
-*.color12:      t_blue
-
-! Magenta (Purple) + Bright Magenta
-*.color5:       t_purple
-*.color13:      #b777e0
-
-! Cyan (Aqua) + Bright Cyan
-*.color6:       t_aqua
-*.color14:      #54ced6
-
-! Light Grey (Selection) + White (Current Line)
-*.color7:       t_selection
-*.color15:      t_current_line
+*.foreground: #F8F8F2
+*.background: #121212
+*.color0:     #000000
+*.color8:     #4D4D4D
+*.color1:     #FF5555
+*.color9:     #FF6E67
+*.color2:     #50FA7B
+*.color10:    #5AF78E
+*.color3:     #F1FA8C
+*.color11:    #F4F99D
+*.color4:     #BD93F9
+*.color12:    #CAA9FA
+*.color5:     #FF79C6
+*.color13:    #FF92D0
+*.color6:     #8BE9FD
+*.color14:    #9AEDFE
+*.color7:     #BFBFBF
+*.color15:    #E6E6E6
 
 ! Perls
 URxvt.perl-ext-common : default,matcher,keyboard-select,url-select,resize-font
@@ -98,4 +67,3 @@ URxvt.url-select.launcher  	: firefox
 URxvt.url-select.autocopy       : true
 URxvt.url-select.underline      : true
 URxvt.url-select.button:   1
-
diff --git a/x/.xinitrc b/x/.xinitrc
index 8626b1b..b32d4c8 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -40,25 +40,5 @@ if [ -n "$DISPLAY" ]; then
         xset b off
 fi
 
-# load additional configs
-if [ "$2" = "nvidia" ]; then
-        XINIT_D="/etc/X11/nvidia/xinit/xinitrc.d"
-else
-        XINIT_D="/etc/X11/xinit/xinitrc.d"
-fi
-
-if [ -d "$XINIT_D" ]; then
-        for f in "$XINIT_D/?*.sh" ; do
-                [ -x "$f" ] && . "$f"
-        done
-        unset f
-fi
-unset XINIT_D
-
-# additional nvidia specific settings
-if [ "$2" = "nvidia" ]; then    
-        xrandr --setprovideroutputsource modesetting NVIDIA-0
-        xrandr --auto
-fi
-
-exec bspwm
+xsetroot -cursor_name left_ptr
+exec dbus-launch --sh-syntax --exit-with-x11 bspwm
diff --git a/zsh/.zshrc b/zsh/.zshrc
index a062cf7..d64be24 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -13,7 +13,7 @@ export XDG_CURRENT_DESKTOP=bspwm
 # load a random theme each time oh-my-zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
 # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
-ZSH_THEME="jaischeema"
+ZSH_THEME="theunraveler"
 
 # Set list of themes to pick from when loading at random
 # Setting this variable when ZSH_THEME=random will cause zsh to load
@@ -73,7 +73,7 @@ ZSH_THEME="jaischeema"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git sudo archlinux extract python common-aliases autojump fzf) 
+plugins=(git sudo extract python common-aliases autojump) 
 
 source $ZSH/oh-my-zsh.sh
 
@@ -106,15 +106,17 @@ alias key="vim $HOME/.config/sxhkd/sxhkdrc"
 alias wm="vim ~/.config/bspwm/bspwmrc"
 alias f="ranger"
 alias bb="cat /proc/acpi/bbswitch"
-alias nu="nmcli connection up "
-alias nt="nmtui-connect"
-alias nd="nmcli connection down "
+alias nu="sudo nmcli connection up "
+alias nt="sudo nmtui-connect"
+alias nd="sudo nmcli connection down "
+alias xi="sudo xbps-install -S "
+alias xu="sudo xbps-install -Syu"
+alias xr="sudo xbps-remove -R "
 alias pg="ping google.com"
 alias weather="curl wttr.in"
 alias py="/bin/python"
 alias py2="/bin/python2"
 alias pubip="curl ipinfo.io/ip"
-alias mirror="sudo reflector --verbose --latest 5 --sort rate --save /etc/pacman.d/mirrorlist"
 alias k="pkill "
 alias m="cmus"
 alias vimrc="vim $HOME/.config/nvim/init.vim"