diff options
| -rw-r--r-- | bash/.bashrc | 3 | ||||
| -rwxr-xr-x | bin/bin/downloads | 2 | ||||
| -rwxr-xr-x | bin/bin/password | 2 | ||||
| -rwxr-xr-x | bin/bin/references | 2 | ||||
| -rwxr-xr-x | bin/bin/run | 2 | ||||
| -rwxr-xr-x | bin/bin/tldr | 8 | ||||
| -rwxr-xr-x | bin/bin/tmux_attach | 2 | ||||
| -rw-r--r-- | tmux/.tmux.conf | 5 | ||||
| -rw-r--r-- | vim/.vim/spell/en.utf-8.add | 10 | ||||
| -rw-r--r-- | vim/.vim/spell/en.utf-8.add.spl | bin | 383 -> 406 bytes | |||
| -rw-r--r-- | vim/.vimrc | 5 | ||||
| -rw-r--r-- | xdg-open/.config/mimeapps.list | 8 |
12 files changed, 26 insertions, 23 deletions
diff --git a/bash/.bashrc b/bash/.bashrc index 3d0e6bd..a8153ac 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -1,3 +1,6 @@ +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + # Prompt if [[ -n $SSH_CLIENT ]]; then PS1=$'\e[0;31m[\h]\e[0m \w $ ' diff --git a/bin/bin/downloads b/bin/bin/downloads index 4a5fa7f..dfbbd98 100755 --- a/bin/bin/downloads +++ b/bin/bin/downloads @@ -1,5 +1,5 @@ #!/usr/bin/env bash download_dir="$HOME/Downloads" -target=$(find $download_dir -regex '.*\.\(pdf\|PDF\|djvu\|ps\)' -printf "%T+ %f\n" | sort -r | cut -d' ' -f2- | dmenu -i -p "Open File:") +target=$(find $download_dir -regex '.*\.\(pdf\|PDF\|djvu\|ps\)' -printf "%T+ %f\n" | sort -r | cut -d' ' -f2- | dmenu -i -p "Open File") [[ -n $target ]] && exec zathura "$download_dir/$target" diff --git a/bin/bin/password b/bin/bin/password index ffcbb7e..eae4be6 100755 --- a/bin/bin/password +++ b/bin/bin/password @@ -2,6 +2,6 @@ # Username in primary, password in clipboard -target=$(find "$HOME/.password-store/" -name "*.gpg" -printf "%P\\n" | dmenu -i -p "Get identifier for:") +target=$(find "$HOME/.password-store/" -name "*.gpg" -printf "%P\\n" | dmenu -i -p "Get identifier for") basename "$target" .gpg | xclip -i -selection "primary" pass show --clip "${target%.gpg}" diff --git a/bin/bin/references b/bin/bin/references index 93ef5f4..46ff41e 100755 --- a/bin/bin/references +++ b/bin/bin/references @@ -1,5 +1,5 @@ #!/bin/bash REF_DIR="$HOME/phd/references" PDF=$(find $REF_DIR -regex ".*.\(pdf\|djvu\|PDF\|ps\)" -printf "%C@ %P\n" | sort | tac | cut -d' ' -f2-) -TARGET=$(echo "${PDF//"$REF_DIR/"/}" | dmenu -i -p "Open File:") +TARGET=$(echo "${PDF//"$REF_DIR/"/}" | dmenu -i -p "Open File") [[ -n $TARGET ]] && exec zathura "$REF_DIR/$TARGET" diff --git a/bin/bin/run b/bin/bin/run index aef09ea..43f83ab 100755 --- a/bin/bin/run +++ b/bin/bin/run @@ -1,3 +1,3 @@ #!/bin/bash -target=$(find $HOME/dotfiles/bin/ -type f -not -name ".*" -printf "%f\n" | dmenu -i -p "Run script:") +target=$(find $HOME/dotfiles/bin/ -type f -not -name ".*" -printf "%f\n" | dmenu -i -p "Run script") [[ -n $target ]] && exec $target diff --git a/bin/bin/tldr b/bin/bin/tldr index cab9dfa..9e12f41 100755 --- a/bin/bin/tldr +++ b/bin/bin/tldr @@ -96,7 +96,7 @@ Style(){ STYLES+=${color[$style]:-}${bg[$style]:-}${mode[$style]:-} XSTYLES=${xmode[$style]:-}${xbg[$style]:-}${xcolor[$style]:-}$XSTYLES done -} +} # Sets: color xcolor bg xbg mode xmode Init_term(){ @@ -191,7 +191,7 @@ Config(){ SunOS) os='sunos' ;; esac Init_term - [[ $TLDR_LESS = 0 ]] && + [[ $TLDR_LESS = 0 ]] && trap 'cat <<<"$stdout"' EXIT || trap 'less -~RXQFP"Browse up/down, press Q to exit " <<<"$stdout"' EXIT @@ -327,7 +327,7 @@ Display_tldr(){ Out "$ENL$ESP$E$REPLY$XE" ;; esac done <"$1" - [[ $TLDR_LESS = 0 ]] && + [[ $TLDR_LESS = 0 ]] && trap 'cat <<<"$stdout"' EXIT || trap 'less -Gg -~RXQFP"%pB\% tldr $I$page$XI - browse up/down, press Q to exit" <<<"$stdout"' EXIT } @@ -362,7 +362,7 @@ Cache_fill(){ rm -- "$tmp" Err "Couldn't unzip the cache archive on $tmp/pages.zip" exit 8 - } + } rm -rf -- "${cachedir:?}/"* mv -- "$tmp/pages/"* "${cachedir:?}/" rm -rf -- "$tmp" diff --git a/bin/bin/tmux_attach b/bin/bin/tmux_attach index b5a613c..25d8f12 100755 --- a/bin/bin/tmux_attach +++ b/bin/bin/tmux_attach @@ -5,7 +5,7 @@ ATTACHED_SESSIONS=$(tmux list-sessions | grep attached | cut -d':' -f1) TMUXINATOR=$(tmuxinator list | sed '1d' | sed 's/\s\+/\n/g') UNION=$(cat <(echo "$SESSIONS") <(echo "$TMUXINATOR") | sort | uniq | sed "/^$/d") -SESSION=$(echo "$UNION" | dmenu -i -p "Session:" | tr -d '[:space:]') +SESSION=$(echo "$UNION" | dmenu -i -p "Session" | tr -d '[:space:]') [[ -n $SESSION ]] || exit # Rename i3 workspace diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 5fc66ee..ee2c342 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -10,7 +10,7 @@ unbind r bind r source-file ~/.tmux.conf set -sg escape-time 0 -set-option -g allow-rename off +set -g allow-rename off bind C-n next-window bind C-p previous-window @@ -25,3 +25,6 @@ PILOT_BOUNDARY=ignore PILOT_MODE=wintab PILOT_ROOT=$HOME/Dropbox/projects/vim-wintab source-file $PILOT_ROOT/pilot.tmux + +# set -g pane-border-status top +# set -g pane-border-format "#{pane_current_command}" diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add index 2ae9dc0..9cf8f88 100644 --- a/vim/.vim/spell/en.utf-8.add +++ b/vim/.vim/spell/en.utf-8.add @@ -4,18 +4,8 @@ Maruyama multiscale SPDE advective -UMFPACK -FreeFem -GMRES -OD2 -darkred -rgb -darkgreen -Cahn interfacial inkjet microfluidic spinodal -Sobolev -prefered orthonormality diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl Binary files differindex 9d07ad0..9559f0d 100644 --- a/vim/.vim/spell/en.utf-8.add.spl +++ b/vim/.vim/spell/en.utf-8.add.spl @@ -70,7 +70,6 @@ Plug 'zchee/deoplete-clang' Plug '~/Dropbox/projects/vim-remembrall' Plug '~/Dropbox/projects/vim-wintab' -Plug 'urbainvaes/vim-tmux-pilot' if has("nvim") " Plug 'roxma/nvim-completion-manager' @@ -517,8 +516,8 @@ let g:flagship_skip = 'FugitiveStatusline' augroup myflags autocmd! - autocmd BufEnter,BufRead,BufWritePost * let b:trailing=search('\s\+$','n') - autocmd BufEnter,BufRead,BufWritePost * let b:mixed=Mixed_indent() + autocmd CmdwinEnter,BufEnter,BufRead,BufWritePost * let b:trailing=search('\s\+$','n') + autocmd CmdwinEnter,BufEnter,BufRead,BufWritePost * let b:mixed=Mixed_indent() autocmd User Flags call Hoist("buffer", "%{FugitiveHead('') != '' ? '['.FugitiveHead('').']' : ''}") autocmd User Flags call Hoist("buffer", "%{b:trailing?'[tw]':''}") autocmd User Flags call Hoist("buffer", "%{b:mixed?'[mixed]':''}") diff --git a/xdg-open/.config/mimeapps.list b/xdg-open/.config/mimeapps.list index cf3f87b..59d1326 100644 --- a/xdg-open/.config/mimeapps.list +++ b/xdg-open/.config/mimeapps.list @@ -1,7 +1,15 @@ +# pkgfile mimetype +# +# To get mimetype: +# mimetype <file> +# +# To set default +# mimeopen -d <file> [Default Applications] text/plain=nvim.desktop; image/jpeg=feh.desktop; image/png=feh.desktop; +image/x-eps=org.pwmt.zathura.desktop; inode/directory=vifm.desktop;nautilus.desktop; text/html=qutebrowser.desktop;firefox.desktop; application/pdf=org.pwmt.zathura.desktop; |