diff --git a/apps/ranger/.gitignore b/apps/ranger/.gitignore new file mode 100644 index 0000000..5faddf5 --- /dev/null +++ b/apps/ranger/.gitignore @@ -0,0 +1,3 @@ +* +!.gitignore +!rc.conf diff --git a/apps/ranger/rc.conf b/apps/ranger/rc.conf new file mode 100644 index 0000000..91cf36c --- /dev/null +++ b/apps/ranger/rc.conf @@ -0,0 +1,2 @@ +set preview_images true +set preview_images_method urxvt diff --git a/de/bar/bar.bash b/de/bar/bar.bash index e410538..23fb18b 100755 --- a/de/bar/bar.bash +++ b/de/bar/bar.bash @@ -6,14 +6,11 @@ export BAR_ON_TOP=0 export BAR_SIDE_MARGIN=200 MONITOR_WIDTH=$(xrandr | grep "$BAR_MONITOR" | grep -Po ' \d+' | head -n 1) -export BAR_FONT=$(xrdb -query | sed -ne 's/.*font:\s*xft:\([^-]*\)\-.*$/\1/p' | head -n 1) +export BAR_FONT=$(xrdb -query | sed -ne 's/.*font:\s*xft:\([^:]*\)\:.*$/\1/p' | head -n 1) export BAR_ICON_FONT="FontAwesome" -export BAR_FONT_SIZE=$(xrdb -query | sed -ne 's/.*font:\s*xft:[^-]*\-\([0-9]*\).*$/\1/p' | head -n 1) +export BAR_FONT_SIZE=$(xrdb -query | sed -ne 's/.*font:\s*xft:[^-]*\=\([0-9]*\).*$/\1/p' | head -n 1) export BAR_ICON_FONT_SIZE=$((BAR_FONT_SIZE)) -export BAR_FONT_DECLARATION="${BAR_FONT}:size=${BAR_FONT_SIZE};1" -export BAR_ICON_FONT_DECLARATION="${BAR_ICON_FONT}:size=${BAR_ICON_FONT_SIZE};1" - export GAP=$(bspc wm -d | grep -Po '(windowGap.*?,)' | grep -Po '\d*' | head -n 1) export BAR_BOTTOM="false" @@ -25,6 +22,9 @@ if [ -f "$HOME/.env_bar" ]; then source "$HOME/.env_bar" fi +export BAR_FONT_DECLARATION="${BAR_FONT}:pixelsize=${BAR_FONT_SIZE};1" +export BAR_ICON_FONT_DECLARATION="${BAR_ICON_FONT}:pixelsize=${BAR_ICON_FONT_SIZE};1" + export BAR_WIDTH=$((MONITOR_WIDTH - GAP - GAP - BAR_SIDE_MARGIN - BAR_SIDE_MARGIN)) export POS_X=$((GAP + BAR_SIDE_MARGIN)) diff --git a/de/xresources b/de/xresources index fdbfecb..ebe2535 100755 --- a/de/xresources +++ b/de/xresources @@ -15,9 +15,9 @@ # *letterSpace: 0 # Set fonts in "$HOME/.Xresources.env" -*font: xft:xos4 Terminus-14,xft:FreeSans-14 -*faceName: xft:xos4 Terminus-14,xft:FreeSans-14 -*boldFont: xft:xos4 Terminus-14,xft:FreeSans-14 +*font: xft:xos4 Termines:pixelsize=14,xft:FreeSans:pixelsize=14 +*faceName: xft:xos4 Terminus:pixelsize=14,xft:FreeSans:pixelsize=14 +*boldFont: xft:xos4 Terminus:pixelsize=14,xft:FreeSans:pixelsize=14 *letterSpace: 0 # rxvt-unicode configuration @@ -30,12 +30,13 @@ *scaleHeight: 1 *depth: 32 URxvt.internalBorder: 24 -URxvt.perl-ext-common: default,matcher,keyboard-select,resize-font +URxvt.perl-ext-common: default,matcher,resize-font URxvt.keysym.M-Escape: perl:keyboard-select:activate URxvt.resize-font.smaller: C-Down URxvt.resize-font.bigger: C-Up URxvt.url-launcher: /usr/bin/xdg-open URxvt.matcher.button: 1 +URxvt.depth: 0 URxvt*iso14755: False # Other Xorg configuration diff --git a/scripts/arch-linux/provisioning/2-essentials.bash b/scripts/arch-linux/provisioning/2-essentials.bash index 421a189..7b8f2a6 100755 --- a/scripts/arch-linux/provisioning/2-essentials.bash +++ b/scripts/arch-linux/provisioning/2-essentials.bash @@ -23,7 +23,7 @@ pacaur -S \ xsel \ xclip \ tmux \ - rxvt-unicode \ + rxvt-unicode-pixbuf \ xorg-xinit xorg-server xorg-xrdb \ xcb-util xcb-util-keysyms xcb-util-wm xorg-xrandr xdotool feh xorg-xprop \ irssi \ @@ -35,6 +35,7 @@ pacaur -S \ ttf-freefont \ ttf-font-awesome \ curl \ + w3m w3m-img \ --noconfirm --noedit sudo pip3 install neovim @@ -45,3 +46,6 @@ sudo ln -s /usr/bin/google-chrome-unstable /usr/bin/chrome mkdir -p "$HOME/.fonts/OTF" curl -L -o "$HOME/.fonts/OTF/monaco_powerline_nerd_font.otf" https://github.com/taohex/font/raw/master/Monaco%20for%20Powerline%20Nerd%20Font%20Complete.otf fc-cache -vf + +mkdir -p "$HOME/.urxvt/ext" +curl -L -o "$HOME/.urxvt/ext/resize-font" https://raw.githubusercontent.com/simmel/urxvt-resize-font/master/resize-font diff --git a/scripts/bin/app-launcher b/scripts/bin/app-launcher index 9451219..5245b97 100755 --- a/scripts/bin/app-launcher +++ b/scripts/bin/app-launcher @@ -2,12 +2,13 @@ source "$DOTFILES_PATH/de/bar/bar.bash" --just-vars -LAUNCHER_FONT=$(xrdb -query | sed -ne 's/.*font:\s*xft:\([^-]*\).*$/\1/p' | head -n 1) -LAUNCHER_FONT_SIZE=$(xrdb -query | sed -ne 's/.*font:\s*xft:.*\-\([^-]*\)$/\1/p' | head -n 1) +LAUNCHER_FONT=$(xrdb -query | sed -ne 's/.*font:\s*xft:\([^:]*\).*$/\1/p' | head -n 1) +LAUNCHER_FONT_SIZE=$(xrdb -query | sed -ne 's/.*font:\s*xft:.*=\(.*\)$/\1/p' | head -n 1) HIGHLIGHT_COLOR=$(xrdb -query | sed -ne 's/.*color4*:\s*\(.*\)$/\1/p' | head -n 1) HIGHLIGHT_FOREGROUND_COLOR=$(xrdb -query | sed -ne 's/.*background:\s*\(.*\)$/\1/p' | head -n 1) BACKGROUND_COLOR=$(xrdb -query | sed -ne 's/.*background:\s*\(.*\)$/\1/p' | head -n 1) FOREGROUND_COLOR=$(xrdb -query | sed -ne 's/.*foreground:\s*\(.*\)$/\1/p' | head -n 1) +GAP=$(xrdb -query | sed -ne 's/.*internalBorder:\s*\(.*\)$/\1/p' | head -n 1) for i in "$@"; do diff --git a/setup b/setup index 148a544..f9d3370 100755 --- a/setup +++ b/setup @@ -55,7 +55,7 @@ links=( # gtk configuration files "$dfp/de/gtk2rc" "$HOME/.gtkrc-2.0" "$dfp/de/gtk2rc" "$HOME/.gtkrc" - "$dfp/de/gtk3settings.ini" "$HOME/.config/gtk-3.0/settings.ini" + "$dfp/de/gtk3settings.ini" "$XDG_CONFIG_HOME/gtk-3.0/settings.ini" # irc files "$dfp/apps/irssi/" "$HOME/.irssi" @@ -75,7 +75,10 @@ links=( "$dfp/de/bar/polybar-config" "$XDG_CONFIG_HOME/polybar/config" # neofetch config - "$dfp/apps/neofetch/config" "$HOME/.config/neofetch/config" + "$dfp/apps/ranger" "$XDG_CONFIG_HOME/ranger" + + # neofetch config + "$dfp/apps/neofetch/config" "$XDG_CONFIG_HOME/neofetch/config" # git config "$dfp/apps/git/config" "$HOME/.gitconfig"