Mon 02 Dec 2019 10:40:10 AM CET

5 files changed, 38 insertions, 35 deletions

diff --git a/files/rcs/.Xresources b/files/rcs/.Xresources
index a45fa3e..5163a2c 100644
--- a/files/rcs/.Xresources
+++ b/files/rcs/.Xresources
@@ -1,10 +1,10 @@
 ! To load into RESOURCE_MANAGER, run xrdb ~/.Xresources
 
-*background: #100010
+! *background and foreground are read by sxiv
 ! Gruvbox dark
 ! hard contrast:
 !*background: #1d2021
-!*background: #282828
+*background: #282828
 ! soft contrast:
 !*background: #32302f
 *foreground: #ebdbb2
@@ -34,29 +34,32 @@
 *color7:  #a89984
 *color15: #ebdbb2
 
+! Man pages
+URxvt.colorIT: #ff0000
+
 URxvt.scrollBar:	false
 
 ! These options are not used when configuration is through picom
-! URxvt.fading:		18
-! *.alpha: 120
+!URxvt.fading:		18
+!*.alpha: 120
 
 ! Fake transparency (copies root window, aka wallpaper)
 ! Overrides real transparency if not commented
-! URxvt.transparent:	true
-! URxvt.shading:		12
+!URxvt.transparent:	true
+!URxvt.shading:		12
 
 ! Real transparency (needs a running composite manager such as picom)
 URxvt.depth:		32
-!!
-URxvt.background:	[90]#100020
+URxvt.background:	[90]#050505
 
+*.font:	inconsolata:size=12
 URxvt.font:	xft:inconsolata:size=10,xft:symbola
 ! URxvt.font:	xft:mononoki:size=9,xft:symbola
 ! URxvt.font:	xft:envy code r:size=9,xft:symbola
 
 ! Leaving this blank stops perl from being initialized
 !URxvt.perl-ext:
-URxvt.perl-ext-common: font-size,default,url-select
+URxvt.perl-ext-common: default,url-select,font-size
 URxvt.keysym.C-equal: font-size:reset
 URxvt.keysym.M-u: perl:url-select:select_next
 URxvt.url-select.launcher: qutebrowser
diff --git a/files/rcs/.bash_aliases b/files/rcs/.bash_aliases
index 356c162..4c484a4 100644
--- a/files/rcs/.bash_aliases
+++ b/files/rcs/.bash_aliases
@@ -1,9 +1,10 @@
 # General abreviations
-alias r='ranger'
+alias r='tmux rename-window ranger; ranger; tmux rename-window bash'
 alias v='nvim'
 alias vim='nvim'
 alias ping='ping fsf.org'
-alias cdf='cd $(fzfPath.sh)'
+alias cdf='cd "$(fzfPath.sh)"'
+alias cdr='ranger "$(fzfPath.sh)"'
 alias mail='mail.sh'
 alias ls='ls -hN --color=auto --group-directories-first'
 alias grep='grep --color=auto'
@@ -29,12 +30,10 @@ alias cnb="vim ~/.newsboat/config"
 alias cnbu="vim ~/.newsboat/urls"
 alias ctmux="vim ~/.tmux.conf"
 
-# Non-path programs
-#alias CryptTool="wine '~/.wine/drive_c/Program Files (x86)/CrypTool/CrypTool.exe\'"
-
 alias upgrade="sudo pacman -Syu"
 
 alias starwars="telnet towel.blinkenlights.nl"
 alias adormir="mpv -vo caca ~/videos/Adormir.mp4 && clear 2>/dev/null"
 alias adormirloop="mpv --loop-file -vo caca ~/videos/Adormir.mp4 2>/dev/null && clear"
 alias nintendos="mpv -vo caca https://www.youtube.com/watch?v=hYNcJj2QDhk 2>/dev/null"
+alias netris="ssh netris.rocketnine.space"
diff --git a/files/rcs/.bash_vars b/files/rcs/.bash_vars
index bc282b3..6a6e64f 100644
--- a/files/rcs/.bash_vars
+++ b/files/rcs/.bash_vars
@@ -32,25 +32,27 @@ export GREP_COLORS='ms=04;32;49:mc=04;32;49:sl=:cx=:fn=01;34;49:ln=34:bn=34:se=3
 # Colors for gcc
 export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
 
-################
-# PATH changes #
-################
+#########
+# $PATH #
+#########
 
 # java
 export JAVA_HOME="/usr/lib/jvm/default/"
 PATH="${PATH}:${JAVA_HOME}/bin"
 
-# add scripts folder to path
-PATH="$PATH:$HOME/scripts"
+# add scripts folder to path plus its direct subfolders
+for dir in $(find "$HOME/scripts" -type d | grep -v '/\.'); do
+	PATH="${PATH}:${dir}"
+done
 
 # add ruby bins (gems) folder to path
-PATH="$PATH:$(ruby -e 'puts Gem.user_dir')/bin"
+PATH="${PATH}:$(ruby -e 'puts Gem.user_dir')/bin"
 
 # add cargo bins folder to path
-PATH="$PATH:$HOME/.cargo/bin"
+PATH="${PATH}:${HOME}/.cargo/bin"
 
 # add pip local bins to path
-PATH="$PATH:$HOME/.local/bin"
+PATH="${PATH}:${HOME}/.local/bin"
 
 # export final PATH
 export PATH
diff --git a/files/rcs/.profile b/files/rcs/.profile
index bb116d9..3857f68 100644
--- a/files/rcs/.profile
+++ b/files/rcs/.profile
@@ -19,22 +19,22 @@ fi
 sudo loadkeys es
 sudo -n loadkeys "$XDG_CONFIG_HOME/ttymaps.kmap"
 [[ $(tty) = "/dev/tty6" ]] && setfont alt-8x8
-if [ "$(tty)" = "/dev/tty1" ] && [ ! "$(pgrep -x i3)" ]; then
+if [ "$(tty)" = "/dev/tty1" ] && ! pgrep -x i3; then
 	echo ""
 	cat "$HOME/.xinitrci3" > "$HOME/.xinitrc"
 	neofetch --config "$XDG_CONFIG_HOME/neofetch/neofetchLogin.conf"
 	#figlet "Starting i3-gaps..." | lolcat -a -d 1 -s 10 -p 1 -F 0.05
 	exec startx >"$CONFIG_FOLDER_LOGS/startx.log" 2>"$CONFIG_FOLDER_LOGS/startxerr.log"
-elif [ "$(tty)" = "/dev/tty3" ] && [ ! "$(pgrep -x xfce4-session)" ]; then
+elif [ "$(tty)" = "/dev/tty3" ] && ! pgrep -x xfce4-session; then
 	echo ""
 	cat "$HOME/.xinitrcxfce4" > "$HOME/.xinitrc"
 	neofetch --config "$XDG_CONFIG_HOME/neofetch/neofetchLogin.conf"
 	exec startx >"$CONFIG_FOLDER_LOGS/startx.log" 2>"$CONFIG_FOLDER_LOGS/startxerr.log"
-elif [ "$(tty)" = "/dev/tty4" ] && [ ! "$(pgrep -x gnome-session)" ]; then
+elif [ "$(tty)" = "/dev/tty4" ] && ! pgrep -x gnome-session; then
 	echo ""
 	cat "$HOME/.xinitrcgnome" > "$HOME/.xinitrc"
 	neofetch --config "$XDG_CONFIG_HOME/neofetch/neofetchLogin.conf"
 	exec startx >"$CONFIG_FOLDER_LOGS/startx.log" 2>"$CONFIG_FOLDER_LOGS/startxerr.log"
-elif [ "$(tty | egrep -e "/dev/tty.*")" ]; then
+elif tty | grep -q '/dev/tty.*' ; then
 	tmux new -s "$(tty | cut -d'/' -f3)"
 fi
diff --git a/files/rcs/.tmux.conf b/files/rcs/.tmux.conf
index 5db927a..aa46451 100644
--- a/files/rcs/.tmux.conf
+++ b/files/rcs/.tmux.conf
@@ -11,20 +11,20 @@ set -g status-keys vi
 # Theme
 #set-option -g status-style attr=default
 # status bar
-set-option -g status-style "fg=colour4 bg=colour8"
+set-option -g status-style "fg=colour4 bg=default"
 # status bar windows
-set-window-option -g window-status-style "fg=colour4 bg=colour8"
+set-window-option -g window-status-style "fg=colour4 bg=default"
 # status bar selected window
-set -g window-status-current-style "fg=colour13 bg=colour8"
-#set-window-option -g window-status-current-attr bold colour8
+set -g window-status-current-style "fg=colour13 bg=default"
+#set-window-option -g window-status-current-attr bold default
 # pane borders
-set-option -g pane-border-style "fg=colour0 bg=colour8"
-set-option -g pane-active-border-style "fg=colour6 bg=colour8"
+set-option -g pane-border-style "fg=colour8 bg=default"
+set-option -g pane-active-border-style "fg=colour6 bg=default"
 # pane number display
 set-option -g display-panes-colour colour4
 set-option -g display-panes-active-colour colour5
 # messages
-set-option -g message-style "fg=colour2 bg=colour8"
+set-option -g message-style "fg=colour2 bg=default"
 # clock
 set-window-option -g clock-mode-colour colour4
 # sizes
@@ -32,14 +32,13 @@ set -g status-interval 60
 set -g status-left-length 20
 #set -g status-left '#[fg=green](#S) #(whoami)  '
 set -g status-left '(#S)  '
-#set -g status-right '(#S)  '
 #zoom
 #{?window_zoomed_flag, ,🔍}
 
 set -g base-index 0
 set -s escape-time 0
 bind r source-file ~/.tmux.conf \; display-message "Config reloaded"
-bind-key C command-prompt -p "Name of new window: " "new-window -n '%%'"
+bind-key C command-prompt -p "Name of new window:" "new-window -n '%%'"
 
 # moving between panes with vim movement keys
 bind h select-pane -L