From 2cc2ade083a4110afe3dedc1760f935e82091259 Mon Sep 17 00:00:00 2001
From: Marcel Schneider <m.schneider@agvolution.com>
Date: Fri, 2 Sep 2022 08:14:11 +0200
Subject: [PATCH] Add work related settings

---
 init.vim                    |  5 +++++
 tmux/tmux.conf.symlink      |  2 +-
 vim/ftplugin/javascript.vim | 18 +++++++++---------
 vim/ftplugin/python.vim     |  2 ++
 zsh/aliases.zsh             | 12 +++++++++++-
 5 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/init.vim b/init.vim
index 00ecb82..2d3d705 100644
--- a/init.vim
+++ b/init.vim
@@ -9,6 +9,7 @@ endif
 call plug#begin()
 
 Plug 'tpope/vim-fugitive' " Git integration
+Plug 'tpope/vim-rhubarb' " Github integration
 Plug 'tpope/vim-sensible' " Defaults everyone can agree on
 Plug 'tpope/vim-surround' " better handling of surrounding markers
 Plug 'tpope/vim-ragtag' " Enhancement of surround for html
@@ -45,6 +46,8 @@ Plug 'nvim-telescope/telescope.nvim'
 Plug 'nvim-telescope/telescope-fzf-native.nvim', { 'do': 'make' } " improve sort performance
 Plug 'pwntester/octo.nvim'
 
+"Plug 'github/copilot.vim'
+
 " {{{ CocPlugins
 Plug 'neoclide/coc-json', { 'do': 'yarn install --frozen-lockfile' }
 Plug 'neoclide/coc-snippets', { 'do': 'yarn install --frozen-lockfile' }
@@ -60,6 +63,7 @@ Plug 'neoclide/coc-yaml', { 'do': 'yarn install --frozen-lockfile' }
 Plug 'fannheyward/coc-sql', { 'do': 'yarn install --frozen-lockfile' }
 Plug 'fannheyward/coc-markdownlint', { 'do': 'yarn install --frozen-lockfile' }
 Plug 'fannheyward/coc-pyright', { 'for': 'python', 'do': 'yarn install --frozen-lockfile' }
+Plug 'josa42/coc-sh', { 'do': 'yarn install --frozen-lockfile' }
 " }}}
 
 " html / templates{{{
@@ -505,5 +509,6 @@ let g:doge_javascript_settings = {
 \  'omit_redundant_param_types': 1,
 \}
 let g:doge_doc_standard_python = 'google'
+let g:doge_mapping_comment_jump_forward = '<c-k>'
 
 "}}}
diff --git a/tmux/tmux.conf.symlink b/tmux/tmux.conf.symlink
index 93b3989..ef36f08 100644
--- a/tmux/tmux.conf.symlink
+++ b/tmux/tmux.conf.symlink
@@ -106,4 +106,4 @@ bind p paste-buffer
 ##############################
 
 source ~/.dotfiles/tmux/theme.sh
-
+run-shell ~/git/build/tmux-yank/yank.tmux
diff --git a/vim/ftplugin/javascript.vim b/vim/ftplugin/javascript.vim
index 84f42f4..0c19ac7 100644
--- a/vim/ftplugin/javascript.vim
+++ b/vim/ftplugin/javascript.vim
@@ -10,15 +10,15 @@ let b:ale_fix_on_save = 1
 let b:ale_javascript_prettier_use_local_config = 1
 let b:ale_typescript_prettier_use_local_config = 1
 " config for local eslint
-g:ale_javascript_eslint_use_global = 1
-g:ale_javascript_eslint_executable = 'yarn'
-g:ale_javascript_eslint_options = 'run eslint'
-g:ale_typescript_eslint_use_global = 1
-g:ale_typescript_eslint_executable = 'yarn'
-g:ale_typescript_eslint_options = 'run eslint'
-g:ale_json_eslint_use_global = 1
-g:ale_json_eslint_executable = 'yarn'
-g:ale_json_eslint_options = 'run eslint'
+let g:ale_javascript_eslint_use_global = 1
+let g:ale_javascript_eslint_executable = 'yarn'
+let g:ale_javascript_eslint_options = 'run eslint'
+let g:ale_typescript_eslint_use_global = 1
+let g:ale_typescript_eslint_executable = 'yarn'
+let g:ale_typescript_eslint_options = 'run eslint'
+let g:ale_json_eslint_use_global = 1
+let g:ale_json_eslint_executable = 'yarn'
+let g:ale_json_eslint_options = 'run eslint'
 
 let g:jsdoc_formatter = 'tsdoc'
 let g:jsdoc_lehre_path = '/home/schneider/.yarn/bin/lehre'
diff --git a/vim/ftplugin/python.vim b/vim/ftplugin/python.vim
index 15b5c77..ba2e8f5 100644
--- a/vim/ftplugin/python.vim
+++ b/vim/ftplugin/python.vim
@@ -10,6 +10,8 @@ let g:ale_fixers['python'] = ['black']
 let g:ale_fix_on_save = 1
 let g:pymode_run_bind = '<F5>'
 let g:pydocstring_formatter = 'google'
+let g:ale_virtualenv_dir_names = []
+let b:ale_python_pylint_executable = 'python $(which pylint)'
 
 " Make a f-string from normal string
 nmap <F8> F"if<ESC>A
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 2b01d09..ea2c1e6 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -1,6 +1,6 @@
 # in case its not already thera
 alias la='ls -la'
-alias sagu='sudo apt-fast update && sudo apt-fast dist-upgrade'
+alias sagu='sudo apt-fast update && sudo apt-fast dist-upgrade && flatpak update'
 alias sagi='sudo apt-fast install '
 alias notes='vim "+:NV"'
 alias slog='sudo less /var/log/syslog'
@@ -63,3 +63,13 @@ alias standup='cd /home/schneider/git/ && git standup -m 8 -d 7 -s'
 alias fuu='fuck'
 
 alias jswatch='/home/schneider/.yarn/bin/watch '
+
+function ls3() {
+    AWS_ACCESS_KEY_ID="S3RVER" AWS_SECRET_ACCESS_KEY="S3RVER" aws --endpoint-url http://0.0.0.0:4568 s3 $@
+}
+alias backend='aws --profile backend'
+alias madness='docker run --rm -it -v $PWD:/docs -p 3005:3000 dannyben/madness'
+
+# {{{ yarn
+alias yrb='yarn run build'
+#}}}