schneider
/
dotfiles
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

update

master
Marcel Schneider 1 week ago
parent
87efd166c4
commit
56d7091963
No known key found for this signature in database GPG Key ID: 86027C59718EEE88
10 changed files with 129 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 104
      init.vim
  2. 16
      tmux/playerctl.sh
  3. 4
      tmux/theme.sh
  4. 17
      tmux/ytm-desktop.sh
  5. 13
      vim/ftplugin/javascript.vim
  6. 2
      vim/ftplugin/sql.vim
  7. 12
      vim/lua/neogenconfig.lua
  8. 2
      vim/lua/octoconfig.lua
  9. 4
      zsh/aliases.zsh
  10. 4
      zsh/custom.zsh

104
init.vim
View File

@ -22,21 +22,22 @@ Plug 'easymotion/vim-easymotion' " better motion with leader
Plug 'bling/vim-airline' " statusline
Plug 'w0rp/ale' " asynchronous linting engine
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 '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 '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 '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 'dpelle/vim-LanguageTool', { 'for': ['markdown', 'tex', 'plaintext', 'mail']} " LanguageTool bindings
"Plug 'dpelle/vim-LanguageTool', { 'for': ['markdown', 'tex', 'plaintext', 'mail']} " LanguageTool bindings
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...
Plug 'mfussenegger/nvim-dap', { 'for': ['typescript', 'javascript', 'python', 'rust'] }
Plug 'lbrayner/vim-rzip' " recursive zip support, needed for yarn pnp
Plug 'kkoomen/vim-doge', { 'do': { -> doge#install() } }
"Plug 'kkoomen/vim-doge', { 'do': { -> doge#install() } }
Plug 'danymat/neogen'
Plug 'taybart/b64.nvim' " en/decode base64 strings
" telescope. Needed for octo.nvim, might replace fzf
@ -44,45 +45,49 @@ Plug 'nvim-lua/popup.nvim'
Plug 'nvim-lua/plenary.nvim'
Plug 'nvim-telescope/telescope.nvim'
Plug 'nvim-telescope/telescope-fzf-native.nvim', { 'do': 'make' } " improve sort performance
Plug 'nvim-telescope/telescope-live-grep-args.nvim'
Plug 'pwntester/octo.nvim'
Plug 'github/copilot.vim'
Plug 'f-person/git-blame.nvim'
" {{{ CocPlugins
Plug 'neoclide/coc-json', { 'do': 'yarn install --frozen-lockfile' }
Plug 'neoclide/coc-snippets', { 'do': 'yarn install --frozen-lockfile' }
Plug 'neoclide/coc-tsserver', { 'do': 'yarn install --frozen-lockfile' }
Plug 'neoclide/coc-eslint', { 'do': 'yarn install --frozen-lockfile' }
Plug 'fannheyward/coc-rust-analyzer', { 'do': 'yarn install --frozen-lockfile' }
Plug 'neoclide/coc-css', { 'do': 'yarn install --frozen-lockfile' }
Plug 'neoclide/coc-vimtex', { 'do': 'yarn install --frozen-lockfile' }
Plug 'fannheyward/coc-texlab', { 'do': 'yarn install --frozen-lockfile' }
Plug 'neoclide/coc-html', { 'do': 'yarn install --frozen-lockfile' }
Plug 'neoclide/coc-yaml', { 'do': 'yarn install --frozen-lockfile' }
"Plug 'neoclide/coc-python', { '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' }
Plug 'neoclide/coc-json', { 'do': 'yarn install' }
Plug 'neoclide/coc-snippets', { 'do': 'yarn install' }
Plug 'neoclide/coc-tsserver', { 'do': 'yarn install' }
Plug 'neoclide/coc-eslint', { 'do': 'yarn install' }
Plug 'fannheyward/coc-rust-analyzer', { 'do': 'yarn install' }
Plug 'neoclide/coc-css', { 'do': 'yarn install' }
"Plug 'neoclide/coc-vimtex', { 'do': 'yarn install' }
"Plug 'fannheyward/coc-texlab', { 'do': 'yarn install' }
Plug 'neoclide/coc-html', { 'do': 'yarn install' }
Plug 'neoclide/coc-yaml', { 'do': 'yarn install' }
"Plug 'neoclide/coc-python', { 'do': 'yarn install' }
Plug 'fannheyward/coc-sql', { 'do': 'yarn install' }
Plug 'fannheyward/coc-markdownlint', { 'do': 'yarn install' }
Plug 'fannheyward/coc-pyright', { 'for': 'python', 'do': 'yarn install' }
Plug 'josa42/coc-sh', { 'do': 'yarn install' }
"Plug 'prisma/vim-prisma'
" }}}
" html / templates{{{
Plug 'mattn/emmet-vim', { 'for': ['jinja.html', 'html', 'php', 'gohtmltmpl', 'vue', 'markdown'] } " emmet support for vim - easily create markdup wth CSS-like syntax
Plug 'gregsexton/MatchTag', { 'for': ['html', 'php', 'gohtmltmpl', 'vue'] } " match tags in html, similar to paren support
Plug 'othree/html5.vim', { 'for': ['html', 'php', 'gohtmltmpl', 'vue'] } " html5 support
Plug 'lumiliet/vim-twig', { 'for': ['html'] } " twig syntax support
Plug 'Glench/Vim-Jinja2-Syntax', { 'for': ['html'] }
Plug 'jvanja/vim-bootstrap4-snippets', { 'for': ['html', 'blade'] }
Plug 'mattn/emmet-vim', { 'for': ['jinja.html', 'html', 'php', 'gohtmltmpl', 'vue', 'markdown', 'typescriptreact'] } " emmet support for vim - easily create markdup wth CSS-like syntax
Plug 'gregsexton/MatchTag', { 'for': ['html', 'php', 'gohtmltmpl', 'vue', 'typescriptreact'] } " match tags in html, similar to paren support
Plug 'othree/html5.vim', { 'for': ['html', 'php', 'gohtmltmpl', 'vue', 'typescriptreact'] } " html5 support
"Plug 'lumiliet/vim-twig', { 'for': ['html'] } " twig syntax support
"Plug 'Glench/Vim-Jinja2-Syntax', { 'for': ['html'] }
"Plug 'jvanja/vim-bootstrap4-snippets', { 'for': ['html', 'blade'] }
"}}}
" JavaScript{{{
Plug 'gavocanov/vim-js-indent', { 'for': [ 'javascript' ]} " JavaScript indent support
Plug 'posva/vim-vue', { 'for': [ 'javascript', 'html', 'vue' ] } " vue.js integration
"Plug 'posva/vim-vue', { 'for': [ 'javascript', 'html', 'vue' ] } " vue.js integration
Plug 'kevinoid/vim-jsonc'
"}}}
" LaTeX{{{
Plug 'lervag/vimtex', { 'for': 'tex' }
"Plug 'lervag/vimtex', { 'for': 'tex' }
"}}}
" Markdown{{{
@ -100,17 +105,17 @@ Plug 'cespare/vim-toml', { 'for': 'toml' }
"}}}
" C/C++{{{
Plug 'Rip-Rip/clang_complete', { 'for': ['c', 'cpp'], 'do': 'make install' }
let g:clang_library_path='/usr/lib/llvm-6.0/lib/libclang-6.0.so.1'
Plug 'rhysd/vim-clang-format', { 'for' : ['c', 'cpp', 'java'] }
Plug 'vim-scripts/DoxygenToolkit.vim', { 'for' : ['c', 'cpp'] }
"Plug 'Rip-Rip/clang_complete', { 'for': ['c', 'cpp'], 'do': 'make install' }
"let g:clang_library_path='/usr/lib/llvm-6.0/lib/libclang-6.0.so.1'
"Plug 'rhysd/vim-clang-format', { 'for' : ['c', 'cpp', 'java'] }
"Plug 'vim-scripts/DoxygenToolkit.vim', { 'for' : ['c', 'cpp'] }
"}}}
" PHP{{{
Plug 'captbaritone/better-indent-support-for-php-with-html', { 'for': 'php' }
Plug 'lumiliet/vim-twig', { 'for': [ 'php', 'html' ] } " Twig templates
Plug 'Rican7/php-doc-modded', { 'for': 'php' } " Automatic phpdoc comments
Plug 'jwalton512/vim-blade', { 'for': 'php' }
"Plug 'captbaritone/better-indent-support-for-php-with-html', { 'for': 'php' }
"Plug 'lumiliet/vim-twig', { 'for': [ 'php', 'html' ] } " Twig templates
"Plug 'Rican7/php-doc-modded', { 'for': 'php' } " Automatic phpdoc comments
"Plug 'jwalton512/vim-blade', { 'for': 'php' }
"}}}
" {{{ Python
@ -322,6 +327,8 @@ if exists('g:started_by_firenvim')
else
let g:airline_powerline_fonts = 1
end
let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
let g:airline#extensions#branch#displayed_head_limit = 10
" notational notes
let g:nv_search_paths = ['~/notes']
@ -360,8 +367,10 @@ autocmd FileType c,cpp,objc vnoremap <buffer><Leader>f :ClangFormat<CR>
"}}}
" Prettier
let g:prettier#config#tab_width = 4
let g:prettier#exec_cmd_async = 1
"let g:prettier#config#tab_width = 4
"let g:prettier#exec_cmd_async = 1
"let g:prettier#autoformat = 1
"let g:prettier#autoformat_require_pragma = 0
" Completion {{{
@ -499,6 +508,14 @@ imap <C-k> <Plug>(coc-snippets-expand-jump)
let g:neosnippet#snippets_directory = '~/.dotfiles/vim/neosnippets'
"}}}
lua <<EOF
require('gitblame').setup {
enabled = false,
delay = 0,
schedule_event = 'CursorHold',
}
EOF
" Treesitter {{{
lua <<EOF
require'nvim-treesitter.configs'.setup {
@ -507,6 +524,7 @@ require'nvim-treesitter.configs'.setup {
enable = true, -- false will disable the whole extension
disable = {}, -- list of language that will be disabled
},
tree_docs = { enable = true },
}
EOF
" }}}
@ -515,7 +533,8 @@ EOF
lua <<EOF
-- You dont need to set any of these options. These are the default ones. Only
-- the loading is important
require('telescope').setup {
local telescope = require("telescope")
telescope.setup {
extensions = {
fzf = {
fuzzy = true, -- false will only do exact matching
@ -529,6 +548,8 @@ require('telescope').setup {
-- To get fzf loaded and working with telescope, you need to call
-- load_extension, somewhere after setup function:
require('telescope').load_extension('fzf')
telescope.load_extension("live_grep_args")
vim.keymap.set("n", "<leader>fg", ":lua require('telescope').extensions.live_grep_args.live_grep_args()<CR>")
EOF
"}}}
@ -539,6 +560,9 @@ let g:doge_javascript_settings = {
let g:doge_doc_standard_python = 'google'
let g:doge_mapping_comment_jump_forward = '<c-k>'
" neogen settings
lua require('neogenconfig')
" Copilot settings
" accept on enter, if no suggestion is selected fallback to default
imap <silent><script><expr> <C-J> copilot#Accept("<CR>")

16
tmux/playerctl.sh
View File

@ -0,0 +1,16 @@
#!/bin/bash
set -eu
artist=$(playerctl metadata artist)
title=$(playerctl metadata title)
if [ -z "$artist" ] && [ -z "$title" ]; then
exit 0
else
# trim and ellipsize if longer than 30 characters
text="$artist - $title"
if [ ${#text} -gt 30 ]; then
text="${text:0:29}…"
fi
echo "$text"
fi

4
tmux/theme.sh
View File

@ -81,6 +81,8 @@ set-window-option -g clock-mode-colour $tm_color_active
#tm_battery="#(~/.dotfiles/bin/battery_indicator.sh)"
#tm_banshee="#[fg=$tm_color_music]#($HOME/.dotfiles/tmux/banshee.sh)"
tm_clementine="#[fg=$tm_color_music]#($HOME/.dotfiles/tmux/strawberry.sh)"
tm_playerctl="#[fg=$tm_color_music]#($HOME/.dotfiles/tmux/playerctl.sh)"
#tm_ytmdesktop="#[fg=$tm_color_music]#($HOME/.dotfiles/tmux/ytm-desktop.sh)"
tm_battery="#[fg=$tm_color_inactive]#(upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep percentage | awk '{print $2}')"
tm_date="#[fg=$tm_color_inactive] %R %d %b"
@ -88,4 +90,4 @@ tm_host="#[fg=$tm_color_feature,bold]#h"
tm_session_name="#[fg=$tm_color_feature,bold]$tm_icon #S"
set -g status-left $tm_session_name' '
set -g status-right $tm_clementine' '$tm_battery' '$tm_date' '$tm_host
set -g status-right $tm_playerctl' '$tm_clementine' '$tm_battery' '$tm_date' '$tm_host

17
tmux/ytm-desktop.sh
View File

@ -0,0 +1,17 @@
#!/usr/bin/env zsh
response=$(curl http://localhost:9863/api/v1/state --header 'Authorization:5c5b96bc669394aa187850daa3da53dd70928b2226f6e10ba4b4acc27f3743d48ccfb1389fa3e066263a6600ae88855c4b40cf7072770f06ab7efb852f9f65cf65892cdc933627099c84fefb5802999c31e8e3f240048fb5e39501e7e49cffa5beb3a58f8f6e89bf70a999adb280c5f011042ff2d9aee92315bbbabe68b996f5f5440ebf6762aa2ed4b7ae607a27e9d96d11f60f452091cc9f17e2ee47dd585ad5624aa43a06536c203cae71922dae615792c05ecc01d98110f30c2efa7efbda0263ecb21e418bf3b03f7a707d193b8273b7499a0a18042cfe1315d7a11acb985f0927f87cb7dcda54fb9dc09c56c989e1ec760739d89609ad1fbbe36a8f8642' --fail-with-body)
responseExitCode=$?
if [ $responseExitCode -ne 0 ]; then
cat /tmp/ytm-title
exit 0
fi
title=$(echo "$response" | jq -r '.video.author+ " - " + .video.title')
# if zero exit code the request worked and we save the title
if [ $responseExitCode -eq 0 ]; then
echo $title > /tmp/ytm-title
fi
cat /tmp/ytm-title

13
vim/ftplugin/javascript.vim
View File

@ -2,9 +2,10 @@ let b:ale_fixers = {}
let b:ale_fixers['javascript'] = ['prettier']
let b:ale_fixers['typescript'] = ['prettier']
let b:ale_fixers['json'] = ['eslint']
let b:ale_javascript_prettier_options = '--tab-width 4'
let b:ale_typescript_prettier_options = '--tab-width 4'
"let b:ale_javascript_prettier_options = '--tab-width 4'
"let b:ale_typescript_prettier_options = '--tab-width 4'
let b:ale_fixers['vue'] = ['prettier']
let b:ale_fixers['typescriptreact'] = ['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
@ -12,13 +13,13 @@ let b:ale_typescript_prettier_use_local_config = 1
" config for local 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_javascript_eslint_options = 'run eslint .'
let g:ale_typescript_eslint_use_global = 0
let g:ale_typescript_eslint_executable = 'yarn'
let g:ale_typescript_eslint_options = 'run eslint'
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:ale_json_eslint_options = 'run eslint .'
let g:jsdoc_formatter = 'tsdoc'
let g:jsdoc_lehre_path = '/home/schneider/.yarn/bin/lehre'

2
vim/ftplugin/sql.vim
View File

@ -0,0 +1,2 @@
let g:ale_fixers['sql'] = ['pgformatter']
let g:ale_fix_on_save=1

12
vim/lua/neogenconfig.lua
View File

@ -0,0 +1,12 @@
require('neogen').setup {
enabled = true,
languages = {
typescript = {
template = {
annotation_convention = "tsdoc" -- for a full list of annotation_conventions, see supported-languages below,
}
},
}
}
vim.keymap.set("n", "<Leader>d", ":lua require('neogen').generate()<CR>", opts)

2
vim/lua/octoconfig.lua
View File

@ -26,7 +26,7 @@ require"octo".setup({
field = "CREATED_AT", -- either COMMENTS, CREATED_AT or UPDATED_AT (https://docs.github.com/en/graphql/reference/enums#issueorderfield)
direction = "DESC" -- either DESC or ASC (https://docs.github.com/en/graphql/reference/enums#orderdirection)
},
always_select_remote_on_create = "false" -- always give prompt to select base remote repo when creating PRs
always_select_remote_on_create = false -- always give prompt to select base remote repo when creating PRs
},
file_panel = {
size = 10, -- changed files panel rows

4
zsh/aliases.zsh
View File

@ -61,6 +61,7 @@ alias killbg='kill ${${(v)jobstates##*:*:}%=*}'
alias dns='dig +noall +answer any '
alias standup='cd /home/schneider/git/ && git standup -m 8 -d 7 -s'
alias yesterday='cd /home/schneider/git/ && git standup -m 12 -d 1 -s'
alias fuu='fuck'
alias jswatch='/home/schneider/.yarn/bin/watch '
@ -74,3 +75,6 @@ alias madness='docker run --rm -it -v $PWD:/docs -p 3005:3000 dannyben/madness'
# {{{ yarn
alias yrb='yarn run build'
#}}}
alias c='clipcopy'
alias gd='git difftool '

4
zsh/custom.zsh
View File

@ -59,8 +59,10 @@ awscreds() {
s3bat() {
# create temporary folder
filename=$(basename -- "$1")
extension="${filename##*.}"
path_hash=$(echo -n "$1" | sha256sum | head -c 64)
tmpfile="/tmp/${path_hash}"
tmpfile="/tmp/${path_hash}.${extension}"
# check if tmpfile already exists
if [[ ! -a "$tmpfile" ]]; then
aws --profile backend s3 cp --request-payer requester $1 "$tmpfile"

Write Preview
Loading…
Cancel
Save