fix stuff

gitconfig

@@ -1,5 +1,5 @@
 [user]
-    email = git@as-webservices.de
+    email = git@asw.io
     name = Arne Schauf
 [alias]
     ci = commit
@@ -8,6 +8,7 @@
     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 +1,3 @@
 .ropeproject
+rol_mails/
+.idea

ohmyzshrc

@@ -1,7 +1,10 @@
 export TERM=xterm-256color
-export ZSH_TMUX_AUTOSTART=true
+export ZSH_TMUX_AUTOSTART=${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
@@ -54,16 +57,20 @@ 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 virtualenvwrapper ssh-agent extract node npm)
+plugins=(tmux dirpersist ssh-agent)
 
 zstyle ':completion:*' special-dirs true
-zstyle :omz:plugins:ssh-agent identities id_rsa
+zstyle :omz:plugins:ssh-agent identities id_ed25519
 
 # User configuration
 
-  export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
+# 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 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
@@ -93,5 +100,10 @@ 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,6 +42,7 @@ def spawn_with_env_lazy(command, env):
 
 
 mod = "mod4"
+alt = "mod1"
 home = os.path.expanduser('~')
 
 keys = [
@@ -53,34 +54,49 @@ 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/office.sh"),
+        lazy.spawn("sh -c " + home + "/.screenlayout/3screens.sh"),
     ),
     Key(
-        [mod, "control"], "4",
+        [mod, "control", "shift"], "3",
-        lazy.spawn("sh -c " + home + "/.screenlayout/home.sh"),
+        lazy.spawn("sh -c " + home + "/.screenlayout/3screens_full.sh"),
     ),
 
     # Switch between windows in current stack pane
     Key(
         [mod], "k",
-        lazy.layout.down()
+        lazy.layout.right()
     ),
     Key(
         [mod], "j",
-        lazy.layout.up()
+        lazy.layout.left()
     ),
 
     # Move windows up or down in current stack
     Key(
         [mod, "control"], "k",
-        lazy.layout.shuffle_down()
+        lazy.layout.shuffle_left()
     ),
     Key(
         [mod, "control"], "j",
-        lazy.layout.shuffle_up()
+        lazy.layout.shuffle_right()
+    ),
+    Key(
+        [mod, "control"], "h",
+        lazy.layout.grow_left()
     ),
+    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(
@@ -103,7 +119,7 @@ keys = [
         lazy.layout.toggle_split()
     ),
     Key([mod], "Return", lazy.spawn("terminator")),
-    Key(["control", "mod1"], "l", lazy.spawn("xautolock -locknow")),
+    Key(["control", "mod1"], "l", lazy.spawn("xscreensaver-command -lock")),
     Key([], "XF86AudioMute", lazy.spawn("pavucontrol")),
     Key([], "XF86MonBrightnessUp", lazy.spawn("xbacklight -inc 3")),
     Key(["shift"], "XF86MonBrightnessUp", lazy.spawn("xbacklight -set 100")),
@@ -111,7 +127,9 @@ 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"], "f", lazy.spawn('/home/ars/start_ff.sh')),
+    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')),
 
     # Toggle between different layouts as defined below
     Key([mod], "Tab", lazy.next_layout()),
@@ -121,9 +139,10 @@ 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 "12345"]
+groups = [Group(i) for i in "123456789"]
 
 for i in groups:
     # mod1 + letter of group = switch to group
@@ -137,7 +156,7 @@ for i in groups:
     )
 
 layouts = [
-    layout.tile.Tile(),
+    layout.columns.Columns(border_width=1),
     layout.Max(),
     layout.floating.Floating(),
 ]
@@ -194,6 +213,7 @@ screens = [
                 widget.DF(),
                 widget.Sep(),
                 widget.Battery(),
+                widget.Battery(battery_name='BAT1'),
                 widget.Sep(),
                 widget.CurrentLayout(),
             ],
@@ -253,3 +273,5 @@ def execute_once(process):
 @hook.subscribe.startup
 def startup():
     execute_once('nm-applet')
+    execute_once('blueman-applet')
+    execute_once(['xscreensaver', '-nosplash'])

tmux.conf

@@ -13,45 +13,19 @@ bind-key C-a last-window
 bind c new-window -c "#{pane_current_path}"
 
 # basic settings
-set -g history-limit 30000
+set -g history-limit 3000
 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
@@ -64,8 +38,7 @@ set -g visual-activity on
 set -g visual-bell off
 
 # status bar
-bind-key z set -g status
+# set-option -g status-utf8 on
-set-option -g status-utf8 on
 set-option -g status-justify left
 set-option -g status-bg black
 set-option -g status-fg cyan
@@ -74,8 +47,7 @@ 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-window-option -g window-status-current-fg black
+set -g window-status-current-style bg=black,fg=green
-set-window-option -g window-status-current-bg green
 
 # clock
 set-window-option -g clock-mode-colour cyan

tmux.server.conf

@@ -6,52 +6,26 @@ setw -g aggressive-resize on
 # command prefix
 unbind C-b
 set -g prefix C-s
-bind s send-prefix
+bind a 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 30000
+set -g history-limit 3000
 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
@@ -64,8 +38,7 @@ set -g visual-activity on
 set -g visual-bell off
 
 # status bar
-bind-key z set -g status
+# set-option -g status-utf8 on
-set-option -g status-utf8 on
 set-option -g status-justify left
 set-option -g status-bg black
 set-option -g status-fg cyan
@@ -74,8 +47,7 @@ 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-window-option -g window-status-current-fg black
+set -g window-status-current-style bg=black,fg=green
-set-window-option -g window-status-current-bg green
 
 # clock
 set-window-option -g clock-mode-colour cyan

vimrc

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