From ae90709b6f846d10ab89f6695490b0752ab02939 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sun, 7 Aug 2016 18:22:01 +0100 Subject: Add vim-like keybindings in ncmpcpp --- ncmpcpp/bindings | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 ncmpcpp/bindings diff --git a/ncmpcpp/bindings b/ncmpcpp/bindings new file mode 100644 index 0000000..aecb316 --- /dev/null +++ b/ncmpcpp/bindings @@ -0,0 +1,41 @@ +# the t key isn't used and it's easier to press than /, so lets use it +def_key "t" + find +def_key "t" + find_item_forward + +def_key "+" + show_clock +def_key "=" + volume_up + +def_key "j" + scroll_down +def_key "k" + scroll_up + +def_key "ctrl-u" + page_up +#push_characters "kkkkkkkkkkkkkkk" +def_key "ctrl-d" + page_down +#push_characters "jjjjjjjjjjjjjjj" + +def_key "h" + previous_column +def_key "l" + next_column + +def_key "." + show_lyrics + +def_key "n" + next_found_item +def_key "N" + previous_found_item + +# not used but bound +def_key "J" + move_sort_order_down +def_key "K" + move_sort_order_up -- cgit v1.2.3 From 6fabf41f6ef9f1d26fe6c1e88d848d8e2d72ac0d Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sun, 7 Aug 2016 18:22:39 +0100 Subject: Add cmaps for and --- vim/.vim/after/ftplugin/tex/mappings.vim | 3 ++- vim/.vimrc | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/vim/.vim/after/ftplugin/tex/mappings.vim b/vim/.vim/after/ftplugin/tex/mappings.vim index 939af68..9da769b 100644 --- a/vim/.vim/after/ftplugin/tex/mappings.vim +++ b/vim/.vim/after/ftplugin/tex/mappings.vim @@ -36,9 +36,10 @@ iabbrev gD \Delta iabbrev gT \Theta iabbrev gL \Lambda iabbrev gX \Xi -iabbrev gF \Phi iabbrev gP \Pi +iabbrev gS \Sigma iabbrev gW \Omega +iabbrev gF \Phi nnoremap i :VimtexCompile nnoremap e :VimtexErrors diff --git a/vim/.vimrc b/vim/.vimrc index 8709521..3e2d84d 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -30,6 +30,7 @@ Plug 'justinmk/vim-sneak' Plug 'klen/python-mode' Plug 'lervag/vimtex' Plug 'majutsushi/tagbar' +Plug 'mhinz/vim-startify' Plug 'mileszs/ack.vim' Plug 'nanotech/jellybeans.vim' Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' , 'on' : 'YcmGenerateConfig' } @@ -269,6 +270,11 @@ nnoremap + za nnoremap h nnoremap fw :%s/\s\+$// +cnoremap +cnoremap +cnoremap +cnoremap + "" Colorscheme let g:seoul256_background =235 silent! colo $COLORSCHEME -- cgit v1.2.3 From f4ab867e8e8e46fa94d92825e74fc9f70cb7fd82 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sun, 7 Aug 2016 23:02:10 +0100 Subject: Update binding ncmpcpp --- ncmpcpp/bindings | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/ncmpcpp/bindings b/ncmpcpp/bindings index aecb316..7758f51 100644 --- a/ncmpcpp/bindings +++ b/ncmpcpp/bindings @@ -1,25 +1,20 @@ -# the t key isn't used and it's easier to press than /, so lets use it +def_key "?" + show_help + def_key "t" find def_key "t" find_item_forward -def_key "+" - show_clock -def_key "=" - volume_up - def_key "j" scroll_down def_key "k" scroll_up -def_key "ctrl-u" +def_key "ctrl-b" page_up -#push_characters "kkkkkkkkkkkkkkk" -def_key "ctrl-d" +def_key "ctrl-f" page_down -#push_characters "jjjjjjjjjjjjjjj" def_key "h" previous_column @@ -34,7 +29,6 @@ def_key "n" def_key "N" previous_found_item -# not used but bound def_key "J" move_sort_order_down def_key "K" -- cgit v1.2.3 From 5bef4ed9217ff4ef83190103baf072917f2bcaa0 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 17 Aug 2016 17:43:07 +0100 Subject: [.muttrc] Add jabber ID in header --- mutt/.mutt/muttrc | 1 + 1 file changed, 1 insertion(+) diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc index 74c26e3..0e780f3 100644 --- a/mutt/.mutt/muttrc +++ b/mutt/.mutt/muttrc @@ -24,6 +24,7 @@ set fcc_clear unset markers set sleep_time = 0 set wait_key = no +my_hdr Jabber-ID: urbain@vaes.uk # Encryption set crypt_autosign = no -- cgit v1.2.3 From f016cf4bfa69cafa32e210aa49547aad35789032 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 17 Aug 2016 17:45:26 +0100 Subject: [.vimrc] Use :u instead of :w in w mapping --- vim/.vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/.vimrc b/vim/.vimrc index 3e2d84d..e37824e 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -253,7 +253,7 @@ endif "" Mappings -nnoremap w :w! +nnoremap w :update nnoremap q :q! nnoremap d :bd! nnoremap n :tabnew -- cgit v1.2.3 From b6495ac1998c312998ed1e6e5fda0607bb2947d0 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 23 Aug 2016 11:57:23 +0200 Subject: Adapt configuration to latest version of mutt --- mutt/.mutt/muttrc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mutt/.mutt/muttrc b/mutt/.mutt/muttrc index 0e780f3..20bb17a 100644 --- a/mutt/.mutt/muttrc +++ b/mutt/.mutt/muttrc @@ -36,12 +36,13 @@ set pgp_use_gpg_agent = yes set pgp_timeout = 3600 # Sidebar -set sidebar_width=26 set sidebar_visible = yes -set sidebar_delim='|' -set sidebar_shortpath = yes -set sidebar_folderindent = yes +set sidebar_width=25 +set sidebar_short_path = yes +set sidebar_folder_indent = yes +set sidebar_indent_string = " " set sidebar_format = "%B%* %?F?[%F]?%?N?(%N)?%4S" +set mail_check_stats bind index,pager \Cn sidebar-next bind index,pager \Cp sidebar-prev bind index,pager O sidebar-open -- cgit v1.2.3 From d41a9cd1da88c7c206e42922ea3ab3b2a4e15fdd Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 24 Aug 2016 18:19:13 +0200 Subject: Add keybindings for GNU info --- info/.infokey | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 info/.infokey diff --git a/info/.infokey b/info/.infokey new file mode 100644 index 0000000..0433909 --- /dev/null +++ b/info/.infokey @@ -0,0 +1,18 @@ +#info +j next-line +k prev-line +l forward-char +h backward-char +^f scroll-forward +^b scroll-backward +g beginning-of-node +G end-of-node +^o history-node +} next-node +{ prev-node +u up-node +t top-node +d dir-node +/ search +n search-next +N search-previous -- cgit v1.2.3 From e4b46c918319fa9ab2a7d11f3275b848ed704a90 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 24 Aug 2016 18:20:03 +0200 Subject: Add keybinding to toggle the i3 bar visibility --- i3/.config/i3/config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/i3/.config/i3/config b/i3/.config/i3/config index ffed0bd..8f6952d 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -147,7 +147,10 @@ bindsym $mod+r mode "resize" # finds out, if available) bar { status_command $HOME/bin/mystatus + mode hide + modifier none } +bindsym $mod+m bar mode toggle # Workspaces bindsym $mod+Tab workspace back_and_forth @@ -177,6 +180,6 @@ bindsym $mod+Shift+n exec $HOME/bin/workspace m bindsym $mod+semicolon exec --no-startup-id $HOME/bin/run bindsym $mod+z exec --no-startup-id $HOME/bin/tmux_attach bindsym $mod+e exec --no-startup-id $HOME/bin/rename_workspace -bindsym $mod+m exec --no-startup-id $HOME/bin/i3-shell +# bindsym $mod+m exec --no-startup-id $HOME/bin/i3-shell for_window [class="^.*"] border pixel 2 -- cgit v1.2.3 From 0b3c3a10f11d8c1598d2773189dfbcd187b0344c Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Mon, 29 Aug 2016 15:02:12 +0200 Subject: [vim] Set python version to 3 for Gundo --- vim/.vim/spell/en.utf-8.add | 6 ++++++ vim/.vim/spell/en.utf-8.add.spl | Bin 0 -> 154 bytes vim/.vimrc | 7 ++++--- 3 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 vim/.vim/spell/en.utf-8.add create mode 100644 vim/.vim/spell/en.utf-8.add.spl diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add new file mode 100644 index 0000000..87ee2ba --- /dev/null +++ b/vim/.vim/spell/en.utf-8.add @@ -0,0 +1,6 @@ +diagonality +laplacian +Maruyama +multiscale +SPDE +advective diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl new file mode 100644 index 0000000..b52c8a6 Binary files /dev/null and b/vim/.vim/spell/en.utf-8.add.spl differ diff --git a/vim/.vimrc b/vim/.vimrc index e37824e..3dc451b 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -55,6 +55,7 @@ Plug 'troydm/zoomwintab.vim' Plug 'vim-airline/vim-airline' Plug 'vim-airline/vim-airline-themes' Plug 'vim-scripts/gmsh.vim' +Plug 'vim-scripts/SpellCheck' if has("nvim") Plug 'Shougo/deoplete.nvim' @@ -64,7 +65,6 @@ if has("nvim") else Plug 'Shougo/neocomplete.vim' Plug 'scrooloose/syntastic' - " Plug 'Valloric/YouCompleteMe', { 'do' : 'python2 install.py --clang-completer' } endif call plug#end() @@ -159,6 +159,9 @@ let g:deoplete#omni_patterns.tex = g:neocomplete#sources#omni#input_patterns.tex " FZF.vim let g:fzf_buffers_jump = 1 +" Gundo +let g:gundo_prefer_python3 = 1 + " NerdTree let g:NERDTreeHijackNetrw = 0 @@ -219,7 +222,6 @@ let g:netrw_bufsettings='relativenumber' let g:tex_conceal= 'adgm' let g:tex_flavor='latex' - "" Vim options set smartindent set expandtab @@ -227,7 +229,6 @@ set tabstop=4 set softtabstop=4 set shiftwidth=4 set showcmd -" set nofoldenable set foldmethod=marker set noswapfile set nowritebackup -- cgit v1.2.3 From 226c196628bb83e0f5406cb51b03be2d7c77a90e Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 31 Aug 2016 17:26:48 +0100 Subject: Update mr config --- mr/.mrconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mr/.mrconfig b/mr/.mrconfig index a007de9..ab0a1eb 100644 --- a/mr/.mrconfig +++ b/mr/.mrconfig @@ -1,19 +1,19 @@ [$HOME/dotfiles] -checkout = git clone 'git@urbainvaes.com:dotfiles.git' 'dotfiles' +checkout = git clone 'gitolite@urbainvaes.com:dotfiles.git' 'dotfiles' update = git pull origin master push = git push origin master [$HOME/gitolite] -checkout = git clone 'git@urbainvaes.com:gitolite-admin.git' 'gitolite' +checkout = git clone 'gitolite@urbainvaes.com:gitolite-admin.git' 'gitolite' update = git pull origin master push = git push origin master [$HOME/personal] -checkout = git clone 'git@urbainvaes.com:private/personal.git' 'personal' +checkout = git clone 'gitolite@urbainvaes.com:private/personal.git' 'personal' update = git pull origin master push = git push origin master [$HOME/.password-store] -checkout = git clone 'git@urbainvaes.com:private/passwords.git' '.password-store' +checkout = git clone 'gitolite@urbainvaes.com:private/passwords.git' '.password-store' update = git pull origin master push = git push origin master -- cgit v1.2.3 From 09a7dcd8ed743b9f7e4dfd184c26454c29fb4774 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 31 Aug 2016 17:27:17 +0100 Subject: [vim] Add localvimrc --- vim/.vimrc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vim/.vimrc b/vim/.vimrc index 3dc451b..25a5cbe 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -13,6 +13,7 @@ Plug 'altercation/vim-colors-solarized' Plug 'beloglazov/vim-online-thesaurus' Plug 'christoomey/vim-tmux-navigator' Plug 'critiqjo/lldb.nvim' +Plug 'embear/vim-localvimrc' Plug 'holomorph/vim-freefem' Plug 'honza/vim-snippets' Plug 'jamessan/vim-gnupg' @@ -101,6 +102,7 @@ vnoremap p :LL print =lldb#util#get_selection() " Fugitive nnoremap gs :Gstatus +nnoremap gc :Gcommit nnoremap gr :Gread nnoremap gd :Gdiff @@ -162,6 +164,10 @@ let g:fzf_buffers_jump = 1 " Gundo let g:gundo_prefer_python3 = 1 +" Idealvimrc +let g:localvimrc_sandbox = 0 +let g:localvimrc_whitelist='/home/*' + " NerdTree let g:NERDTreeHijackNetrw = 0 -- cgit v1.2.3 From 85d03dc7297404ad0cac04a0a9c2bbef8e301fbb Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 2 Sep 2016 12:06:35 +0100 Subject: [zsh] Add aliases for GNU Make --- zsh/.zsh/alias | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/zsh/.zsh/alias b/zsh/.zsh/alias index 7d0dc7d..8477d7d 100644 --- a/zsh/.zsh/alias +++ b/zsh/.zsh/alias @@ -5,13 +5,9 @@ alias c='clear' alias ca='printf "\ec"' alias cdd='cd ~/dotfiles' -# Shortcut to files -alias notes='vim ~/dotfiles/.notes' - # Programs alias a='vifm . .' alias ff='FreeFem++' -alias g='git' alias m='cd ~/.mutt/attachments && mutt && cd -' alias e='nvim' alias n='nvim' @@ -19,13 +15,14 @@ alias ns='nvim -S Session.vim' alias v='vim' alias vs="vim -S Session.vim" -# Build +# Git +alias g='git' +alias rd='cd $(git rev-parse --show-toplevel)' + +# GNU Make +alias mi='make install' alias mc='make clean' alias mca='make clean-all' -# Tmux -alias son="tmux set -g status on" -alias soff="tmux set -g status off" - # Unablias ag from ubuntu plugin unalias ag -- cgit v1.2.3 From eb389e6458bb4d1a2f91f4268feabf51879ca455 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 7 Sep 2016 14:44:44 +0100 Subject: [i3] Add mapping for screenshot --- i3/.config/i3/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 8f6952d..6668438 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -160,7 +160,7 @@ bindsym $mod+period workspace next # Programs shortcuts bindsym $mod+b exec --no-startup-id qutebrowser bindsym $mod+i exec $HOME/bin/vimin - +bindsym Print exec xfce4-screenshooter # Pulse Audio controls bindsym XF86AudioRaiseVolume exec amixer -D pulse sset Master 5%+ bindsym XF86AudioLowerVolume exec amixer -D pulse sset Master 5%- -- cgit v1.2.3 From aed8b6e0bca84363a9766c5355afe5ee4617a315 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 7 Sep 2016 14:46:43 +0100 Subject: [zsh] Change directory for z data files --- zsh/.zsh/plugins | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/zsh/.zsh/plugins b/zsh/.zsh/plugins index 3506d70..3cbc6fd 100644 --- a/zsh/.zsh/plugins +++ b/zsh/.zsh/plugins @@ -20,7 +20,6 @@ if ! zgen saved; then zgen oh-my-zsh plugins/themes # Appearance - # zgen oh-my-zsh themes/eastwood zgen load mafredri/zsh-async zgen load sindresorhus/pure @@ -49,4 +48,4 @@ fi } # Z -export _Z_EXCLUDE_DIRS=("$HOME/sshfs", "$HOME/nfs") +_Z_DADA=("$HOME/.local/share/z") -- cgit v1.2.3 From 3dee1f08f1a0b7be5e7f6fcbbc20861de5fea2a1 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Thu, 8 Sep 2016 11:38:50 +0100 Subject: [keyboard] Add mapping for Insert --- bin/bin/keyboard | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/bin/keyboard b/bin/bin/keyboard index d00035b..45d9972 100755 --- a/bin/bin/keyboard +++ b/bin/bin/keyboard @@ -30,6 +30,9 @@ xmodmap -e "keysym g = g G 7" xmodmap -e "keysym c = c C 8" xmodmap -e "keysym r = r R 9" +# Special characters +xmodmap -e "keysym XF86Eject = Insert" + # Xcape settings killall -9 xcape -- cgit v1.2.3 From 71a953f8f659d7dab2918a9080ff069cac7d495a Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Thu, 8 Sep 2016 11:40:16 +0100 Subject: [info] Rearrange configuration file --- info/.infokey | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/info/.infokey b/info/.infokey index 0433909..9c34cc4 100644 --- a/info/.infokey +++ b/info/.infokey @@ -3,16 +3,18 @@ j next-line k prev-line l forward-char h backward-char -^f scroll-forward -^b scroll-backward g beginning-of-node G end-of-node -^o history-node -} next-node -{ prev-node u up-node t top-node d dir-node -/ search n search-next N search-previous +m menu-item +} next-node +{ prev-node +/ search +^f scroll-forward +^b scroll-backward +^c abort-key +^o history-node -- cgit v1.2.3 From 71f5e8324147bc1dcc63f900cb4655cb42036caa Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 9 Sep 2016 13:53:57 +0100 Subject: Add khal + vdirsyncer configurations --- crontab/crontab | 2 ++ khal/.config/khal/khal.conf | 10 ++++++++++ vdirsyncer/.config/vdirsyncer/.gitignore | 1 + vdirsyncer/.config/vdirsyncer/config | 20 ++++++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 crontab/crontab create mode 100644 khal/.config/khal/khal.conf create mode 100644 vdirsyncer/.config/vdirsyncer/.gitignore create mode 100644 vdirsyncer/.config/vdirsyncer/config diff --git a/crontab/crontab b/crontab/crontab new file mode 100644 index 0000000..a6b27a3 --- /dev/null +++ b/crontab/crontab @@ -0,0 +1,2 @@ +*/5 * * * * /home/urbain/bin/email >> /home/urbain/.cron_email_log +*/5 * * * * /usr/bin/vdirsyncer sync >> /home/urbain/.cron_calendar_log diff --git a/khal/.config/khal/khal.conf b/khal/.config/khal/khal.conf new file mode 100644 index 0000000..3be1d2b --- /dev/null +++ b/khal/.config/khal/khal.conf @@ -0,0 +1,10 @@ +[calendars] + + [[home]] + path = ~/.calendars/home/ + color = dark green + +[default] + default_calendar = home + print_new = event + timedelta = 30d diff --git a/vdirsyncer/.config/vdirsyncer/.gitignore b/vdirsyncer/.config/vdirsyncer/.gitignore new file mode 100644 index 0000000..8be5547 --- /dev/null +++ b/vdirsyncer/.config/vdirsyncer/.gitignore @@ -0,0 +1 @@ +status diff --git a/vdirsyncer/.config/vdirsyncer/config b/vdirsyncer/.config/vdirsyncer/config new file mode 100644 index 0000000..0b2b070 --- /dev/null +++ b/vdirsyncer/.config/vdirsyncer/config @@ -0,0 +1,20 @@ +[general] +status_path = ~/.config/vdirsyncer/status/ + +# CALDAV +[pair calendar] +a = calendar_local +b = calendar_remote +collections = ["from b"] +conflict_resolution = b wins + +[storage calendar_local] +type = filesystem +path = ~/.calendars/ +fileext = .ics + +[storage calendar_remote] +type = caldav +url = "https://cal.urbainvaes.com/" +username = urbain +password.fetch = ["command", "pass", "show", "radicale/urbain"] -- cgit v1.2.3 From c40a53fb9804545c3d7fe0cebf32244eb6c1bf76 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 9 Sep 2016 14:17:23 +0100 Subject: Integrate qutebrowser upstream changes --- qutebrowser/.config/qutebrowser/keys.conf | 15 ++++++++++++--- qutebrowser/.config/qutebrowser/qutebrowser.conf | 22 +++++++++------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/qutebrowser/.config/qutebrowser/keys.conf b/qutebrowser/.config/qutebrowser/keys.conf index e441f4e..d8f070c 100644 --- a/qutebrowser/.config/qutebrowser/keys.conf +++ b/qutebrowser/.config/qutebrowser/keys.conf @@ -168,13 +168,13 @@ hint images tab hint images tab-bg .i -hint links fill ":open {hint-url}" +hint links fill :open {hint-url} ;o -hint links fill ":open -t {hint-url}" +hint links fill :open -t {hint-url} ;O -hint links fill ":open -b {hint-url}" +hint links fill :open -b {hint-url} .o hint links yank @@ -434,6 +434,12 @@ yank -p yank -ps yP +hint inputs + ;t + +repeat-command + . + [insert] # Keybindings for insert mode. # Since normal keypresses are passed through, only special keys are @@ -529,6 +535,9 @@ prompt-yes prompt-no n +prompt-open-download + + [command,prompt] rl-backward-char diff --git a/qutebrowser/.config/qutebrowser/qutebrowser.conf b/qutebrowser/.config/qutebrowser/qutebrowser.conf index f635c74..9944be4 100644 --- a/qutebrowser/.config/qutebrowser/qutebrowser.conf +++ b/qutebrowser/.config/qutebrowser/qutebrowser.conf @@ -34,11 +34,6 @@ # smart: Search case-sensitively if there are capital chars # Default: smart # -# wrap-search (Bool): -# Whether to wrap finding text to the top when arriving at the end. -# Valid values: true, false -# Default: true -# # startpage (List): # The default page(s) to open at the start, separated by commas. # Default: https://duckduckgo.com @@ -153,7 +148,6 @@ # Valid values: host, path, query, anchor # Default: path,query ignore-case = smart -wrap-search = true startpage = about:blank default-page = https://startpage.com auto-search = naive @@ -190,6 +184,11 @@ url-incdec-segments = path,query # Valid values: top, bottom # Default: top # +# status-position (VerticalPosition): +# The position of the status bar. +# Valid values: top, bottom +# Default: bottom +# # message-timeout (Int): # Time (in ms) to show messages in the statusbar for. # Default: 2000 @@ -208,11 +207,6 @@ url-incdec-segments = path,query # never: Never show a confirmation. # Default: never # -# display-statusbar-messages (Bool): -# Whether to display javascript statusbar messages. -# Valid values: true, false -# Default: false -# # zoom-text-only (Bool): # Whether the zoom factor on a frame applies only to the text or to # all content. @@ -264,6 +258,7 @@ url-incdec-segments = path,query # otherwise. # * `{id}`: The internal window ID of this window. # * `{scroll_pos}`: The page scroll position. +# * `{host}`: The host of the current web page. # Default: {perc}{title}{title_sep}qutebrowser # # hide-mouse-cursor (Bool): @@ -289,10 +284,10 @@ url-incdec-segments = path,query zoom-levels = 25%,33%,50%,67%,75%,90%,100%,110%,125%,150%,175%,200%,250%,300%,400%,500% default-zoom = 100% downloads-position = top +status-position = bottom message-timeout = 2000 message-unfocused = false confirm-quit = never -display-statusbar-messages = false zoom-text-only = false frame-flattening = false user-stylesheet = ::-webkit-scrollbar { width: 0px; height: 0px; } @@ -619,6 +614,7 @@ mouse-zoom-divider = 512 # * `{index}`: The index of this tab. # * `{id}`: The internal tab ID of this tab. # * `{scroll_pos}`: The page scroll position. +# * `{host}`: The host of the current web page. # Default: {index}: {title} # # title-alignment (TextAlignment): @@ -993,7 +989,7 @@ DEFAULT = https://duckduckgo.com/?q={} # Colors used in the UI. # A value can be in one of the following format: # * `#RGB`/`#RRGGBB`/`#RRRGGGBBB`/`#RRRRGGGGBBBB` -# * A SVG color name as specified in http://www.w3.org/TR/SVG/types.html#ColorKeywords[the W3C specification]. +# * An SVG color name as specified in http://www.w3.org/TR/SVG/types.html#ColorKeywords[the W3C specification]. # * transparent (no color) # * `rgb(r, g, b)` / `rgba(r, g, b, a)` (values 0-255 or percentages) # * `hsv(h, s, v)` / `hsva(h, s, v, a)` (values 0-255, hue 0-359) -- cgit v1.2.3 From ec1b5a57e30d08093795cd0148730516f8f8da90 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 9 Sep 2016 16:05:08 +0100 Subject: Remove newsbeuter configuration --- newsbeuter/.config/newsbeuter/cache.db | Bin 71680 -> 0 bytes newsbeuter/.config/newsbeuter/config | 25 ------------------------- newsbeuter/.config/newsbeuter/history.cmdline | 3 --- newsbeuter/.config/newsbeuter/history.search | 0 newsbeuter/.config/newsbeuter/urls | 1 - 5 files changed, 29 deletions(-) delete mode 100644 newsbeuter/.config/newsbeuter/cache.db delete mode 100644 newsbeuter/.config/newsbeuter/config delete mode 100644 newsbeuter/.config/newsbeuter/history.cmdline delete mode 100644 newsbeuter/.config/newsbeuter/history.search delete mode 120000 newsbeuter/.config/newsbeuter/urls diff --git a/newsbeuter/.config/newsbeuter/cache.db b/newsbeuter/.config/newsbeuter/cache.db deleted file mode 100644 index a92771b..0000000 Binary files a/newsbeuter/.config/newsbeuter/cache.db and /dev/null differ diff --git a/newsbeuter/.config/newsbeuter/config b/newsbeuter/.config/newsbeuter/config deleted file mode 100644 index 84a1546..0000000 --- a/newsbeuter/.config/newsbeuter/config +++ /dev/null @@ -1,25 +0,0 @@ -# Dark solarized color scheme for newsbeuter, based on -# Ethan Schoonover's Solarized. -# -# In order to use this color scheme, you must first configure -# your terminal emulator to use the Solarized palette. -# See for more information. - -color background default default -color listnormal default default -color listfocus black yellow -color info default black -color article default default - -# highlights -highlight article "^(Title):.*$" blue default -highlight article "https?://[^ ]+" red default -highlight article "\\[image\\ [0-9]+\\]" green default - -# vim-like navigation -bind-key j down -bind-key k up -bind-key h left -bind-key l right - -browser "qutebrowser %u" diff --git a/newsbeuter/.config/newsbeuter/history.cmdline b/newsbeuter/.config/newsbeuter/history.cmdline deleted file mode 100644 index aed4974..0000000 --- a/newsbeuter/.config/newsbeuter/history.cmdline +++ /dev/null @@ -1,3 +0,0 @@ -q -q -q diff --git a/newsbeuter/.config/newsbeuter/history.search b/newsbeuter/.config/newsbeuter/history.search deleted file mode 100644 index e69de29..0000000 diff --git a/newsbeuter/.config/newsbeuter/urls b/newsbeuter/.config/newsbeuter/urls deleted file mode 120000 index 777955c..0000000 --- a/newsbeuter/.config/newsbeuter/urls +++ /dev/null @@ -1 +0,0 @@ -../../../../personal/newsbeuter/urls \ No newline at end of file -- cgit v1.2.3 From a306594af82b16c0fd319ff3c3b2df94c9d07fc7 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 9 Sep 2016 18:12:59 +0100 Subject: [khal] Reduce default timedelta --- khal/.config/khal/khal.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/khal/.config/khal/khal.conf b/khal/.config/khal/khal.conf index 3be1d2b..27c90ec 100644 --- a/khal/.config/khal/khal.conf +++ b/khal/.config/khal/khal.conf @@ -7,4 +7,4 @@ [default] default_calendar = home print_new = event - timedelta = 30d + timedelta = 7d -- cgit v1.2.3 From 8cd9e65747d0d7b956d0fe46708cdb64a8c265de Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sat, 10 Sep 2016 22:51:03 +0100 Subject: Delete unused scripts --- bin/bin/dot | 48 ------------------------------------------------ bin/bin/dyndns | 5 ----- bin/bin/swap | 16 ---------------- 3 files changed, 69 deletions(-) delete mode 100755 bin/bin/dot delete mode 100755 bin/bin/dyndns delete mode 100755 bin/bin/swap diff --git a/bin/bin/dot b/bin/bin/dot deleted file mode 100755 index acb0e64..0000000 --- a/bin/bin/dot +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash - -get_links() -{ - find $HOME -not -path "$HOME/dotfiles/*" -type l | while read line; do - if [[ "$(realpath -q $line)" == "${HOME}/dotfiles/"* ]]; then - echo $line - fi - done -} - -clean() -{ - get_links | while read link; do - rm -v ${link} - done -} - -down() -{ - source $HOME/dotfiles/.dotmap - for link in "${!dotmap[@]}"; do - echo "Removing ${link}." - rm -rf $link - done -} - -up() -{ - source $HOME/dotfiles/.dotmap - for link in "${!dotmap[@]}"; do - target=${dotmap[$link]} - mkdir -p $(dirname ${link}) - echo "Linking $target." - rm -rf $link && ln -s $target $link - done -} - -save() -{ - echo "declare -A dotmap" > .dotmap - get_links | while read link; do - echo "dotmap[$link]=$(readlink -f -q $link)" | sed "s#$HOME#"'$HOME#g' >> .dotmap - done - sort .dotmap -o .dotmap -} - -$1 diff --git a/bin/bin/dyndns b/bin/bin/dyndns deleted file mode 100755 index 8d1f553..0000000 --- a/bin/bin/dyndns +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -PASSWORD=$(pass show email/urbain@vaes.uk) - -curl -4 -X PUT --user "urbain@vaes.uk:$PASSWORD" https://box.bknguyen.org/admin/dns/custom/urbainvaes.com diff --git a/bin/bin/swap b/bin/bin/swap deleted file mode 100755 index 4c17dc7..0000000 --- a/bin/bin/swap +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/python - -import i3 -outputs = i3.get_outputs() -print(outputs[0]) - -# set current workspace to output 0 -i3.workspace(outputs[0]['current_workspace']) - -# ..and move it to the other output. -# outputs wrap, so the right of the right is left ;) -i3.command('move', 'workspace to output right') - -# rinse and repeat -i3.workspace(outputs[1]['current_workspace']) -i3.command('move', 'workspace to output right') -- cgit v1.2.3 From 2d391edd4d38e024519718104962a0825478c26d Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sat, 10 Sep 2016 22:51:35 +0100 Subject: [vim] Add mappings to open vifm --- vim/.vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vim/.vimrc b/vim/.vimrc index 25a5cbe..4c937ff 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -270,6 +270,8 @@ nnoremap cqc :cclose nnoremap got :call system('urxvt -cd '.getcwd().' &') nnoremap goT :call system('urxvt -cd '.expand("%:p:h").' &') +nnoremap gof :call system('urxvt -e vifm '.expand("%:p:h").' '.expand("%:p:h").' &') +nnoremap goF :call system('urxvt -e vifm '.expand("%:p:h").' '.expand("%:p:h").' &') nnoremap h :e %:p:s,.hpp$,.X123X,:s,.cpp$,.hpp,:s,.X123X$,.cpp, nnoremap Y y$ -- cgit v1.2.3 From c9e6b19648e8344d430d3322a8a3717595a390c3 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sun, 11 Sep 2016 13:23:34 +0100 Subject: [Add] Add expand-region plugin --- vim/.vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/vim/.vimrc b/vim/.vimrc index 25a5cbe..79d3abd 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -37,6 +37,7 @@ Plug 'nanotech/jellybeans.vim' Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' , 'on' : 'YcmGenerateConfig' } Plug 'scrooloose/nerdtree' Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' } +Plug 'terryma/vim-expand-region' Plug 'terryma/vim-multiple-cursors' Plug 'tomasr/molokai' Plug 'tommcdo/vim-exchange' -- cgit v1.2.3 From 6e26873bc1cff72a2e97cad21124c58b2cdcb276 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Mon, 12 Sep 2016 20:34:54 +0100 Subject: [khal] Add work calendar --- khal/.config/khal/khal.conf | 5 +++++ qutebrowser/.config/qutebrowser/qsettings/QtProject.conf | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/khal/.config/khal/khal.conf b/khal/.config/khal/khal.conf index 27c90ec..2cfb434 100644 --- a/khal/.config/khal/khal.conf +++ b/khal/.config/khal/khal.conf @@ -4,7 +4,12 @@ path = ~/.calendars/home/ color = dark green + [[work]] + path = ~/.calendars/work/ + color = dark blue + [default] default_calendar = home print_new = event timedelta = 7d + highlight_event_days = True diff --git a/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf b/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf index b2a0669..b429b24 100644 --- a/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf +++ b/qutebrowser/.config/qutebrowser/qsettings/QtProject.conf @@ -1,8 +1,8 @@ [FileDialog] -history=file:///home/urbain/Dropbox/toprint -lastVisited=file:///home/urbain/Dropbox/toprint -qtVersion=5.6.0 +history=file:///home/urbain/Dropbox/toprint, file:///home/urbain/Pictures/family +lastVisited=file:///home/urbain/Pictures/family +qtVersion=5.7.0 shortcuts=file:, file:///home/urbain sidebarWidth=90 -treeViewHeader=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1\xec\0\0\0\x4\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x4\0\0\0\xff\0\0\0\x1\0\0\0\0\0\0\0?\0\0\0\x1\0\0\0\0\0\0\0@\0\0\0\x1\0\0\0\0\0\0\0n\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0) +treeViewHeader=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1\xec\0\0\0\x4\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x4\0\0\0\xff\0\0\0\x1\0\0\0\0\0\0\0?\0\0\0\x1\0\0\0\0\0\0\0@\0\0\0\x1\0\0\0\0\0\0\0n\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\xff\xff\xff\xff) viewMode=Detail -- cgit v1.2.3 From f48f9065c12395354def7b5d8277800e7fcc6c71 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 20 Sep 2016 12:59:28 +0100 Subject: Update crontab --- crontab/crontab | 2 ++ 1 file changed, 2 insertions(+) diff --git a/crontab/crontab b/crontab/crontab index a6b27a3..edb4b22 100644 --- a/crontab/crontab +++ b/crontab/crontab @@ -1,2 +1,4 @@ +*/5 * * * * /usr/bin/r2e run */5 * * * * /home/urbain/bin/email >> /home/urbain/.cron_email_log */5 * * * * /usr/bin/vdirsyncer sync >> /home/urbain/.cron_calendar_log +0 * * * * cd /home/urbain/ && /usr/bin/mr update && /usr/bin/mr push -- cgit v1.2.3 From 0da3d56ca20efe17f3b01b03fbe514e222b62661 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 21 Sep 2016 11:07:30 +0100 Subject: [vimrc] Update fzf mappings --- vim/.vimrc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/vim/.vimrc b/vim/.vimrc index 0baab27..9e93a22 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -81,12 +81,17 @@ nnoremap cpt :TagbarToggle nnoremap cpu :GundoToggle " Fuzzy finder +nnoremap a :Ag nnoremap b :Buffers +nnoremap c :Commands nnoremap f :Files -nnoremap r :History nnoremap g :GitFiles -nnoremap c :Colors -nnoremap h :History: +nnoremap hf :History +nnoremap h: :History: +nnoremap h/ :History/ +nnoremap l :BLines +nnoremap m :Marks +nnoremap t :Tags imap (fzf-complete-line) imap (fzf-complete-file) @@ -271,7 +276,7 @@ nnoremap cqc :cclose nnoremap got :call system('urxvt -cd '.getcwd().' &') nnoremap goT :call system('urxvt -cd '.expand("%:p:h").' &') -nnoremap gof :call system('urxvt -e vifm '.expand("%:p:h").' '.expand("%:p:h").' &') +nnoremap gof :call system('urxvt -e vifm '.getcwd().' '.getcwd().' &') nnoremap goF :call system('urxvt -e vifm '.expand("%:p:h").' '.expand("%:p:h").' &') nnoremap h :e %:p:s,.hpp$,.X123X,:s,.cpp$,.hpp,:s,.X123X$,.cpp, -- cgit v1.2.3 From af828606c1d53aa8f9e0c1b82a0d4a2d66dce370 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 21 Sep 2016 22:35:23 +0100 Subject: [mr] Add thesis repository --- mr/.mrconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mr/.mrconfig b/mr/.mrconfig index ab0a1eb..2c185e9 100644 --- a/mr/.mrconfig +++ b/mr/.mrconfig @@ -13,6 +13,11 @@ checkout = git clone 'gitolite@urbainvaes.com:private/personal.git' 'personal' update = git pull origin master push = git push origin master +[$HOME/thesis] +checkout = git clone 'gitolite@urbainvaes.com:private/thesis.git' 'thesis' +update = git pull origin master +push = git push origin master + [$HOME/.password-store] checkout = git clone 'gitolite@urbainvaes.com:private/passwords.git' '.password-store' update = git pull origin master -- cgit v1.2.3 From 5b37686303e248c05db2c2b77e6af89b0708491d Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 21 Sep 2016 22:41:19 +0100 Subject: [i3] Add rofi shortcut --- i3/.config/i3/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/i3/.config/i3/config b/i3/.config/i3/config index 6668438..b6e54d1 100644 --- a/i3/.config/i3/config +++ b/i3/.config/i3/config @@ -180,6 +180,7 @@ bindsym $mod+Shift+n exec $HOME/bin/workspace m bindsym $mod+semicolon exec --no-startup-id $HOME/bin/run bindsym $mod+z exec --no-startup-id $HOME/bin/tmux_attach bindsym $mod+e exec --no-startup-id $HOME/bin/rename_workspace -# bindsym $mod+m exec --no-startup-id $HOME/bin/i3-shell +bindsym $mod+o exec rofi -show window +# bindsym $mod+m exec --no-startup-id $HOME/bin/i3-shell for_window [class="^.*"] border pixel 2 -- cgit v1.2.3 From 5b5d1da3d92443b760b0aa1a90ec8ec1c4570fc2 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sun, 25 Sep 2016 23:06:51 +0100 Subject: [info] Add ^w keybinding --- info/.infokey | 3 +++ 1 file changed, 3 insertions(+) diff --git a/info/.infokey b/info/.infokey index 9c34cc4..0680692 100644 --- a/info/.infokey +++ b/info/.infokey @@ -18,3 +18,6 @@ m menu-item ^b scroll-backward ^c abort-key ^o history-node + +#echo-area +^w echo-area-backward-kill-word -- cgit v1.2.3 From e100d310d54cad23f72a9d26922633797eec9de6 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 27 Sep 2016 15:29:32 +0100 Subject: [.zshrc] Add /usr/lib/surfraw to path --- zsh/.zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zsh/.zshrc b/zsh/.zshrc index d809354..dc84770 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,4 +1,4 @@ -export PATH="${PATH}:$HOME/bin" +export PATH="${PATH}:$HOME/bin:/usr/lib/surfraw" export EDITOR=/usr/bin/nvim # Source configuration files -- cgit v1.2.3 From 823357067df3b1dc0baee9bfb838c66dde1c10ea Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 27 Sep 2016 15:31:20 +0100 Subject: [.vimrc] Update plugins --- vim/.vimrc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vim/.vimrc b/vim/.vimrc index 9e93a22..3f41edc 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -23,17 +23,16 @@ Plug 'junegunn/goyo.vim' Plug 'junegunn/gv.vim' Plug 'junegunn/seoul256.vim' Plug 'junegunn/vim-easy-align' -Plug 'junegunn/vim-oblique' Plug 'junegunn/vim-peekaboo' -Plug 'junegunn/vim-pseudocl' Plug 'justinmk/vim-dirvish' Plug 'justinmk/vim-sneak' Plug 'klen/python-mode' Plug 'lervag/vimtex' Plug 'majutsushi/tagbar' Plug 'mhinz/vim-startify' -Plug 'mileszs/ack.vim' +Plug 'mhinz/vim-grepper' Plug 'nanotech/jellybeans.vim' +Plug 'pgdouyon/vim-evanesco' Plug 'rdnetto/YCM-Generator', { 'branch' : 'stable' , 'on' : 'YcmGenerateConfig' } Plug 'scrooloose/nerdtree' Plug 'sjl/Gundo.vim', { 'on' : 'GundoToggle' } -- cgit v1.2.3 From 8b2d5dc3fb67dd5ecd2b0165b131167ce3a82b1d Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Tue, 27 Sep 2016 15:32:08 +0100 Subject: [i3] Update dmenu options in workspace script --- bin/bin/workspace | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/bin/workspace b/bin/bin/workspace index a9e4aa0..e380f98 100755 --- a/bin/bin/workspace +++ b/bin/bin/workspace @@ -11,7 +11,7 @@ workspaces=$(i3-msg -t get_workspaces | grep -Po '"name":.*?[^\\]"' | sed 's/"na workspaces=$(echo $workspaces | sed '/:/!d') # Get desired workspace -target=$(echo $workspaces | dmenu -b -i -sf green -p "Go to workspace:") +target=$(echo $workspaces | dmenu "Go to workspace:") # Exit if empty [[ -z $target ]] && exit -- cgit v1.2.3 From 32e61b026cfb1f2d22da6e2b2cb41768d56f8fb9 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 28 Sep 2016 21:12:41 +0100 Subject: Clean unused scripts --- bin/bin/i3-shell | 27 --------------------------- bin/bin/rename_workspace | 12 ------------ bin/bin/vimin | 2 +- 3 files changed, 1 insertion(+), 40 deletions(-) delete mode 100755 bin/bin/i3-shell delete mode 100755 bin/bin/rename_workspace diff --git a/bin/bin/i3-shell b/bin/bin/i3-shell deleted file mode 100755 index 120e4b4..0000000 --- a/bin/bin/i3-shell +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# i3 thread: https://faq.i3wm.org/question/150/how-to-launch-a-terminal-from-here/?answer=152#post-id-152 - -CMD=urxvt -CWD='' - -# Get window ID -ID=$(xdpyinfo | grep focus | cut -f4 -d " ") - -# Get PID of process whose window this is -PID=$(xprop -id $ID | grep -m 1 PID | cut -d " " -f 3) - -# Get last child process (shell, vim, etc) -if [ -n "$PID" ]; then - TREE=$(pstree -lpA $PID | tail -n 1) - PID=$(echo $TREE | awk -F'---' '{print $NF}' | sed -re 's/[^0-9]//g') - - # If we find the working directory, run the command in that directory - if [ -e "/proc/$PID/cwd" ]; then - CWD=$(readlink /proc/$PID/cwd) - fi -fi -if [ -n "$CWD" ]; then - cd $CWD && $CMD -else - $CMD -fi diff --git a/bin/bin/rename_workspace b/bin/bin/rename_workspace deleted file mode 100755 index 61fffd3..0000000 --- a/bin/bin/rename_workspace +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -workspace=$(i3-msg -t get_workspaces | grep -Po '{[^}]*"focused":true[^}]*}' | sed 's/.*"name":"\([^"]*\)".*$/\1/g') -number=$(i3-msg -t get_workspaces | grep -Po '{[^}]*"focused":true[^}]*}' | sed 's/{"num":\([^,]*\),.*$/\1/g') - -new_name=$(zenity --entry --title="Rename workspace" --entry-text "$workspace") -if [[ "$new_name" != *:* ]]; then - new_name="$number:$new_name" -fi - -echo $new_name -exec i3-msg rename workspace to "$new_name" diff --git a/bin/bin/vimin b/bin/bin/vimin index 905b30f..b00d8fa 100755 --- a/bin/bin/vimin +++ b/bin/bin/vimin @@ -1,4 +1,4 @@ #!/usr/bin/env bash tempfile=$(mktemp) -urxvt -e vim ${tempfile} +urxvt -e nvim ${tempfile} +star cat ${tempfile} | xclip -i -- cgit v1.2.3 From 9c63157ec8832994ffe4337b1bac91f77a907d0c Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 5 Oct 2016 12:50:16 +0100 Subject: [tmux] Revert to default colors --- tmux/.tmux.conf | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index eac0eb5..d6e36ca 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -18,11 +18,5 @@ bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D" bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U" bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R" -bind C-n next-window -bind C-p previous-window - -bind-key -n C-S-Left swap-window -t -1 -bind-key -n C-S-Right swap-window -t +1 - -set -g status-bg colour18 -set -g status-fg colour2 +bind-key H swap-window -t -1 +bind-key L swap-window -t +1 -- cgit v1.2.3 From 24424ccf7029f16798a6919c90a6d3a55ba1efd0 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 5 Oct 2016 12:56:25 +0100 Subject: [vim] Add keybindings for tabs --- vim/.vimrc | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/vim/.vimrc b/vim/.vimrc index 3f41edc..3ffe129 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -268,7 +268,14 @@ endif nnoremap w :update nnoremap q :q! nnoremap d :bd! -nnoremap n :tabnew + +nnoremap tn :tabnew +nnoremap te :tabedit +nnoremap th :-tabmove +nnoremap tl :+tabmove +nnoremap tm :tabmove +nnoremap t0 :tabmove 0 +nnoremap t$ :tabmove nnoremap cqo :copen nnoremap cqc :cclose @@ -304,7 +311,10 @@ augroup vimrc au BufNewFile,Bufread /tmp/mutt-* setlocal tw=72 au BufNewFile,BufRead *.geo setf gmsh au BufNewFile,BufRead *.pde setf freefem - au FileType gmsh set makeprg=gmsh\ % + au BufNewFile,BufRead *.plt setf gnuplot + au FileType gmsh setlocal makeprg=gmsh\ % + au FileType gnuplot setlocal makeprg=gnuplot\ % + au FileType gnuplot setlocal commentstring=#%s au FileType freefem comp freefem - au FileType dirvish set relativenumber + au FileType dirvish setlocal relativenumber augroup END -- cgit v1.2.3 From a7b7e9e1bc23ff74478674b8dbf4f72b3cbee2ce Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Wed, 5 Oct 2016 12:56:46 +0100 Subject: [xinit] Fix initial colorscheme --- xinit/.xinitrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xinit/.xinitrc b/xinit/.xinitrc index abaadb4..d978132 100755 --- a/xinit/.xinitrc +++ b/xinit/.xinitrc @@ -7,7 +7,8 @@ xset r rate 400 50 $HOME/bin/keyboard # Load Xresources to light colorscheme -xrdb $HOME/.Xresources/solarized.light +source $HOME/.local/share/zsh/colors.zsh +xrdb $HOME/.Xresources/$XRESOURCE # Background feh --bg-fill --randomize /usr/share/backgrounds -- cgit v1.2.3 From 2d7e16716afa4b43405ddabb8625b918b6224ede Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 7 Oct 2016 12:20:53 +0100 Subject: [khal] Update name of config file --- khal/.config/khal/config | 15 +++++++++++++++ khal/.config/khal/khal.conf | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) create mode 100644 khal/.config/khal/config delete mode 100644 khal/.config/khal/khal.conf diff --git a/khal/.config/khal/config b/khal/.config/khal/config new file mode 100644 index 0000000..2cfb434 --- /dev/null +++ b/khal/.config/khal/config @@ -0,0 +1,15 @@ +[calendars] + + [[home]] + path = ~/.calendars/home/ + color = dark green + + [[work]] + path = ~/.calendars/work/ + color = dark blue + +[default] + default_calendar = home + print_new = event + timedelta = 7d + highlight_event_days = True diff --git a/khal/.config/khal/khal.conf b/khal/.config/khal/khal.conf deleted file mode 100644 index 2cfb434..0000000 --- a/khal/.config/khal/khal.conf +++ /dev/null @@ -1,15 +0,0 @@ -[calendars] - - [[home]] - path = ~/.calendars/home/ - color = dark green - - [[work]] - path = ~/.calendars/work/ - color = dark blue - -[default] - default_calendar = home - print_new = event - timedelta = 7d - highlight_event_days = True -- cgit v1.2.3 From 82bbd033fc6999cbb282127d893cf377af4ff0f0 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 7 Oct 2016 12:24:12 +0100 Subject: [mr] Update config --- mr/.mrconfig | 14 +++++++------- mr/.mrtrust | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mr/.mrconfig b/mr/.mrconfig index 2c185e9..44ef5f4 100644 --- a/mr/.mrconfig +++ b/mr/.mrconfig @@ -1,24 +1,24 @@ [$HOME/dotfiles] -checkout = git clone 'gitolite@urbainvaes.com:dotfiles.git' 'dotfiles' +checkout = git clone 'gitolite@urbainvaes.com:dotfiles.git' update = git pull origin master push = git push origin master [$HOME/gitolite] -checkout = git clone 'gitolite@urbainvaes.com:gitolite-admin.git' 'gitolite' +checkout = git clone 'gitolite@urbainvaes.com:gitolite-admin.git' update = git pull origin master push = git push origin master [$HOME/personal] -checkout = git clone 'gitolite@urbainvaes.com:private/personal.git' 'personal' +checkout = git clone 'gitolite@urbainvaes.com:private/personal.git' update = git pull origin master push = git push origin master -[$HOME/thesis] -checkout = git clone 'gitolite@urbainvaes.com:private/thesis.git' 'thesis' +[$HOME/.password-store] +checkout = git clone 'gitolite@urbainvaes.com:private/passwords.git' update = git pull origin master push = git push origin master -[$HOME/.password-store] -checkout = git clone 'gitolite@urbainvaes.com:private/passwords.git' '.password-store' +[$HOME/phd] +checkout = git clone 'gitolite@urbainvaes.com:phd.git' update = git pull origin master push = git push origin master diff --git a/mr/.mrtrust b/mr/.mrtrust index aa0f340..5f0dbe2 100644 --- a/mr/.mrtrust +++ b/mr/.mrtrust @@ -1 +1 @@ -~/Dropbox/phd/.mrconfig +~/phd/.mrconfig -- cgit v1.2.3 From e8e89dabb1754582c4793eae329a479e30fdbb08 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sun, 9 Oct 2016 19:01:42 +0100 Subject: Add conky configuration file Launch conky at startx --- conky/.config/conky/conky.conf | 82 ++++++++++++++++++++++++++++++++++++++++++ xinit/.xinitrc | 1 + 2 files changed, 83 insertions(+) create mode 100644 conky/.config/conky/conky.conf diff --git a/conky/.config/conky/conky.conf b/conky/.config/conky/conky.conf new file mode 100644 index 0000000..5499b07 --- /dev/null +++ b/conky/.config/conky/conky.conf @@ -0,0 +1,82 @@ +-- vim: ts=4 sw=4 noet ai cindent syntax=lua +--[[ +Conky, a system monitor, based on torsmo + +Any original torsmo code is licensed under the BSD license + +All code written since the fork of torsmo is licensed under the GPL + +Please see COPYING for details + +Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen +Copyright (c) 2005-2012 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS) +All rights reserved. + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +You should have received a copy of the GNU General Public License +along with this program. If not, see . +]] + +conky.config = { + alignment = 'top_right', + background = true, + border_width = 1, + cpu_avg_samples = 2, + default_color = 'white', + default_outline_color = 'white', + default_shade_color = 'white', + double_buffer = true, + draw_borders = false, + draw_graph_borders = true, + draw_outline = false, + draw_shades = false, + use_xft = true, + font = 'DejaVu Sans Mono:size=12', + gap_x = 10, + gap_y = 10, + minimum_height = 5, + minimum_width = 5, + net_avg_samples = 2, + no_buffers = true, + out_to_console = false, + out_to_stderr = false, + extra_newline = false, + own_window = false, + stippled_borders = 0, + update_interval = 1.0, + uppercase = false, + use_spacer = 'none', + show_graph_scale = false, + show_graph_range = false +} + +conky.text = [[ +$hr +${color grey}Uptime:$color $uptime +${color grey}Frequency (in MHz):$color $freq +${color grey}Frequency (in GHz):$color $freq_g +${color grey}RAM Usage:$color $mem/$memmax - $memperc% ${membar 4} +${color grey}Swap Usage:$color $swap/$swapmax - $swapperc% ${swapbar 4} +${color grey}CPU Usage:$color $cpu% ${cpubar 4} +${color grey}Processes:$color $processes ${color grey}Running:$color $running_processes +$hr +${color grey}File systems: + / $color${fs_used /}/${fs_size /} ${fs_bar 6 /} + /home $color${fs_used /home}/${fs_size /home} ${fs_bar 6 /home} +${color grey}Networking: +Up:$color ${upspeed eth0} ${color grey} - Down:$color ${downspeed eth0} +$hr +${color grey}Name PID CPU% MEM% +${color lightgrey} ${top name 1} ${top pid 1} ${top cpu 1} ${top mem 1} +${color lightgrey} ${top name 2} ${top pid 2} ${top cpu 2} ${top mem 2} +${color lightgrey} ${top name 3} ${top pid 3} ${top cpu 3} ${top mem 3} +${color lightgrey} ${top name 4} ${top pid 4} ${top cpu 4} ${top mem 4} +]] diff --git a/xinit/.xinitrc b/xinit/.xinitrc index d978132..5ae3595 100755 --- a/xinit/.xinitrc +++ b/xinit/.xinitrc @@ -28,5 +28,6 @@ eval $(ssh-agent) nm-applet & dropbox & dunst & +conky exec i3 -- cgit v1.2.3 From d8a7f039c1258557df3a24e35bd659c5c9aaedd8 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sun, 9 Oct 2016 22:58:17 +0100 Subject: [mr] Fix errors in configuration --- mr/.mrconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mr/.mrconfig b/mr/.mrconfig index 44ef5f4..73b38d3 100644 --- a/mr/.mrconfig +++ b/mr/.mrconfig @@ -1,24 +1,24 @@ [$HOME/dotfiles] -checkout = git clone 'gitolite@urbainvaes.com:dotfiles.git' +checkout = git clone 'gitolite@urbainvaes.com:dotfiles.git' dotfiles update = git pull origin master push = git push origin master [$HOME/gitolite] -checkout = git clone 'gitolite@urbainvaes.com:gitolite-admin.git' +checkout = git clone 'gitolite@urbainvaes.com:gitolite-admin.git' gitolite update = git pull origin master push = git push origin master [$HOME/personal] -checkout = git clone 'gitolite@urbainvaes.com:private/personal.git' +checkout = git clone 'gitolite@urbainvaes.com:private/personal.git' personal update = git pull origin master push = git push origin master [$HOME/.password-store] -checkout = git clone 'gitolite@urbainvaes.com:private/passwords.git' +checkout = git clone 'gitolite@urbainvaes.com:private/passwords.git' .password-store update = git pull origin master push = git push origin master [$HOME/phd] -checkout = git clone 'gitolite@urbainvaes.com:phd.git' +checkout = git clone 'gitolite@urbainvaes.com:phd/base.git' phd update = git pull origin master push = git push origin master -- cgit v1.2.3 From 99587dca308e085b2accb72a89896b5a63cb20e1 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Mon, 10 Oct 2016 17:37:40 +0100 Subject: Add script for PhD references --- bin/bin/references | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 bin/bin/references diff --git a/bin/bin/references b/bin/bin/references new file mode 100755 index 0000000..a578728 --- /dev/null +++ b/bin/bin/references @@ -0,0 +1,5 @@ +#!/bin/bash +REF_DIR="$HOME/phd/references" +PDF=$(locate "$REF_DIR/**/*.pdf") +TARGET=$(echo "${PDF//"$REF_DIR/"/}" | dmenu -i -p "Open File:") +[[ -n $TARGET ]] && zathura "$REF_DIR/$TARGET" & -- cgit v1.2.3