From: Mart Lubbers Date: Thu, 7 Jan 2016 18:51:21 +0000 (+0100) Subject: stowified the repo X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=7c0c395e57530a31d96410759e5f65b12d2aaea2;p=dotfiles.git stowified the repo --- diff --git a/.gitmodules b/.gitmodules index e124b88..b35fc6b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule ".vim/bundle/vim-gnupg"] - path = .vim/bundle/vim-gnupg - url = git://github.com/jamessan/vim-gnupg -[submodule ".vim/bundle/syntastic"] - path = .vim/bundle/syntastic - url = git://github.com/scrooloose/syntastic.git +[submodule "vim/.vim/bundle/vim-gnupg.git"] + path = vim/.vim/bundle/vim-gnupg.git + url = git@github.com:jamessan/vim-gnupg.git +[submodule "vim/.vim/bundle/vim-syntastic.git"] + path = vim/.vim/bundle/vim-syntastic.git + url = git@github.com:scrooloose/syntastic.git diff --git a/.vim/.gitignore b/.vim/.gitignore deleted file mode 100644 index 7c26141..0000000 --- a/.vim/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.netrwhist -spell diff --git a/.vim/bundle/syntastic b/.vim/bundle/syntastic deleted file mode 160000 index b609b3b..0000000 --- a/.vim/bundle/syntastic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b609b3bdd37724b64e35bc9e6e087e2d43345062 diff --git a/.vim/bundle/vim-gnupg b/.vim/bundle/vim-gnupg deleted file mode 160000 index dd8e4ad..0000000 --- a/.vim/bundle/vim-gnupg +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dd8e4adb4d1c6c9fda7a1d60cbc863e260687de9 diff --git a/.vim/bundle/wmnusmv.vim b/.vim/bundle/wmnusmv.vim deleted file mode 160000 index a9fa46e..0000000 --- a/.vim/bundle/wmnusmv.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a9fa46eea8e667aa6413267a27209be18cae6622 diff --git a/.vim/ftplugin/c.vim b/.vim/ftplugin/c.vim deleted file mode 100644 index 375e233..0000000 --- a/.vim/ftplugin/c.vim +++ /dev/null @@ -1,4 +0,0 @@ -set tabstop=8 -set softtabstop=8 -set shiftwidth=8 -set noexpandtab diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add deleted file mode 100644 index 5958b19..0000000 --- a/.vim/spell/en.utf-8.add +++ /dev/null @@ -1,12 +0,0 @@ -RSS -Hyperleap -subjectual -backend -permalink -metadata -deeplink -subword -cyclicity -frontend -GUID -XSD diff --git a/.vim/spell/en.utf-8.add.spl b/.vim/spell/en.utf-8.add.spl deleted file mode 100644 index bf2fcda..0000000 Binary files a/.vim/spell/en.utf-8.add.spl and /dev/null differ diff --git a/README b/README deleted file mode 100644 index 51a0434..0000000 --- a/README +++ /dev/null @@ -1,13 +0,0 @@ -Dotfiles - -Run install.sh to load the dotfiles, the script assumes them being linked and -replaces the link with a link to this directory. - -To load the vim plugins you have to clone the repo recursively: - git clone --recursive https://github.com/dopefishh/dotfiles.git - -If you forgot the recursive flag you can do: - git submodule init - git submodule update - git submodule foreach git submodule init - git submodule foreach git submodule update diff --git a/README.md b/README.md new file mode 100644 index 0000000..5ce5e59 --- /dev/null +++ b/README.md @@ -0,0 +1,17 @@ +# Dotfiles. + +Tip: use GNU stow + +`stow -t ~/ NAME` + +Where NAME is: + +| `NAME` | contents +--- | --- +| cal | khard, khal, vdirsyncer +| email | mutt, offlineimap, notmuch, msmtp +| git | git +| shell | bash, top, readline +| vim | vim, vim-gnupg, vim-syntastic +| vimperator | vimperator +| x | i3, i3status, urxvt, font, gv, askpass diff --git a/.config/khal/khal.conf b/cal/.config/khal/khal.conf similarity index 100% rename from .config/khal/khal.conf rename to cal/.config/khal/khal.conf diff --git a/.config/khard/khard.conf b/cal/.config/khard/khard.conf similarity index 100% rename from .config/khard/khard.conf rename to cal/.config/khard/khard.conf diff --git a/.config/vdirsyncer/config b/cal/.config/vdirsyncer/config similarity index 100% rename from .config/vdirsyncer/config rename to cal/.config/vdirsyncer/config diff --git a/.mutt/mailcap b/email/.mutt/mailcap similarity index 100% rename from .mutt/mailcap rename to email/.mutt/mailcap diff --git a/.mutt/msmtprc b/email/.mutt/msmtprc similarity index 61% rename from .mutt/msmtprc rename to email/.mutt/msmtprc index cd56da1..20af6b2 100644 --- a/.mutt/msmtprc +++ b/email/.mutt/msmtprc @@ -1,9 +1,9 @@ -account net +account default host mail.martlubbers.net port 587 auth on tls on -tls_certcheck off +tls_fingerprint D8:F2:61:3E:E3:01:7F:E9:EA:EC:77:2C:D0:70:94:34:29:45:F6:32 user mart@martlubbers.net passwordeval pass mail/mart@martlubbers.net from mart@martlubbers.net diff --git a/.mutt/muttrc b/email/.mutt/muttrc similarity index 100% rename from .mutt/muttrc rename to email/.mutt/muttrc diff --git a/.mutt/notmuch-config b/email/.mutt/notmuch-config similarity index 100% rename from .mutt/notmuch-config rename to email/.mutt/notmuch-config diff --git a/.mutt/offlineimap.py b/email/.mutt/offlineimap.py similarity index 100% rename from .mutt/offlineimap.py rename to email/.mutt/offlineimap.py diff --git a/.mutt/offlineimaprc b/email/.mutt/offlineimaprc similarity index 100% rename from .mutt/offlineimaprc rename to email/.mutt/offlineimaprc diff --git a/.gitconfig b/git/.gitconfig similarity index 100% rename from .gitconfig rename to git/.gitconfig diff --git a/install.sh b/install.sh deleted file mode 100644 index c8d98f9..0000000 --- a/install.sh +++ /dev/null @@ -1,19 +0,0 @@ -# Set keymaps -sudo localectl set-x11-keymap --no-convert dvorak,ru pc104 ,phonetic_dvorak grp:shifts_toggle,compose:ralt -sudo localectl set-keymap --no-convert dvorak - -# Link the dotfiles -hf=(.bashrc .gitconfig .inputrc .toprc -.xinitrc .Xresources -.vim .vimrc .vimperatorrc -.mutt/mailcap .mutt/msmtprc .mutt/muttrc -.mutt/offlineimap.py .mutt/offlineimaprc .mutt/notmuch-config -.config/i3/config .config/i3status/config -.config/khal/khal.conf -.config/khard/khard.conf -.config/vdirsyncer/config) -for f in ${hf[*]} -do - unlink "$HOME/$f" || true - ln -vs "$PWD/$f" "$HOME/$f" -done diff --git a/.bashrc b/shell/.bashrc similarity index 100% rename from .bashrc rename to shell/.bashrc diff --git a/.inputrc b/shell/.inputrc similarity index 100% rename from .inputrc rename to shell/.inputrc diff --git a/.toprc b/shell/.toprc similarity index 100% rename from .toprc rename to shell/.toprc diff --git a/.vim/autoload/pathogen.vim b/vim/.vim/autoload/pathogen.vim similarity index 100% rename from .vim/autoload/pathogen.vim rename to vim/.vim/autoload/pathogen.vim diff --git a/vim/.vim/bundle/vim-gnupg.git b/vim/.vim/bundle/vim-gnupg.git new file mode 160000 index 0000000..2dfb82f --- /dev/null +++ b/vim/.vim/bundle/vim-gnupg.git @@ -0,0 +1 @@ +Subproject commit 2dfb82f13ea87e36c5df34024d3d2b054b0e72f0 diff --git a/vim/.vim/bundle/vim-syntastic.git b/vim/.vim/bundle/vim-syntastic.git new file mode 160000 index 0000000..17a4c01 --- /dev/null +++ b/vim/.vim/bundle/vim-syntastic.git @@ -0,0 +1 @@ +Subproject commit 17a4c01236323bec9dba1c2a99e6fe2b6d22c2df diff --git a/.vimrc b/vim/.vimrc similarity index 100% rename from .vimrc rename to vim/.vimrc diff --git a/.vimperatorrc b/vimperator/.vimperatorrc similarity index 100% rename from .vimperatorrc rename to vimperator/.vimperatorrc diff --git a/.Xresources b/x/.Xresources similarity index 100% rename from .Xresources rename to x/.Xresources diff --git a/.config/i3/config b/x/.config/i3/config similarity index 98% rename from .config/i3/config rename to x/.config/i3/config index 62adfd0..6ae8a27 100644 --- a/.config/i3/config +++ b/x/.config/i3/config @@ -12,8 +12,7 @@ set $mod Mod4 # lock the screen after 10 minutes -exec xautolock -locker \ - 'sudo -K; echo RELOADAGENT | gpg-connect-agent; i3lock -c ccff00' +exec xautolock -locker 'sudo -K; echo RELOADAGENT | gpg-connect-agent; i3lock -c ccff00' # set a background exec convert -size 1600x900 plasma:fractal -modulate 20,100,10 png:- | display -window root # set the backlight diff --git a/.config/i3status/config b/x/.config/i3status/config similarity index 100% rename from .config/i3status/config rename to x/.config/i3status/config diff --git a/x/.config/user-dirs.dirs b/x/.config/user-dirs.dirs new file mode 100644 index 0000000..91f2ad4 --- /dev/null +++ b/x/.config/user-dirs.dirs @@ -0,0 +1,15 @@ +# This file is written by xdg-user-dirs-update +# If you want to change or add directories, just edit the line you're +# interested in. All local changes will be retained on the next run +# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped +# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an +# absolute path. No other format is supported. +# +XDG_DESKTOP_DIR="$HOME/" +XDG_DOWNLOAD_DIR="$HOME/downloads" +XDG_TEMPLATES_DIR="$HOME/" +XDG_PUBLICSHARE_DIR="$HOME/" +XDG_DOCUMENTS_DIR="$HOME/documents" +XDG_MUSIC_DIR="$HOME/music" +XDG_PICTURES_DIR="$HOME/pictures" +XDG_VIDEOS_DIR="$HOME/" diff --git a/.xinitrc b/x/.xinitrc similarity index 100% rename from .xinitrc rename to x/.xinitrc