Cleanup and small tweaks

.config/dunst/dunstrc

@@ -10,7 +10,6 @@ padding = 10
 shrink = false
 
 frame_width = 3
-frame_color = "#676E7D"
 separator_height = 3
 separator_color = frame
 
@@ -41,13 +40,15 @@ history = ctrl+grave
 context = ctrl+shift+period
 
 [urgency_low]
-background = "#404552"
+background = "#8C9440"
 foreground = "#FFFFFF"
+frame_color = "#B5BD68"
 timeout = 10
 
 [urgency_normal]
 background = "#404552"
 foreground = "#FFFFFF"
+frame_color = "#676E7D"
 timeout = 10
 
 [urgency_critical]

.config/polybar/colors

@@ -1,3 +1,5 @@
+; -*- conf -*-
+
 ; Xresources colors
 [colors]
 foreground     = ${xrdb:foreground:#c5c8c6}

.config/polybar/modules

@@ -1,3 +1,5 @@
+; -*- conf -*-
+
 ; https://github.com/polybar/polybar/wiki/Module:-bspwm
 [module/bspwm]
 type = internal/bspwm
@@ -11,7 +13,8 @@ label-focused-padding = 2
 label-occupied = %name%
 label-occupied-padding = 2
 
-label-urgent = %name%!
+label-urgent = %name%
+label-urgent-foreground = ${colors.white-bright}
 label-urgent-background = ${wmcolors.bgcolor-urgent}
 label-urgent-padding = 2
 
@@ -114,7 +117,7 @@ format-full-foreground = ${colors.green-bright}
 format-discharging = <ramp-capacity> <label-discharging>
 format-discharging-foreground = ${colors.white-bright}
 
-ramp-capacity-0 = %{F#a54242}
+ramp-capacity-0 = %{F#dc7a43}
 ramp-capacity-1 = 
 ramp-capacity-2 = 
 ramp-capacity-3 = 

.config/sxhkd/bspwm

@@ -1,4 +1,4 @@
-# -*-conf-*-
+# -*- conf -*-
 
 
 ##--- Control ---##

.config/sxhkd/sxhkdrc

@@ -1,4 +1,4 @@
-# -*-conf-*-
+# -*- conf -*-
 
 #--- General ---#
 

.config/zsh/.zprofile

@@ -67,7 +67,7 @@ export BROWSER="firefox"
 export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc"
 
 # WM
-export WM="i3"
+export WM="bspwm"
 
 # Xorg
 export XINITRC="$XDG_CONFIG_HOME/xorg/xinitrc"

.config/zsh/.zshrc

@@ -42,7 +42,7 @@ zstyle ':vcs_info:*' formats '%F{cyan}(%F{red}%b%F{cyan})%f %c%u'
 compinit -d "$XDG_CACHE_HOME/zsh/zcompdump"
 zstyle ':completion::complete:*' use-cache 1
 zstyle ':completion::complete:*' cache-path "$XDG_CACHE_HOME/zsh/zcompcache"
-zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|=*' 'l:|=* r:|=*'
+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
 zstyle ':completion:*' list-colors ''
 zstyle ':completion:*' menu select
 
@@ -74,15 +74,22 @@ SAVEHIST=10000
 ## Aliases
 
 # General
+alias ..="cd .."
+alias ...="cd ../.."
+alias ....="cd ../../.."
 alias q="exit"
-alias la="ls -laGh --color --group-directories-first"
+alias la="ls -lAGh --color --group-directories-first"
 alias ls="ls --color --group-directories-first"
 alias grep="grep --color"
+alias df="df -h"
 alias md="mkdir -p"
 alias rm="rm -i"
+alias se="sudoedit"
+alias v="vim --servername VIM"
 alias vim="vim --servername VIM"
-alias svim="sudoedit"
 alias fuck='sudo $(fc -ln -1)'
+alias pkill="pkill -9"
+alias ss="sudo systemctl"
 
 # Config
 alias c="$HOME/.scripts/config.sh"
@@ -109,13 +116,14 @@ alias depend="$HOME/.scripts/alias.sh depend"
 alias jdoc="$HOME/.scripts/alias.sh java-doc"
 alias jr="$HOME/.scripts/alias.sh java-run"
 alias raspbian="$HOME/.scripts/alias.sh raspbian"
-alias ser="pio serialports monitor -b 9600"
+alias ser="pio device monitor -b 9600"
 alias upl="pio run -t upload"
 alias qmake="qmake -makefile ../ && make"
 
 # Git
 alias g="git"
 alias ga="git add"
+alias gap="git add -p"
 alias gs="git status"
 alias gc="git commit"
 alias gp="git pull"
@@ -131,7 +139,8 @@ alias vp="$HOME/.scripts/vimplugin.sh"
 alias mpvshuffle="$HOME/.scripts/mpv.sh shuffle"
 
 # Other
-alias mysql-workbench="GDK_SCALE=1 GDK_DPI_SCALE=1 mysql-workbench 1>/dev/null 2>&1 &; disown"
+alias weather="curl -s 'https://wttr.in/dordrecht?q&n&p' | head -n -3"
-alias weather="curl -s 'http://wttr.in/dordrecht?q&n&p' | head -n -3"
+alias workbench="GDK_SCALE=1 GDK_DPI_SCALE=1 mysql-workbench > /dev/null 2>&1 & disown"
+alias ytaudio="youtube-dl -f bestaudio -x --audio-format mp3"
 
 [ -f "$ZDOTDIR/.zshrc_extended" ] && source "$ZDOTDIR/.zshrc_extended"

.emacs.d/config.org

@@ -81,7 +81,7 @@ Install and configure packages.
 
 #+BEGIN_SRC emacs-lisp
   (use-package hybrid-reverse-theme
-	:load-path "~/Code/elisp/emacs-hybrid-reverse"
+	:load-path "~/code/elisp/emacs-hybrid-reverse"
 	:custom (load-theme 'hybrid-reverse t))
 
   (use-package which-key
@@ -551,6 +551,7 @@ File auto-saves, backups, tramps.
   ;; C/C++-like languages formatting style
   ;https://www.emacswiki.org/emacs/IndentingC
   (setq-default c-basic-offset 4
+				sgml-basic-offset 4
 				c-default-style "linux")
 #+END_SRC
 
@@ -761,7 +762,8 @@ Useful links:\\
 [[https://www.masteringemacs.org/article/mastering-key-bindings-emacs][Mastering Emacs key bindings]] \\
 [[https://github.com/jwiegley/use-package/blob/master/bind-key.el][use-package bind key]] \\
 [[https://www.gnu.org/software/emacs/manual/html_node/elisp/Remapping-Commands.html][GNU remapping commands]] \\
-[[https://www.gnu.org/software/emacs/manual/html_node/efaq/Binding-combinations-of-modifiers-and-function-keys.html][GNU binding combinations of modifiers]]
+[[https://www.gnu.org/software/emacs/manual/html_node/efaq/Binding-combinations-of-modifiers-and-function-keys.html][GNU binding combinations of modifiers]] \\
+[[https://github.com/hlissner/doom-emacs/blob/develop/modules/config/default/+evil-bindings.el][Doom Emacs bindings]]
 
 ** Disable default
 

.mozilla/firefox/rick.profile/user.js

@@ -1,3 +1,6 @@
+// Download directory
+user_pref("browser.download.dir", "/home/rick/downloads");
+
 // Display a blank new tab
 user_pref("browser.newtabpage.enabled", false);
 user_pref("browser.newtab.url", "about:blank");

.scripts/config.sh

@@ -10,10 +10,10 @@ BACKGROUND="&"
 
 # List of directories to exclude
 EXCLUDES="
-Code
+code
-Documents
+documents
 dotfiles
-Downloads
+downloads
 pictures
 .cache
 .clangd
@@ -34,8 +34,8 @@ pictures
 
 # List of files to include
 INCLUDES="
-Documents/vm/backup/backup.sh
+documents/vm/backup/backup.sh
-Documents/vm/commands.org
+documents/vm/commands.org
 dotfiles/dotfiles.sh
 "
 

.scripts/inputctl.sh

@@ -37,20 +37,20 @@ ${B}ARGS${N}
 EOF
 }
 
-# If no option is provided
+# Exit if no option is provided
-[ "$#" -eq 0 ] && help && exit
+[ "$#" -eq 0 ] && help && exit 1
 
 # Set required X variables
 export DISPLAY=:0
 export XAUTHORITY="$XDG_DATA_HOME/xorg/Xauthority"
 
-SCRIPT="$(basename "$0")"
 # Option handling
+SCRIPT="$(basename "$0")"
 while getopts ':h?d:k:s:' opt; do
 	case $opt in
 		h)
 			help
-			exit
+			exit 1
 			;;
 		d)
 			dev="SYNA3602:00 0911:5288 Touchpad"
@@ -105,8 +105,8 @@ keyboard() {
 	fi
 }
 
-shift $((OPTIND - 2))
 # Command handling
+[ $OPTIND -ge 2 ] && shift $((OPTIND - 2))
 if [ "$dev" = "Keyboard" ]; then
 	keyboard "$1"
 else

.scripts/netctl.sh

@@ -35,8 +35,8 @@ EOF
 # Exit if no option is provided
 [ "$#" -eq 0 ] && help && exit 1
 
-SCRIPT="$(basename "$0")"
 # Option handling
+SCRIPT="$(basename "$0")"
 while getopts ':h?e:w:' opt; do
 	case $opt in
 		h)
@@ -79,6 +79,7 @@ wireless() {
 	fi
 }
 
+# Command handling
 [ $OPTIND -ge 2 ] && shift $((OPTIND - 2))
 case "$1" in
 	1 | on)

etc/modprobe.d/blacklist.conf

@@ -1,2 +1,9 @@
+# Disable bluetooth
+blacklist bluetooth
+blacklist btbcm
+blacklist btintel
+blacklist btrtl
+blacklist btusb
+
 # Disable speck cipher
 blacklist speck

etc/udev/rules.d/00-usb-keyboard.rules

@@ -1,4 +1,4 @@
-# -*- mode: conf -*-
+# -*- conf -*-
 
 # When usb keyboard is plugged in, run inputctl script
 # Requires: run as local user with X variables set (DISPLAY and XAUTHORITY)