From 433e6a3a733f3836a0a11dcc710ba441a7bb945b Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Thu, 17 Jul 2014 09:24:20 +0200 Subject: [PATCH] first real commit, started clean --- .Xresources | 4 +- .bashrc | 46 ++--- .gitconfig | 4 +- .gitmodules | 12 -- .i3/bar | 10 + {i3 => .i3}/config | 11 +- muttrc => .mutt/muttrc | 104 ++++------ .mutt/passwords.gpg | 1 + .notmuch-config | 86 -------- .vim/.netrwhist | 9 - .vim/.vim | 1 - .vim/autoload/pathogen.vim | 332 ------------------------------- .vim/bundle/nerdtree | 1 - .vim/bundle/tlib_vim | 1 - .vim/bundle/vim-addon-mw-utils | 1 - .vim/bundle/vim-colors-solarized | 1 - .vim/bundle/vim-flake8 | 1 - .vim/bundle/vim-snipmate | 1 - .vim/bundle/zazen | 1 - .vim/colors/256-grayvim.vim | 46 ----- .vim/colors/; | 57 ------ .vim/ftplugin/python.vim | 5 - .vim/skel/py | 2 - .vim/skel/tex | 9 - .vim/snippets/java.snippets | 30 --- .vim/snippets/python.snippets | 6 - .vim/snippets/snippet.snippets | 7 - .vimrc | 5 +- README.md | 10 - gpg-agent.conf | 2 - gpg-agent.sh | 10 - i3/bar | 29 --- msmtp | 9 - offlineimap.py | 11 - offlineimaprc | 29 --- 35 files changed, 66 insertions(+), 828 deletions(-) delete mode 100644 .gitmodules create mode 100755 .i3/bar rename {i3 => .i3}/config (91%) rename muttrc => .mutt/muttrc (50%) create mode 100644 .mutt/passwords.gpg delete mode 100644 .notmuch-config delete mode 100644 .vim/.netrwhist delete mode 120000 .vim/.vim delete mode 100644 .vim/autoload/pathogen.vim delete mode 160000 .vim/bundle/nerdtree delete mode 160000 .vim/bundle/tlib_vim delete mode 160000 .vim/bundle/vim-addon-mw-utils delete mode 160000 .vim/bundle/vim-colors-solarized delete mode 160000 .vim/bundle/vim-flake8 delete mode 160000 .vim/bundle/vim-snipmate delete mode 160000 .vim/bundle/zazen delete mode 100644 .vim/colors/256-grayvim.vim delete mode 100644 .vim/colors/; delete mode 100644 .vim/ftplugin/python.vim delete mode 100644 .vim/skel/py delete mode 100644 .vim/skel/tex delete mode 100644 .vim/snippets/java.snippets delete mode 100644 .vim/snippets/python.snippets delete mode 100644 .vim/snippets/snippet.snippets delete mode 100644 README.md delete mode 100644 gpg-agent.conf delete mode 100644 gpg-agent.sh delete mode 100755 i3/bar delete mode 100644 msmtp delete mode 100644 offlineimap.py delete mode 100644 offlineimaprc diff --git a/.Xresources b/.Xresources index 7a2ba1b..ec4abe2 100644 --- a/.Xresources +++ b/.Xresources @@ -1,4 +1,6 @@ -URxvt.background: rgba:0000/0000/0200/c800 +URxvt.visualBell: true +URxvt.depth: 32 +URxvt.background: black URxvt.saveLines: 10000 URxvt.foreground: grey80 URxvt.scrollBar: false diff --git a/.bashrc b/.bashrc index 9074f96..55fc625 100644 --- a/.bashrc +++ b/.bashrc @@ -1,40 +1,18 @@ -STCONTROL=ignoreboth -HISTSIZE=100000 -HISTFILESIZE=10000 shopt -s checkwinsize shopt -s histappend set -o vi -. /etc/bash_completion +xset -b >/dev/null 2>&1 -##Variables -export BROWSER=chromium -export EDITOR=vim -export TERMINAL=urxvt -export TERM=screen -export PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin +#Variables export COLORFGBG="default:default" +export EDITOR=vim +export HISTFILESIZE=10000 +export HISTSIZE=100000 +export PATH=~/home/bin:$PATH export PYTHONDONTWRITEBYTECODE -export NOTMUCH_CONFIG=~/.mutt/.notmuch-config -export TEXMFHOME=~/.texmf -# -##Colors yeeeyyyy -alias ls='ls --color=auto' -alias grep='grep --color=auto' - -function getpass { - gpg -d -q --use-agent ~/passwd.gpg | grep "^$1" | awk '{print $3}' -} - -function getuser { - gpg -d -q --use-agent ~/passwd.gpg | grep "^$1" | awk '{print $2}' -} - -function addaccount { - gpg -d -o ~/passwd -q --use-agent ~/passwd.gpg - echo -n "user? " - read user - echo -n "pass? " - read pass - echo "$1 $user $pass" >> ~/passwd - shred -u -v -z ~/passwd -} +export PYTHONPATH=~/home/lib/python2.7/site-packages +export STCONTROL=ignoreboth +export TERM=screen +export TERMINAL=urxvt +export LD_LIBRARY_PATH=/home/marlub/home/lib64/:/home/marlub/home/lib/ +export PKG_CONFIG_PATH=/home/marlub/home/lib64/pkgconfig/ diff --git a/.gitconfig b/.gitconfig index 4acfb4c..04dff35 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,5 +1,5 @@ [user] name = Mart Lubbers - email = mart@martlubbers.net + email = mart.lubbers@mpi.nl [alias] - tree = log --oneline --decorate --graph --all + tree = log --decorate --oneline --graph --all diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 98268b6..0000000 --- a/.gitmodules +++ /dev/null @@ -1,12 +0,0 @@ -[submodule ".vim/bundle/tlib_vim"] - path = .vim/bundle/tlib_vim - url = git://github.com/tomtom/tlib_vim.git -[submodule ".vim/bundle/vim-addon-mw-utils"] - path = .vim/bundle/vim-addon-mw-utils - url = git://github.com/MarcWeber/vim-addon-mw-utils.git -[submodule ".vim/bundle/vim-snipmate"] - path = .vim/bundle/vim-snipmate - url = git://github.com/garbas/vim-snipmate.git -[submodule ".vim/bundle/vim-flake8"] - path = .vim/bundle/vim-flake8 - url = git://github.com/nvie/vim-flake8.git diff --git a/.i3/bar b/.i3/bar new file mode 100755 index 0000000..453b096 --- /dev/null +++ b/.i3/bar @@ -0,0 +1,10 @@ +#!/bin/bash +function volume { + volume=$(amixer | grep -A4 Master | grep -o "[0-9]\{1,3\}%\|\[off\]") + echo -ne "Volume: $volume | " +} + +while [ 1 ]; do + echo "$(volume)$(date +%y-%m-%d\ %H:%M)" + sleep 5 +done diff --git a/i3/config b/.i3/config similarity index 91% rename from i3/config rename to .i3/config index 7caa49f..ef4d088 100644 --- a/i3/config +++ b/.i3/config @@ -8,8 +8,9 @@ # i3 config file (v4) # # Please see http://i3wm.org/docs/userguide.html for a complete reference! -exec xautolock -time 15 -locker 'bash -c "i3lock -i <(import -window root - | convert - -blur 10x2 png:-)"' +exec setxkbmap dvorak exec xrdb ~/.Xresources +exec skype set $mod Mod4 @@ -19,12 +20,6 @@ font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1 # Use Mouse+$mod to drag floating windows to their wanted position floating_modifier $mod -# music controls -bindsym XF86AudioPlay exec mpc toggle >> /dev/null -bindsym XF86AudioStop exec mpc stop >> /dev/null -bindsym XF86AudioPrev exec mpc prev >> /dev/null -bindsym XF86AudioNext exec mpc next >> /dev/null - #bindsym Print exec scrot # volume controls @@ -138,7 +133,7 @@ bindsym $mod+p mode "resize" # Start i3bar to display a workspace bar (plus the system information i3status # finds out, if available) bar { - status_command /home/mart/.i3/bar + status_command /home/marlub/.i3/bar position bottom Font -gnu-unifont-*-*-*-16-160-*-*-*-*-*-* } diff --git a/muttrc b/.mutt/muttrc similarity index 50% rename from muttrc rename to .mutt/muttrc index b2005ff..e166ec8 100644 --- a/muttrc +++ b/.mutt/muttrc @@ -1,59 +1,23 @@ -# Name and info set realname="Mart Lubbers" -set from="mart@martlubbers.net" +# Name and info +set realname="Mart Lubbers" +set from="mart.lubbers@mpi.nl" set use_from=yes set envelope_from=yes -set my_hdr="X-PGP-Key: http://www.martlubbers.net/mart@martlubbers.net.asc" - -# Receiving and sending email -set my_force_agent=`gpg -dq ~/passwd.gpg >> /dev/null` -set sendmail="msmtp -C /home/mart/.mutt/msmtp -f mart@martlubbers.net -a net" - -# Bindings index -bind index gg first-entry -bind index G last-entry - -# Bindings pager -bind pager k previous-line -bind pager j next-line -bind pager gg top -bind pager G bottom -bind pager R group-reply - -# Macros -macro index S "mutt-notmuch-py ~/.mutt/mail/temp+temp" "search mail (using notmuch)" -macro index,pager $ "offlineimap -c ~/.mutt/offlineimaprc &" "Force refresh" -macro index,pager \CT "\ -~C vim@vim.org | ~C vim_use=vim\ -~C lists.debian.org=debian\ -~C mutt-users@mutt.org=mutt\ -~C praat-users=praat\ -~C i3-discuss@i3.zekjur.net=i3\ -" "Clean up mailing lists" -macro index,pager \cb "|urlview\n" - -# Folders -set mbox_type=Maildir -set folder=~/.mutt/mail/ -set spoolfile=+/INBOX/ -set record="+Sent/" -set trash="+Trash/" -set postponed="+Drafts/" -set mask="!^\\.[^.]" -set timeout = 3 -set mail_check=0 -source ~/.mutt/mailboxes +set folder="imap://marlub@imaphost.mpi.nl" +set spoolfile="+INBOX" +set folder="imap://marlub@imaphost.mpi.nl/Mail" +set smtp_url="smtp://smtphost.mpi.nl" +source "gpg -d ~/.mutt/passwords.gpg |" +set record="+/Sent" #View unset wait_key unset markers -set sort_browser=alpha -set sort=threads -set sort_aux=date -set editor=vim -set duplicate_threads=yes +set sort_browser=reverse-date +set sort_aux=reverse-last-date-received +set editor="vim" +set duplicate_threads = yes auto_view text/html -ignore headers * -unignore headers from to subject date cc #Pager set pager_index_lines=20 @@ -63,19 +27,12 @@ set menu_scroll set tilde set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+" alternative_order text/plain text/enriched text/html - -# Adress book -set alias_file="~/.mutt/alias" -source "~/.mutt/alias" - -# Mailing lists -subscribe debian-user-dutch@lists.debian.org -subscribe debian-user@lists.debian.org -subscribe vim_use@googlegroups.com -subscribe vim@vim.org -subscribe mutt-user@mutt.org -subscribe praat-users@egroups.com -subscribe i3-discuss@i3.zekjur.net +bind pager k previous-line +bind pager j next-line +bind pager gg top +bind pager G bottom +bind pager R group-reply +macro pager \cb 'urlview' 'Follow links with urlview' #Skip some options set include=yes @@ -102,11 +59,10 @@ color quoted2 red default color hdrdefault cyan default color signature cyan default -color index green default ~p -color index brightyellow default ~N -color index blue default ~T -color index red default ~D -color index brightblue default ~F +color index green default ~p# To me +color index brightyellow default ~N# New +color index blue default ~T# Tagged +color index red default ~D# Deleted #Crypto set pgp_decode_command="gpg %?p?--passphrase-fd 0? --no-verbose --batch --output - %f" @@ -125,9 +81,17 @@ set pgp_sign_as=0xAD3FEBE7 set pgp_timeout=60 set pgp_good_sign="^gpg: Good signature from" -set crypt_autosign -set crypt_replysign +set crypt_autosign=yes +set crypt_replysign=yes set crypt_replysignencrypted=yes set crypt_verify_sig=yes -message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' "exec check-traditional-pgp" +alias alexander.koenig Alexander König +alias connie.de.vos Connie de Vos +alias digiteam Nick Wood +alias emma.valtersson Emma Waltersson +alias francisco.torreira Francisco Torreira +alias han.sloetjes Han Sloetjes +alias hedvig.skirgard Hedvig SkirgÃ¥rd +alias imke.van.brink Imke van Brink +alias sara.bogels Sara Bögels diff --git a/.mutt/passwords.gpg b/.mutt/passwords.gpg new file mode 100644 index 0000000..8f22c58 --- /dev/null +++ b/.mutt/passwords.gpg @@ -0,0 +1 @@ +Œ —©ÛÚý£à¸ÓÉ9½kßl^ööÇiwܝû]”ž<ÍóÕ»›ŽÑ4AUϘ”aïG Ywc¶/#ëÒºFî¡k_²¿’¹b¨ \ No newline at end of file diff --git a/.notmuch-config b/.notmuch-config deleted file mode 100644 index 7e49c09..0000000 --- a/.notmuch-config +++ /dev/null @@ -1,86 +0,0 @@ -# .notmuch-config - Configuration file for the notmuch mail system -# -# For more information about notmuch, see http://notmuchmail.org - -# Database configuration -# -# The only value supported here is 'path' which should be the top-level -# directory where your mail currently exists and to where mail will be -# delivered in the future. Files should be individual email messages. -# Notmuch will store its database within a sub-directory of the path -# configured here named ".notmuch". -# -[database] -path=/home/mart/.mutt/mail - -# User configuration -# -# Here is where you can let notmuch know how you would like to be -# addressed. Valid settings are -# -# name Your full name. -# primary_email Your primary email address. -# other_email A list (separated by ';') of other email addresses -# at which you receive email. -# -# Notmuch will use the various email addresses configured here when -# formatting replies. It will avoid including your own addresses in the -# recipient list of replies, and will set the From address based on the -# address to which the original email was addressed. -# -[user] -name=Mart Lubbers -primary_email=mart@martlubbers.net - -# Configuration for "notmuch new" -# -# The following options are supported here: -# -# tags A list (separated by ';') of the tags that will be -# added to all messages incorporated by "notmuch new". -# -# ignore A list (separated by ';') of file and directory names -# that will not be searched for messages by "notmuch new". -# -# NOTE: *Every* file/directory that goes by one of those names will -# be ignored, independent of its depth/location in the mail store. -# -[new] -tags=unread;inbox; -ignore= - -# Search configuration -# -# The following option is supported here: -# -# exclude_tags -# A ;-separated list of tags that will be excluded from -# search results by default. Using an excluded tag in a -# query will override that exclusion. -# -[search] -exclude_tags=deleted;spam; - -# Maildir compatibility configuration -# -# The following option is supported here: -# -# synchronize_flags Valid values are true and false. -# -# If true, then the following maildir flags (in message filenames) -# will be synchronized with the corresponding notmuch tags: -# -# Flag Tag -# ---- ------- -# D draft -# F flagged -# P passed -# R replied -# S unread (added when 'S' flag is not present) -# -# The "notmuch new" command will notice flag changes in filenames -# and update tags, while the "notmuch tag" and "notmuch restore" -# commands will notice tag changes and update flags in filenames -# -[maildir] -synchronize_flags=true diff --git a/.vim/.netrwhist b/.vim/.netrwhist deleted file mode 100644 index 90c496a..0000000 --- a/.vim/.netrwhist +++ /dev/null @@ -1,9 +0,0 @@ -let g:netrw_dirhistmax =10 -let g:netrw_dirhist_cnt =7 -let g:netrw_dirhist_1='/home/mart' -let g:netrw_dirhist_2='/home/mart/copy/School/semantiek_correctheid/proj' -let g:netrw_dirhist_3='/home/mart' -let g:netrw_dirhist_4='/home/mart/copy/Projecten/pynterfaces' -let g:netrw_dirhist_5='/home/mart/downloads/snipmate.vim/plugin' -let g:netrw_dirhist_6='/home/mart/.vim/snippets' -let g:netrw_dirhist_7='/home/mart/copy/Projecten/dotfiles' diff --git a/.vim/.vim b/.vim/.vim deleted file mode 120000 index 8355b52..0000000 --- a/.vim/.vim +++ /dev/null @@ -1 +0,0 @@ -.vim \ No newline at end of file diff --git a/.vim/autoload/pathogen.vim b/.vim/autoload/pathogen.vim deleted file mode 100644 index a3a8f1d..0000000 --- a/.vim/autoload/pathogen.vim +++ /dev/null @@ -1,332 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope -" Version: 2.3 - -" Install in ~/.vim/autoload (or ~\vimfiles\autoload). -" -" For management of individually installed plugins in ~/.vim/bundle (or -" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your -" .vimrc is the only other setup necessary. -" -" The API is documented inline below. For maximum ease of reading, -" :set foldmethod=marker - -if exists("g:loaded_pathogen") || &cp - finish -endif -let g:loaded_pathogen = 1 - -" Point of entry for basic default usage. Give a relative path to invoke -" pathogen#interpose() (defaults to "bundle/{}"), or an absolute path to invoke -" pathogen#surround(). For backwards compatibility purposes, a full path that -" does not end in {} or * is given to pathogen#runtime_prepend_subdirectories() -" instead. -function! pathogen#infect(...) abort " {{{1 - for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}'] - if path =~# '^[^\\/]\+$' - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#interpose(path . '/{}') - elseif path =~# '^[^\\/]\+[\\/]\%({}\|\*\)$' - call pathogen#interpose(path) - elseif path =~# '[\\/]\%({}\|\*\)$' - call pathogen#surround(path) - else - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#surround(path . '/{}') - endif - endfor - call pathogen#cycle_filetype() - return '' -endfunction " }}}1 - -" Split a path into a list. -function! pathogen#split(path) abort " {{{1 - if type(a:path) == type([]) | return a:path | endif - let split = split(a:path,'\\\@]','\\&','') - endif -endfunction " }}}1 - -" Like findfile(), but hardcoded to use the runtimepath. -function! pathogen#runtime_findfile(file,count) abort "{{{1 - let rtp = pathogen#join(1,pathogen#split(&rtp)) - let file = findfile(a:file,rtp,a:count) - if file ==# '' - return '' - else - return fnamemodify(file,':p') - endif -endfunction " }}}1 - -" Section: Deprecated - -function! s:warn(msg) - echohl WarningMsg - echomsg a:msg - echohl NONE -endfunction - -" Prepend all subdirectories of path to the rtp, and append all 'after' -" directories in those subdirectories. Deprecated. -function! pathogen#runtime_prepend_subdirectories(path) " {{{1 - call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')') - return pathogen#surround(a:path . pathogen#slash() . '{}') -endfunction " }}}1 - -function! pathogen#incubate(...) abort " {{{1 - let name = a:0 ? a:1 : 'bundle/{}' - call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')') - return pathogen#interpose(name) -endfunction " }}}1 - -" Deprecated alias for pathogen#interpose(). -function! pathogen#runtime_append_all_bundles(...) abort " {{{1 - if a:0 - call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')') - else - call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()') - endif - return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}') -endfunction " }}}1 - -if exists(':Vedit') - finish -endif - -let s:vopen_warning = 0 - -function! s:find(count,cmd,file,lcd) " {{{1 - let rtp = pathogen#join(1,pathogen#split(&runtimepath)) - let file = pathogen#runtime_findfile(a:file,a:count) - if file ==# '' - return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'" - endif - if !s:vopen_warning - let s:vopen_warning = 1 - let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE' - else - let warning = '' - endif - if a:lcd - let path = file[0:-strlen(a:file)-2] - execute 'lcd `=path`' - return a:cmd.' '.pathogen#fnameescape(a:file) . warning - else - return a:cmd.' '.pathogen#fnameescape(file) . warning - endif -endfunction " }}}1 - -function! s:Findcomplete(A,L,P) " {{{1 - let sep = pathogen#slash() - let cheats = { - \'a': 'autoload', - \'d': 'doc', - \'f': 'ftplugin', - \'i': 'indent', - \'p': 'plugin', - \'s': 'syntax'} - if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0]) - let request = cheats[a:A[0]].a:A[1:-1] - else - let request = a:A - endif - let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*' - let found = {} - for path in pathogen#split(&runtimepath) - let path = expand(path, ':p') - let matches = split(glob(path.sep.pattern),"\n") - call map(matches,'isdirectory(v:val) ? v:val.sep : v:val') - call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]') - for match in matches - let found[match] = 1 - endfor - endfor - return sort(keys(found)) -endfunction " }}}1 - -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(,'edit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(,'split',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(,'vsplit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(,'tabedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(,'pedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(,'read',,1) - -" vim:set et sw=2: diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree deleted file mode 160000 index b0bb781..0000000 --- a/.vim/bundle/nerdtree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b0bb781fc73ef40365e4c996a16f04368d64fc9d diff --git a/.vim/bundle/tlib_vim b/.vim/bundle/tlib_vim deleted file mode 160000 index 8e5bf4d..0000000 --- a/.vim/bundle/tlib_vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8e5bf4d9d445565b4fc88ef700635d6210f4c69c diff --git a/.vim/bundle/vim-addon-mw-utils b/.vim/bundle/vim-addon-mw-utils deleted file mode 160000 index 0c5612f..0000000 --- a/.vim/bundle/vim-addon-mw-utils +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0c5612fa31ee434ba055e21c76f456244b3b5109 diff --git a/.vim/bundle/vim-colors-solarized b/.vim/bundle/vim-colors-solarized deleted file mode 160000 index 528a59f..0000000 --- a/.vim/bundle/vim-colors-solarized +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21 diff --git a/.vim/bundle/vim-flake8 b/.vim/bundle/vim-flake8 deleted file mode 160000 index 8a573a9..0000000 --- a/.vim/bundle/vim-flake8 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8a573a9806eacf000b03b4bbf37aff4ce06d73a6 diff --git a/.vim/bundle/vim-snipmate b/.vim/bundle/vim-snipmate deleted file mode 160000 index f5b464b..0000000 --- a/.vim/bundle/vim-snipmate +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f5b464b38b8d0454d5a1207f2f84d6a9d7da318d diff --git a/.vim/bundle/zazen b/.vim/bundle/zazen deleted file mode 160000 index 5cd00e9..0000000 --- a/.vim/bundle/zazen +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5cd00e929df650d66abcb910602e5ebfa50c914a diff --git a/.vim/colors/256-grayvim.vim b/.vim/colors/256-grayvim.vim deleted file mode 100644 index fc81da0..0000000 --- a/.vim/colors/256-grayvim.vim +++ /dev/null @@ -1,46 +0,0 @@ -" Vim color file -" Maintainer: Piotr Husiatyński - -set background=dark -set t_Co=256 -let g:colors_name="256-grayvim" - -let python_highlight_all = 1 -let c_gnu = 1 - - -hi Normal ctermfg=253 ctermbg=235 cterm=None -hi Cursor ctermfg=Red ctermbg=None cterm=None -hi SpecialKey ctermfg=87 ctermbg=None cterm=Bold -hi Directory ctermfg=76 ctermbg=None cterm=None -hi ErrorMsg ctermfg=124 ctermbg=White cterm=None -hi PreProc ctermfg=246 ctermbg=None cterm=Bold -hi Search ctermfg=160 ctermbg=232 cterm=Bold -hi Type ctermfg=75 ctermbg=None cterm=Bold -hi Statement ctermfg=75 ctermbg=None cterm=None -hi Comment ctermfg=244 ctermbg=None cterm=None -hi Identifier ctermfg=111 ctermbg=None cterm=Bold -hi DiffText ctermfg=88 ctermbg=250 cterm=None -hi Constant ctermfg=208 ctermbg=None cterm=None -hi Todo ctermfg=233 ctermbg=118 cterm=Bold -hi Error ctermfg=233 ctermbg=124 cterm=Bold -hi Special ctermfg=160 ctermbg=None cterm=Bold -hi Ignore ctermfg=220 ctermbg=None cterm=Bold -hi Underline ctermfg=244 ctermbg=None cterm=None - -hi FoldColumn ctermfg=247 ctermbg=None cterm=Bold -hi StatusLineNC ctermfg=247 ctermbg=234 cterm=None -hi StatusLine ctermfg=247 ctermbg=233 cterm=Bold -hi VertSplit ctermfg=247 ctermbg=234 cterm=Bold - -hi LineNr ctermfg=238 ctermbg=244 cterm=Bold -hi LineNr ctermfg=247 ctermbg=235 cterm=Bold -hi NonText ctermfg=87 ctermbg=None cterm=Bold - - -hi Pmenu ctermfg=White ctermbg=DarkGray cterm=None -hi PmenuSel ctermfg=None ctermbg=Gray cterm=Bold -hi PmenuSbar ctermfg=DarkGray ctermbg=DarkGray cterm=None -hi PmenuThumb ctermfg=Gray ctermbg=Gray cterm=None - -"vim: sw=4 diff --git a/.vim/colors/; b/.vim/colors/; deleted file mode 100644 index 576b1c9..0000000 --- a/.vim/colors/; +++ /dev/null @@ -1,57 +0,0 @@ -execute pathogen#infect() -filetype indent plugin on -syntax enable -set t_Co=256 -color 256-grayvim -hi Normal ctermbg=NONE - -set encoding=utf-8 -set history=1000 -set number -set ruler -set backspace=eol,start,indent -set whichwrap+=<,>,h,l -set incsearch -set noerrorbells -set novisualbell -set nobackup -set nowb -set noswapfile -set shiftwidth=2 -set tabstop=2 -set foldmethod=indent -set foldnestmax=2 -set nofoldenable -set cc=80 -set textwidth=79 -set list -set listchars=tab:.\ ,eol:¬,trail:_,precedes:<,extends:> - -" Source the vimrc while editing -autocmd! bufwritepost .vimrc source % - -" Tab Mappings -map l l -map h h -map j j -map k k - -" Search results stay in middle of screen -nnoremap n nzzzv -nnoremap N Nzzzv - -" Unmap the arrow keys!!! -for prefix in ['i', 'n', 'v'] - for key in ['', '', '', ''] - exe prefix . "noremap " . key . " " - endfor -endfor - -" Load all the skeletons for newfiles -for i in split(globpath('~/.vim/skel/', './*'), '\n') - let extension = split(i, "/")[-1] - exe "au BufNewFile *." . extension . " 0r ~/.vim/skel/" . extension -endfor - -let mapleader="'" -map n :NERDTreeToggle diff --git a/.vim/ftplugin/python.vim b/.vim/ftplugin/python.vim deleted file mode 100644 index 0668ebe..0000000 --- a/.vim/ftplugin/python.vim +++ /dev/null @@ -1,5 +0,0 @@ -autocmd BufWritePost *.py call Flake8() -set tabstop=8 -set expandtab -set shiftwidth=4 -set softtabstop=4 diff --git a/.vim/skel/py b/.vim/skel/py deleted file mode 100644 index 89f1db4..0000000 --- a/.vim/skel/py +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/env python -# -*- coding: utf-8 -*- diff --git a/.vim/skel/tex b/.vim/skel/tex deleted file mode 100644 index 671c902..0000000 --- a/.vim/skel/tex +++ /dev/null @@ -1,9 +0,0 @@ -\documentclass{article} - -\author{Mart Lubbers} -\title{ -\date{\today} - -\begin{document} - -\end{document} diff --git a/.vim/snippets/java.snippets b/.vim/snippets/java.snippets deleted file mode 100644 index 1a2c492..0000000 --- a/.vim/snippets/java.snippets +++ /dev/null @@ -1,30 +0,0 @@ -#Import etc -snippet im - import - -#Modifiers -snippet pu - public -snippet po - protected -snippet pr - private -snippet st - static -snippet fi - final -snippet ab - abstract -snippet sy - synchronized - -#Functions -snippet main - public static void main (String [] args) - { - ${1:/* code */} - } - -#Javadoc -snippet syso - System.out.println(${1:text}) diff --git a/.vim/snippets/python.snippets b/.vim/snippets/python.snippets deleted file mode 100644 index c5b8ff4..0000000 --- a/.vim/snippets/python.snippets +++ /dev/null @@ -1,6 +0,0 @@ -snippet imp - import ${1:module} - -snippet ifmain - if __name__ == '__main__': - ${1:main()} diff --git a/.vim/snippets/snippet.snippets b/.vim/snippets/snippet.snippets deleted file mode 100644 index 854c058..0000000 --- a/.vim/snippets/snippet.snippets +++ /dev/null @@ -1,7 +0,0 @@ -# snippets for making snippets :) -snippet snip - snippet ${1:trigger} - ${2} -snippet msnip - snippet ${1:trigger} ${2:description} - ${3} diff --git a/.vimrc b/.vimrc index 62e1bac..2d38495 100644 --- a/.vimrc +++ b/.vimrc @@ -1,8 +1,7 @@ execute pathogen#infect() filetype indent plugin on syntax enable -set background=dark -colorscheme 256-grayvim +colorscheme elflord set encoding=utf-8 set history=1000 @@ -23,8 +22,6 @@ set foldnestmax=2 set nofoldenable set cc=80 set textwidth=79 -set list -set listchars=tab:\ \ ,eol:¬,trail:_,precedes:<,extends:> " Source the vimrc while editing autocmd! bufwritepost .vimrc source % diff --git a/README.md b/README.md deleted file mode 100644 index 778f679..0000000 --- a/README.md +++ /dev/null @@ -1,10 +0,0 @@ -Yay dotfiles to share -===================== - -Also includes a script to install it:) - -notes: -- You need flake8 for the flake8 plugin https://pypi.python.org/pypi/flake8/ - -TODO: -* irssi diff --git a/gpg-agent.conf b/gpg-agent.conf deleted file mode 100644 index 20193f1..0000000 --- a/gpg-agent.conf +++ /dev/null @@ -1,2 +0,0 @@ -pinentry-program /usr/bin/pinentry-curses -default-cache-ttl 3600 diff --git a/gpg-agent.sh b/gpg-agent.sh deleted file mode 100644 index 33c6451..0000000 --- a/gpg-agent.sh +++ /dev/null @@ -1,10 +0,0 @@ -if [ $EUID -ne 0 ] ; then - envfile="$HOME/.gnupg/gpg-agent.env" - if [[ -e "$envfile" ]] && kill -0 $(grep GPG_AGENT_INFO "$envfile" | cut -d: -f 2) 2>/dev/null; then - eval "$(cat "$envfile")" - else - eval "$(gpg-agent --daemon --enable-ssh-support --write-env-file "$envfile")" - fi - export GPG_AGENT_INFO # the env file does not contain the export statement - export SSH_AUTH_SOCK # enable gpg-agent for ssh -fi diff --git a/i3/bar b/i3/bar deleted file mode 100755 index cdebaf8..0000000 --- a/i3/bar +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -function net { - grep -q "$1" /run/network/ifstate && echo "$2 <$(iwconfig "$1" 2>/dev/null | grep -Po "(?<=ESSID:\").*(?=\")")> | " -} - -function volume { - volume=$(amixer | grep -A4 Master | grep -o "[0-9]\{1,3\}%\|\[off\]") - echo -ne "♬: $volume | " -} - -function temp { - temp=$(sensors|grep temp1|head -1|awk '{print $2}') - echo -ne "⚠: $temp | " -} - -function battery { - pa="/sys/class/power_supply/BAT0" - power=$(echo "$(cat $pa/charge_now)*100/$(cat $pa/charge_full)" | bc) - charge="" - if [ "$(cat $pa/status)" = "Charging" ]; then - charge="(C)" - fi - echo -ne "⚡: $power%$charge | " -} - -while [ 1 ]; do - echo "$(volume)$(net wlan0 W)$(net eth0 E)$(net usb0 U)$(temp)$(battery)$(date +%y-%m-%d\ %H:%M)" - sleep 5 -done diff --git a/msmtp b/msmtp deleted file mode 100644 index 7225816..0000000 --- a/msmtp +++ /dev/null @@ -1,9 +0,0 @@ -account net -host mail.martlubbers.net -port 587 -auth on -tls on -tls_certcheck off -user mart@martlubbers.net -passwordeval gpg --quiet --batch --use-agent -d ~/passwd.gpg | grep -i mail | awk '{print $3}' -from mart@martlubbers.net diff --git a/offlineimap.py b/offlineimap.py deleted file mode 100644 index 8d5b9cb..0000000 --- a/offlineimap.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/env python -# -*- coding: utf-8 -*- - -import subprocess - -def mailpasswd(): - args = '/usr/bin/gpg --use-agent --quiet --batch -d /home/mart/passwd.gpg | grep -i mail | awk \'{print $3}\'' - try: - return subprocess.check_output(args, shell='/bin/bash').strip() - except subprocess.CalledProcessError: - return "" diff --git a/offlineimaprc b/offlineimaprc deleted file mode 100644 index ebee978..0000000 --- a/offlineimaprc +++ /dev/null @@ -1,29 +0,0 @@ -[general] -pythonfile = ~/.mutt/offlineimap.py -metadata = ~/.mutt/offlineimap_meta -accounts = net -ui = quiet - -[Account net] -localrepository = Local -remoterepository = Remote -postsynchook = notmuch new - -[Repository Local] -type = Maildir -localfolders = ~/.mutt/mail - -[Repository Remote] -type = IMAP -remotepasseval = mailpasswd() -remotehost = mail.martlubbers.net -remoteuser = mart@martlubbers.net -ssl = yes - -[mbnames] -enabled = yes -filename = ~/.mutt/mailboxes -header = "mailboxes " -peritem = "~/.mutt/mail/%(foldername)s/" -sep = " " -footer = "\n" -- 2.20.1