diff --git a/.config/aliasrc b/.config/aliasrc index e69963f..4a9fbd4 100644 --- a/.config/aliasrc +++ b/.config/aliasrc @@ -1,6 +1,7 @@ #!/bin/bash alias .evim='vim $HOME/.config/vim/vimrc' +alias .ebspwm='vim $HOME/.config/bspwm/bspwmrc' alias .f='git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME' alias aliases='vim ~/.config/aliasrc && source ~/.config/aliasrc' @@ -19,6 +20,7 @@ alias du='du -h' alias free='free -h' alias grep='grep --color=auto' +alias grep-highlight='grep -e "^" -e' alias hist-grep='history 0 | grep ' @@ -35,11 +37,11 @@ alias mv='mv -iv' alias pacman-autoremove='pacman -Rns $(pacman -Qtdq)' -alias qutebrowser-kiosk='qutebrowser -B $XDG_DATA_HOME/qutebrowser-kiosk -C $XDG_CONFIG_DIR/qutebrowser/config-kiosk.py' +alias qutebrowser-kiosk='qutebrowser -B $XDG_DATA_HOME/qutebrowser-kiosk -C $XDG_CONFIG_HOME/qutebrowser/config-kiosk.py' alias rm='rm -I --one-file-system -v' -alias s3cmd="s3cmd --config=$XDG_CONFIG_DIR/s3cmd/config" +alias s3cmd="s3cmd --config=$XDG_CONFIG_HOME/s3cmd/config" alias sudo='sudo ' alias wget='wget -c' diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index af1a9d6..b24d5ed 100755 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -8,6 +8,8 @@ if [[ $host_name == "portalo" ]]; then bspc monitor primary -d web terminal 3 4 5 6 game bspc monitor secondary -d side-view voip messenger + sleep 0.5 + bspc wm -O primary secondary elif [[ $host_name == *"laptop"* ]]; then @@ -18,6 +20,7 @@ fi bspc desktop web --layout monocle bspc desktop game --layout monocle +bspc desktop side-view --layout monocle bspc config border_width 1 bspc config window_gap 10 diff --git a/.config/environment b/.config/environment index 306160a..e69ed33 100644 --- a/.config/environment +++ b/.config/environment @@ -1,26 +1,31 @@ #!/usr/bin/env sh -[ -f "$HOME/.config/user-dirs.dirs" ] && source "$HOME/.config/user-dirs.dirs" +source "$HOME/.config/user-dirs.dirs" +source "$XDG_CONFIG_HOME/locale.conf" export CM_LAUNCHER='rofi' export EDITOR='/usr/bin/vim' -export GOPATH="$HOME/.local/share/go" +export GOPATH="$XDG_DATA_HOME/go" export MAKEFLAGS="-j$(grep -c ^processor /proc/cpuinfo)" -export MAILCAPS="$HOME/.config/mailcap/mailcaprc" -export MARKPATH="$HOME/.config/zsh/jump_marks" +export MAILCAPS="$XDG_CONFIG_HOME/mailcap/mailcaprc" +export MARKPATH="$XDG_CONFIG_HOME/zsh/jump_marks" -export NOTMUCH_CONFIG="$HOME/.config/notmuch/config" +export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch/config" -export OSH="$HOME/.config/bash/oh-my-bash" +export OSH="$XDG_CONFIG_HOME/bash/oh-my-bash" export PASSWORD_STORE_GENERATED_LENGTH='64' -export PATH=/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin:$HOME/.local/bin:$GOPATH/bin +export PATH=$HOME/.local/bin:/usr/local/bin:/usr/bin:/usr/sbin:/bin:/sbin:$GOPATH/bin -export VIMINIT="source $HOME/.config/vim/vimrc" +export VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc" -export ZDOTDIR="$HOME/.config/zsh" +export ZDOTDIR="$XDG_CONFIG_HOME/zsh" export ZSH="$ZDOTDIR/oh-my-zsh" + +### conditionals + +[ -x "$(command -v bat)" ] && export MANPAGER="sh -c 'col -bx | bat -l man -p'" diff --git a/.config/locale.conf b/.config/locale.conf new file mode 100644 index 0000000..97e25c7 --- /dev/null +++ b/.config/locale.conf @@ -0,0 +1,14 @@ +LANG=en_DK.UTF-8 +LANGUAGE=C:en +LC_ADDRESS=de_DE.UTF-8 +LC_COLLATE=C +LC_CTYPE=C +LC_IDENTIFICATION=C +LC_MEASUREMENT=de_DE.UTF-8 +LC_MESSAGES=C +LC_MONETARY=de_DE.UTF-8 +LC_NAME=C +LC_NUMERIC=C +LC_PAPER=de_DE.UTF-8 +LC_TELEPHONE=de_DE.UTF-8 +LC_TIME=en_DK.UTF-8 diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf index 68f92a8..fc07649 100644 --- a/.config/mpd/mpd.conf +++ b/.config/mpd/mpd.conf @@ -1,5 +1,5 @@ # Recommended location for database -db_file "$XDG_CONFIG_DIR/mpd/database" +db_file "$XDG_CONFIG_HOME/mpd/database" # Logs to systemd journal log_file "syslog" @@ -14,10 +14,10 @@ auto_update "yes" restore_paused "yes" # Uncomment to enable the functionalities -playlist_directory "$XDG_CONFIG_DIR/mpd/playlists" -pid_file "$XDG_CONFIG_DIR/mpd/pid" -state_file "$XDG_CONFIG_DIR/mpd/state" -sticker_file "$XDG_CONFIG_DIR/mpd/sticker.sql" +playlist_directory "$XDG_CONFIG_HOME/mpd/playlists" +pid_file "$XDG_CONFIG_HOME/mpd/pid" +state_file "$XDG_CONFIG_HOME/mpd/state" +sticker_file "$XDG_CONFIG_HOME/mpd/sticker.sql" audio_output { type "pulse" diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs index 49ef47c..e6cd0e0 100644 --- a/.config/user-dirs.dirs +++ b/.config/user-dirs.dirs @@ -6,6 +6,6 @@ XDG_DOCUMENTS_DIR="$HOME/documents" XDG_MUSIC_DIR="$HOME/music" XDG_PICTURES_DIR="$HOME/pictures" XDG_VIDEOS_DIR="$HOME/videos" -XDG_CONFIG_DIR="$HOME/.config" +XDG_CONFIG_HOME="$HOME/.config" XDG_CACHE_DIR="$HOME/.cache" XDG_DATA_HOME="$HOME/.local/share" diff --git a/.local/bin/passgen b/.local/bin/passgen index bb6ce5a..1fb6fd4 100755 --- a/.local/bin/passgen +++ b/.local/bin/passgen @@ -1,7 +1,4 @@ #!/usr/bin/env sh -xkcdpass_res=$(xkcdpass --numwords=13 --delimiter=_ --case=capitalize) - -shuf_res=$(shuf -i 100000-999999 -n1) - -echo ${xkcdpass_res}_${shuf_res} +xkcdpass_res=$(xkcdpass --numwords=13 --case=capitalize) +echo ${xkcdpass_res}