diff options
| -rwxr-xr-x | bspwm/.config/bspwm/bspwmrc | 9 | ||||
| -rw-r--r-- | fontconfig/.config/fontconfig/fonts.conf | 4 | ||||
| -rw-r--r-- | git/.gitconfig | 5 | ||||
| -rw-r--r-- | gtk/.config/gtk-3.0/settings.ini | 1 | ||||
| -rw-r--r-- | isync/.mbsyncrc | 1 | ||||
| -rwxr-xr-x | notmuch/mail/.notmuch/hooks/post-new | 8 | ||||
| -rw-r--r-- | rofi/.config/rofi/config | 9 | ||||
| -rw-r--r-- | sxhkd/.config/sxhkd/sxhkdrc | 5 | ||||
| -rw-r--r-- | x/.Xresources | 2 | ||||
| -rw-r--r-- | x/.Xresources.d/emacs | 2 | ||||
| -rw-r--r-- | x/.Xresources.d/rxvt-unicode | 24 | ||||
| -rw-r--r-- | zsh/.zprofile | 9 | ||||
| -rw-r--r-- | zsh/.zshrc | 2 |
13 files changed, 53 insertions, 28 deletions
diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc index 8ed07b1..c31e18b 100755 --- a/bspwm/.config/bspwm/bspwmrc +++ b/bspwm/.config/bspwm/bspwmrc @@ -23,6 +23,7 @@ bspc config click_to_focus button1 bspc config directional_focus_tightness low bspc rule -a Firefox desktop='^1' follow=on +bspc rule -a Nightly desktop='^1' follow=on bspc rule -a Emacs desktop='^2' state=tiled follow=on #bspc rule -a Chromium desktop='^4' follow=on bspc rule -a URxvt state=floating @@ -41,3 +42,11 @@ bspc rule -a Autokey-gtk state=floating bspc rule -a Mousepad state=floating bspc rule -a Wrapper-1.0 state=floating bspc rule -a File-roller state=floating +bspc rule -a Gnome-disks state=floating +bspc rule -a Termite state=floating +bspc rule -a Termite:tiled state=tiled +bspc rule -a Thunderbird:Calendar state=floating +bspc rule -a Audacity state=floating +bspc rule -a Proof state=floating # pvs x-show-proof +bspc rule -a Nm-connection-editor state=floating +bspc rule -a Wire state=floating diff --git a/fontconfig/.config/fontconfig/fonts.conf b/fontconfig/.config/fontconfig/fonts.conf index 444d8ed..21a387e 100644 --- a/fontconfig/.config/fontconfig/fonts.conf +++ b/fontconfig/.config/fontconfig/fonts.conf @@ -1,5 +1,5 @@ -<?xml version='1.0'?> -<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'> +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> <fontconfig> <match target="font"> <edit mode="assign" name="rgba"> diff --git a/git/.gitconfig b/git/.gitconfig index 222da55..aed8242 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -6,3 +6,8 @@ # gpgsign = true # [format] # signoff = true + +[alias] + git = !exec git +[core] + autocrlf = input diff --git a/gtk/.config/gtk-3.0/settings.ini b/gtk/.config/gtk-3.0/settings.ini index 30ebaa7..9056fdb 100644 --- a/gtk/.config/gtk-3.0/settings.ini +++ b/gtk/.config/gtk-3.0/settings.ini @@ -1,5 +1,6 @@ [Settings] gtk-icon-theme-name = Paper +#gtk-theme-name = Adwaita gtk-theme-name = Greybird #gtk-theme-name = Arc-Darker #gtk-theme-name = Numix-ArchBlue diff --git a/isync/.mbsyncrc b/isync/.mbsyncrc index 2d6d6f6..9d6d94b 100644 --- a/isync/.mbsyncrc +++ b/isync/.mbsyncrc @@ -14,6 +14,7 @@ Account amin MaildirStore amin-local Path ~/mail/amin/ Inbox ~/mail/amin/Inbox +SubFolders Verbatim Channel amin Master :amin-remote: diff --git a/notmuch/mail/.notmuch/hooks/post-new b/notmuch/mail/.notmuch/hooks/post-new index 63b2e2f..01ec2d2 100755 --- a/notmuch/mail/.notmuch/hooks/post-new +++ b/notmuch/mail/.notmuch/hooks/post-new @@ -2,7 +2,7 @@ afew -tn # apply tags to lists -notmuch tag +lists +lists/deepspec -- folder:amin/lists/.deepspec -notmuch tag +lists +lists/haskell-cafe -- folder:amin/lists/.haskell-cafe -notmuch tag +lists +lists/haskell-weekly -- folder:amin/lists/.haskell-weekly -notmuch tag +lists +lists/hackernewsletter -- folder:amin/lists/.hackernewsletter +notmuch tag +lists +lists/deepspec -- folder:amin/lists/deepspec +notmuch tag +lists +lists/haskell-cafe -- folder:amin/lists/haskell-cafe +notmuch tag +lists +lists/haskell-weekly -- folder:amin/lists/haskell-weekly +notmuch tag +lists +lists/hackernewsletter -- folder:amin/lists/hackernewsletter diff --git a/rofi/.config/rofi/config b/rofi/.config/rofi/config index 54afb77..32bcbb8 100644 --- a/rofi/.config/rofi/config +++ b/rofi/.config/rofi/config @@ -1,12 +1,13 @@ ! rofi.font: Ubuntu Mono 10.5 -rofi.font: Inconsolata 16 +!rofi.font: Inconsolata 16 +rofi.font: Iosevka 13 ! rofi.font: Source Code Pro 11 rofi.modi: run,window ! rofi.width: 640 rofi.width: 600 -rofi.location: 2 -rofi.yoffset: 200 +!rofi.location: 2 +!rofi.yoffset: 200 rofi.monitor: -1 -rofi.lines: 7 +rofi.lines: 10 rofi.theme: /usr/share/rofi/themes//gruvbox-light.rasi diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc index a34d562..08338d9 100644 --- a/sxhkd/.config/sxhkd/sxhkdrc +++ b/sxhkd/.config/sxhkd/sxhkdrc @@ -3,8 +3,11 @@ # # terminal emulator +#super + {_,shift} + Return +# urxvt{_, -name tiled} + super + {_,shift} + Return - urxvt{_, -name tiled} + termite{_, --name=tiled} # program launcher super + space diff --git a/x/.Xresources b/x/.Xresources index 5d23a38..d8e7145 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -1,4 +1,4 @@ #include ".Xresources.d/fonts" -#include ".Xresources.d/colors" +!#include ".Xresources.d/colors" #include ".Xresources.d/emacs" #include ".Xresources.d/rxvt-unicode" diff --git a/x/.Xresources.d/emacs b/x/.Xresources.d/emacs index 8b459ea..7372b6f 100644 --- a/x/.Xresources.d/emacs +++ b/x/.Xresources.d/emacs @@ -15,6 +15,6 @@ Emacs.FontBackend: xft,x ! Emacs.font: Inconsolata:size=17 ! Emacs.font: Inconsolata:size=16 ! Emacs.font: Inconsolata LGC:size=14 -!Emacs.font: Source Code Pro Medium-10.5 +! Emacs.font: Source Code Pro Medium-10.5 Emacs.font: Ubuntu Mono:size=16 ! Emacs.font: Iosevka:size=16 diff --git a/x/.Xresources.d/rxvt-unicode b/x/.Xresources.d/rxvt-unicode index 61520c9..528fdf9 100644 --- a/x/.Xresources.d/rxvt-unicode +++ b/x/.Xresources.d/rxvt-unicode @@ -20,16 +20,16 @@ URxvt.letterSpace: 0 ! 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 +!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: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 @@ -42,10 +42,10 @@ URxvt.bolditalicFont: xft:ubuntu mono:pixelsize=16:antialias=true:hinting=true !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-12:pixelsize=14:antialias=true:hinting=true, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true -!URxvt.boldFont: xft:iosevka-12:pixelsize=14:antialias=true:hinting=true:bold, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:bold -!URxvt.italicFont: xft:iosevka-12:pixelsize=14:antialias=true:hinting=true:italic, xft:dejavu sans mono:pixelsize=15:antialias=true:hinting=true:italic -!URxvt.bolditalicFont: xft:iosevka-12:pixelsize=14: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 diff --git a/zsh/.zprofile b/zsh/.zprofile index 3d060ab..d1948bf 100644 --- a/zsh/.zprofile +++ b/zsh/.zprofile @@ -9,12 +9,15 @@ export CVS_RSH=ssh export MATHMODELS=$HOME/src/eiffel/mathmodels export RUST_SRC_PATH=~/.multirust/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/src/rust/src -export PATH="$HOME/.cargo/bin:$PATH" - # Eiffel2Java stuff export JAVA_HOME=/usr/lib/jvm/default export CPATH=$CPATH:"$JAVA_HOME/include:$JAVA_HOME/include/linux" export LIBRARY_PATH=$LIBRARY_PATH:"$JAVA_HOME/jre/lib/amd64/server" export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$JAVA_HOME/jre/lib/amd64/server" -# 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 +export PATH="$HOME/usr/build/pvs:$PATH" +export SBCLISP_HOME=/usr/share/sbcl-source +export PVS_LIBRARY_PATH="$HOME/usr/build/pvs/nasalib" + + + #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 @@ -27,6 +27,7 @@ ZSH_HIGHLIGHT_PATTERNS+=('rm -rf *' 'fg=white,bold,bg=red') #ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=red,bold' source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh +source ~/.zsh/zsh-autopair/autopair.zsh # aliases alias mpv="mpv --ytdl-format mp4" @@ -35,3 +36,4 @@ alias cp="cp -iv" alias scl=systemctl alias jcl=journalctl alias m="mbsync -Va; getmail; notmuch new" +alias best="youtube-dl -f best" |