Merge branch 'master' of github.com:dopefishh/dotfiles
authorMart Lubbers <mart@martlubbers.net>
Mon, 29 Oct 2018 09:18:55 +0000 (10:18 +0100)
committerMart Lubbers <mart@martlubbers.net>
Mon, 29 Oct 2018 09:18:55 +0000 (10:18 +0100)
28 files changed:
.gitmodules
README.md
config.h/dwm/config.h
dirs.sh
email/.config/notmuch/config
email/.mutt/muttrc
music/.config/mpd/mpd.conf [deleted file]
music/.local/bin/ncmpcpp [deleted file]
music/.ncmpcpp/bindings [deleted file]
music/.ncmpcpp/config [deleted file]
music/.ncmpcpp/cover.sh [deleted file]
shell/.bash_completion [new file with mode: 0644]
shell/.bash_completion.d/clm [new file with mode: 0644]
shell/.bash_completion.d/cpm [new file with mode: 0644]
shell/.bashrc
shell/.local/bin/backup.sh
shell/.local/bin/latex.mk [deleted file]
vimperator/.vimperatorrc [deleted file]
x/.config/i3/config [deleted file]
x/.config/i3status/config [deleted file]
x/.local/bin/bg [deleted file]
x/.local/bin/gvwrap [deleted file]
x/.local/bin/network [deleted file]
x/.local/bin/passmenu [deleted file]
x/.local/bin/pdflatexi [deleted file]
x/.local/bin/thumbnailer.sh [deleted file]
x/.local/bin/wifi [deleted file]
x/.xinitrc

index 5e4bd62..f552da1 100644 (file)
@@ -1,6 +1,6 @@
 [submodule "vim/.vim/pack/plugins/start/vim-clean"]
        path = vim/.vim/pack/plugins/start/vim-clean
-       url = https://github.com/camilstaps/vim-clean.git
+       url = https://gitlab.science.ru.nl/cstaps/vim-clean
 [submodule "vim/.vim/pack/plugins/start/syntastic"]
        path = vim/.vim/pack/plugins/start/syntastic
        url = https://github.com/scrooloose/syntastic.git
index 8187cbf..5bfcd42 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,19 +1,19 @@
 # Dotfiles.
 
+## True dotfiles
 Tip: use GNU stow
 
-`stow -t ~/ NAME`
+`stow -t ~/ DIR`
 
-Where NAME is:
+## Other configurations
 
-| `NAME` | contents
---- | ---
-| cal | khard, khal, vdirsyncer
-| email | mutt, offlineimap, notmuch, msmtp
-| git | git
-| pgp | gpg, gpg-agent
-| shell | bash, top, readline
-| vim | vim, vim-gnupg, vim-syntastic
-| vimperator | vimperator
-| x | i3, i3status, urxvt, font, gv, askpass
-| misc\_binaries | screenshot script
+- `udev/backup.rules` defines the rules for the automatic backup.
+  Install in: `/etc/udev/rules.d`
+- `20-keyboard.conf` defines the keyboard layout.
+  Install in: `/etc/X11/xorg.conf.d/`
+- `dirs.sh` creates all the directories so that stow won't link entire
+  directories.
+- `pkgs.sh` installs all™ packages needed for the dotfiles
+- `config.h` contains `config.h`'s for `st` and `dwm`
+- `texlive.profile` contains a minimal texlive profile for unattended installation.
+  Install texlive by running `install-tl -profile texlive.profile`
index fee5179..3ebd358 100644 (file)
@@ -61,8 +61,8 @@ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn()
 static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
 static const char *termcmd[]  = { "st", NULL };
 static const char *quitcmd[]  = { "killall", "xinit", NULL };
-static const char *passmenu[]  = { "passmenu", "-m", dmenumon, "-fn", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
-static const char *passmenu_type[]  = { "passmenu", "--type", "-m", dmenumon, "-fn", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
+static const char *passmenu[]  = { "/usr/share/doc/pass/examples/dmenu/passmenu", "-m", dmenumon, "-fn", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
+static const char *passmenu_type[]  = { "/usr/share/doc/pass/examples/dmenu/passmenu", "--type", "-m", dmenumon, "-fn", font0, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
 static const char *scr[] = { "scr", NULL };
 static const char *scr_sel[] = { "scr", "selection", NULL };
 static const char *lock[] = { "slock", NULL };
diff --git a/dirs.sh b/dirs.sh
index df73377..bcf64f2 100644 (file)
--- a/dirs.sh
+++ b/dirs.sh
@@ -1,5 +1,6 @@
 mkdir -pv ~/.config/{khal,khard,vdirsyncer,todoman,notmuch,msmtp,offlineimap,dunst,tmux}
 mkdir -pv ~/.mutt
+mkdir -pv ~/.bash_completion.d
 mkdir -pv ~/.gnupg
 mkdir -pv ~/.vim/{ftplugin,after/ftplugin,autoload,bundle,spell,pack/plugins/{opt,start}}
 mkdir -pv ~/.local/bin
index 73b20c3..e9150a6 100644 (file)
@@ -31,6 +31,7 @@ path=/home/mrl/.mutt/mail
 [user]
 name=Mart Lubbers
 primary_email=mart@martlubbers.net
+other_email=martlubbers@gmail.com,mart-lubbers@hotmail.com,mail@rooslubbers.nl,mart@cs.ru.nl
 
 # Configuration for "notmuch new"
 #
index 6b27ab8..e0a8bb1 100644 (file)
@@ -17,8 +17,11 @@ set sendmail="/home/mrl/.mutt/checkattach.sh msmtp -C /home/mrl/.config/msmtp/co
 set send_charset="us-ascii:utf-8"
 macro index,pager $ "<shell-escape>/home/mrl/.mutt/force_sync.sh<enter><sync-mailbox>" "Force refresh"
 macro attach B "<pipe-entry>firefox \"data:text/html;base64,$(base64 -w 0 <&0)\"<enter>"
-send2-hook "~f mart@martlubbers.net"\
-       "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a net\""
+
+macro compose <esc>1 "<esc>f^UMart Lubbers <mart@martlubbers.net><enter>ps"
+send2-hook "~f mart@martlubbers.net" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a net\""
+
+macro compose <esc>2 "<esc>f^UMart Lubbers <mart@cs.ru.nl><enter>pc"
 send2-hook "~f m.lubbers@cs.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\""
 send2-hook "~f m.lubbers@science.ru.nl" "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\""
 send2-hook "~f mart@cs.ru.nl"  "set sendmail=\"msmtp -C /home/mrl/.config/msmtp/config -a ru\""
diff --git a/music/.config/mpd/mpd.conf b/music/.config/mpd/mpd.conf
deleted file mode 100644 (file)
index 85a4202..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-db_file            "~/.config/mpd/database"
-log_file           "~/.config/mpd/log"
-
-music_directory    "/mnt/data/music"
-playlist_directory "~/.config/mpd/playlists"
-pid_file           "~/.config/mpd/pid"
-state_file         "~/.config/mpd/state"
-sticker_file       "~/.config/mpd/sticker.sql"
-
-user                           "mrl"
-group                          "mrl"
-bind_to_address                "any"
-
-#auto_update   "yes"
-follow_outside_symlinks        "yes"
-follow_inside_symlinks         "yes"
-
-input {
-        plugin "curl"
-}
-
-audio_output {
-       type            "pulse"
-       name            "My Pulse Output"
-}
-
-audio_output {
-       type            "cgi-output"
-       name            "CGI Output"
-       command         "/home/mrl/projects/mpdcgilog/mpdcgilog.py"
-}
-
-audio_output {
-       type "fifo"
-       name "Visualizer feed"
-       path "/dev/shm/mpd.fifo"
-       format "44100:16:2"
-}
-
-filesystem_charset             "UTF-8"
-id3v1_encoding                 "UTF-8"
diff --git a/music/.local/bin/ncmpcpp b/music/.local/bin/ncmpcpp
deleted file mode 100755 (executable)
index 352eee5..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-/usr/bin/ncmpcpp "$@"
-printf "\e]20;;100x100+1000+1000\a"
diff --git a/music/.ncmpcpp/bindings b/music/.ncmpcpp/bindings
deleted file mode 100644 (file)
index 5512564..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-def_key "j"
-       scroll_down
-def_key "k"
-       scroll_up
-def_key "J"
-       select_item
-       scroll_down
-def_key "K"
-       select_item
-       scroll_up
-def_key "l"
-       next_column
-def_key "l"
-       slave_screen
-def_key "h"
-       previous_column
-def_key "h"
-       master_screen
-def_key "ctrl-j"
-       page_down
-def_key "ctrl-k"
-       page_up
diff --git a/music/.ncmpcpp/config b/music/.ncmpcpp/config
deleted file mode 100644 (file)
index c252e51..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-mpd_music_dir = /mnt/data/music
-
-visualizer_fifo_path = /dev/shm/mpd.fifo
-visualizer_output_name = Visualizer feed
-visualizer_in_stereo = yes
-visualizer_type = spectrum
-visualizer_look = .*
-# ●▮
-
-browser_sort_mode = name
-browser_sort_format = {%A - }{%t}|{%f} {(%l)}
-song_columns_list_format = (6f)[green]{NE} (30)[]{a} (30)[white]{t} (30)[cyan]{b} (7f)[magenta]{l}
-
-execute_on_song_change = "~/.ncmpcpp/cover.sh"
-
-playlist_show_remaining_time = yes
-playlist_shorten_total_times = yes
-playlist_separate_albums = yes
-
-browser_display_mode = columns
-search_engine_display_mode = columns
-playlist_editor_display_mode = columns
-
-autocenter_mode = yes
-centered_cursor = yes
-
-default_place_to_search_in = database
-user_interface = alternative
-
-media_library_primary_tag = album_artist
-cyclic_scrolling = yes
-
-allow_for_physical_item_deletion = no
-
-startup_screen = "playlist"
-startup_slave_screen = "media_library"
-
-locked_screen_width_part = 50
-ask_for_locked_screen_width_part = no
-
-clock_display_seconds = yes
-display_volume_level = yes
-display_bitrate = yes
-display_remaining_time = yes
-
-ignore_leading_the = yes
-media_library_sort_by_mtime = no
-
-enable_window_title = yes
-
-external_editor = vim
-use_console_editor = yes
diff --git a/music/.ncmpcpp/cover.sh b/music/.ncmpcpp/cover.sh
deleted file mode 100755 (executable)
index 755429a..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-shopt -s nullglob
-
-file="$(mpc --format /mnt/data/music/%file% current)"
-printf "\e]20;;100x100+1000+1000\a"
-for c in "${file%/*}/cover."*; do
-       printf "\e]20;$c;50x50+1+94:op=keep-aspect\a"
-done
diff --git a/shell/.bash_completion b/shell/.bash_completion
new file mode 100644 (file)
index 0000000..0591bba
--- /dev/null
@@ -0,0 +1 @@
+for f in ~/.bash_completion.d/*; do . "$f"; done
diff --git a/shell/.bash_completion.d/clm b/shell/.bash_completion.d/clm
new file mode 100644 (file)
index 0000000..3f5b9ef
--- /dev/null
@@ -0,0 +1,53 @@
+_clm()
+{
+       local cur prev opts
+       COMPRREPLY=()
+       cur="${COMP_WORDS[COMP_CWORD]}"
+       prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+       opts="-I -IL -P -w -nw -d -nd -sa -nsa -mv -ms -O -PO -S -PS -ABC -PABC -c -lt -nlt -lat -nlat -lset -ci -nci -ou -nou -fusion -nfusion -pt -npt -desc -exl -tst -funcmayfail -varnotused -funcnotused -nowarn -ns -no-opt-link -l -sl -e -E -aC -h -s -b -sc -t -nt -gc -ngc -st -nst -nr -gcm -gcc -gcf -gci -dynamics -nortsopts -p -pic -optabc -bytecode"
+
+       case $prev in
+               "-IL")
+                       # Complete Clean libraries
+                       opts="$(find "$CLEAN_HOME/lib" -mindepth 1 -type d -not -name exe -regex ".*/lib/\([^/]*\|Platform/Deprecated/[^/]*\)" | cut -c $((${#CLEAN_HOME}+6))-)"
+                       
+                       
+
+                       COMPREPLY=($(compgen -W "$opts" -- $cur))
+                       return 0
+                       ;;
+               "-I")
+                       # Complete directories
+                       _filedir
+                       for index in "${!COMPREPLY[@]}"; do
+                               [ -d "${COMPREPLY[index]}" ] || unset -v 'COMPREPLY[$index]'
+                       done
+                       return 0
+                       ;;
+               "-l" | "-sl")
+                       # Complete files
+                       _filedir
+                       for index in "${!COMPREPLY[@]}"; do
+                               [ -f "${COMPREPLY[index]}" ] || unset -v 'COMPREPLY[$index]'
+                       done
+                       return 0
+                       ;;
+               "-P" | "-e" | "-E" | "-h" | "-s" | "-gcf" | "-gci")
+                       # Complete nothing
+                       return 0
+                       ;;
+       esac
+
+       if [[ $cur == -* ]]; then
+               # Complete options
+               COMPREPLY=($(compgen -W "$opts" -- $cur))
+               return 0
+       else
+               # Main module; complete icl module names
+               opts="$(find -name '*.icl' -maxdepth 4 -type f -print 2>/dev/null | sed 's:^\./::;s:/:.:g;s:\.icl$::' | grep -v '[- ]')"
+               COMPREPLY=($(compgen -W "$opts" -- $cur))
+               return 0
+       fi
+}
+complete -F _clm clm
diff --git a/shell/.bash_completion.d/cpm b/shell/.bash_completion.d/cpm
new file mode 100644 (file)
index 0000000..b4ce889
--- /dev/null
@@ -0,0 +1,115 @@
+# bash completion for cpm
+# Author: Mart Lubbers
+# Date: 2018-07-17
+#
+# Todo
+# - support --envs=filename
+# - create completion for module
+# - create completion for environment
+# - test on non-linux
+_set_opts="-generic_fusion -ngeneric_fusion -dynamics -ndynamics -descexl -ndescexl -b -nr -nc -sc"
+
+_targets()
+{
+       sed 's/EnvironmentName:[[:space:]]*//;t;d' | tr -d '\n'
+}
+
+_paths()
+{
+       sed 's/\[\([[:digit:]]\)\].*/\1/;t;d' | tr -d '\n'
+}
+
+_cpm()
+{
+       local arg cur prev words cword split
+
+       # Require bash completion
+       _init_completion || return
+       _get_first_arg
+       _get_comp_words_by_ref
+
+       # subcommand or project file
+       if [[ -z "${arg}" ]]
+       then
+               COMPREPLY=( $(compgen -W "environment project module make" -- ${cur}) )
+               _filedir prj
+       else 
+               case "${arg}" in
+               *.prj)
+                       COMPREPLY=( $(compgen -W "--force" -- ${cur}) )
+                       ;;
+               make)
+                       ;;
+               project)
+                       # Not even a project file is selected
+                       if [[ "$cword" = 2 ]]
+                       then
+                               _filedir prj
+                       # A project file is selected
+                       elif [[ "$cword" = 3 ]]
+                       then
+                               COMPREPLY=( $(compgen -W "create show build path root target exec set" -- ${cur}) )
+                       # A project command is selected
+                       elif [[ "$cword" -ge 4 ]]
+                       then
+                               case "${words[3]}" in
+                                       build)
+                                               COMPREPLY=( $(compgen -W "--force --envs" -- ${cur}) )
+                                               ;;
+                                       path)
+                                               # No path command set yet
+                                               if [[ "$cword" = 4 ]]
+                                               then
+                                                       COMPREPLY=( $(compgen -W "add list remove move" -- ${cur}) )
+                                               # Path command is set
+                                               elif [[ "$cword" -ge 5 ]]
+                                               then
+                                                       case "${words[4]}" in
+                                                               add)
+                                                                       _filedir -d
+                                                                       ;;
+                                                               list)
+                                                                       ;;
+                                                               remove)
+                                                                       COMPREPLY=( $(compgen -W "$("${words[0]}" project "${words[2]}" path list | _paths)" -- ${cur}) )
+                                                                       ;;
+                                                               move)
+                                                                       if [[ "$cword" = 5 ]]
+                                                                       then
+                                                                               COMPREPLY=( $(compgen -W "$("${words[0]}" project "${words[2]}" path list | _paths)" -- ${cur}) )
+                                                                       elif [[ "$cword" = 6 ]]
+                                                                       then
+                                                                               COMPREPLY=( $(compgen -W "up down top bottom" -- ${cur}) )
+                                                                       fi
+                                                                       ;;
+                                                       esac
+                                               fi
+                                               ;;
+                                       root)
+                                               COMPREPLY=( $(compgen -W ". .. ... .... ....." -- ${cur}) )
+                                               ;;
+                                       target)
+                                               COMPREPLY=( $(compgen -W "$(_targets < "$CLEAN_HOME/etc/IDEEnvs")" -- ${cur}) )
+                                               ;;
+                                       set)
+                                               COMPREPLY=( $(compgen -W "$_set_opts" -- ${cur}) )
+                                               ;;
+                                       exec)
+                                               ;;
+                                       create)
+                                               ;;
+                                       show)
+                                               ;;
+                                       main)
+                                               _filedir
+                                               ;;
+                               esac
+                       fi
+                       ;;
+               module)
+                       ;;
+               environment)
+                       ;;
+               esac
+       fi
+} && complete -F _cpm cpm
index 51cd06a..09a6848 100644 (file)
@@ -18,7 +18,7 @@ export CLEAN_HOME=/opt/clean
 
 export PATH=~/.local/bin:$PATH
 export PATH=$PATH:$CLEAN_HOME/lib/exe:$CLEAN_HOME/bin
-export PATH=$PATH:/opt/texlive/2018/bin/x86_64-linux:/opt/zotero
+export PATH=$PATH:/opt/texlive/2018/bin/x86_64-linux:/opt/zotero:/opt/arduino
 
 export GTK_IM_MODULE=xim
 export QT_IM_MODULE=xim
@@ -29,6 +29,7 @@ alias vi=vim
 alias latexmk='make -f ~/.local/bin/latex.mk'
 export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
 alias tmux='tmux -f ~/.config/tmux/config'
+alias shutdown="echo \"Are you sure? I\'m Ygdrassil\" && read && shutdown"
 
 . /etc/bash_completion
 
index 0656811..cd4ebe5 100755 (executable)
@@ -8,7 +8,7 @@ um ()
 start="$(date)"
 if [ ! -n "$1" ]
 then
-       echo "Was this script called from udev? I need the ID_FS_UUID_ENC variable" | tee /home/mrl/backup.log
+       echo "Was this script called from udev? I need the UUID as the first argument" > /home/mrl/backup.log
        exit 1
 elif mountpoint -q /mnt/backupdrive
 then
diff --git a/shell/.local/bin/latex.mk b/shell/.local/bin/latex.mk
deleted file mode 100644 (file)
index ad46f07..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-.PHONY: clean clobber all
-
-DOCUMENT:=$(shell grep -Fl documentclass *.tex)
-LATEX?=pdflatex
-LATEXFLAGS?=-synctex=1 -no-shell-escape -file-line-error -halt-on-error
-BIBTEX?=bibtex
-MAKEGLOSSARIES?=makeglossaries
-MAKEINDEX?=makeindex
-
-all: $(patsubst %.tex,%.pdf,$(shell grep -Fl documentclass *.tex))
-
-%.pdf: %.tex $(wildcard *.tex)
-       $(LATEX) $(LATEXFLAGS) $*
-       grep -q '^\\bibdata{' $*.aux && $(BIBTEX) $(BIBTEXFLAGS) $* || true
-       grep -q '\@istfilename' $*.aux && $(MAKEGLOSSARIES) $(MAKEGLOSSARIESFLAGS) $* || true
-       [ -f $*.idx ] && $(MAKEINDEX) $(MAKEINDEXFLAGS) $* || true
-       $(LATEX) $(LATEXFLAGS) $*
-       $(LATEX) $(LATEXFLAGS) $*
-
-clean:
-       $(RM) $(addprefix *.,acn acr alg aux bbl blg fmt glg glo gls idx ilg ind ist loa lof log lol lot nav out snm tdo toc vrb)
-
-clobber: clean
-       $(RM) -i *.pdf
diff --git a/vimperator/.vimperatorrc b/vimperator/.vimperatorrc
deleted file mode 100644 (file)
index 36d66b3..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-nnoremap j 5j
-nnoremap k 5k
-nnoremap l 5l
-nnoremap h 5h
-
-nnoremap J <C-f>
-nnoremap K <C-b>
-
-nnoremap <TAB>l :tabn<RETURN>
-nnoremap <TAB>h :tabp<RETURN>
-
-nnoremap <TAB>L :tabm! +1<RETURN>
-nnoremap <TAB>H :tabm! -1<RETURN>
-
-set gui=noaddons,nobookmarks,nomenu,nonavigation,tabs
-set hintchars=uhetonasidyfpgcrlkxjbqmz
-
-set editor="urxvt -e vim"
-set focuscontent
diff --git a/x/.config/i3/config b/x/.config/i3/config
deleted file mode 100644 (file)
index c6b06bb..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-
-set $mod Mod4
-set $font DejaVu Sans Mono
-set $fontsize 12
-
-# Toggle playback
-bindsym Pause exec mpc toggle
-# Printscreen
-bindsym Shift+Print exec ~/.local/bin/scr window
-bindsym Print exec ~/.local/bin/scr
-# put a password in the clipboard
-bindsym $mod+y exec passmenu
-bindsym $mod+Shift+y exec passmenu --type
-
-# font for window titles.
-font pango:$font 8
-
-# use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-hide_edge_borders none
-
-# start a terminal
-bindsym $mod+Return exec st
-
-# lock
-bindsym $mod+l exec xautolock -locknow
-
-# kill focused window
-bindsym $mod+Shift+quotedbl kill
-
-# start dmenu
-bindsym $mod+e exec dmenu_run -i -f -fn 'xft:$font:pixelsize=$fontsize'
-
-# change focus
-bindsym $mod+h focus left
-bindsym $mod+t focus down
-bindsym $mod+n focus up
-bindsym $mod+s focus right
-
-# alternatively, you can use the cursor keys:
-bindsym XF86MonBrightnessUp exec xbacklight -inc 5
-bindsym XF86MonBrightnessDown exec xbacklight -dec 5
-bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle
-bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
-bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5%
-
-# move focused window
-bindsym $mod+Shift+h move left
-bindsym $mod+Shift+t move down
-bindsym $mod+Shift+n move up
-bindsym $mod+Shift+s move right
-
-# split in horizontal orientation
-bindsym $mod+d split h
-
-# split in vertical orientation
-bindsym $mod+k split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+u fullscreen
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+o layout stacking
-bindsym $mod+comma layout tabbed
-bindsym $mod+period layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-# 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
-
-# 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 the configuration file
-bindsym $mod+Shift+j reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+p restart
-# exit i3 (logs you out of your X session)
-bindsym $mod+Shift+period exec i3-msg exit
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-        bindsym h resize shrink width 5 px or 5 ppt
-        bindsym t resize grow height 5 px or 5 ppt
-        bindsym n resize shrink height 5 px or 5 ppt
-        bindsym s resize grow width 5 px or 5 ppt
-
-        # back to normal: Enter or Escape
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-}
-
-bindsym $mod+p mode "resize"
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-       status_command i3status
-       font pango:$font $fontsize
-}
diff --git a/x/.config/i3status/config b/x/.config/i3status/config
deleted file mode 100644 (file)
index 8da17fb..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-general {
-       colors = true
-       interval = 3
-}
-
-order += "wireless _first_"
-order += "ethernet _first_"
-#order += "keyboard"
-order += "volume master"
-order += "disk /"
-order += "battery 0"
-order += "tztime local"
-
-battery 0 {
-       format = "%status %percentage"
-       integer_battery_capacity = true
-#      format_down = "No battery"
-#      status_chr = "⚇ CHR"
-#      status_bat = "⚡ BAT"
-#      status_full = "☻ FULL"
-       path = "/sys/class/power_supply/BAT%d/uevent"
-       low_threshold = 10
-}
-
-wireless _first_ {
-       format_up = "W: (%quality at %essid) %ip"
-       format_down = "W: down"
-}
-ethernet _first_ {
-       format_up = "E: %ip"
-       format_down = "E: down"
-}
-
-volume master {
-       format = "♪: %volume"
-       format_muted = "♪: muted (%volume)"
-}
-
-tztime local {
-       format = "%Y-%m-%d %H:%M:%S"
-}
-
-disk "/" {
-       format = "%free/%total free"
-}
-
-#keyboard {
-#}
diff --git a/x/.local/bin/bg b/x/.local/bin/bg
deleted file mode 100755 (executable)
index b7e28a4..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-convert -size 1x1 xc:black png:- | display -window root
diff --git a/x/.local/bin/gvwrap b/x/.local/bin/gvwrap
deleted file mode 100755 (executable)
index 39b8a83..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-gv "$(fsel)"
diff --git a/x/.local/bin/network b/x/.local/bin/network
deleted file mode 100755 (executable)
index 4cb4f0c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-netctl list | cut -b 3- | dmenu | ifne xargs -I{}\
-       sudo -A bash -c "netctl switch-to {} && ntpd -qg && hwclock -w"
diff --git a/x/.local/bin/passmenu b/x/.local/bin/passmenu
deleted file mode 100755 (executable)
index 9f91d12..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/passmenu "$@"|| /usr/share/doc/pass/examples/dmenu/passmenu "$@"
diff --git a/x/.local/bin/pdflatexi b/x/.local/bin/pdflatexi
deleted file mode 100755 (executable)
index a23b435..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/expect
-proc tryInstallPackage { name } {
-       global latexpid oldresult result spawn_id argv
-
-       # Set result
-       set result $name
-       send_user "\nTrying to install missing package\n"
-       # Encountering this result for the second time...
-       if {$oldresult == $result} {
-               send_user "$result has been tried twice with no results\n"
-               send_user "Is this not an image? Aborting...\n"
-               exit
-       # Install the package with tlmgri
-       } { spawn tlmgri $result
-               interact
-               # Reset spawn id to kill original pdflatex
-               set spawn_id $latexpid
-               close
-               wait
-               # Respawn pdflatex
-               spawn pdflatex {*}$argv
-               set oldresult $result
-               exp_continue
-       }
-}
-
-# Start latex and save the pid to kill it later
-spawn pdflatex {*}$argv
-set latexpid $spawn_id
-
-# Initialize the saved result to compare later
-set oldresult ""
-set result ""
-
-expect {
-       # Regular sty file is missing
-       -re "^.*File .(.*). not found.*$" {
-               tryInstallPackage $expect_out(1,string)
-       } -re "^.*language definition file (.*) was not foun" {
-       # Bibtex ldf file is missing
-               tryInstallPackage $expect_out(1,string)
-       } -re "^.*Encoding file .(.*). not found." {
-       # Font encoding file is missing
-               tryInstallPackage $expect_out(1,string)
-       } timeout {
-       # Timeout
-               send_user "Compilation timed out???"
-               exit
-       }
-}
diff --git a/x/.local/bin/thumbnailer.sh b/x/.local/bin/thumbnailer.sh
deleted file mode 100755 (executable)
index 9c7edeb..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-PAGERESIZE=50%
-
-log () {
-       echo "$@" >&2
-}
-
-if [ "$#" -ne 2 ]
-then
-       log "Convert all pdf pages to a montage"
-       log "Usage: $0 INPUT.pdf OUTPUT.png"
-       exit 1
-fi
-log "Processing $1 to $2"
-
-TMPDIR="$(mktemp -d)"
-trap "rm -r $TMPDIR" EXIT 
-log "Temp directory created in $TMPDIR"
-
-NUMPAGES=$(identify "$1" | wc -l)
-log "$NUMPAGES detected"
-
-log -n "Processing page: "
-for ((p=0;p<$NUMPAGES;p++))
-do
-       convert "$1"[$p] -resize $PAGERESIZE $TMPDIR/$p.png
-       log -n "$p, "
-done
-log "done!"
-
-montage -geometry +0+0 $TMPDIR/*.png "$2"
-log "Montaging done"
diff --git a/x/.local/bin/wifi b/x/.local/bin/wifi
deleted file mode 100755 (executable)
index f024272..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-{ 
-       sudo -A iw dev wlp2s0 scan | grep -Po "(?<=SSID: ).*" | sort -u;
-       netctl list | cut -b 3-; 
-} | sort | uniq -d | head -1 | ifne xargs sudo -A netctl switch-to
index 7966201..23df7c9 100755 (executable)
@@ -2,7 +2,7 @@
 #To fix java applications in tiling (e.g. arduino)
 export _JAVA_AWT_WM_NONREPARENTING=1
 dunst &
-trayer --align right --widthtype request --SetPartialStrut false --height 22 &
+trayer --align right --widthtype request --SetPartialStrut false --height 22 &
 
 eval "$(gpg-agent --daemon)"
 xrdb -merge ~/.Xresources