From bb16f1b86c32d13df7be7245a871c4f191b7e5d4 Mon Sep 17 00:00:00 2001 From: Camil Staps Date: Wed, 11 Jan 2017 19:16:39 +0100 Subject: Stowify repo --- .gitmodules | 3 - README.md | 96 ++---------- git/.gitconfig | 31 ++++ git/.gitconfig.local | 5 + git/gitconfig.local.example | 6 - git/gitconfig.symlink | 31 ---- haskell/.ghci | 20 +++ haskell/ghci.symlink | 20 --- i3.symlink/config | 123 --------------- i3/.i3/config | 123 +++++++++++++++ i3/.i3status.conf | 53 +++++++ mutt/.muttrc | 29 ++++ mutt/muttrc.symlink | 29 ---- script/bootstrap | 234 ---------------------------- script/install | 10 -- system/.Xresources | 106 +++++++++++++ system/.bash_aliases | 10 ++ system/.bash_logout | 7 + system/.bashrc | 134 ++++++++++++++++ system/.inputrc | 9 ++ system/.profile | 21 +++ system/.xinitrc | 4 + system/.xsessionrc | 29 ++++ system/Xresources.symlink | 106 ------------- system/bash_aliases.symlink | 10 -- system/bash_logout.symlink | 7 - system/bashrc.symlink | 134 ---------------- system/i3status.conf.symlink | 53 ------- system/inputrc.symlink | 9 -- system/profile.symlink | 21 --- system/xinitrc.symlink | 4 - system/xsessionrc.symlink | 29 ---- vim/.vim/after/ftplugin/bb.vim | 1 + vim/.vim/after/ftplugin/c.vim | 1 + vim/.vim/after/ftplugin/clean.vim | 1 + vim/.vim/after/ftplugin/html.vim | 1 + vim/.vim/after/ftplugin/jade.vim | 1 + vim/.vim/after/ftplugin/javascript.vim | 1 + vim/.vim/after/ftplugin/markdown.vim | 4 + vim/.vim/after/ftplugin/python.vim | 1 + vim/.vim/after/ftplugin/scala.vim | 1 + vim/.vim/after/ftplugin/tex.vim | 2 + vim/.vim/plugin/visincrPlugin.vim | 156 +++++++++++++++++++ vim/vim.symlink/after/ftplugin/bb.vim | 1 - vim/vim.symlink/after/ftplugin/c.vim | 1 - vim/vim.symlink/after/ftplugin/clean.vim | 1 - vim/vim.symlink/after/ftplugin/html.vim | 1 - vim/vim.symlink/after/ftplugin/jade.vim | 1 - vim/vim.symlink/after/ftplugin/markdown.vim | 4 - vim/vim.symlink/after/ftplugin/python.vim | 1 - vim/vim.symlink/after/ftplugin/scala.vim | 1 - vim/vim.symlink/after/ftplugin/tex.vim | 2 - vim/vim.symlink/bundle/Vundle.vim | 1 - vim/vim.symlink/plugin/visincrPlugin.vim | 156 ------------------- 54 files changed, 763 insertions(+), 1083 deletions(-) create mode 100644 git/.gitconfig create mode 100644 git/.gitconfig.local delete mode 100644 git/gitconfig.local.example delete mode 100644 git/gitconfig.symlink create mode 100644 haskell/.ghci delete mode 100644 haskell/ghci.symlink delete mode 100644 i3.symlink/config create mode 100644 i3/.i3/config create mode 100644 i3/.i3status.conf create mode 100644 mutt/.muttrc delete mode 100644 mutt/muttrc.symlink delete mode 100755 script/bootstrap delete mode 100755 script/install create mode 100644 system/.Xresources create mode 100644 system/.bash_aliases create mode 100644 system/.bash_logout create mode 100644 system/.bashrc create mode 100644 system/.inputrc create mode 100644 system/.profile create mode 100644 system/.xinitrc create mode 100644 system/.xsessionrc delete mode 100644 system/Xresources.symlink delete mode 100644 system/bash_aliases.symlink delete mode 100644 system/bash_logout.symlink delete mode 100644 system/bashrc.symlink delete mode 100644 system/i3status.conf.symlink delete mode 100644 system/inputrc.symlink delete mode 100644 system/profile.symlink delete mode 100644 system/xinitrc.symlink delete mode 100644 system/xsessionrc.symlink create mode 100644 vim/.vim/after/ftplugin/bb.vim create mode 100644 vim/.vim/after/ftplugin/c.vim create mode 100644 vim/.vim/after/ftplugin/clean.vim create mode 100644 vim/.vim/after/ftplugin/html.vim create mode 100644 vim/.vim/after/ftplugin/jade.vim create mode 100644 vim/.vim/after/ftplugin/javascript.vim create mode 100644 vim/.vim/after/ftplugin/markdown.vim create mode 100644 vim/.vim/after/ftplugin/python.vim create mode 100644 vim/.vim/after/ftplugin/scala.vim create mode 100644 vim/.vim/after/ftplugin/tex.vim create mode 100644 vim/.vim/plugin/visincrPlugin.vim delete mode 100644 vim/vim.symlink/after/ftplugin/bb.vim delete mode 100644 vim/vim.symlink/after/ftplugin/c.vim delete mode 100644 vim/vim.symlink/after/ftplugin/clean.vim delete mode 100644 vim/vim.symlink/after/ftplugin/html.vim delete mode 100644 vim/vim.symlink/after/ftplugin/jade.vim delete mode 100644 vim/vim.symlink/after/ftplugin/markdown.vim delete mode 100644 vim/vim.symlink/after/ftplugin/python.vim delete mode 100644 vim/vim.symlink/after/ftplugin/scala.vim delete mode 100644 vim/vim.symlink/after/ftplugin/tex.vim delete mode 160000 vim/vim.symlink/bundle/Vundle.vim delete mode 100644 vim/vim.symlink/plugin/visincrPlugin.vim diff --git a/.gitmodules b/.gitmodules index bf071fc..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "vim/vim.symlink/bundle/Vundle.vim"] - path = vim/vim.symlink/bundle/Vundle.vim - url = https://github.com/VundleVim/Vundle.vim diff --git a/README.md b/README.md index 1f56baa..ffb1e1f 100644 --- a/README.md +++ b/README.md @@ -1,88 +1,16 @@ -# holman does dotfiles +# dotfiles -## dotfiles +My dotfiles. Feel free to use what you can. -Your dotfiles are how you personalize your system. These are mine. +## Install -I was a little tired of having long alias files and everything strewn about -(which is extremely common on other dotfiles projects, too). That led to this -project being much more topic-centric. I realized I could split a lot of things -up into the main areas I used (Ruby, git, system libraries, and so on), so I -structured the project accordingly. +`stow -t ~ `, where `` is one of: -If you're interested in the philosophy behind why projects like these are -awesome, you might want to [read my post on the -subject](http://zachholman.com/2010/08/dotfiles-are-meant-to-be-forked/). - -## install - -Run this: - -```sh -git clone https://github.com/holman/dotfiles.git ~/.dotfiles -cd ~/.dotfiles -script/bootstrap -``` - -This will symlink the appropriate files in `.dotfiles` to your home directory. -Everything is configured and tweaked within `~/.dotfiles`. - -The main file you'll want to change right off the bat is `zsh/zshrc.symlink`, -which sets up a few paths that'll be different on your particular machine. - -`dot` is a simple script that installs some dependencies, sets sane OS X -defaults, and so on. Tweak this script, and occasionally run `dot` from -time to time to keep your environment fresh and up-to-date. You can find -this script in `bin/`. - -## topical - -Everything's built around topic areas. If you're adding a new area to your -forked dotfiles — say, "Java" — you can simply add a `java` directory and put -files in there. Anything with an extension of `.zsh` will get automatically -included into your shell. Anything with an extension of `.symlink` will get -symlinked without extension into `$HOME` when you run `script/bootstrap`. - -## what's inside - -A lot of stuff. Seriously, a lot of stuff. Check them out in the file browser -above and see what components may mesh up with you. -[Fork it](https://github.com/holman/dotfiles/fork), remove what you don't -use, and build on what you do use. - -## components - -There's a few special files in the hierarchy. - -- **bin/**: Anything in `bin/` will get added to your `$PATH` and be made - available everywhere. -- **topic/\*.zsh**: Any files ending in `.zsh` get loaded into your - environment. -- **topic/path.zsh**: Any file named `path.zsh` is loaded first and is - expected to setup `$PATH` or similar. -- **topic/completion.zsh**: Any file named `completion.zsh` is loaded - last and is expected to setup autocomplete. -- **topic/\*.symlink**: Any files ending in `*.symlink` get symlinked into - your `$HOME`. This is so you can keep all of those versioned in your dotfiles - but still keep those autoloaded files in your home directory. These get - symlinked in when you run `script/bootstrap`. - -## bugs - -I want this to work for everyone; that means when you clone it down it should -work for you even though you may not have `rbenv` installed, for example. That -said, I do use this as *my* dotfiles, so there's a good chance I may break -something if I forget to make a check for a dependency. - -If you're brand-new to the project and run into any blockers, please -[open an issue](https://github.com/holman/dotfiles/issues) on this repository -and I'd love to get it fixed for you! - -## thanks - -I forked [Ryan Bates](http://github.com/ryanb)' excellent -[dotfiles](http://github.com/ryanb/dotfiles) for a couple years before the -weight of my changes and tweaks inspired me to finally roll my own. But Ryan's -dotfiles were an easy way to get into bash customization, and then to jump ship -to zsh a bit later. A decent amount of the code in these dotfiles stem or are -inspired from Ryan's original project. +| `` | Contents | Comments +---|---|--- +| `git` | git | Edit `~/.gitconfig.local` yourself +| `haskell` | GHCi | You need to `cabal install` some things +| `i3` | i3, i3bar +| `mutt` | mutt | Still working on this +| `system` | bash, X +| `vim` | vim | Highly subjective diff --git a/git/.gitconfig b/git/.gitconfig new file mode 100644 index 0000000..cd10b26 --- /dev/null +++ b/git/.gitconfig @@ -0,0 +1,31 @@ +# Sample gitconfig +# + +[include] + path = ~/.gitconfig.local + +[hub] + protocol = https +[alias] + count = !git shortlog -sn +[color] + diff = auto + status = auto + branch = auto + ui = true +[core] + excludesfile = ~/.gitignore + editor = vim + whitespace = blank-at-eol,blank-at-eof,space-before-tab,tab-indent +[apply] + whitespace = error +[mergetool] + keepBackup = false +[difftool] + prompt = false +[help] + autocorrect = 1 +[commit] + gpgsign = 1 +[push] + default = simple diff --git a/git/.gitconfig.local b/git/.gitconfig.local new file mode 100644 index 0000000..f061734 --- /dev/null +++ b/git/.gitconfig.local @@ -0,0 +1,5 @@ +[user] + name = NAME + email = EMAIL +[credential] + helper = CREDENTIAL_HELPER diff --git a/git/gitconfig.local.example b/git/gitconfig.local.example deleted file mode 100644 index 8f3efc8..0000000 --- a/git/gitconfig.local.example +++ /dev/null @@ -1,6 +0,0 @@ -[user] - name = NAME - email = EMAIL -[credential] - helper = CREDENTIAL_HELPER - diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink deleted file mode 100644 index cd10b26..0000000 --- a/git/gitconfig.symlink +++ /dev/null @@ -1,31 +0,0 @@ -# Sample gitconfig -# - -[include] - path = ~/.gitconfig.local - -[hub] - protocol = https -[alias] - count = !git shortlog -sn -[color] - diff = auto - status = auto - branch = auto - ui = true -[core] - excludesfile = ~/.gitignore - editor = vim - whitespace = blank-at-eol,blank-at-eof,space-before-tab,tab-indent -[apply] - whitespace = error -[mergetool] - keepBackup = false -[difftool] - prompt = false -[help] - autocorrect = 1 -[commit] - gpgsign = 1 -[push] - default = simple diff --git a/haskell/.ghci b/haskell/.ghci new file mode 100644 index 0000000..e5bf06f --- /dev/null +++ b/haskell/.ghci @@ -0,0 +1,20 @@ +:set -v0 +:set -XNoMonomorphismRestriction +:set -Wall -fno-warn-name-shadowing -fno-warn-type-defaults +:set editor vim + +import qualified IPPrint +import qualified Language.Haskell.HsColour as HsColour +import qualified Language.Haskell.HsColour.Colourise as HsColour +import qualified Language.Haskell.HsColour.Output as HsColour + +let myColourPrefs = HsColour.defaultColourPrefs { HsColour.conid = [HsColour.Foreground HsColour.Yellow, HsColour.Bold], HsColour.conop = [HsColour.Foreground HsColour.Yellow], HsColour.string = [HsColour.Foreground HsColour.Green], HsColour.char = [HsColour.Foreground HsColour.Cyan], HsColour.number = [HsColour.Foreground HsColour.Red, HsColour.Bold], HsColour.layout = [HsColour.Foreground HsColour.White], HsColour.keyglyph = [HsColour.Foreground HsColour.White] } + +let myPrint = putStrLn . HsColour.hscolour (HsColour.TTYg HsColour.XTerm256Compatible) myColourPrefs False False "" False . IPPrint.pshow + +:set -interactive-print=myPrint +:set prompt "λ. " + +:def hoogle \str -> return $ ":! hoogle --count=15 \"" ++ str ++ "\"" + +:def pf \str -> return $ ":! pointfree \"" ++ str ++ "\"" diff --git a/haskell/ghci.symlink b/haskell/ghci.symlink deleted file mode 100644 index e5bf06f..0000000 --- a/haskell/ghci.symlink +++ /dev/null @@ -1,20 +0,0 @@ -:set -v0 -:set -XNoMonomorphismRestriction -:set -Wall -fno-warn-name-shadowing -fno-warn-type-defaults -:set editor vim - -import qualified IPPrint -import qualified Language.Haskell.HsColour as HsColour -import qualified Language.Haskell.HsColour.Colourise as HsColour -import qualified Language.Haskell.HsColour.Output as HsColour - -let myColourPrefs = HsColour.defaultColourPrefs { HsColour.conid = [HsColour.Foreground HsColour.Yellow, HsColour.Bold], HsColour.conop = [HsColour.Foreground HsColour.Yellow], HsColour.string = [HsColour.Foreground HsColour.Green], HsColour.char = [HsColour.Foreground HsColour.Cyan], HsColour.number = [HsColour.Foreground HsColour.Red, HsColour.Bold], HsColour.layout = [HsColour.Foreground HsColour.White], HsColour.keyglyph = [HsColour.Foreground HsColour.White] } - -let myPrint = putStrLn . HsColour.hscolour (HsColour.TTYg HsColour.XTerm256Compatible) myColourPrefs False False "" False . IPPrint.pshow - -:set -interactive-print=myPrint -:set prompt "λ. " - -:def hoogle \str -> return $ ":! hoogle --count=15 \"" ++ str ++ "\"" - -:def pf \str -> return $ ":! pointfree \"" ++ str ++ "\"" diff --git a/i3.symlink/config b/i3.symlink/config deleted file mode 100644 index bd184e6..0000000 --- a/i3.symlink/config +++ /dev/null @@ -1,123 +0,0 @@ -# General settings -set $mod Mod4 -floating_modifier $mod -font pango:DejaVu Sans Mono 8 -focus_follows_mouse no - -# Autolock -exec xautolock -time 10 -locker 'i3lock -d' -bindsym $mod+Control+Shift+l exec xautolock -locknow - -# Assignments -assign [class="Firefox"] 1 -assign [class="Icedove"] 2 - -# Menus -bindsym $mod+d exec dmenu_run -bindsym $mod+p exec passmenu -i -l 20 - -# kill focused window -bindsym $mod+Shift+Q kill - -# Programs -bindsym $mod+Return exec uxterm -bindsym $mod+Shift+v exec uxterm -e vim -bindsym $mod+Shift+m exec uxterm -e cmus - -# Special keys -bindsym Print exec scrot '/tmp/%Y-%m-%d-%H%M%S_$wx$h.png' -bindsym Shift+Print exec scrot -u '/tmp/%Y-%m-%d-%H%M%S_$wx$h.png' -bindsym --release Control+Print exec scrot -s '/tmp/%Y-%m-%d-%H%M%S_$wx$h.png' -bindsym XF86KbdBrightnessUp exec sudo -A ~/bin/kbdbacklight up -bindsym XF86KbdBrightnessDown exec sudo -A ~/bin/kbdbacklight down -bindsym XF86AudioMute exec amixer sset Master toggle && kill -s 10 `pidof i3status` -bindsym XF86AudioRaiseVolume exec amixer sset Master 1%+ && kill -s 10 `pidof i3status` -bindsym XF86AudioLowerVolume exec amixer sset Master 1%- && kill -s 10 `pidof i3status` -bindsym $mod+F6 exec xbacklight -inc 5 -time 80 -bindsym $mod+F5 exec xbacklight -dec 5 -time 80 -bindsym $mod+Shift+F6 exec xbacklight -set 100 -time 80 -bindsym $mod+Shift+F5 exec xbacklight -set 1 -time 80 - -# change focus -bindsym $mod+j focus left -bindsym $mod+k focus down -bindsym $mod+l focus up -bindsym $mod+semicolon focus right -# between tiling/floating -bindsym $mod+space focus mode_toggle -# to parent -bindsym $mod+a focus parent - -# move focused window -bindsym $mod+Shift+J move left -bindsym $mod+Shift+K move down -bindsym $mod+Shift+L move up -bindsym $mod+Shift+colon move right - -# move workspaces to monitors -bindsym $mod+Up move workspace to output up -bindsym $mod+Down move workspace to output up - -# splits -bindsym $mod+h split h -bindsym $mod+v split v - -# change container layout / fullscreen / floating-tiling -bindsym $mod+f fullscreen -bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed -bindsym $mod+e layout toggle split -bindsym $mod+Shift+space floating toggle - -# switch to workspace -bindsym $mod+1 workspace 1 -bindsym $mod+2 workspace 2 -bindsym $mod+3 workspace 3 -bindsym $mod+4 workspace 4 -bindsym $mod+5 workspace 5 -bindsym $mod+6 workspace 6 -bindsym $mod+7 workspace 7 -bindsym $mod+8 workspace 8 -bindsym $mod+9 workspace 9 -bindsym $mod+0 workspace 10 -bindsym $mod+n exec --no-startup-id newws - -# move focused container to workspace -bindsym $mod+Shift+1 move container to workspace 1 -bindsym $mod+Shift+2 move container to workspace 2 -bindsym $mod+Shift+3 move container to workspace 3 -bindsym $mod+Shift+4 move container to workspace 4 -bindsym $mod+Shift+5 move container to workspace 5 -bindsym $mod+Shift+6 move container to workspace 6 -bindsym $mod+Shift+7 move container to workspace 7 -bindsym $mod+Shift+8 move container to workspace 8 -bindsym $mod+Shift+9 move container to workspace 9 -bindsym $mod+Shift+0 move container to workspace 10 - -# reload; restart in-place; exit and log out -bindsym $mod+Shift+C reload -bindsym $mod+Shift+R exec "i3-nagbar -t warning -m 'You pressed the restart shortcut (Mod-Shift-R). Do you really want to restart i3?' -b 'Yes, restart i3' 'i3-msg restart'" -bindsym $mod+Shift+E exec "i3-nagbar -t warning -m 'You pressed the exit shortcut (Mod-Shift-E). Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" - -bindsym $mod+r mode "resize" -mode "resize" { - bindsym j resize shrink width 1 px or 1 ppt - bindsym k resize grow height 1 px or 1 ppt - bindsym l resize shrink height 1 px or 1 ppt - bindsym semicolon resize grow width 1 px or 1 ppt - - bindsym Shift+j resize shrink width 5 px or 5 ppt - bindsym Shift+k resize grow height 5 px or 5 ppt - bindsym Shift+l resize shrink height 5 px or 5 ppt - bindsym Shift+semicolon resize grow width 5 px or 5 ppt - - # back to normal - bindsym Return mode "default" - bindsym Escape mode "default" - bindsym $mod+r mode "default" -} - -bar { - font pango:DejaVu Sans Mono, 9 - status_command i3status.py -} diff --git a/i3/.i3/config b/i3/.i3/config new file mode 100644 index 0000000..bd184e6 --- /dev/null +++ b/i3/.i3/config @@ -0,0 +1,123 @@ +# General settings +set $mod Mod4 +floating_modifier $mod +font pango:DejaVu Sans Mono 8 +focus_follows_mouse no + +# Autolock +exec xautolock -time 10 -locker 'i3lock -d' +bindsym $mod+Control+Shift+l exec xautolock -locknow + +# Assignments +assign [class="Firefox"] 1 +assign [class="Icedove"] 2 + +# Menus +bindsym $mod+d exec dmenu_run +bindsym $mod+p exec passmenu -i -l 20 + +# kill focused window +bindsym $mod+Shift+Q kill + +# Programs +bindsym $mod+Return exec uxterm +bindsym $mod+Shift+v exec uxterm -e vim +bindsym $mod+Shift+m exec uxterm -e cmus + +# Special keys +bindsym Print exec scrot '/tmp/%Y-%m-%d-%H%M%S_$wx$h.png' +bindsym Shift+Print exec scrot -u '/tmp/%Y-%m-%d-%H%M%S_$wx$h.png' +bindsym --release Control+Print exec scrot -s '/tmp/%Y-%m-%d-%H%M%S_$wx$h.png' +bindsym XF86KbdBrightnessUp exec sudo -A ~/bin/kbdbacklight up +bindsym XF86KbdBrightnessDown exec sudo -A ~/bin/kbdbacklight down +bindsym XF86AudioMute exec amixer sset Master toggle && kill -s 10 `pidof i3status` +bindsym XF86AudioRaiseVolume exec amixer sset Master 1%+ && kill -s 10 `pidof i3status` +bindsym XF86AudioLowerVolume exec amixer sset Master 1%- && kill -s 10 `pidof i3status` +bindsym $mod+F6 exec xbacklight -inc 5 -time 80 +bindsym $mod+F5 exec xbacklight -dec 5 -time 80 +bindsym $mod+Shift+F6 exec xbacklight -set 100 -time 80 +bindsym $mod+Shift+F5 exec xbacklight -set 1 -time 80 + +# change focus +bindsym $mod+j focus left +bindsym $mod+k focus down +bindsym $mod+l focus up +bindsym $mod+semicolon focus right +# between tiling/floating +bindsym $mod+space focus mode_toggle +# to parent +bindsym $mod+a focus parent + +# move focused window +bindsym $mod+Shift+J move left +bindsym $mod+Shift+K move down +bindsym $mod+Shift+L move up +bindsym $mod+Shift+colon move right + +# move workspaces to monitors +bindsym $mod+Up move workspace to output up +bindsym $mod+Down move workspace to output up + +# splits +bindsym $mod+h split h +bindsym $mod+v split v + +# change container layout / fullscreen / floating-tiling +bindsym $mod+f fullscreen +bindsym $mod+s layout stacking +bindsym $mod+w layout tabbed +bindsym $mod+e layout toggle split +bindsym $mod+Shift+space floating toggle + +# switch to workspace +bindsym $mod+1 workspace 1 +bindsym $mod+2 workspace 2 +bindsym $mod+3 workspace 3 +bindsym $mod+4 workspace 4 +bindsym $mod+5 workspace 5 +bindsym $mod+6 workspace 6 +bindsym $mod+7 workspace 7 +bindsym $mod+8 workspace 8 +bindsym $mod+9 workspace 9 +bindsym $mod+0 workspace 10 +bindsym $mod+n exec --no-startup-id newws + +# move focused container to workspace +bindsym $mod+Shift+1 move container to workspace 1 +bindsym $mod+Shift+2 move container to workspace 2 +bindsym $mod+Shift+3 move container to workspace 3 +bindsym $mod+Shift+4 move container to workspace 4 +bindsym $mod+Shift+5 move container to workspace 5 +bindsym $mod+Shift+6 move container to workspace 6 +bindsym $mod+Shift+7 move container to workspace 7 +bindsym $mod+Shift+8 move container to workspace 8 +bindsym $mod+Shift+9 move container to workspace 9 +bindsym $mod+Shift+0 move container to workspace 10 + +# reload; restart in-place; exit and log out +bindsym $mod+Shift+C reload +bindsym $mod+Shift+R exec "i3-nagbar -t warning -m 'You pressed the restart shortcut (Mod-Shift-R). Do you really want to restart i3?' -b 'Yes, restart i3' 'i3-msg restart'" +bindsym $mod+Shift+E exec "i3-nagbar -t warning -m 'You pressed the exit shortcut (Mod-Shift-E). Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" + +bindsym $mod+r mode "resize" +mode "resize" { + bindsym j resize shrink width 1 px or 1 ppt + bindsym k resize grow height 1 px or 1 ppt + bindsym l resize shrink height 1 px or 1 ppt + bindsym semicolon resize grow width 1 px or 1 ppt + + bindsym Shift+j resize shrink width 5 px or 5 ppt + bindsym Shift+k resize grow height 5 px or 5 ppt + bindsym Shift+l resize shrink height 5 px or 5 ppt + bindsym Shift+semicolon resize grow width 5 px or 5 ppt + + # back to normal + bindsym Return mode "default" + bindsym Escape mode "default" + bindsym $mod+r mode "default" +} + +bar { + font pango:DejaVu Sans Mono, 9 + status_command i3status.py +} diff --git a/i3/.i3status.conf b/i3/.i3status.conf new file mode 100644 index 0000000..67710fb --- /dev/null +++ b/i3/.i3status.conf @@ -0,0 +1,53 @@ +general { + colors = true + interval = 5 + output_format = "i3bar" +} + +order += "cmd nowplaying" +order += "volume master" +order += "wireless wlan0" +order += "battery 0" +order += "cpu_usage" +order += "load" +order += "tztime local" + +volume master { + format = "♪: %volume" + format_muted = "♪: muted (%volume)" + device = "default" + mixer = "Master" + mixer_idx = 0 +} + +cmd nowplaying { + cmd = "cmus-remote -Q | grep '^tag \\(artist\\|album\\|title\\) ' | sort | cut -d' ' -f 3- | tr '\\n' '\t' | awk 'BEGIN { FS = \"\\t\" } ; { print \"♪: \" $3 \" (\" $1 \", \" $2 \")\" }'; echo -n ' '" +} + +wireless wlan0 { + format_up = "%essid: %quality, %bitrate (%ip)" + format_down = "wlan0 down" +} + +battery 0 { + format = "%status %percentage %remaining %consumption" + hide_seconds = true + status_chr = "⚇" + status_bat = "⚡" + status_full = "☻" + low_threshold = 30 + threshold_type = "percentage" +} + +cpu_usage { + format = "⚙️ %usage" +} + +load { + max_threshold = "0.7" +} + +tztime local { + format = "%a %b %-d, %I:%M %p" +} + diff --git a/mutt/.muttrc b/mutt/.muttrc new file mode 100644 index 0000000..9ffef67 --- /dev/null +++ b/mutt/.muttrc @@ -0,0 +1,29 @@ +# General +set editor=`echo \$EDITOR` +set send_charset="utf-8" +set edit_headers=yes +unset user_agent + +# Passwords +source "gpg2 -dq $HOME/.mutt-pwds.gpg |" +# don't let people read them +bind generic,alias,attach,browser,editor,index,compose,pager,pgp,postpone ':' noop + +# IMAP +set imap_user=$my_info_camilstaps_un +set imap_pass=$my_info_camilstaps_pw +set folder=imaps://mail.camilstaps.nl/ +set spoolfile=+INBOX +set imap_check_subscribed + +# SMTP +set record=+Sent +set realname="Camil Staps" +set from=info@camilstaps.nl +set use_from=yes +set smtp_url=smtps://$imap_user:$imap_pass@mail.camilstaps.nl + +# Cache +set header_cache=~/.cache/mutt +set message_cachedir=~/.cache/mutt + diff --git a/mutt/muttrc.symlink b/mutt/muttrc.symlink deleted file mode 100644 index 9ffef67..0000000 --- a/mutt/muttrc.symlink +++ /dev/null @@ -1,29 +0,0 @@ -# General -set editor=`echo \$EDITOR` -set send_charset="utf-8" -set edit_headers=yes -unset user_agent - -# Passwords -source "gpg2 -dq $HOME/.mutt-pwds.gpg |" -# don't let people read them -bind generic,alias,attach,browser,editor,index,compose,pager,pgp,postpone ':' noop - -# IMAP -set imap_user=$my_info_camilstaps_un -set imap_pass=$my_info_camilstaps_pw -set folder=imaps://mail.camilstaps.nl/ -set spoolfile=+INBOX -set imap_check_subscribed - -# SMTP -set record=+Sent -set realname="Camil Staps" -set from=info@camilstaps.nl -set use_from=yes -set smtp_url=smtps://$imap_user:$imap_pass@mail.camilstaps.nl - -# Cache -set header_cache=~/.cache/mutt -set message_cachedir=~/.cache/mutt - diff --git a/script/bootstrap b/script/bootstrap deleted file mode 100755 index 1acfd22..0000000 --- a/script/bootstrap +++ /dev/null @@ -1,234 +0,0 @@ -#!/usr/bin/env bash -# -# bootstrap installs things. - -cd "$(dirname "$0")/.." -DOTFILES_ROOT=$(pwd -P) - -set -e - -echo '' - -info () { - printf "\r [ \033[00;34m..\033[0m ] $1\n" -} - -user () { - printf "\r [ \033[0;33m??\033[0m ] $1\n" -} - -success () { - printf "\r\033[2K [ \033[00;32mOK\033[0m ] $1\n" -} - -fail () { - printf "\r\033[2K [\033[0;31mFAIL\033[0m] $1\n" - echo '' - exit -} - -setup_gitconfig () { - if ! [ -f git/gitconfig.symlink ] - then - info 'setup gitconfig' - - git_credential='cache --timeout=3600' - if [ "$(uname -s)" == "Darwin" ] - then - git_credential='osxkeychain' - fi - - user ' - What is your github author name?' - read -e git_authorname - user ' - What is your github author email?' - read -e git_authoremail - - sed -e "s/AUTHORNAME/$git_authorname/g" -e "s/AUTHOREMAIL/$git_authoremail/g" -e "s/GIT_CREDENTIAL_HELPER/$git_credential/g" git/gitconfig.symlink.example > git/gitconfig.symlink - - success 'gitconfig' - fi -} - - -link_directory () { - local src=$1 dst=$2 - - local overwrite= backup= skip= remove= - local action= - - if [ -f "$dst" -o -L "$dst" ] - then - - if [ "$overwrite_all" == "false" ] && [ "$backup_all" == "false" ] && [ "$skip_all" == "false" ] - then - - user "Directory already exists: $dst ($(basename "$src")), what do you want to do?\n\ - [s]kip, [r]emove, [b]ackup?" - read -n 1 action - - case "$action" in - s ) - skip=true;; - r ) - remove=true;; - b ) - backup=true;; - * ) - ;; - esac - - fi - - skip=${skip:-$skip_all} - backup=${backup:-$backup_all} - - if [ "$remove" == "true" ] - then - rm -rf "$dst" - success "removed $dst" - fi - - if [ "$backup" == "true" ] - then - mv "$dst" "${dst}.backup" - success "moved $dst to ${dst}.backup" - fi - - if [ "$skip" == "true" ] - then - success "skipped $src" - fi - fi - - if [ "$skip" != "true" ] - then - mkdir -p "$dst" - - for f in "$src"/* - do - this_dst="$dst/$(basename "$f")" - link "$f" "$this_dst" - done - fi -} - - -link_file () { - local src=$1 dst=$2 - - local overwrite= backup= skip= - local action= - - if [ -f "$dst" -o -d "$dst" -o -L "$dst" ] - then - - if [ "$overwrite_all" == "false" ] && [ "$backup_all" == "false" ] && [ "$skip_all" == "false" ] - then - - local currentSrc="$(readlink $dst)" - - if [ "$currentSrc" == "$src" ] - then - - skip=true; - - else - - user "File already exists: $dst ($(basename "$src")), what do you want to do?\n\ - [s]kip, [S]kip all, [o]verwrite, [O]verwrite all, [b]ackup, [B]ackup all?" - read -n 1 action - - case "$action" in - o ) - overwrite=true;; - O ) - overwrite_all=true;; - b ) - backup=true;; - B ) - backup_all=true;; - s ) - skip=true;; - S ) - skip_all=true;; - * ) - ;; - esac - - fi - - fi - - overwrite=${overwrite:-$overwrite_all} - backup=${backup:-$backup_all} - skip=${skip:-$skip_all} - - if [ "$overwrite" == "true" ] - then - rm -rf "$dst" - success "removed $dst" - fi - - if [ "$backup" == "true" ] - then - mv "$dst" "${dst}.backup" - success "moved $dst to ${dst}.backup" - fi - - if [ "$skip" == "true" ] - then - success "skipped $src" - fi - fi - - if [ "$skip" != "true" ] # "false" or empty - then - ln -s "$1" "$2" - success "linked $1 to $2" - fi -} - - -link () { - local src=$1 dst=$2 - - if [ -f "$src" ] - then - link_file "$src" "$dst" - elif [ -d "$src" ] - then - link_directory "$src" "$dst" - fi -} - - -install_dotfiles () { - info 'installing dotfiles' - - local overwrite_all=false backup_all=false skip_all=false - - for src in $(find -H "$DOTFILES_ROOT" -maxdepth 2 -name '*.symlink') - do - dst="$HOME/.$(basename "${src%.*}")" - link "$src" "$dst" - done -} - -setup_gitconfig -install_dotfiles -ln -s "$DOTFILES_ROOT/bin" "$HOME/bin" - -# If we're on a Mac, let's install and setup homebrew. -if [ "$(uname -s)" == "Darwin" ] -then - info "installing dependencies" - if source bin/dot > /tmp/dotfiles-dot 2>&1 - then - success "dependencies installed" - else - fail "error installing dependencies" - fi -fi - -echo '' -echo ' All installed!' diff --git a/script/install b/script/install deleted file mode 100755 index 1887fc2..0000000 --- a/script/install +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -# -# Run all dotfiles installers. - -set -e - -cd "$(dirname $0)"/.. - -# find the installers and run them iteratively -find . -name install.sh | while read installer ; do sh -c "${installer}" ; done diff --git a/system/.Xresources b/system/.Xresources new file mode 100644 index 0000000..801f715 --- /dev/null +++ b/system/.Xresources @@ -0,0 +1,106 @@ +XTerm*faceName: DejaVu Sans Mono +XTerm*faceSize: 9 +XTerm*selectToClipboard: true +XTerm*dynamicColors: on +UXTerm*faceName: DejaVu Sans Mono +UXTerm*faceSize: 9 +UXTerm*selectToClipboard: true +UXTerm*dynamicColors: on + +! Solarized color scheme for the X Window System +! +! http://ethanschoonover.com/solarized + +! Common + +#define S_yellow #b58900 +#define S_orange #cb4b16 +#define S_red #dc322f +#define S_magenta #d33682 +#define S_violet #6c71c4 +#define S_blue #268bd2 +#define S_cyan #2aa198 +#define S_green #859900 + + +! Dark + +#define S_base03 #002b36 +#define S_base02 #073642 +#define S_base01 #586e75 +#define S_base00 #657b83 +#define S_base0 #839496 +#define S_base1 #93a1a1 +#define S_base2 #eee8d5 +#define S_base3 #fdf6e3 + + +! Light + +! #define S_base03 #fdf6e3 +! #define S_base02 #eee8d5 +! #define S_base01 #93a1a1 +! #define S_base00 #839496 +! #define S_base0 #657b83 +! #define S_base1 #586e75 +! #define S_base2 #073642 +! #define S_base3 #002b36 + + +! To only apply colors to your terminal, for example, prefix +! the color assignment statement with its name. Example: +! +! URxvt*background: S_base03 + +UXTerm*background: S_base03 +UXTerm*foreground: S_base0 +UXTerm*fading: 40 +UXTerm*fadeColor: S_base03 +UXTerm*cursorColor: S_base1 +UXTerm*pointerColorBackground: S_base01 +UXTerm*pointerColorForeground: S_base1 + +UXTerm*color0: S_base02 +UXTerm*color1: S_red +UXTerm*color2: S_green +UXTerm*color3: S_yellow +UXTerm*color4: S_blue +UXTerm*color5: S_magenta +UXTerm*color6: S_cyan +UXTerm*color7: S_base2 +UXTerm*color9: S_orange +UXTerm*color8: S_base03 +UXTerm*color10: S_base01 +UXTerm*color11: S_base00 +UXTerm*color12: S_base0 +UXTerm*color13: S_violet +UXTerm*color14: S_base1 +UXTerm*color15: S_base3 + +XTerm*background: S_base03 +XTerm*foreground: S_base0 +XTerm*fading: 40 +XTerm*fadeColor: S_base03 +XTerm*cursorColor: S_base1 +XTerm*pointerColorBackground: S_base01 +XTerm*pointerColorForeground: S_base1 + +XTerm*color0: S_base02 +XTerm*color1: S_red +XTerm*color2: S_green +XTerm*color3: S_yellow +XTerm*color4: S_blue +XTerm*color5: S_magenta +XTerm*color6: S_cyan +XTerm*color7: S_base2 +XTerm*color9: S_orange +XTerm*color8: S_base03 +XTerm*color10: S_base01 +XTerm*color11: S_base00 +XTerm*color12: S_base0 +XTerm*color13: S_violet +XTerm*color14: S_base1 +XTerm*color15: S_base3 + +Xcursor.size: 16 + diff --git a/system/.bash_aliases b/system/.bash_aliases new file mode 100644 index 0000000..db48f37 --- /dev/null +++ b/system/.bash_aliases @@ -0,0 +1,10 @@ +alias batstat='upower -i /org/freedesktop/UPower/devices/DisplayDevice' +alias iclean="iclean -nr -nt" +alias :q="exit" +alias grade="cd ./\$(grep -l 'Needs Grading' s*/s*.txt | sort -R | cut -d'/' -f1 | head -1) && for f in *.pdf; do evince \"\$f\" & PID=\$!; done; vim -c \"set tw=79 spell spelllang=nl\" s*.txt && kill \"\$PID\" && cd .." +alias synctop="watch -n1 grep -e Dirty: -e Writeback: /proc/meminfo" +alias iclean="docker run --rm -it --tmpfs /tmp:exec,size=1024k -v ~/.iclean_history:/home/.iclean_history -v ~/.iclean_template:/home/.iclean_template camilstaps/iclean" +alias gcc-6.2='docker run --rm -v "$PWD":/usr/src/app -w /usr/src/app gcc:6.2 gcc' +alias gcc-5.4='docker run --rm -v "$PWD":/usr/src/app -w /usr/src/app gcc:5.4 gcc' +alias gcc-4.9='docker run --rm -v "$PWD":/usr/src/app -w /usr/src/app gcc:4.9 gcc' +alias ghci='/usr/bin/ghci -fhistory-size=1000' diff --git a/system/.bash_logout b/system/.bash_logout new file mode 100644 index 0000000..de4f5f7 --- /dev/null +++ b/system/.bash_logout @@ -0,0 +1,7 @@ +# ~/.bash_logout: executed by bash(1) when login shell exits. + +# when leaving the console clear the screen to increase privacy + +if [ "$SHLVL" = 1 ]; then + [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q +fi diff --git a/system/.bashrc b/system/.bashrc new file mode 100644 index 0000000..6ec738e --- /dev/null +++ b/system/.bashrc @@ -0,0 +1,134 @@ +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + +# don't put duplicate lines or lines starting with space in the history. +# See bash(1) for more options +HISTCONTROL=ignoreboth + +# append to the history file, don't overwrite it +shopt -s histappend + +# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) +HISTSIZE=1000 +HISTFILESIZE=2000 + +# check the window size after each command and, if necessary, +# update the values of LINES and COLUMNS. +shopt -s checkwinsize + +# If set, the pattern "**" used in a pathname expansion context will +# match all files and zero or more directories and subdirectories. +#shopt -s globstar + +# make less more friendly for non-text input files, see lesspipe(1) +#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" + +# set variable identifying the chroot you work in (used in the prompt below) +if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then + debian_chroot=$(cat /etc/debian_chroot) +fi + +# set a fancy prompt (non-color, unless we know we "want" color) +case "$TERM" in + xterm-color) color_prompt=yes;; +esac + +# uncomment for a colored prompt, if the terminal has the capability; turned +# off by default to not distract the user: the focus in a terminal window +# should be on the output of commands, not on the prompt +#force_color_prompt=yes + +if [ -n "$force_color_prompt" ]; then + if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then + # We have color support; assume it's compliant with Ecma-48 + # (ISO/IEC-6429). (Lack of such support is extremely rare, and such + # a case would tend to support setf rather than setaf.) + color_prompt=yes + else + color_prompt= + fi +fi + +if [ "$color_prompt" = yes ]; then + PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' +else + PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' +fi +unset color_prompt force_color_prompt + +# If this is an xterm set the title to user@host:dir +case "$TERM" in +xterm*|rxvt*) + PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" + ;; +*) + ;; +esac + +# enable color support of ls and also add handy aliases +if [ -x /usr/bin/dircolors ]; then + test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" + alias ls='ls --color=auto' + alias dir='dir --color=auto' + alias vdir='vdir --color=auto' + + alias grep='grep --color=auto' + alias fgrep='fgrep --color=auto' + alias egrep='egrep --color=auto' +fi + +# colored GCC warnings and errors +#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' + +# some more ls aliases +#alias ll='ls -l' +#alias la='ls -A' +#alias l='ls -CF' + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases +fi + +# enable programmable completion features (you don't need to enable +# this, if it's already enabled in /etc/bash.bashrc and /etc/profile +# sources /etc/bash.bashrc). +if ! shopt -oq posix; then + if [ -f /usr/share/bash-completion/bash_completion ]; then + . /usr/share/bash-completion/bash_completion + elif [ -f /etc/bash_completion ]; then + . /etc/bash_completion + fi +fi + +[ -f ~/.fzf.bash ] && source ~/.fzf.bash + +# Path abbreviations like Vim, see http://unix.stackexchange.com/a/26885/37050 +PROMPT_COMMAND='pwd2=$(if [ "$PWD" != "$HOME" ]; then sed "s:\([^/]\{1,2\}\)[^/]*/:\1/:g" <<<$PWD; else echo "~";fi)' +export PS1='\u@\h:$pwd2\$ ' + +GPG_TTY=$(tty) +export GPG_TTY + + +PATH="/home/camil/perl5/bin${PATH+:}${PATH}"; export PATH; +PERL5LIB="/home/camil/perl5/lib/perl5${PERL5LIB+:}${PERL5LIB}"; export PERL5LIB; +PERL_LOCAL_LIB_ROOT="/home/camil/perl5${PERL_LOCAL_LIB_ROOT+:}${PERL_LOCAL_LIB_ROOT}"; export PERL_LOCAL_LIB_ROOT; +PERL_MB_OPT="--install_base \"/home/camil/perl5\""; export PERL_MB_OPT; +PERL_MM_OPT="INSTALL_BASE=/home/camil/perl5"; export PERL_MM_OPT; + +source ~/.profile + +verse 2>/dev/null && echo + diff --git a/system/.inputrc b/system/.inputrc new file mode 100644 index 0000000..6449edb --- /dev/null +++ b/system/.inputrc @@ -0,0 +1,9 @@ +set completion-ignore-case on + +"\e[1;5C": forward-word +"\e[1;5D": backward-word + +"\e[A": history-search-backward +"\e[B": history-search-forward + +"\e[Z": menu-complete diff --git a/system/.profile b/system/.profile new file mode 100644 index 0000000..5ef7aaa --- /dev/null +++ b/system/.profile @@ -0,0 +1,21 @@ +export CLEAN_HOME=/opt/clean +export CLEANLIB=$CLEAN_HOME/exe +export PATH="$CLEAN_HOME/bin:$CLEAN_LIB:$HOME/bin.local:$HOME/bin:$HOME/.cabal/bin:$HOME/.composer/vendor/bin:./bin:/usr/local/bin:/usr/local/sbin:/usr/sbin:/sbin:$PATH:/usr/local/texlive/2016/bin/x86_64-linux:/opt/microchip/xc16/v1.26/bin:/opt/microchip/xc8/v1.37/bin" +export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH" +export SUDO_ASKPASS=~/bin/askpass +export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=gasp -Dsun.java2d.opengl=true' +export HISTTIMEFORMAT="%Y-%m-%d %T " + +cpmq() { + res="$(cpm $@)" + echo "$res" | grep -i 'Error' >/dev/null + if [ $? -eq 0 ]; then + echo "$res" | grep -i '^\|Error\|Warning' + return -1 + else + echo "$res" | grep --color=never -i 'Finished making.' + return 0 + fi +} + +shopt -s globstar diff --git a/system/.xinitrc b/system/.xinitrc new file mode 100644 index 0000000..e0eddfc --- /dev/null +++ b/system/.xinitrc @@ -0,0 +1,4 @@ +setxkbmap -layout us -variant intl + +exec xmonad + diff --git a/system/.xsessionrc b/system/.xsessionrc new file mode 100644 index 0000000..5b20582 --- /dev/null +++ b/system/.xsessionrc @@ -0,0 +1,29 @@ +# Dropbox +dropbox start & + +# GNOME to provide default programs +export DE='gnome' + +# GNOME settings daemon +nohup gnome-settings-daemon -r & >/dev/null + +# Background image +setbg & + +# GPG agent +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 + +xrdb ~/.Xresources + +setxkbmap "us(intl),us(dvorak-intl),ru(phonetic),il(biblicalSIL)" -option grp:shift_caps_toggle + +# WM +exec /etc/alternatives/x-window-manager + diff --git a/system/Xresources.symlink b/system/Xresources.symlink deleted file mode 100644 index 801f715..0000000 --- a/system/Xresources.symlink +++ /dev/null @@ -1,106 +0,0 @@ -XTerm*faceName: DejaVu Sans Mono -XTerm*faceSize: 9 -XTerm*selectToClipboard: true -XTerm*dynamicColors: on -UXTerm*faceName: DejaVu Sans Mono -UXTerm*faceSize: 9 -UXTerm*selectToClipboard: true -UXTerm*dynamicColors: on - -! Solarized color scheme for the X Window System -! -! http://ethanschoonover.com/solarized - -! Common - -#define S_yellow #b58900 -#define S_orange #cb4b16 -#define S_red #dc322f -#define S_magenta #d33682 -#define S_violet #6c71c4 -#define S_blue #268bd2 -#define S_cyan #2aa198 -#define S_green #859900 - - -! Dark - -#define S_base03 #002b36 -#define S_base02 #073642 -#define S_base01 #586e75 -#define S_base00 #657b83 -#define S_base0 #839496 -#define S_base1 #93a1a1 -#define S_base2 #eee8d5 -#define S_base3 #fdf6e3 - - -! Light - -! #define S_base03 #fdf6e3 -! #define S_base02 #eee8d5 -! #define S_base01 #93a1a1 -! #define S_base00 #839496 -! #define S_base0 #657b83 -! #define S_base1 #586e75 -! #define S_base2 #073642 -! #define S_base3 #002b36 - - -! To only apply colors to your terminal, for example, prefix -! the color assignment statement with its name. Example: -! -! URxvt*background: S_base03 - -UXTerm*background: S_base03 -UXTerm*foreground: S_base0 -UXTerm*fading: 40 -UXTerm*fadeColor: S_base03 -UXTerm*cursorColor: S_base1 -UXTerm*pointerColorBackground: S_base01 -UXTerm*pointerColorForeground: S_base1 - -UXTerm*color0: S_base02 -UXTerm*color1: S_red -UXTerm*color2: S_green -UXTerm*color3: S_yellow -UXTerm*color4: S_blue -UXTerm*color5: S_magenta -UXTerm*color6: S_cyan -UXTerm*color7: S_base2 -UXTerm*color9: S_orange -UXTerm*color8: S_base03 -UXTerm*color10: S_base01 -UXTerm*color11: S_base00 -UXTerm*color12: S_base0 -UXTerm*color13: S_violet -UXTerm*color14: S_base1 -UXTerm*color15: S_base3 - -XTerm*background: S_base03 -XTerm*foreground: S_base0 -XTerm*fading: 40 -XTerm*fadeColor: S_base03 -XTerm*cursorColor: S_base1 -XTerm*pointerColorBackground: S_base01 -XTerm*pointerColorForeground: S_base1 - -XTerm*color0: S_base02 -XTerm*color1: S_red -XTerm*color2: S_green -XTerm*color3: S_yellow -XTerm*color4: S_blue -XTerm*color5: S_magenta -XTerm*color6: S_cyan -XTerm*color7: S_base2 -XTerm*color9: S_orange -XTerm*color8: S_base03 -XTerm*color10: S_base01 -XTerm*color11: S_base00 -XTerm*color12: S_base0 -XTerm*color13: S_violet -XTerm*color14: S_base1 -XTerm*color15: S_base3 - -Xcursor.size: 16 - diff --git a/system/bash_aliases.symlink b/system/bash_aliases.symlink deleted file mode 100644 index db48f37..0000000 --- a/system/bash_aliases.symlink +++ /dev/null @@ -1,10 +0,0 @@ -alias batstat='upower -i /org/freedesktop/UPower/devices/DisplayDevice' -alias iclean="iclean -nr -nt" -alias :q="exit" -alias grade="cd ./\$(grep -l 'Needs Grading' s*/s*.txt | sort -R | cut -d'/' -f1 | head -1) && for f in *.pdf; do evince \"\$f\" & PID=\$!; done; vim -c \"set tw=79 spell spelllang=nl\" s*.txt && kill \"\$PID\" && cd .." -alias synctop="watch -n1 grep -e Dirty: -e Writeback: /proc/meminfo" -alias iclean="docker run --rm -it --tmpfs /tmp:exec,size=1024k -v ~/.iclean_history:/home/.iclean_history -v ~/.iclean_template:/home/.iclean_template camilstaps/iclean" -alias gcc-6.2='docker run --rm -v "$PWD":/usr/src/app -w /usr/src/app gcc:6.2 gcc' -alias gcc-5.4='docker run --rm -v "$PWD":/usr/src/app -w /usr/src/app gcc:5.4 gcc' -alias gcc-4.9='docker run --rm -v "$PWD":/usr/src/app -w /usr/src/app gcc:4.9 gcc' -alias ghci='/usr/bin/ghci -fhistory-size=1000' diff --git a/system/bash_logout.symlink b/system/bash_logout.symlink deleted file mode 100644 index de4f5f7..0000000 --- a/system/bash_logout.symlink +++ /dev/null @@ -1,7 +0,0 @@ -# ~/.bash_logout: executed by bash(1) when login shell exits. - -# when leaving the console clear the screen to increase privacy - -if [ "$SHLVL" = 1 ]; then - [ -x /usr/bin/clear_console ] && /usr/bin/clear_console -q -fi diff --git a/system/bashrc.symlink b/system/bashrc.symlink deleted file mode 100644 index 6ec738e..0000000 --- a/system/bashrc.symlink +++ /dev/null @@ -1,134 +0,0 @@ -# ~/.bashrc: executed by bash(1) for non-login shells. -# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) -# for examples - -# If not running interactively, don't do anything -case $- in - *i*) ;; - *) return;; -esac - -# don't put duplicate lines or lines starting with space in the history. -# See bash(1) for more options -HISTCONTROL=ignoreboth - -# append to the history file, don't overwrite it -shopt -s histappend - -# for setting history length see HISTSIZE and HISTFILESIZE in bash(1) -HISTSIZE=1000 -HISTFILESIZE=2000 - -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize - -# If set, the pattern "**" used in a pathname expansion context will -# match all files and zero or more directories and subdirectories. -#shopt -s globstar - -# make less more friendly for non-text input files, see lesspipe(1) -#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" - -# set variable identifying the chroot you work in (used in the prompt below) -if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then - debian_chroot=$(cat /etc/debian_chroot) -fi - -# set a fancy prompt (non-color, unless we know we "want" color) -case "$TERM" in - xterm-color) color_prompt=yes;; -esac - -# uncomment for a colored prompt, if the terminal has the capability; turned -# off by default to not distract the user: the focus in a terminal window -# should be on the output of commands, not on the prompt -#force_color_prompt=yes - -if [ -n "$force_color_prompt" ]; then - if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then - # We have color support; assume it's compliant with Ecma-48 - # (ISO/IEC-6429). (Lack of such support is extremely rare, and such - # a case would tend to support setf rather than setaf.) - color_prompt=yes - else - color_prompt= - fi -fi - -if [ "$color_prompt" = yes ]; then - PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ ' -else - PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' -fi -unset color_prompt force_color_prompt - -# If this is an xterm set the title to user@host:dir -case "$TERM" in -xterm*|rxvt*) - PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" - ;; -*) - ;; -esac - -# enable color support of ls and also add handy aliases -if [ -x /usr/bin/dircolors ]; then - test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" - alias ls='ls --color=auto' - alias dir='dir --color=auto' - alias vdir='vdir --color=auto' - - alias grep='grep --color=auto' - alias fgrep='fgrep --color=auto' - alias egrep='egrep --color=auto' -fi - -# colored GCC warnings and errors -#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' - -# some more ls aliases -#alias ll='ls -l' -#alias la='ls -A' -#alias l='ls -CF' - -# Alias definitions. -# You may want to put all your additions into a separate file like -# ~/.bash_aliases, instead of adding them here directly. -# See /usr/share/doc/bash-doc/examples in the bash-doc package. - -if [ -f ~/.bash_aliases ]; then - . ~/.bash_aliases -fi - -# enable programmable completion features (you don't need to enable -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile -# sources /etc/bash.bashrc). -if ! shopt -oq posix; then - if [ -f /usr/share/bash-completion/bash_completion ]; then - . /usr/share/bash-completion/bash_completion - elif [ -f /etc/bash_completion ]; then - . /etc/bash_completion - fi -fi - -[ -f ~/.fzf.bash ] && source ~/.fzf.bash - -# Path abbreviations like Vim, see http://unix.stackexchange.com/a/26885/37050 -PROMPT_COMMAND='pwd2=$(if [ "$PWD" != "$HOME" ]; then sed "s:\([^/]\{1,2\}\)[^/]*/:\1/:g" <<<$PWD; else echo "~";fi)' -export PS1='\u@\h:$pwd2\$ ' - -GPG_TTY=$(tty) -export GPG_TTY - - -PATH="/home/camil/perl5/bin${PATH+:}${PATH}"; export PATH; -PERL5LIB="/home/camil/perl5/lib/perl5${PERL5LIB+:}${PERL5LIB}"; export PERL5LIB; -PERL_LOCAL_LIB_ROOT="/home/camil/perl5${PERL_LOCAL_LIB_ROOT+:}${PERL_LOCAL_LIB_ROOT}"; export PERL_LOCAL_LIB_ROOT; -PERL_MB_OPT="--install_base \"/home/camil/perl5\""; export PERL_MB_OPT; -PERL_MM_OPT="INSTALL_BASE=/home/camil/perl5"; export PERL_MM_OPT; - -source ~/.profile - -verse 2>/dev/null && echo - diff --git a/system/i3status.conf.symlink b/system/i3status.conf.symlink deleted file mode 100644 index 67710fb..0000000 --- a/system/i3status.conf.symlink +++ /dev/null @@ -1,53 +0,0 @@ -general { - colors = true - interval = 5 - output_format = "i3bar" -} - -order += "cmd nowplaying" -order += "volume master" -order += "wireless wlan0" -order += "battery 0" -order += "cpu_usage" -order += "load" -order += "tztime local" - -volume master { - format = "♪: %volume" - format_muted = "♪: muted (%volume)" - device = "default" - mixer = "Master" - mixer_idx = 0 -} - -cmd nowplaying { - cmd = "cmus-remote -Q | grep '^tag \\(artist\\|album\\|title\\) ' | sort | cut -d' ' -f 3- | tr '\\n' '\t' | awk 'BEGIN { FS = \"\\t\" } ; { print \"♪: \" $3 \" (\" $1 \", \" $2 \")\" }'; echo -n ' '" -} - -wireless wlan0 { - format_up = "%essid: %quality, %bitrate (%ip)" - format_down = "wlan0 down" -} - -battery 0 { - format = "%status %percentage %remaining %consumption" - hide_seconds = true - status_chr = "⚇" - status_bat = "⚡" - status_full = "☻" - low_threshold = 30 - threshold_type = "percentage" -} - -cpu_usage { - format = "⚙️ %usage" -} - -load { - max_threshold = "0.7" -} - -tztime local { - format = "%a %b %-d, %I:%M %p" -} - diff --git a/system/inputrc.symlink b/system/inputrc.symlink deleted file mode 100644 index 6449edb..0000000 --- a/system/inputrc.symlink +++ /dev/null @@ -1,9 +0,0 @@ -set completion-ignore-case on - -"\e[1;5C": forward-word -"\e[1;5D": backward-word - -"\e[A": history-search-backward -"\e[B": history-search-forward - -"\e[Z": menu-complete diff --git a/system/profile.symlink b/system/profile.symlink deleted file mode 100644 index 5ef7aaa..0000000 --- a/system/profile.symlink +++ /dev/null @@ -1,21 +0,0 @@ -export CLEAN_HOME=/opt/clean -export CLEANLIB=$CLEAN_HOME/exe -export PATH="$CLEAN_HOME/bin:$CLEAN_LIB:$HOME/bin.local:$HOME/bin:$HOME/.cabal/bin:$HOME/.composer/vendor/bin:./bin:/usr/local/bin:/usr/local/sbin:/usr/sbin:/sbin:$PATH:/usr/local/texlive/2016/bin/x86_64-linux:/opt/microchip/xc16/v1.26/bin:/opt/microchip/xc8/v1.37/bin" -export MANPATH="/usr/local/man:/usr/local/mysql/man:/usr/local/git/man:$MANPATH" -export SUDO_ASKPASS=~/bin/askpass -export _JAVA_OPTIONS='-Dawt.useSystemAAFontSettings=gasp -Dsun.java2d.opengl=true' -export HISTTIMEFORMAT="%Y-%m-%d %T " - -cpmq() { - res="$(cpm $@)" - echo "$res" | grep -i 'Error' >/dev/null - if [ $? -eq 0 ]; then - echo "$res" | grep -i '^\|Error\|Warning' - return -1 - else - echo "$res" | grep --color=never -i 'Finished making.' - return 0 - fi -} - -shopt -s globstar diff --git a/system/xinitrc.symlink b/system/xinitrc.symlink deleted file mode 100644 index e0eddfc..0000000 --- a/system/xinitrc.symlink +++ /dev/null @@ -1,4 +0,0 @@ -setxkbmap -layout us -variant intl - -exec xmonad - diff --git a/system/xsessionrc.symlink b/system/xsessionrc.symlink deleted file mode 100644 index 5b20582..0000000 --- a/system/xsessionrc.symlink +++ /dev/null @@ -1,29 +0,0 @@ -# Dropbox -dropbox start & - -# GNOME to provide default programs -export DE='gnome' - -# GNOME settings daemon -nohup gnome-settings-daemon -r & >/dev/null - -# Background image -setbg & - -# GPG agent -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 - -xrdb ~/.Xresources - -setxkbmap "us(intl),us(dvorak-intl),ru(phonetic),il(biblicalSIL)" -option grp:shift_caps_toggle - -# WM -exec /etc/alternatives/x-window-manager - diff --git a/vim/.vim/after/ftplugin/bb.vim b/vim/.vim/after/ftplugin/bb.vim new file mode 100644 index 0000000..5b041ba --- /dev/null +++ b/vim/.vim/after/ftplugin/bb.vim @@ -0,0 +1 @@ +setlocal tw=79 spell spelllang=nl diff --git a/vim/.vim/after/ftplugin/c.vim b/vim/.vim/after/ftplugin/c.vim new file mode 100644 index 0000000..16ffc97 --- /dev/null +++ b/vim/.vim/after/ftplugin/c.vim @@ -0,0 +1 @@ +setlocal foldmethod=syntax diff --git a/vim/.vim/after/ftplugin/clean.vim b/vim/.vim/after/ftplugin/clean.vim new file mode 100644 index 0000000..94f327e --- /dev/null +++ b/vim/.vim/after/ftplugin/clean.vim @@ -0,0 +1 @@ +setlocal autoindent foldnestmax=0 diff --git a/vim/.vim/after/ftplugin/html.vim b/vim/.vim/after/ftplugin/html.vim new file mode 100644 index 0000000..1b4c30f --- /dev/null +++ b/vim/.vim/after/ftplugin/html.vim @@ -0,0 +1 @@ +setlocal tabstop=2 shiftwidth=2 diff --git a/vim/.vim/after/ftplugin/jade.vim b/vim/.vim/after/ftplugin/jade.vim new file mode 100644 index 0000000..1b4c30f --- /dev/null +++ b/vim/.vim/after/ftplugin/jade.vim @@ -0,0 +1 @@ +setlocal tabstop=2 shiftwidth=2 diff --git a/vim/.vim/after/ftplugin/javascript.vim b/vim/.vim/after/ftplugin/javascript.vim new file mode 100644 index 0000000..1b4c30f --- /dev/null +++ b/vim/.vim/after/ftplugin/javascript.vim @@ -0,0 +1 @@ +setlocal tabstop=2 shiftwidth=2 diff --git a/vim/.vim/after/ftplugin/markdown.vim b/vim/.vim/after/ftplugin/markdown.vim new file mode 100644 index 0000000..b4b5304 --- /dev/null +++ b/vim/.vim/after/ftplugin/markdown.vim @@ -0,0 +1,4 @@ +setlocal spell spelllang=en_gb +setlocal autoindent +setlocal textwidth=79 +setlocal tabstop=4 diff --git a/vim/.vim/after/ftplugin/python.vim b/vim/.vim/after/ftplugin/python.vim new file mode 100644 index 0000000..d52aa2e --- /dev/null +++ b/vim/.vim/after/ftplugin/python.vim @@ -0,0 +1 @@ +setlocal foldmethod=indent diff --git a/vim/.vim/after/ftplugin/scala.vim b/vim/.vim/after/ftplugin/scala.vim new file mode 100644 index 0000000..dcca7bf --- /dev/null +++ b/vim/.vim/after/ftplugin/scala.vim @@ -0,0 +1 @@ +setlocal tabstop=4 shiftwidth=4 noexpandtab softtabstop=0 diff --git a/vim/.vim/after/ftplugin/tex.vim b/vim/.vim/after/ftplugin/tex.vim new file mode 100644 index 0000000..aabdc85 --- /dev/null +++ b/vim/.vim/after/ftplugin/tex.vim @@ -0,0 +1,2 @@ +setlocal spell spelllang=en_gb +setlocal tabstop=2 shiftwidth=2 diff --git a/vim/.vim/plugin/visincrPlugin.vim b/vim/.vim/plugin/visincrPlugin.vim new file mode 100644 index 0000000..8907408 --- /dev/null +++ b/vim/.vim/plugin/visincrPlugin.vim @@ -0,0 +1,156 @@ +" visincrPlugin.vim: Visual-block incremented lists +" Author: Charles E. Campbell +" Date: Jan 06, 2016 +" Public Interface Only +" +" (James 2:19,20 WEB) You believe that God is one. You do well! +" The demons also believe, and shudder. +" But do you want to know, vain man, that +" faith apart from works is dead? + +" --------------------------------------------------------------------- +" Load Once: {{{1 +if &cp || exists("g:loaded_visincrPlugin") + finish +endif +let g:loaded_visincrPlugin = "v21g" +let s:keepcpo = &cpo +set cpo&vim + +" --------------------------------------------------------------------- +" Methods: {{{1 +let s:I = 0 +let s:II = 1 +let s:IMOD = 2 +let s:IREP = 3 +let s:IMDY = 4 +let s:IYMD = 5 +let s:IDMY = 6 +let s:ID = 7 +let s:IM = 8 +let s:IA = 9 +let s:IX = 10 +let s:IIX = 11 +let s:IB = 12 +let s:IIB = 13 +let s:IO = 14 +let s:IIO = 15 +let s:IR = 16 +let s:IIR = 17 +let s:IPOW = 18 +let s:IIPOW = 19 +let s:RI = 20 +let s:RII = 21 +let s:RIMOD = 22 +let s:RIREP = 23 +let s:RIMDY = 24 +let s:RIYMD = 25 +let s:RIDMY = 26 +let s:RID = 27 +let s:RIM = 28 +let s:RIA = 29 +let s:RIX = 30 +let s:RIIX = 31 +let s:RIB = 32 +let s:RIIB = 33 +let s:RIO = 34 +let s:RIIO = 35 +let s:RIR = 36 +let s:RIIR = 37 +let s:RIPOW = 38 +let s:RIIPOW = 39 + +" ------------------------------------------------------------------------------ +" Public Interface: {{{1 +if !exists("g:visincr_longcmd") + com! -range -complete=expression -nargs=* I call visincr#VisBlockIncr(s:I , ) + com! -range -complete=expression -nargs=* II call visincr#VisBlockIncr(s:II , ) + com! -range -complete=expression -nargs=* IMOD call visincr#VisBlockIncr(s:IMOD , ) + com! -range -complete=expression -nargs=* IREP call visincr#VisBlockIncr(s:IREP , ) + com! -range -complete=expression -nargs=* IMDY call visincr#VisBlockIncr(s:IMDY , ) + com! -range -complete=expression -nargs=* IYMD call visincr#VisBlockIncr(s:IYMD , ) + com! -range -complete=expression -nargs=* IDMY call visincr#VisBlockIncr(s:IDMY , ) + com! -range -complete=expression -nargs=? ID call visincr#VisBlockIncr(s:ID , ) + com! -range -complete=expression -nargs=? IM call visincr#VisBlockIncr(s:IM , ) + com! -range -complete=expression -nargs=? IA call visincr#VisBlockIncr(s:IA , ) + com! -range -complete=expression -nargs=? IX call visincr#VisBlockIncr(s:IX , ) + com! -range -complete=expression -nargs=? IIX call visincr#VisBlockIncr(s:IIX , ) + com! -range -complete=expression -nargs=* IB call visincr#VisBlockIncr(s:IB , ) + com! -range -complete=expression -nargs=* IIB call visincr#VisBlockIncr(s:IIB , ) + com! -range -complete=expression -nargs=* IO call visincr#VisBlockIncr(s:IO , ) + com! -range -complete=expression -nargs=* IIO call visincr#VisBlockIncr(s:IIO , ) + com! -range -complete=expression -nargs=? IR call visincr#VisBlockIncr(s:IR , ) + com! -range -complete=expression -nargs=? IIR call visincr#VisBlockIncr(s:IIR , ) + com! -range -complete=expression -nargs=* IPOW call visincr#VisBlockIncr(s:IPOW , ) + com! -range -complete=expression -nargs=* IIPOW call visincr#VisBlockIncr(s:IIPOW , ) + + com! -range -complete=expression -nargs=* RI call visincr#VisBlockIncr(s:RI , ) + com! -range -complete=expression -nargs=* RII call visincr#VisBlockIncr(s:RII , ) + com! -range -complete=expression -nargs=* RIMOD call visincr#VisBlockIncr(s:RIMOD , ) + com! -range -complete=expression -nargs=* RIREP call visincr#VisBlockIncr(s:RIREP , ) + com! -range -complete=expression -nargs=* RIMDY call visincr#VisBlockIncr(s:RIMDY , ) + com! -range -complete=expression -nargs=* RIYMD call visincr#VisBlockIncr(s:RIYMD , ) + com! -range -complete=expression -nargs=* RIDMY call visincr#VisBlockIncr(s:RIDMY , ) + com! -range -complete=expression -nargs=? RID call visincr#VisBlockIncr(s:RID , ) + com! -range -complete=expression -nargs=? RIM call visincr#VisBlockIncr(s:RIM , ) + com! -range -complete=expression -nargs=? RIA call visincr#VisBlockIncr(s:RIA , ) + com! -range -complete=expression -nargs=? RIX call visincr#VisBlockIncr(s:RIX , ) + com! -range -complete=expression -nargs=? RIIX call visincr#VisBlockIncr(s:RIIX , ) + com! -range -complete=expression -nargs=* RIB call visincr#VisBlockIncr(s:RIB , ) + com! -range -complete=expression -nargs=* RIIB call visincr#VisBlockIncr(s:RIIB , ) + com! -range -complete=expression -nargs=* RIO call visincr#VisBlockIncr(s:RIO , ) + com! -range -complete=expression -nargs=* RIIO call visincr#VisBlockIncr(s:RIIO , ) + com! -range -complete=expression -nargs=? RIR call visincr#VisBlockIncr(s:RIR , ) + com! -range -complete=expression -nargs=? RIIR call visincr#VisBlockIncr(s:RIIR , ) + com! -range -complete=expression -nargs=* RIPOW call visincr#VisBlockIncr(s:RIPOW , ) + com! -range -complete=expression -nargs=* RIIPOW call visincr#VisBlockIncr(s:RIIPOW , ) + +else + com! -range -complete=expression -nargs=* VI_I call visincr#VisBlockIncr(s:I , ) + com! -range -complete=expression -nargs=* VI_II call visincr#VisBlockIncr(s:II , ) + com! -range -complete=expression -nargs=* VI_IMOD call visincr#VisBlockIncr(s:IMOD , ) + com! -range -complete=expression -nargs=* VI_IREP call visincr#VisBlockIncr(s:IREP , ) + com! -range -complete=expression -nargs=* VI_IMDY call visincr#VisBlockIncr(s:IMDY , ) + com! -range -complete=expression -nargs=* VI_IYMD call visincr#VisBlockIncr(s:IYMD , ) + com! -range -complete=expression -nargs=* VI_IDMY call visincr#VisBlockIncr(s:IDMY , ) + com! -range -complete=expression -nargs=? VI_ID call visincr#VisBlockIncr(s:ID , ) + com! -range -complete=expression -nargs=? VI_IM call visincr#VisBlockIncr(s:IM , ) + com! -range -complete=expression -nargs=? VI_IA call visincr#VisBlockIncr(s:IA , ) + com! -range -complete=expression -nargs=? VI_IX call visincr#VisBlockIncr(s:IX , ) + com! -range -complete=expression -nargs=? VI_IIX call visincr#VisBlockIncr(s:IIX , ) + com! -range -complete=expression -nargs=* VI_IB call visincr#VisBlockIncr(s:IB , ) + com! -range -complete=expression -nargs=* VI_IIB call visincr#VisBlockIncr(s:IIB , ) + com! -range -complete=expression -nargs=* VI_IO call visincr#VisBlockIncr(s:IO , ) + com! -range -complete=expression -nargs=* VI_IIO call visincr#VisBlockIncr(s:IIO , ) + com! -range -complete=expression -nargs=? VI_IR call visincr#VisBlockIncr(s:IR , ) + com! -range -complete=expression -nargs=? VI_IIR call visincr#VisBlockIncr(s:IIR , ) + com! -range -complete=expression -nargs=* VI_IPOW call visincr#VisBlockIncr(s:IPOW , ) + com! -range -complete=expression -nargs=* VI_IIPOW call visincr#VisBlockIncr(s:IIPOW , ) + + com! -range -complete=expression -nargs=* VI_RI call visincr#VisBlockIncr(s:RI , ) + com! -range -complete=expression -nargs=* VI_RII call visincr#VisBlockIncr(s:RII , ) + com! -range -complete=expression -nargs=* VI_RIMOD call visincr#VisBlockIncr(s:RIMOD , ) + com! -range -complete=expression -nargs=* VI_RIREP call visincr#VisBlockIncr(s:RIREP , ) + com! -range -complete=expression -nargs=* VI_RIMDY call visincr#VisBlockIncr(s:RIMDY , ) + com! -range -complete=expression -nargs=* VI_RIYMD call visincr#VisBlockIncr(s:RIYMD , ) + com! -range -complete=expression -nargs=* VI_RIDMY call visincr#VisBlockIncr(s:RIDMY , ) + com! -range -complete=expression -nargs=? VI_RID call visincr#VisBlockIncr(s:RID , ) + com! -range -complete=expression -nargs=? VI_RIM call visincr#VisBlockIncr(s:RIM , ) + com! -range -complete=expression -nargs=? VI_RIA call visincr#VisBlockIncr(s:RIA , ) + com! -range -complete=expression -nargs=? VI_RIX call visincr#VisBlockIncr(s:RIX , ) + com! -range -complete=expression -nargs=? VI_RIIX call visincr#VisBlockIncr(s:RIIX , ) + com! -range -complete=expression -nargs=* VI_RIB call visincr#VisBlockIncr(s:RIB , ) + com! -range -complete=expression -nargs=* VI_RIIB call visincr#VisBlockIncr(s:RIIB , ) + com! -range -complete=expression -nargs=* VI_RIO call visincr#VisBlockIncr(s:RIO , ) + com! -range -complete=expression -nargs=* VI_RIIO call visincr#VisBlockIncr(s:RIIO , ) + com! -range -complete=expression -nargs=? VI_RIR call visincr#VisBlockIncr(s:RIR , ) + com! -range -complete=expression -nargs=? VI_RIIR call visincr#VisBlockIncr(s:RIIR , ) + com! -range -complete=expression -nargs=* VI_RIPOW call visincr#VisBlockIncr(s:RIPOW , ) + com! -range -complete=expression -nargs=* VI_RIIPOW call visincr#VisBlockIncr(s:RIIPOW , ) +endif + +" --------------------------------------------------------------------- +" Restoration And Modelines: {{{1 +" vim: ts=4 fdm=marker +let &cpo= s:keepcpo +unlet s:keepcpo diff --git a/vim/vim.symlink/after/ftplugin/bb.vim b/vim/vim.symlink/after/ftplugin/bb.vim deleted file mode 100644 index 5b041ba..0000000 --- a/vim/vim.symlink/after/ftplugin/bb.vim +++ /dev/null @@ -1 +0,0 @@ -setlocal tw=79 spell spelllang=nl diff --git a/vim/vim.symlink/after/ftplugin/c.vim b/vim/vim.symlink/after/ftplugin/c.vim deleted file mode 100644 index 16ffc97..0000000 --- a/vim/vim.symlink/after/ftplugin/c.vim +++ /dev/null @@ -1 +0,0 @@ -setlocal foldmethod=syntax diff --git a/vim/vim.symlink/after/ftplugin/clean.vim b/vim/vim.symlink/after/ftplugin/clean.vim deleted file mode 100644 index 94f327e..0000000 --- a/vim/vim.symlink/after/ftplugin/clean.vim +++ /dev/null @@ -1 +0,0 @@ -setlocal autoindent foldnestmax=0 diff --git a/vim/vim.symlink/after/ftplugin/html.vim b/vim/vim.symlink/after/ftplugin/html.vim deleted file mode 100644 index 1b4c30f..0000000 --- a/vim/vim.symlink/after/ftplugin/html.vim +++ /dev/null @@ -1 +0,0 @@ -setlocal tabstop=2 shiftwidth=2 diff --git a/vim/vim.symlink/after/ftplugin/jade.vim b/vim/vim.symlink/after/ftplugin/jade.vim deleted file mode 100644 index 1b4c30f..0000000 --- a/vim/vim.symlink/after/ftplugin/jade.vim +++ /dev/null @@ -1 +0,0 @@ -setlocal tabstop=2 shiftwidth=2 diff --git a/vim/vim.symlink/after/ftplugin/markdown.vim b/vim/vim.symlink/after/ftplugin/markdown.vim deleted file mode 100644 index b4b5304..0000000 --- a/vim/vim.symlink/after/ftplugin/markdown.vim +++ /dev/null @@ -1,4 +0,0 @@ -setlocal spell spelllang=en_gb -setlocal autoindent -setlocal textwidth=79 -setlocal tabstop=4 diff --git a/vim/vim.symlink/after/ftplugin/python.vim b/vim/vim.symlink/after/ftplugin/python.vim deleted file mode 100644 index d52aa2e..0000000 --- a/vim/vim.symlink/after/ftplugin/python.vim +++ /dev/null @@ -1 +0,0 @@ -setlocal foldmethod=indent diff --git a/vim/vim.symlink/after/ftplugin/scala.vim b/vim/vim.symlink/after/ftplugin/scala.vim deleted file mode 100644 index dcca7bf..0000000 --- a/vim/vim.symlink/after/ftplugin/scala.vim +++ /dev/null @@ -1 +0,0 @@ -setlocal tabstop=4 shiftwidth=4 noexpandtab softtabstop=0 diff --git a/vim/vim.symlink/after/ftplugin/tex.vim b/vim/vim.symlink/after/ftplugin/tex.vim deleted file mode 100644 index aabdc85..0000000 --- a/vim/vim.symlink/after/ftplugin/tex.vim +++ /dev/null @@ -1,2 +0,0 @@ -setlocal spell spelllang=en_gb -setlocal tabstop=2 shiftwidth=2 diff --git a/vim/vim.symlink/bundle/Vundle.vim b/vim/vim.symlink/bundle/Vundle.vim deleted file mode 160000 index 4984767..0000000 --- a/vim/vim.symlink/bundle/Vundle.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4984767509e3d05ca051e253c8a8b37de784be45 diff --git a/vim/vim.symlink/plugin/visincrPlugin.vim b/vim/vim.symlink/plugin/visincrPlugin.vim deleted file mode 100644 index 8907408..0000000 --- a/vim/vim.symlink/plugin/visincrPlugin.vim +++ /dev/null @@ -1,156 +0,0 @@ -" visincrPlugin.vim: Visual-block incremented lists -" Author: Charles E. Campbell -" Date: Jan 06, 2016 -" Public Interface Only -" -" (James 2:19,20 WEB) You believe that God is one. You do well! -" The demons also believe, and shudder. -" But do you want to know, vain man, that -" faith apart from works is dead? - -" --------------------------------------------------------------------- -" Load Once: {{{1 -if &cp || exists("g:loaded_visincrPlugin") - finish -endif -let g:loaded_visincrPlugin = "v21g" -let s:keepcpo = &cpo -set cpo&vim - -" --------------------------------------------------------------------- -" Methods: {{{1 -let s:I = 0 -let s:II = 1 -let s:IMOD = 2 -let s:IREP = 3 -let s:IMDY = 4 -let s:IYMD = 5 -let s:IDMY = 6 -let s:ID = 7 -let s:IM = 8 -let s:IA = 9 -let s:IX = 10 -let s:IIX = 11 -let s:IB = 12 -let s:IIB = 13 -let s:IO = 14 -let s:IIO = 15 -let s:IR = 16 -let s:IIR = 17 -let s:IPOW = 18 -let s:IIPOW = 19 -let s:RI = 20 -let s:RII = 21 -let s:RIMOD = 22 -let s:RIREP = 23 -let s:RIMDY = 24 -let s:RIYMD = 25 -let s:RIDMY = 26 -let s:RID = 27 -let s:RIM = 28 -let s:RIA = 29 -let s:RIX = 30 -let s:RIIX = 31 -let s:RIB = 32 -let s:RIIB = 33 -let s:RIO = 34 -let s:RIIO = 35 -let s:RIR = 36 -let s:RIIR = 37 -let s:RIPOW = 38 -let s:RIIPOW = 39 - -" ------------------------------------------------------------------------------ -" Public Interface: {{{1 -if !exists("g:visincr_longcmd") - com! -range -complete=expression -nargs=* I call visincr#VisBlockIncr(s:I , ) - com! -range -complete=expression -nargs=* II call visincr#VisBlockIncr(s:II , ) - com! -range -complete=expression -nargs=* IMOD call visincr#VisBlockIncr(s:IMOD , ) - com! -range -complete=expression -nargs=* IREP call visincr#VisBlockIncr(s:IREP , ) - com! -range -complete=expression -nargs=* IMDY call visincr#VisBlockIncr(s:IMDY , ) - com! -range -complete=expression -nargs=* IYMD call visincr#VisBlockIncr(s:IYMD , ) - com! -range -complete=expression -nargs=* IDMY call visincr#VisBlockIncr(s:IDMY , ) - com! -range -complete=expression -nargs=? ID call visincr#VisBlockIncr(s:ID , ) - com! -range -complete=expression -nargs=? IM call visincr#VisBlockIncr(s:IM , ) - com! -range -complete=expression -nargs=? IA call visincr#VisBlockIncr(s:IA , ) - com! -range -complete=expression -nargs=? IX call visincr#VisBlockIncr(s:IX , ) - com! -range -complete=expression -nargs=? IIX call visincr#VisBlockIncr(s:IIX , ) - com! -range -complete=expression -nargs=* IB call visincr#VisBlockIncr(s:IB , ) - com! -range -complete=expression -nargs=* IIB call visincr#VisBlockIncr(s:IIB , ) - com! -range -complete=expression -nargs=* IO call visincr#VisBlockIncr(s:IO , ) - com! -range -complete=expression -nargs=* IIO call visincr#VisBlockIncr(s:IIO , ) - com! -range -complete=expression -nargs=? IR call visincr#VisBlockIncr(s:IR , ) - com! -range -complete=expression -nargs=? IIR call visincr#VisBlockIncr(s:IIR , ) - com! -range -complete=expression -nargs=* IPOW call visincr#VisBlockIncr(s:IPOW , ) - com! -range -complete=expression -nargs=* IIPOW call visincr#VisBlockIncr(s:IIPOW , ) - - com! -range -complete=expression -nargs=* RI call visincr#VisBlockIncr(s:RI , ) - com! -range -complete=expression -nargs=* RII call visincr#VisBlockIncr(s:RII , ) - com! -range -complete=expression -nargs=* RIMOD call visincr#VisBlockIncr(s:RIMOD , ) - com! -range -complete=expression -nargs=* RIREP call visincr#VisBlockIncr(s:RIREP , ) - com! -range -complete=expression -nargs=* RIMDY call visincr#VisBlockIncr(s:RIMDY , ) - com! -range -complete=expression -nargs=* RIYMD call visincr#VisBlockIncr(s:RIYMD , ) - com! -range -complete=expression -nargs=* RIDMY call visincr#VisBlockIncr(s:RIDMY , ) - com! -range -complete=expression -nargs=? RID call visincr#VisBlockIncr(s:RID , ) - com! -range -complete=expression -nargs=? RIM call visincr#VisBlockIncr(s:RIM , ) - com! -range -complete=expression -nargs=? RIA call visincr#VisBlockIncr(s:RIA , ) - com! -range -complete=expression -nargs=? RIX call visincr#VisBlockIncr(s:RIX , ) - com! -range -complete=expression -nargs=? RIIX call visincr#VisBlockIncr(s:RIIX , ) - com! -range -complete=expression -nargs=* RIB call visincr#VisBlockIncr(s:RIB , ) - com! -range -complete=expression -nargs=* RIIB call visincr#VisBlockIncr(s:RIIB , ) - com! -range -complete=expression -nargs=* RIO call visincr#VisBlockIncr(s:RIO , ) - com! -range -complete=expression -nargs=* RIIO call visincr#VisBlockIncr(s:RIIO , ) - com! -range -complete=expression -nargs=? RIR call visincr#VisBlockIncr(s:RIR , ) - com! -range -complete=expression -nargs=? RIIR call visincr#VisBlockIncr(s:RIIR , ) - com! -range -complete=expression -nargs=* RIPOW call visincr#VisBlockIncr(s:RIPOW , ) - com! -range -complete=expression -nargs=* RIIPOW call visincr#VisBlockIncr(s:RIIPOW , ) - -else - com! -range -complete=expression -nargs=* VI_I call visincr#VisBlockIncr(s:I , ) - com! -range -complete=expression -nargs=* VI_II call visincr#VisBlockIncr(s:II , ) - com! -range -complete=expression -nargs=* VI_IMOD call visincr#VisBlockIncr(s:IMOD , ) - com! -range -complete=expression -nargs=* VI_IREP call visincr#VisBlockIncr(s:IREP , ) - com! -range -complete=expression -nargs=* VI_IMDY call visincr#VisBlockIncr(s:IMDY , ) - com! -range -complete=expression -nargs=* VI_IYMD call visincr#VisBlockIncr(s:IYMD , ) - com! -range -complete=expression -nargs=* VI_IDMY call visincr#VisBlockIncr(s:IDMY , ) - com! -range -complete=expression -nargs=? VI_ID call visincr#VisBlockIncr(s:ID , ) - com! -range -complete=expression -nargs=? VI_IM call visincr#VisBlockIncr(s:IM , ) - com! -range -complete=expression -nargs=? VI_IA call visincr#VisBlockIncr(s:IA , ) - com! -range -complete=expression -nargs=? VI_IX call visincr#VisBlockIncr(s:IX , ) - com! -range -complete=expression -nargs=? VI_IIX call visincr#VisBlockIncr(s:IIX , ) - com! -range -complete=expression -nargs=* VI_IB call visincr#VisBlockIncr(s:IB , ) - com! -range -complete=expression -nargs=* VI_IIB call visincr#VisBlockIncr(s:IIB , ) - com! -range -complete=expression -nargs=* VI_IO call visincr#VisBlockIncr(s:IO , ) - com! -range -complete=expression -nargs=* VI_IIO call visincr#VisBlockIncr(s:IIO , ) - com! -range -complete=expression -nargs=? VI_IR call visincr#VisBlockIncr(s:IR , ) - com! -range -complete=expression -nargs=? VI_IIR call visincr#VisBlockIncr(s:IIR , ) - com! -range -complete=expression -nargs=* VI_IPOW call visincr#VisBlockIncr(s:IPOW , ) - com! -range -complete=expression -nargs=* VI_IIPOW call visincr#VisBlockIncr(s:IIPOW , ) - - com! -range -complete=expression -nargs=* VI_RI call visincr#VisBlockIncr(s:RI , ) - com! -range -complete=expression -nargs=* VI_RII call visincr#VisBlockIncr(s:RII , ) - com! -range -complete=expression -nargs=* VI_RIMOD call visincr#VisBlockIncr(s:RIMOD , ) - com! -range -complete=expression -nargs=* VI_RIREP call visincr#VisBlockIncr(s:RIREP , ) - com! -range -complete=expression -nargs=* VI_RIMDY call visincr#VisBlockIncr(s:RIMDY , ) - com! -range -complete=expression -nargs=* VI_RIYMD call visincr#VisBlockIncr(s:RIYMD , ) - com! -range -complete=expression -nargs=* VI_RIDMY call visincr#VisBlockIncr(s:RIDMY , ) - com! -range -complete=expression -nargs=? VI_RID call visincr#VisBlockIncr(s:RID , ) - com! -range -complete=expression -nargs=? VI_RIM call visincr#VisBlockIncr(s:RIM , ) - com! -range -complete=expression -nargs=? VI_RIA call visincr#VisBlockIncr(s:RIA , ) - com! -range -complete=expression -nargs=? VI_RIX call visincr#VisBlockIncr(s:RIX , ) - com! -range -complete=expression -nargs=? VI_RIIX call visincr#VisBlockIncr(s:RIIX , ) - com! -range -complete=expression -nargs=* VI_RIB call visincr#VisBlockIncr(s:RIB , ) - com! -range -complete=expression -nargs=* VI_RIIB call visincr#VisBlockIncr(s:RIIB , ) - com! -range -complete=expression -nargs=* VI_RIO call visincr#VisBlockIncr(s:RIO , ) - com! -range -complete=expression -nargs=* VI_RIIO call visincr#VisBlockIncr(s:RIIO , ) - com! -range -complete=expression -nargs=? VI_RIR call visincr#VisBlockIncr(s:RIR , ) - com! -range -complete=expression -nargs=? VI_RIIR call visincr#VisBlockIncr(s:RIIR , ) - com! -range -complete=expression -nargs=* VI_RIPOW call visincr#VisBlockIncr(s:RIPOW , ) - com! -range -complete=expression -nargs=* VI_RIIPOW call visincr#VisBlockIncr(s:RIIPOW , ) -endif - -" --------------------------------------------------------------------- -" Restoration And Modelines: {{{1 -" vim: ts=4 fdm=marker -let &cpo= s:keepcpo -unlet s:keepcpo -- cgit v1.2.3