update

awesome/rc.lua

@@ -606,7 +606,7 @@ autorun = true
 autorunApps =
 {
     "/home/schneider/bin/keepass",
-    "clementine"
+    "strawberry"
 }
 if autorun then
     awful.util.spawn("sleep 1")

init.vim

@@ -13,8 +13,6 @@ 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
 Plug 'tpope/vim-repeat' " repeat last command with .
-Plug 'tpope/vim-dadbod' " Modern database interface for Vim
-Plug 'tpope/vim-dispatch' " Needed for dadbod
 Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } " file tree
 Plug 'Xuyuanp/nerdtree-git-plugin', { 'on': 'NERDTreeToggle' }
 Plug 'scrooloose/nerdcommenter' " better commenting
@@ -26,16 +24,21 @@ Plug 'godlygeek/tabular' " Align text on symbols
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } " fuzzy file finder
 Plug 'junegunn/fzf.vim' " vim integration for fzf
 Plug 'airblade/vim-gitgutter' " git status in gutter column
-Plug 'radenling/vim-dispatch-neovim' " support for :Start command, needed in dadbod
 Plug 'lambdalisue/suda.vim' " As w!! did not work anymore in nvim
 Plug 'https://github.com/alok/notational-fzf-vim' " note taking
 Plug 'prettier/vim-prettier', { 'do': 'npm install' } " prettier integration
 Plug 'honza/vim-snippets' " Collection of Snippets, used by coc-snippet
-Plug 'ludovicchabant/vim-gutentags', { 'for': ['js', 'vue', 'php', 'python'] } " Keep tags in sync
-Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } }
+"Plug 'ludovicchabant/vim-gutentags', { 'for': ['js', 'vue', 'php', 'python'] } " Keep tags in sync
 Plug 'dpelle/vim-LanguageTool', { 'for': ['markdown', 'tex', 'plaintext', 'mail']} " LanguageTool bindings
-Plug 'msvechla/coc-jira-complete', { 'do': 'yarn install --frozen-lockfile' , 'for': 'gitcommit' }
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}  " We recommend updating the parsers on update
+Plug 'nvim-treesitter/nvim-treesitter-textobjects'
+Plug 'kyazdani42/nvim-web-devicons' " Icons...
+
+" telescope. Needed for octo.nvim, might replace fzf
+Plug 'nvim-lua/popup.nvim'
+Plug 'nvim-lua/plenary.nvim'
+Plug 'nvim-telescope/telescope.nvim'
+Plug 'pwntester/octo.nvim'
 
 " {{{ CocPlugins
 Plug 'neoclide/coc-json', { 'do': 'yarn install --frozen-lockfile' }
@@ -68,8 +71,9 @@ Plug 'jvanja/vim-bootstrap4-snippets', { 'for': ['html', 'blade'] }
 
 " JavaScript{{{
 Plug 'gavocanov/vim-js-indent', { 'for': [ 'javascript' ]} " JavaScript indent support
-Plug 'heavenshell/vim-jsdoc', { 'for': [ 'javascript', 'vue' ]} " Generate JSDoc comments
+Plug 'heavenshell/vim-jsdoc', { 'for': [ 'javascript', 'typescript', 'vue' ], 'do': 'make install'} " Generate JSDoc comments
 Plug 'posva/vim-vue', { 'for': [ 'javascript', 'html', 'vue' ] } " vue.js integration
+Plug 'kevinoid/vim-jsonc'
 "}}}
 
 " LaTeX{{{
@@ -167,6 +171,7 @@ set scrolloff=3             " lines of text around cursor
 set shell=$SHELL
 set cmdheight=1             " command bar height
 set title                   " set terminal title
+set mouse=nv
 
 set foldmethod=marker"      " folds are marked with {{{}}}
 
@@ -242,6 +247,9 @@ let g:nv_search_paths = ['~/notes']
 let g:nv_default_extension = '.md'
 let g:nv_main_directory = '~/notes'
 
+" Octo.nvim
+lua require('octo')
+
 " ALE {{{
 let g:airline#extensions#ale#enabled = 1
 "}}}
@@ -365,9 +373,9 @@ nmap <leader>ac  <Plug>(coc-codeaction)
 nmap <leader>qf  <Plug>(coc-fix-current)
 
 " Use <tab> for select selections ranges, needs server support, like: coc-tsserver, coc-python
-nmap <silent> <TAB> <Plug>(coc-range-select)
-xmap <silent> <TAB> <Plug>(coc-range-select)
-xmap <silent> <S-TAB> <Plug>(coc-range-select-backword)
+"nmap <silent> <TAB> <Plug>(coc-range-select)
+"xmap <silent> <TAB> <Plug>(coc-range-select)
+"xmap <silent> <S-TAB> <Plug>(coc-range-select-backward)
 
 " Use `:Format` to format current buffer
 command! -nargs=0 Format :call CocAction('format')

kitty/Solarized_Dark_-_Patched.conf

@@ -0,0 +1,21 @@
+background            #001e26
+foreground            #708183
+cursor                #708183
+selection_background  #002731
+color0                #002731
+color8                #465a61
+color1                #d01b24
+color9                #bd3612
+color2                #728905
+color10               #465a61
+color3                #a57705
+color11               #52676f
+color4                #2075c7
+color12               #708183
+color5                #c61b6e
+color13               #5856b9
+color6                #259185
+color14               #81908f
+color7                #e9e2cb
+color15               #fcf4dc
+selection_foreground #001e26

kitty/Solarized_Dark_Higher_Contrast.conf

@@ -0,0 +1,21 @@
+background            #001e26
+foreground            #9bc1c2
+cursor                #f34a00
+selection_background  #003747
+color0                #002731
+color8                #006388
+color1                #d01b24
+color9                #f4153b
+color2                #6bbe6c
+color10               #50ee84
+color3                #a57705
+color11               #b17e28
+color4                #2075c7
+color12               #178dc7
+color5                #c61b6e
+color13               #e14d8e
+color6                #259185
+color14               #00b29e
+color7                #e9e2cb
+color15               #fcf4dc
+selection_foreground #001e26

kitty/Solarized_Light.conf

@@ -0,0 +1,21 @@
+background            #fdf6e3
+foreground            #52676f
+cursor                #52676f
+selection_background  #e9e2cb
+color0 #e4e4e4
+color8 #ffffd7
+color1 #d70000
+color9 #d75f00
+color2 #5f8700
+color10 #585858
+color3 #af8700
+color11 #626262
+color4 #0087ff
+color12 #808080
+color5 #af005f
+color13 #5f5faf
+color6 #00afaf
+color14 #8a8a8a
+color7 #262626
+color15 #1c1c1c
+selection_foreground #fcf4dc

kitty/kitty.conf

@@ -24,6 +24,9 @@ color13                 #6c71c4
 color14                 #93a1a1
 color15                 #fdf6e3
 
+#include ./Solarized_Light.conf
+#include ./Solarized_Dark_Higher_Contrast.conf
+
 font_family      Fira Code
 font_size 12.0
 bold_font        auto

vim/ftplugin/javascript.vim

@@ -1,22 +1,34 @@
-" use prettier in ALE
 let b:ale_fixers = {}
-let b:ale_fixers['javascript'] = ['prettier']
-let b:ale_fixers['typescript'] = ['prettier']
-let b:ale_javascript_prettier_options = '--no-semi --single-quote'
-let b:ale_typescript_prettier_options = '--no-semi --single-quote'
+let b:ale_fixers['javascript'] = ['eslint']
+let b:ale_fixers['typescript'] = ['eslint']
+let b:ale_fixers['json'] = ['eslint']
+let b:ale_javascript_prettier_options = '--no-semi --single-quote --tab-width 2'
+let b:ale_typescript_prettier_options = '--no-semi --single-quote --tab-width 2'
 let b:ale_fixers['vue'] = ['prettier']
 let b:ale_vue_prettier_options = '--no-semi --single-quote'
 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
-let b:ale_linters=['']
+" 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:jsdoc_formatter = 'tsdoc'
 
 "autocmd bufwritepost *.js silent !standard --fix %
 setlocal wildignore+=node_modules
 
-setlocal tabstop=2
-setlocal shiftwidth=2
+setlocal tabstop=4
+setlocal shiftwidth=4
 
 " Create jsdoc with ,h
 nnoremap <leader>h :JsDoc<CR>
 nnoremap <F8> Biawait <ESC>A
+nnoremap <F2> :Prettier<CR>

vim/ftplugin/json.vim

@@ -1,2 +1,3 @@
 let g:ale_fixers['json'] = ['prettier']
-let g:ale_fix_on_save = 1
+let g:ale_fix_on_save = 0
+let b:ale_json_prettier_options = '--no-semi --single-quote --tab-width 4'

vim/ftplugin/xml.vim

@@ -0,0 +1,3 @@
+let b:ale_fixers = {}
+let b:ale_fixers['xml'] = ['xmllint']
+let b:ale_fix_on_save = 1

vim/lua/octo.lua

@@ -0,0 +1,128 @@
+-- Config file for octo.nvim
+
+require"octo".setup({
+    default_remote = {"upstream", "origin"}; -- order to try remotes
+    reaction_viewer_hint_icon = "";         -- marker for user reactions
+    user_icon = " ";                        -- user icon
+    timeline_marker = "";                   -- timeline marker
+    timeline_indent = "2";                   -- timeline indentation
+    right_bubble_delimiter = "";            -- Bubble delimiter
+    left_bubble_delimiter = "";             -- Bubble delimiter
+    github_hostname = "";                    -- GitHub Enterprise host
+    snippet_context_lines = 4;               -- number or lines around commented lines
+    file_panel = {
+        size = 10,                             -- changed files panel rows
+        use_icons = true                       -- use web-devicons in file panel
+    },
+    mappings = {
+        issue = {
+            close_issue = "<space>ic",           -- close issue
+            reopen_issue = "<space>io",          -- reopen issue
+            list_issues = "<space>il",           -- list open issues on same repo
+            reload = "<C-r>",                    -- reload issue
+            open_in_browser = "<C-b>",           -- open issue in browser
+            copy_url = "<C-y>",                  -- copy url to system clipboard
+            add_assignee = "<space>aa",          -- add assignee
+            remove_assignee = "<space>ad",       -- remove assignee
+            create_label = "<space>lc",          -- create label
+            add_label = "<space>la",             -- add label
+            remove_label = "<space>ld",          -- remove label
+            goto_issue = "<space>gi",            -- navigate to a local repo issue
+            add_comment = "<space>ca",           -- add comment
+            delete_comment = "<space>cd",        -- delete comment
+            next_comment = "]c",                 -- go to next comment
+            prev_comment = "[c",                 -- go to previous comment
+            react_hooray = "<space>rp",          -- add/remove 🎉 reaction
+            react_heart = "<space>rh",           -- add/remove ❤️ reaction
+            react_eyes = "<space>re",            -- add/remove 👀 reaction
+            react_thumbs_up = "<space>r+",       -- add/remove 👍 reaction
+            react_thumbs_down = "<space>r-",     -- add/remove 👎 reaction
+            react_rocket = "<space>rr",          -- add/remove 🚀 reaction
+            react_laugh = "<space>rl",           -- add/remove 😄 reaction
+            react_confused = "<space>rc",        -- add/remove 😕 reaction
+        },
+        pull_request = {
+            checkout_pr = "<space>po",           -- checkout PR
+            merge_pr = "<space>pm",              -- merge PR
+            list_commits = "<space>pc",          -- list PR commits
+            list_changed_files = "<space>pf",    -- list PR changed files
+            show_pr_diff = "<space>pd",          -- show PR diff
+            add_reviewer = "<space>va",          -- add reviewer
+            remove_reviewer = "<space>vd",       -- remove reviewer request
+            close_issue = "<space>ic",           -- close PR
+            reopen_issue = "<space>io",          -- reopen PR
+            list_issues = "<space>il",           -- list open issues on same repo
+            reload = "<C-r>",                    -- reload PR
+            open_in_browser = "<C-b>",           -- open PR in browser
+            copy_url = "<C-y>",                  -- copy url to system clipboard
+            add_assignee = "<space>aa",          -- add assignee
+            remove_assignee = "<space>ad",       -- remove assignee
+            create_label = "<space>lc",          -- create label
+            add_label = "<space>la",             -- add label
+            remove_label = "<space>ld",          -- remove label
+            goto_issue = "<space>gi",            -- navigate to a local repo issue
+            add_comment = "<space>ca",           -- add comment
+            delete_comment = "<space>cd",        -- delete comment
+            next_comment = "]c",                 -- go to next comment
+            prev_comment = "[c",                 -- go to previous comment
+            react_hooray = "<space>rp",          -- add/remove 🎉 reaction
+            react_heart = "<space>rh",           -- add/remove ❤️ reaction
+            react_eyes = "<space>re",            -- add/remove 👀 reaction
+            react_thumbs_up = "<space>r+",       -- add/remove 👍 reaction
+            react_thumbs_down = "<space>r-",     -- add/remove 👎 reaction
+            react_rocket = "<space>rr",          -- add/remove 🚀 reaction
+            react_laugh = "<space>rl",           -- add/remove 😄 reaction
+            react_confused = "<space>rc",        -- add/remove 😕 reaction
+        },
+        review_thread = {
+            goto_issue = "<space>gi",            -- navigate to a local repo issue
+            add_comment = "<space>ca",           -- add comment
+            add_suggestion = "<space>sa",        -- add suggestion
+            delete_comment = "<space>cd",        -- delete comment
+            next_comment = "]c",                 -- go to next comment
+            prev_comment = "[c",                 -- go to previous comment
+            select_next_entry = "]q",            -- move to previous changed file
+            select_prev_entry = "[q",            -- move to next changed file
+            close_review_tab = "<C-c>",          -- close review tab
+            react_hooray = "<space>rp",          -- add/remove 🎉 reaction
+            react_heart = "<space>rh",           -- add/remove ❤️ reaction
+            react_eyes = "<space>re",            -- add/remove 👀 reaction
+            react_thumbs_up = "<space>r+",       -- add/remove 👍 reaction
+            react_thumbs_down = "<space>r-",     -- add/remove 👎 reaction
+            react_rocket = "<space>rr",          -- add/remove 🚀 reaction
+            react_laugh = "<space>rl",           -- add/remove 😄 reaction
+            react_confused = "<space>rc",        -- add/remove 😕 reaction
+        },
+        submit_win = {
+            approve_review = "<C-a>",            -- approve review
+            comment_review = "<C-m>",            -- comment review
+            request_changes = "<C-r>",           -- request changes review
+            close_review_tab = "<C-c>",          -- close review tab
+        },
+        review_diff = {
+            add_review_comment = "<space>ca",    -- add a new review comment
+            add_review_suggestion = "<space>sa", -- add a new review suggestion
+            focus_files = "<leader>e",           -- move focus to changed file panel
+            toggle_files = "<leader>b",          -- hide/show changed files panel
+            next_thread = "]t",                  -- move to next thread
+            prev_thread = "[t",                  -- move to previous thread
+            select_next_entry = "]q",            -- move to previous changed file
+            select_prev_entry = "[q",            -- move to next changed file
+            close_review_tab = "<C-c>",          -- close review tab
+            toggle_viewed = "<leader><space>",   -- toggle viewer viewed state
+        },
+        file_panel = {
+            next_entry = "j",                    -- move to next changed file
+            prev_entry = "k",                    -- move to previous changed file
+            select_entry = "<cr>",               -- show selected changed file diffs
+            refresh_files = "R",                 -- refresh changed files panel
+            focus_files = "<leader>e",           -- move focus to changed file panel
+            toggle_files = "<leader>b",          -- hide/show changed files panel
+            select_next_entry = "]q",            -- move to previous changed file
+            select_prev_entry = "[q",            -- move to next changed file
+            close_review_tab = "<C-c>",          -- close review tab
+            toggle_viewed = "<leader><space>",   -- toggle viewer viewed state
+        }
+    }
+})
+

vim/lua/treesitter.textobj.lua

@@ -0,0 +1,26 @@
+require'nvim-treesitter.configs'.setup {
+  textobjects = {
+    select = {
+      enable = true,
+
+      -- Automatically jump forward to textobj, similar to targets.vim
+      lookahead = true,
+
+      keymaps = {
+        -- You can use the capture groups defined in textobjects.scm
+        ["af"] = "@function.outer",
+        ["if"] = "@function.inner",
+        ["ac"] = "@class.outer",
+        ["ic"] = "@class.inner",
+
+        -- Or you can define your own textobjects like this
+        --["iF"] = {
+          --python = "(function_definition) @function",
+          --cpp = "(function_definition) @function",
+          --c = "(function_definition) @function",
+          --java = "(method_declaration) @function",
+        --},
+      },
+    },
+  },
+}

zsh/aliases.zsh

@@ -17,6 +17,7 @@ alias gc='git commit '
 alias ga='git add '
 alias gc1='git clone --depth 1 '
 alias gco='git checkout '
+alias gpt='git push && git push --tags'
 #}}}
 
 alias mem='cd /dev/shm'
@@ -24,6 +25,7 @@ alias svim='sudoedit '
 alias down='http --download '
 
 alias p3='python3 '
+alias py='/usr/bin/env python3 '
 
 alias -g L='| less'
 alias -g G='| grep'

zsh/custom-agnoster.zsh-theme

@@ -29,6 +29,40 @@
 # jobs are running in this shell will all be displayed automatically when
 # appropriate.
 
+
+##### prezto/prompt ######
+
+#
+# Prompt setup function commonly used by prompt themes.
+#
+# Authors:
+#   Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+
+prompt_pwd() {
+
+setopt localoptions extendedglob
+
+local current_pwd="${PWD/#$HOME/~}"
+local ret_directory
+
+if [[ "$current_pwd" == (#m)[/~] ]]; then
+  ret_directory="$MATCH"
+  unset MATCH
+elif zstyle -m ':prezto:module:prompt' pwd-length 'full'; then
+  ret_directory=${PWD}
+elif zstyle -m ':prezto:module:prompt' pwd-length 'long'; then
+  ret_directory=${current_pwd}
+else
+  ret_directory="${${${${(@j:/:M)${(@s:/:)current_pwd}##.#?}:h}%/}//\%/%%}/${${current_pwd:t}//\%/%%}"
+fi
+
+unset current_pwd
+
+print "$ret_directory"
+}
+################################
+
 ### Segment drawing
 # A few utility functions to make it easy and re-usable to draw segmented prompts