From 56fe44972a5871c713fee75ca255e540a658f4ec Mon Sep 17 00:00:00 2001 From: Amin Bandali Date: Wed, 20 Dec 2017 15:19:01 -0500 Subject: [PATCH] Back to urxvt; other updates --- sxhkd/.config/sxhkd/sxhkdrc | 15 +-- x/.Xresources.d/rxvt-unicode | 175 +++++++++++++++++++++-------------- x/.xprofile | 9 +- zsh/.zimrc | 4 +- zsh/.zlogin | 57 +----------- zsh/.zprofile | 4 +- zsh/.zshrc | 42 +++++++-- 7 files changed, 161 insertions(+), 145 deletions(-) diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc index 08338d9..7bd6400 100644 --- a/sxhkd/.config/sxhkd/sxhkdrc +++ b/sxhkd/.config/sxhkd/sxhkdrc @@ -3,11 +3,11 @@ # # terminal emulator -#super + {_,shift} + Return -# urxvt{_, -name tiled} - super + {_,shift} + Return - termite{_, --name=tiled} + urxvt{_, -name tiled} + +#super + {_,shift} + Return +# termite{_, --name=tiled} # program launcher super + space @@ -65,8 +65,8 @@ XF86LaunchB toggle-presentation-mode # monitor brightness -XF86MonBrightness{Up,Down} - light -s mba6x_backlight -{A,U} 5 +#XF86MonBrightness{Up,Down} +# light -{A,U} 5 # keyboard brightness #XF86KbdBrightness{Up,Down} @@ -181,3 +181,6 @@ super + alt + shift + {h,j,k,l} # move a floating window super + {Left,Down,Up,Right} bspc node -v {-20 0,0 20,0 -20,20 0} + +#alt + bracket{left,right} +# xdotool key --clearmodifiers ctrl+Page_{Up,Down} diff --git a/x/.Xresources.d/rxvt-unicode b/x/.Xresources.d/rxvt-unicode index 528fdf9..56df5fc 100644 --- a/x/.Xresources.d/rxvt-unicode +++ b/x/.Xresources.d/rxvt-unicode @@ -1,63 +1,11 @@ +! Font +URxvt.font: xft:ubuntu mono:pixelsize=16:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true +URxvt.boldFont: xft:ubuntu mono:pixelsize=16:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold +URxvt.italicFont: xft:ubuntu mono:pixelsize=16:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic +URxvt.bolditalicFont: xft:ubuntu mono:pixelsize=16:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic + URxvt.xftAntialias: true -URxvt.letterSpace: 0 - -! Fira Mono -! URxvt.font: xft:Fira Mono:pixelsize=15:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true -! URxvt.boldFont: xft:Fira Mono:pixelsize=15:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold -! URxvt.italicFont: xft:Fira Mono:pixelsize=15:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic -! URxvt.bolditalicFont: xft:Fira Mono:pixelsize=15:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic - -! Inconsolata -!URxvt.font: xft:inconsolata:pixelsize=16:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=14:antialias=true:hinting=true -!URxvt.boldFont: xft:inconsolata:pixelsize=16:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=14:antialias=true:hinting=true:bold -!URxvt.italicFont: xft:inconsolata:pixelsize=16:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=14:antialias=true:hinting=true:italic -!URxvt.bolditalicFont: xft:inconsolata:pixelsize=16:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=14:antialias=true:hinting=true:bolditalic - -! Ubuntu Mono -! URxvt.font: xft:ubuntu mono:pixelsize=17:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true -! URxvt.boldFont: xft:ubuntu mono:pixelsize=17:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold -! URxvt.italicFont: xft:ubuntu mono:pixelsize=17:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic -! URxvt.bolditalicFont: xft:ubuntu mono:pixelsize=17:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic - -! Ubuntu Mono -!URxvt.font: xft:ubuntu mono:pixelsize=16:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true -!URxvt.boldFont: xft:ubuntu mono:pixelsize=16:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold -!URxvt.italicFont: xft:ubuntu mono:pixelsize=16:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic -!URxvt.bolditalicFont: xft:ubuntu mono:pixelsize=16:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic - -! Ubuntu Mono -! URxvt.font: xft:ubuntu mono-10.5:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true -! URxvt.boldFont: xft:ubuntu mono-10.5:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold -! URxvt.italicFont: xft:ubuntu mono-10.5:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic -! URxvt.bolditalicFont: xft:ubuntu mono-10.5:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic - -!URxvt.font: xft:Triplicate T4C-11.5:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true -!URxvt.boldFont: xft:Triplicate T4C-11.5:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold -!URxvt.italicFont: xft:Triplicate T4C-11.5:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic -!URxvt.bolditalicFont: xft:Triplicate T4C-11.5:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic - -! Iosevka -!URxvt.font: xft:iosevka-13:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true -!URxvt.boldFont: xft:iosevka-13:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold -!URxvt.italicFont: xft:iosevka-13:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic -!URxvt.bolditalicFont: xft:iosevka-13:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic - -URxvt.font: xft:iosevka medium:pixelsize=16:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true -URxvt.boldFont: xft:iosevka:pixelsize=16:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold -URxvt.italicFont: xft:iosevka medium oblique:pixelsize=16:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic -URxvt.bolditalicFont: xft:iosevka bold oblique:pixelsize=16:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic - -! DejaVu Sans Mono -! URxvt.font: xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true -! URxvt.boldFont: xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold -! URxvt.italicFont: xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic -! URxvt.bolditalicFont: xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic - -! Source Code Pro -!URxvt.font: xft:source code pro:pixelsize=14.5:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true -!URxvt.boldFont: xft:source code pro:pixelsize=14.5:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold -!URxvt.italicFont: xft:source code pro:pixelsize=14.5:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic -!URxvt.bolditalicFont: xft:source code pro:pixelsize=14.5:antialias=true:hinting=true:bold:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bolditalic +URxvt.letterSpace: 0 URxvt.depth: 0 URxvt.loginShell: true @@ -72,9 +20,8 @@ URxvt*scrollTtyKeypress: true URxvt.keysym.Shift-Up: command:\033]720;1\007 URxvt.keysym.Shift-Down: command:\033]721;1\007 -!URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select,bidi -URxvt.perl-ext: default,clipboard,url-select,keyboard-select,bidi -!!,font-size +URxvt.perl-ext-common: default,clipboard,url-select,keyboard-select +URxvt.perl-ext: bidi URxvt.bidi.enabled: 1 URxvt.url-select.launcher: firefox URxvt.url-select.underline: true @@ -88,12 +35,98 @@ URxvt.iso14755_53: false URxvt.keysym.M-c: perl:clipboard:copy URxvt.keysym.M-v: perl:clipboard:paste URxvt.keysym.C-A-V: perl:clipboard:paste_escaped -!URxvt.keysym.C-Up: font-size:increase -!URxvt.keysym.C-Down: font-size:decrease -!URxvt.keysym.C-S-Up: font-size:incglobal -!URxvt.keysym.C-S-Down: font-size:decglobal -!URxvt.keysym.C-equal: font-size:reset -!URxvt.keysym.C-question: font-size:show - -! URxvt.iconFile: /usr/share/icons/Moka/96x96/apps/utilities-terminal.png -URxvt.iconFile: /usr/share/icons/elementary-xfce/apps/128/utilities-terminal.svg +URxvt.keysym.C-Up: font-size:increase +URxvt.keysym.C-Down: font-size:decrease +URxvt.keysym.C-S-Up: font-size:incglobal +URxvt.keysym.C-S-Down: font-size:decglobal +URxvt.keysym.C-equal: font-size:reset +!URxvt.keysym.C-question: font-size:show + +URxvt.iconFile: /usr/share/icons/Paper/48x48/apps/utilities-terminal.png + +!urxvt*foreground: white +!urxvt*background: black + +!*color0: #2E3436 +!*color1: #a40000 +!*color2: #4E9A06 +!*color3: #C4A000 +!*color4: #3465A4 +!*color5: #75507B +!*color6: #ce5c00 +!*color7: #babdb9 +!*color8: #555753 +!*color9: #EF2929 +!*color10: #8AE234 +!*color11: #FCE94F +!*color12: #729FCF +!*color13: #AD7FA8 +!*color14: #fcaf3e +!*color15: #EEEEEC + +!URxvt.foreground: #C8C8C8 +!URxvt.background: #FFFFFF + +!! black +!*color0: #2E3436 +!*color8: #555753 +!! red +!*color1: #a40000 +!*color9: #EF2929 +!! green +!*color2: #4E9A06 +!*color10: #8AE234 +!! yellow +!*color3: #C4A000 +!*color11: #FCE94F +!! blue +!*color4: #3465A4 +!*color12: #729FCF +!! purple +!*color5: #75507B +!*color13: #AD7FA8 +!! orange (replaces cyan) +!*color6: #ce5c00 +!*color14: #fcaf3e +!! white +!*color7: #babdb9 +!*color15: #EEEEEC + +! Tango colour theme for rxvt-unicode +URxvt.background: #FFFFFF +URxvt.foreground: #000000 + +! Black +URxvt.color0: #2E3436 +URxvt.color8: #757773 + +! Red +URxvt.color1: #CC0000 +URxvt.color9: #EF2929 + +! Green +URxvt.color2: #4E9A06 +URxvt.color10: #8AE234 + +! Yellow +URxvt.color3: #C4A000 +URxvt.color11: #FCE94F + +! Blue +URxvt.color4: #3465A4 +URxvt.color12: #729FCF + +! Magenta +URxvt.color5: #75507B +URxvt.color13: #AD7FA8 + +!! Cyan +!URxvt.color6: #06989A +!URxvt.color14: #34E2E2 +! orange (replaces cyan) +*color6: #ce5c00 +*color14: #fcaf3e + +! White +URxvt.color7: #D3D7CF +URxvt.color15: #EEEEEC diff --git a/x/.xprofile b/x/.xprofile index 055725d..e3736f1 100644 --- a/x/.xprofile +++ b/x/.xprofile @@ -1,5 +1,12 @@ -setxkbmap -option ctrl:nocaps #setxkbmap -option compose:ralt +setxkbmap -option ctrl:nocaps + +setxkbmap -option ctrl:rctrl_ralt +setxkbmap -option altwin:swap_alt_win +#xmodmap .Xmodmap + +#light -Scrs "intel_backlight" 75 +light -Scrs "intel_backlight" 2 source ~/.zprofile export _JAVA_AWT_WM_NONREPARENTING=1 diff --git a/zsh/.zimrc b/zsh/.zimrc index 2b07dee..1ef71b2 100644 --- a/zsh/.zimrc +++ b/zsh/.zimrc @@ -11,7 +11,7 @@ # Select what modules you would like enabled. # The second line of modules may depend on options set by modules in the first # line. These dependencies are noted on the respective module's README.md. -zmodules=(directory environment git git-info history input ssh utility meta custom \ +zmodules=(directory environment git git-info history input ssh utility custom \ syntax-highlighting history-substring-search prompt completion) @@ -25,8 +25,6 @@ zmodules=(directory environment git git-info history input ssh utility meta cust # Set your desired prompt here zprompt_theme='pure' -#zprompt_theme='gitster' -#zprompt_theme='minimal' PURE_PROMPT_SYMBOL=λ #PURE_PROMPT_SYMBOL=➜ diff --git a/zsh/.zlogin b/zsh/.zlogin index d8b5b0a..e29c860 100644 --- a/zsh/.zlogin +++ b/zsh/.zlogin @@ -1,59 +1,8 @@ # -# startup file read in interactive login shells +# User configuration sourced by login shells # -# The following code helps us by optimizing the existing framework. -# This includes zcompile, zcompdump, etc. -# - -( - # Function to determine the need of a zcompile. If the .zwc file - # does not exist, or the base file is newer, we need to compile. - # These jobs are asynchronous, and will not impact the interactive shell - zcompare() { - if [[ -s ${1} && ( ! -s ${1}.zwc || ${1} -nt ${1}.zwc) ]]; then - zcompile ${1} - fi - } - - zim_mods=${ZDOTDIR:-${HOME}}/.zim/modules - setopt EXTENDED_GLOB - - # zcompile the completion cache; siginificant speedup. - for file in ${ZDOTDIR:-${HOME}}/.zcomp^(*.zwc)(.); do - zcompare ${file} - done - - # zcompile .zshrc - zcompare ${ZDOTDIR:-${HOME}}/.zshrc - - # zcompile some light module init scripts - zcompare ${zim_mods}/git/init.zsh - zcompare ${zim_mods}/utility/init.zsh - zcompare ${zim_mods}/pacman/init.zsh - zcompare ${zim_mods}/spectrum/init.zsh - zcompare ${zim_mods}/completion/init.zsh - zcompare ${zim_mods}/fasd/init.zsh - - # zcompile all .zsh files in the custom module - for file in ${zim_mods}/custom/**/^(README.md|*.zwc)(.); do - zcompare ${file} - done - - # zcompile all autoloaded functions - for file in ${zim_mods}/**/functions/^(*.zwc)(.); do - zcompare ${file} - done - - # syntax-highlighting - for file in ${zim_mods}/syntax-highlighting/external/highlighters/**/*.zsh; do - zcompare ${file} - done - zcompare ${zim_mods}/syntax-highlighting/external/zsh-syntax-highlighting.zsh - - # zsh-histery-substring-search - zcompare ${zim_mods}/history-substring-search/external/zsh-history-substring-search.zsh - -) &! \ No newline at end of file +# Initialize zim +[[ -s ${ZIM_HOME}/login_init.zsh ]] && source ${ZIM_HOME}/login_init.zsh \ No newline at end of file diff --git a/zsh/.zprofile b/zsh/.zprofile index d1948bf..a5786c3 100644 --- a/zsh/.zprofile +++ b/zsh/.zprofile @@ -1,5 +1,5 @@ #PATH="$(ruby -e 'print Gem.user_dir')/bin:$PATH" -PATH=$HOME/.gem/ruby/2.4.0/bin:$PATH +#PATH=$HOME/.gem/ruby/2.4.0/bin:$PATH export PATH=$HOME/.local/bin:$HOME/.cabal/bin:$HOME/.cargo/bin:$PATH export XDG_CONFIG_HOME=$HOME/.config export XDG_DATA_HOME=$HOME/.local/share @@ -19,5 +19,7 @@ export PATH="$HOME/usr/build/pvs:$PATH" export SBCLISP_HOME=/usr/share/sbcl-source export PVS_LIBRARY_PATH="$HOME/usr/build/pvs/nasalib" +export MOZ_USE_XINPUT2=1 + #if [ -e /home/amin/.nix-profile/etc/profile.d/nix.sh ]; then . /home/amin/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer diff --git a/zsh/.zshrc b/zsh/.zshrc index 4de08ab..75126ac 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,8 +1,7 @@ # Bash-like navigation #export WORDCHARS='*?_-.[]~=&;!#$%^(){}<>' -export WORDCHARS='*?-[]~=&;!#$%^(){}<>' - -fpath+=~/.zfunc +#export WORDCHARS='*?-[]~=&;!#$%^(){}<>' +export WORDCHARS='*?[]~=&;!#$%^(){}<>' disable -r time # disable shell reserved word alias time='time -p' # -p for POSIX output @@ -11,24 +10,45 @@ alias time='time -p' # -p for POSIX output # (so that zsh picks up changes in $PATH immediately) TRAPUSR1() { rehash}; precmd() { [[ $history[$[ HISTCMD -1 ]] == *(pacaur|pacman)* ]] && killall -USR1 zsh } - - # # User configuration sourced by interactive shells # -# Source zim -if [[ -s ${ZDOTDIR:-${HOME}}/.zim/init.zsh ]]; then - source ${ZDOTDIR:-${HOME}}/.zim/init.zsh -fi +# Change default zim location +export ZIM_HOME=${ZDOTDIR:-${HOME}}/.zim +# Start zim +[[ -s ${ZIM_HOME}/init.zsh ]] && source ${ZIM_HOME}/init.zsh ZSH_HIGHLIGHT_PATTERNS+=('rm -rf *' 'fg=white,bold,bg=red') #ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=red,bold' +setopt globdots + source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh source ~/.zsh/zsh-autopair/autopair.zsh + +### fzf ### + +source /usr/share/fzf/key-bindings.zsh +source /usr/share/fzf/completion.zsh + +# Accept history selection instead of putting it on +# the command line +fzf-history-widget-accept() { + fzf-history-widget + zle accept-line +} +#zle -N fzf-history-widget-accept +#bindkey '^R' fzf-history-widget-accept + +# alt+c preview +export FZF_ALT_C_OPTS="--preview 'tree -C {} | head -200'" + +### fzf ### + + # aliases alias mpv="mpv --ytdl-format mp4" alias mv="mv -iv" @@ -37,3 +57,7 @@ alias scl=systemctl alias jcl=journalctl alias m="mbsync -Va; getmail; notmuch new" alias best="youtube-dl -f best" + +# i-beam cursor +echo -e "\033[5 q" +#echo -e "\033[6 q" -- 2.20.1