gitconfig

@@ -1,5 +1,5 @@
 [user]
-    email = git@asw.io
+    email = git@as-webservices.de
     name = Arne Schauf
 [alias]
     ci = commit
@@ -8,7 +8,6 @@
     lv = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat
     lg = log --graph --pretty=format:"%C(yellow)%h\\ %ad%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --date=relative
     grep = grep -Ii
-    diffs = diff --staged
 [push]
     default = current
 [color]

gitignore

@@ -1,3 +1 @@
 .ropeproject
-rol_mails/
-.idea

ohmyzshrc

@@ -1,10 +1,7 @@
 export TERM=xterm-256color
-export ZSH_TMUX_AUTOSTART=${ZSH_TMUX_AUTOSTART:-true}
+export ZSH_TMUX_AUTOSTART=true
 export ZSH_TMUX_FIXTERM=false
 
-# export PATH=~/.npm-global/bin:$PATH
-export PATH="$(yarn global bin):~/.local/bin:$PATH"
-
 # Path to your oh-my-zsh installation.
 export ZSH=~/.oh-my-zsh
 export LC_ALL=en_US.UTF-8
@@ -57,20 +54,16 @@ ZSH_THEME="gentoo"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(tmux dirpersist ssh-agent)
+plugins=(tmux dirpersist virtualenvwrapper ssh-agent extract node npm)
 
 zstyle ':completion:*' special-dirs true
-zstyle :omz:plugins:ssh-agent identities id_ed25519
+zstyle :omz:plugins:ssh-agent identities id_rsa
 
 # User configuration
 
-# export PATH="/home/asmaps/bin:/home/asmaps/openclonk:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
-export PATH=$PATH:~/bin
+  export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
 # export MANPATH="/usr/local/man:$MANPATH"
 
-export ANDROID_HOME="$HOME/Android/Sdk"
-export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools
-
 source $ZSH/oh-my-zsh.sh
 
 # You may need to manually set your language environment
@@ -100,10 +93,5 @@ source $ZSH/oh-my-zsh.sh
 
 alias mkvirtualenv3="mkvirtualenv -p `which python3`"
 alias dc="docker-compose"
-alias ap="ansible-playbook"
-alias apa="ansible-playbook ansible/ansible.yml -i ansible/hosts"
-alias apak="ansible-playbook ansible/ansible.yml -i ansible/hosts -K"
-alias aps="ansible-playbook ansible/setup.yml -i ansible/hosts -K"
-alias apau="ansible-playbook ansible/ansible.yml --tags update -i ansible/hosts -K"
 
 stty -ixon

qtile_config.py

@@ -42,7 +42,6 @@ def spawn_with_env_lazy(command, env):
 
 
 mod = "mod4"
-alt = "mod1"
 home = os.path.expanduser('~')
 
 keys = [
@@ -54,49 +53,34 @@ keys = [
         [mod, "control"], "2",
         lazy.spawn("sh -c " + home + "/.screenlayout/2screens.sh"),
     ),
-    Key(
-        [mod, "control", "shift"], "2",
-        lazy.spawn("sh -c " + home + "/.screenlayout/2screens_ja.sh"),
-    ),
     Key(
         [mod, "control"], "3",
-        lazy.spawn("sh -c " + home + "/.screenlayout/3screens.sh"),
+        lazy.spawn("sh -c " + home + "/.screenlayout/office.sh"),
     ),
     Key(
-        [mod, "control", "shift"], "3",
-        lazy.spawn("sh -c " + home + "/.screenlayout/3screens_full.sh"),
+        [mod, "control"], "4",
+        lazy.spawn("sh -c " + home + "/.screenlayout/home.sh"),
     ),
 
     # Switch between windows in current stack pane
     Key(
         [mod], "k",
-        lazy.layout.right()
+        lazy.layout.down()
     ),
     Key(
         [mod], "j",
-        lazy.layout.left()
+        lazy.layout.up()
     ),
 
     # Move windows up or down in current stack
     Key(
         [mod, "control"], "k",
-        lazy.layout.shuffle_left()
+        lazy.layout.shuffle_down()
     ),
     Key(
         [mod, "control"], "j",
-        lazy.layout.shuffle_right()
-    ),
-    Key(
-        [mod, "control"], "h",
-        lazy.layout.grow_left()
+        lazy.layout.shuffle_up()
     ),
-    Key(
-        [mod, "control"], "l",
-        lazy.layout.grow_right()
-    ),
-
-    Key([alt], "Tab", lazy.layout.next()),
-    Key([alt, "shift"], "Tab", lazy.layout.previous()),
 
     # Switch window focus to other pane(s) of stack
     Key(
@@ -119,7 +103,7 @@ keys = [
         lazy.layout.toggle_split()
     ),
     Key([mod], "Return", lazy.spawn("terminator")),
-    Key(["control", "mod1"], "l", lazy.spawn("xscreensaver-command -lock")),
+    Key(["control", "mod1"], "l", lazy.spawn("xautolock -locknow")),
     Key([], "XF86AudioMute", lazy.spawn("pavucontrol")),
     Key([], "XF86MonBrightnessUp", lazy.spawn("xbacklight -inc 3")),
     Key(["shift"], "XF86MonBrightnessUp", lazy.spawn("xbacklight -set 100")),
@@ -127,9 +111,7 @@ keys = [
     Key(["shift"], "XF86MonBrightnessDown", lazy.spawn("xbacklight -set 1")),
     Key([], "XF86LaunchA", lazy.spawn("xinput set-prop 11 \"Device Enabled\" 0")),
     Key(["shift"], "XF86LaunchA", lazy.spawn("xinput set-prop 11 \"Device Enabled\" 1")),
-    Key(['mod1', "control"], "p", lazy.spawn('/home/asmaps/pycharm/pycharm.sh')),
-    Key(['mod1', "control"], "o", lazy.spawn('/home/asmaps/git/openclonk/openclonk')),
-    Key(['mod1', "shift", "control"], "o", lazy.spawn('/home/asmaps/openclonk/openclonk --editor')),
+    Key(['mod1', "control"], "f", lazy.spawn('/home/ars/start_ff.sh')),
 
     # Toggle between different layouts as defined below
     Key([mod], "Tab", lazy.next_layout()),
@@ -139,10 +121,9 @@ keys = [
     Key([mod, "control"], "q", lazy.shutdown()),
     Key([mod], "r", lazy.spawncmd()),
     Key([mod, "control"], "space", lazy.window.toggle_floating()),
-    Key([], "Print", lazy.spawn("bash /home/asmaps/.take_screenshot.sh")),
 ]
 
-groups = [Group(i) for i in "123456789"]
+groups = [Group(i) for i in "12345"]
 
 for i in groups:
     # mod1 + letter of group = switch to group
@@ -156,7 +137,7 @@ for i in groups:
     )
 
 layouts = [
-    layout.columns.Columns(border_width=1),
+    layout.tile.Tile(),
     layout.Max(),
     layout.floating.Floating(),
 ]
@@ -213,7 +194,6 @@ screens = [
                 widget.DF(),
                 widget.Sep(),
                 widget.Battery(),
-                widget.Battery(battery_name='BAT1'),
                 widget.Sep(),
                 widget.CurrentLayout(),
             ],
@@ -273,5 +253,3 @@ def execute_once(process):
 @hook.subscribe.startup
 def startup():
     execute_once('nm-applet')
-    execute_once('blueman-applet')
-    execute_once(['xscreensaver', '-nosplash'])

tmux.conf

@@ -13,19 +13,45 @@ bind-key C-a last-window
 bind c new-window -c "#{pane_current_path}"
 
 # basic settings
-set -g history-limit 3000
+set -g history-limit 30000
 set-option -g default-shell /usr/bin/zsh
-# set-window-option -g utf8 on
+set-window-option -g utf8 on
 set -g base-index 1
 
+# vi mode
+set-window-option -g mode-keys vi
+bind-key -t vi-copy 'v' begin-selection
+bind-key -t vi-copy 'y' copy-selection
+
 # escape mode
 unbind [
 bind Escape copy-mode
 set -s escape-time 0
 
+# switch windows
+bind -r j previous-window
+bind -r k next-window
+bind -r h swap-window -t -1
+bind -r l swap-window -t +1
+
 # fixes redraw bugs
 set -g default-terminal screen-256color
 
+# splitting
+unbind %
+unbind '"'
+bind = split-window -h
+bind - split-window -v
+bind -r C-h run "tmux select-pane -L"
+bind -r C-j run "tmux select-pane -D"
+bind -r C-k run "tmux select-pane -U"
+bind -r C-l run "tmux select-pane -R"
+bind [ resize-pane -L 5
+bind ] resize-pane -R 5
+bind < resize-pane -D 5
+bind > resize-pane -U 5
+bind-key b command-prompt -p "create pane from:"  "join-pane -s ':%%'"
+bind-key v command-prompt -p "send pane to:"  "join-pane -t ':%%'"
 
 # window title
 set-option -g set-titles on
@@ -38,7 +64,8 @@ set -g visual-activity on
 set -g visual-bell off
 
 # status bar
-# set-option -g status-utf8 on
+bind-key z set -g status
+set-option -g status-utf8 on
 set-option -g status-justify left
 set-option -g status-bg black
 set-option -g status-fg cyan
@@ -47,7 +74,8 @@ set-option -g status-left-length 0
 set-option -g status-right-length 80
 set-option -g status-left ''
 set-option -g status-right '#[fg=blue,bold]#H #[fg=green,bold]|#[fg=black,bold]#(uptime | rev | cut -d":" -f1 | rev | sed s/,//g ) #[fg=green,bold]| #[fg=blue,bold]%d.%m.%y %H:%M'
-set -g window-status-current-style bg=black,fg=green
+set-window-option -g window-status-current-fg black
+set-window-option -g window-status-current-bg green
 
 # clock
 set-window-option -g clock-mode-colour cyan

tmux.server.conf

@@ -6,26 +6,52 @@ setw -g aggressive-resize on
 # command prefix
 unbind C-b
 set -g prefix C-s
-bind a send-prefix
+bind s send-prefix
 bind-key C-s last-window
 
 # new window with current pwd
 bind c new-window -c "#{pane_current_path}"
 
 # basic settings
-set -g history-limit 3000
+set -g history-limit 30000
 set-option -g default-shell /usr/bin/zsh
-# set-window-option -g utf8 on
+set-window-option -g utf8 on
 set -g base-index 1
 
+# vi mode
+set-window-option -g mode-keys vi
+bind-key -t vi-copy 'v' begin-selection
+bind-key -t vi-copy 'y' copy-selection
+
 # escape mode
 unbind [
 bind Escape copy-mode
 set -s escape-time 0
 
+# switch windows
+bind -r j previous-window
+bind -r k next-window
+bind -r h swap-window -t -1
+bind -r l swap-window -t +1
+
 # fixes redraw bugs
 set -g default-terminal screen-256color
 
+# splitting
+unbind %
+unbind '"'
+bind = split-window -h
+bind - split-window -v
+bind -r C-h run "tmux select-pane -L"
+bind -r C-j run "tmux select-pane -D"
+bind -r C-k run "tmux select-pane -U"
+bind -r C-l run "tmux select-pane -R"
+bind [ resize-pane -L 5
+bind ] resize-pane -R 5
+bind < resize-pane -D 5
+bind > resize-pane -U 5
+bind-key b command-prompt -p "create pane from:"  "join-pane -s ':%%'"
+bind-key v command-prompt -p "send pane to:"  "join-pane -t ':%%'"
 
 # window title
 set-option -g set-titles on
@@ -38,7 +64,8 @@ set -g visual-activity on
 set -g visual-bell off
 
 # status bar
-# set-option -g status-utf8 on
+bind-key z set -g status
+set-option -g status-utf8 on
 set-option -g status-justify left
 set-option -g status-bg black
 set-option -g status-fg cyan
@@ -47,7 +74,8 @@ set-option -g status-left-length 0
 set-option -g status-right-length 80
 set-option -g status-left ''
 set-option -g status-right '#[fg=blue,bold]#H #[fg=green,bold]|#[fg=black,bold]#(uptime | rev | cut -d":" -f1 | rev | sed s/,//g ) #[fg=green,bold]| #[fg=blue,bold]%d.%m.%y %H:%M'
-set -g window-status-current-style bg=black,fg=green
+set-window-option -g window-status-current-fg black
+set-window-option -g window-status-current-bg green
 
 # clock
 set-window-option -g clock-mode-colour cyan

vimrc

@@ -7,6 +7,8 @@ scriptencoding utf-8
 
 "" filetype plugin and syntax
 filetype off
+syntax on
+filetype indent plugin on
 
 "" system
 set enc=utf-8
@@ -79,11 +81,6 @@ autocmd BufNewFile,BufReadPost *.md set formatoptions+=t
 
 autocmd BufNewFile,BufReadPost Dockerfile set filetype=dockerfile
 
-autocmd BufNewFile,BufReadPost *.yml set shiftwidth=2
-autocmd BufNewFile,BufReadPost *.yml set softtabstop=2
-autocmd BufNewFile,BufReadPost *.ts set shiftwidth=2
-autocmd BufNewFile,BufReadPost *.ts set softtabstop=2
-
 "" Vundle
 
 " Setting up Vundle - the vim plugin bundler
@@ -99,8 +96,6 @@ endif
 
 set rtp+=~/.vim/bundle/vundle/
 call vundle#rc()
-
-
 Bundle 'gmarik/vundle'
 
 if iCanHazVundle == 0
@@ -115,21 +110,21 @@ Bundle 'myusuf3/numbers.vim'
 
 " Bundle 'kien/ctrlp.vim'
 
-" Bundle 'scrooloose/nerdtree'
-" nnoremap <silent><C-n> :NERDTreeToggle<Cr>
-" let NERDTreeIgnore=['\.pyc', '\~$', '\.swo$', '\.swp$', '\.git', '\.hg', '\.svn', '\.bzr']
-" let NERDTreeQuitOnOpen=1
+Bundle 'scrooloose/nerdtree'
+nnoremap <silent><C-n> :NERDTreeToggle<Cr>
+let NERDTreeIgnore=['\.pyc', '\~$', '\.swo$', '\.swp$', '\.git', '\.hg', '\.svn', '\.bzr']
+let NERDTreeQuitOnOpen=1
 
 Bundle 'tomtom/tcomment_vim'
 
-" Bundle 'vim-scripts/taglist.vim'
-" noremap <silent><leader>t :TlistToggle<Cr>
-" noremap <silent><C-T> :TlistToggle<Cr>
-" let Tlist_Use_Right_Window=1
-" let Tlist_GainFocus_On_ToggleOpen = 1
+Bundle 'vim-scripts/taglist.vim'
+noremap <silent><leader>t :TlistToggle<Cr>
+noremap <silent><C-T> :TlistToggle<Cr>
+let Tlist_Use_Right_Window=1
+let Tlist_GainFocus_On_ToggleOpen = 1
 
-" Bundle 'saltstack/salt-vim'
-" au BufRead,BufNewFile *.sls set filetype=sls
+Bundle 'saltstack/salt-vim'
+au BufRead,BufNewFile *.sls set filetype=sls
 
 Bundle 'bling/vim-airline'
 let g:airline#extensions#tabline#enabled = 1
@@ -137,65 +132,46 @@ set laststatus=2
 
 Bundle 'bling/vim-bufferline'
 
-" Bundle 'davidhalter/jedi-vim'
-" let g:jedi#use_tabs_not_buffers = 0
-" let g:jedi#show_call_signatures = "0"
-" autocmd FileType python setlocal completeopt-=preview
+Bundle 'davidhalter/jedi-vim'
+let g:jedi#use_tabs_not_buffers = 0
+let g:jedi#show_call_signatures = "0"
+autocmd FileType python setlocal completeopt-=preview
 
-" Bundle 'ivyl/vim-bling'
-" Bundle 'jmcantrell/vim-virtualenv'
+Bundle 'ivyl/vim-bling'
+Bundle 'jmcantrell/vim-virtualenv'
 Bundle 'ervandew/supertab'
 " Bundle 'rstacruz/sparkup'
 " Bundle 'scrooloose/syntastic'
-" set statusline+=%#warningmsg#
-" set statusline+=%{SyntasticStatuslineFlag()}
-" set statusline+=%*
-" 
-" let g:syntastic_always_populate_loc_list = 1
-" let g:syntastic_auto_loc_list = 1
-" let g:syntastic_check_on_open = 1
-" let g:syntastic_check_on_wq = 0
+" let g:syntastic_python_flake8_args = "--ignore=E501,W0611,W0401"
 
 " Bundle 'vim-scripts/indentpython.vim'
-" Bundle 'klen/python-mode'
-" let g:pymode_folding = 0
-" let g:pymode_quickfix_minheight = 1
-" let g:pymode_lint_on_fly = 1
-" let g:pymode_lint_ignore = "W0401,"
-" let g:pymode_rope_autoimport_import_after_complete = 1
-" let g:pymode_doc = 0
-" let g:pymode_motion = 0
-" let g:pymode_rope_completion = 0
-" let g:pymode_lint_cwindow = 0
-" let g:pymode_options_max_line_length = 120
+Bundle 'klen/python-mode'
+let g:pymode_folding = 0
+let g:pymode_quickfix_minheight = 1
+let g:pymode_lint_on_fly = 1
+let g:pymode_lint_ignore = "W0401,"
+let g:pymode_rope_autoimport_import_after_complete = 1
+let g:pymode_doc = 0
+let g:pymode_motion = 0
+let g:pymode_rope_completion = 0
+let g:pymode_lint_cwindow = 0
+let g:pymode_options_max_line_length = 120
 " let g:pymode_lint_checkers = ['pylint', 'pep8', 'mccabe']
-" let g:pymode_virtualenv = 1
+let g:pymode_virtualenv = 1
 " set completeopt=menu
 
-Plugin 'flazz/vim-colorschemes'
-Plugin 'felixhummel/setcolors.vim'
-colorscheme molokai
-set background=light
-
-
-" Plugin 'leafgarland/typescript-vim'
-" let g:syntastic_typescript_tsc_args = "--experimentalDecorators"
-" Plugin 'Shougo/vimproc.vim'
-" Plugin 'Quramy/tsuquyomi'
-" let g:tsuquyomi_disable_quickfix = 1
-" let g:syntastic_typescript_checkers = ['tsuquyomi']
-
-" Plugin 'othree/html5.vim'
-" Plugin 'othree/yajs.vim', { 'for': 'html' }
-" Plugin 'othree/javascript-libraries-syntax.vim'
-" Plugin 'vim-scripts/SyntaxComplete'
-" Plugin 'pangloss/vim-javascript'
-" Plugin 'posva/vim-vue'
-" au BufNewFile,BufRead *.vue set filetype=html
-" au BufNewFile,BufReadPost *.vue set shiftwidth=2
-" au BufNewFile,BufReadPost *.vue set softtabstop=2
-" au BufNewFile,BufReadPost *.js set shiftwidth=2
-" au BufNewFile,BufReadPost *.js set softtabstop=2
-
-syntax on
-filetype plugin indent on
+set background=dark
+Bundle 'trevorrjohn/vim-obsidian'
+colorscheme obsidian
+
+Plugin 'othree/html5.vim'
+Plugin 'othree/yajs.vim', { 'for': 'html' }
+Plugin 'othree/javascript-libraries-syntax.vim'
+Plugin 'vim-scripts/SyntaxComplete'
+Plugin 'pangloss/vim-javascript'
+Plugin 'posva/vim-vue'
+au BufNewFile,BufRead *.vue set filetype=html
+au BufNewFile,BufReadPost *.vue set shiftwidth=2
+au BufNewFile,BufReadPost *.vue set softtabstop=2
+au BufNewFile,BufReadPost *.js set shiftwidth=2
+au BufNewFile,BufReadPost *.js set softtabstop=2