8 files changed, 96 insertions, 110 deletions

diff --git a/bin/.local/bin/fetch b/bin/.local/bin/fetch
index 609850c..93d7fc7 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-gentoo - tiny system info for gentoo
 
 ## INFO
 
 # user is already defined
 host="$(hostname)"
-os='Arch Linux'
+os='Gentoo 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="$(ls -d /var/db/pkg/*/* | 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}${magenta}"      # labels
+nc="${reset}${bold}${magenta}"      # user and hostname
+ic="${reset}"                       # info
+c0="${reset}${bold}${magenta}"      # first color
+c1="${reset}${magenta}"             # 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}
+${c0}  .\`    _  \`.    ${lc}OS:        ${ic}${os}${reset}
+${c0}  \`.   (${c1}_)   ${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}${uitype}:        ${ic}${ui}${reset}
 
 EOF
+
diff --git a/bin/.local/bin/shut b/bin/.local/bin/shut
new file mode 100755
index 0000000..dc391e1
--- /dev/null
+++ b/bin/.local/bin/shut
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+RET=$(echo -e "shutdown\nreboot\nsleep\nlock\ncancel" | dmenu -l 5 -p "Say goodbye")
+
+case $RET in
+        shutdown) sudo poweroff ;;
+        reboot) sudo reboot ;;
+        sleep) lock & sudo sh -c "echo -n mem > /sys/power/state" ;;
+    lock) lock ;;
+        *) ;;
+esac
diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
index 54f2aa6..8320458 100755
--- a/bspwm/.config/bspwm/bspwmrc
+++ b/bspwm/.config/bspwm/bspwmrc
@@ -3,14 +3,13 @@
 sxhkd &
 dunst &
 unclutter &
+xset b off &
 mpDris2 &
-xss-lock -- /home/fd0e/.local/bin/lock &
-/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
-compton --config ~/.config/compton.conf &
+#xss-lock -- /home/fd0e/.local/bin/lock &
+compton &
 ~/scrypts/bat_check.sh &
 redshift -l 13.082680:80.270718 &
-xbacklight -set 30 & 
-feh --bg-fill ~/Pictures/bech.jpg &
+~/.fehbg &
 urxvtd &
 
 bspc monitor -d term web music files code virt chat game IX X
@@ -23,6 +22,6 @@ bspc config borderless_monocle   true
 bspc config gapless_monocle      true
 
 bspc rule -a firefox desktop='^2'
-bspc rule -a Pcmanfm desktop='^4'
+bspc rule -a Spacefm desktop='^4'
 
 $HOME/.config/polybar/launch.sh &
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index 8260bc9..fa869f3 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -31,11 +31,10 @@ padding-left = 2
 padding-right = 2
 module-margin-left = 1.5
 module-margin-right = 1.5
-font-0 = Hermit:style=medium:pixelsize=10;1
-font-1 = FontAwesome:style=Regular:size=10;1
-modules-left = pulseaudio battery date time bspwm
+font-0 = Hermit:style=medium:size=9;1
+modules-left = alsa battery date time bspwm
 modules-center = 
-modules-right = spotify mpd
+;modules-right = spotify mpd
 tray-position = right
 cursor-click = pointer
 cursor-scroll = ns-resize
@@ -123,26 +122,18 @@ battery = BAT0
 adapter = ADP1
 poll-interval = 1
 full-at = 98
-label-discharging = %percentage%%
-label-charging = %percentage%%
-label-full = %percentage%%
-format-discharging = <ramp-capacity> <label-discharging>
-format-full = <ramp-capacity> <label-full>
-format-charging =  <label-charging>
-ramp-capacity-0 = 
-ramp-capacity-1 = 
-ramp-capacity-2 = 
-ramp-capacity-3 = 
-ramp-capacity-4 = 
-
-[module/pulseaudio]
-type = internal/pulseaudio
-format-volume = <ramp-volume> <label-volume>
+label-discharging = -bat %percentage%%
+label-charging = +bat %percentage%%
+label-full = ^bat %percentage%%
+format-discharging = <label-discharging>
+format-full = <label-full>
+format-charging = <label-charging>
+
+[module/alsa]
+type = internal/alsa
+format-volume = vol <label-volume>
 label-volume = %percentage%%
-label-muted = 婢 muted
-ramp-volume-0 = 
-ramp-volume-1 = 
-ramp-volume-2 = 
+label-muted = muted
 
 [module/spotify]
 type = custom/script
@@ -187,14 +178,3 @@ bar-progress-width = 10
 bar-progress-indicator = |
 bar-progress-fill = ─
 bar-progress-empty = ─
-
-[module/backlight]
-type = internal/backlight
-; Use the following command to list available cards:
-; $ ls -1 /sys/class/backlight/
-card = intel_backlight
-format = <ramp> <label>
-label = %percentage%%
-ramp-0 = 
-ramp-1 = 
-ramp-2 = 
diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
index b7e3d8a..22fe28e 100644
--- a/sxhkd/.config/sxhkd/sxhkdrc
+++ b/sxhkd/.config/sxhkd/sxhkdrc
@@ -7,8 +7,7 @@ super + shift + Return
 
 # program launcher
 super + @space
-        rofi -show drun -show-icons
-
+        dmenu_run -l 10
 super + c
     rofi -show calc -modi calc -no-show-match -no-sort -no-history
 super + i
@@ -30,15 +29,15 @@ super + Escape
 super + shift + w 
         firefox
 control + alt + l
-        /home/fd0e/.local/bin/lock
+    lock
 super + shift + f
-        pcmanfm
+        spacefm
 Print
         scrot
 ctrl + Print
         scrot 
 super + x
-        ~/.config/rofi/rofi-power.sh
+        shut
 super + shift + p
         rofi-pass
 #
@@ -162,5 +161,7 @@ XF86Audio{Play,Next,Prev}
         playerctl {play-pause,next,previous}
 
 #light
-XF86MonBrightness{Down,Up}
-        xbacklight {-dec 3,-inc 3}
+XF86MonBrightnessDown
+    sudo sh -c 'for f in /sys/class/backlight/*; do echo $(($(<$f/brightness)-5*$(<$f/max_brightness)/100)) > $f/brightness; done'
+XF86MonBrightnessUp
+    sudo sh -c 'for f in /sys/class/backlight/*; do echo $(($(<$f/brightness)+5*$(<$f/max_brightness)/100)) > $f/brightness; done'
diff --git a/x/.Xresources b/x/.Xresources
index 71e4fb8..26d3024 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -16,7 +16,7 @@ URxvt.scrollTtyKeypress: true
 URxvt.font: xft:Hermit:size=9:style=medium:antialias=true 
 !URxvt.boldFont: xft:Hermit:size=9:style=Bold:antialias=true
 !URxvt.italicFont: xft:Hermit:size=9:style=Italic:antialias=true
-URxvt.letterSpace: 1
+!URxvt.letterSpace: 1
 urxvt*termName: rxvt
 urxvt*scrollBar: false
 urxvt*matcher.button: 1
diff --git a/x/.xinitrc b/x/.xinitrc
index 1da9231..13792ac 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -61,4 +61,4 @@ if [ "$2" = "nvidia" ]; then
         xrandr --auto
 fi
 xsetroot -cursor_name left_ptr
-exec dbus-launch bspwm
+exec bspwm
diff --git a/zsh/.zshrc b/zsh/.zshrc
index bddd6dd..2dd7790 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="mh"
+ZSH_THEME="half-life"
 
 # 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="mh"
 # 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) 
 
 source $ZSH/oh-my-zsh.sh
 
@@ -105,36 +105,18 @@ source $ZSH/oh-my-zsh.sh
 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 pg="ping google.com"
 alias weather="curl wttr.in"
 alias py="/bin/python"
 alias py2="/bin/python2"
+alias pg="ping google.com"
 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="ncmpcpp"
 alias vimrc="vim $HOME/.config/nvim/init.vim"
 alias poly="vim $HOME/.config/polybar/config"
-alias z="zathura"
 alias v="/usr/bin/nvim"
 alias vim="/usr/bin/nvim"
 alias sudo="sudo "
 
-source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-
-
-# Import colorscheme from 'wal' asynchronously
-# &   # Run the process in the background.
-# ( ) # Hide shell job control messages.
-#(cat ~/.cache/wal/sequences &)
-
-# Alternative (blocks terminal for 0-3ms)
-#cat ~/.cache/wal/sequences
-
-# To add support for TTYs this line can be optionally added.
-#source ~/.cache/wal/colors-tty.sh
+source /usr/share/zsh/site-functions/zsh-syntax-highlighting.zsh