diff options
author | Yigit Sever | 2021-11-07 23:42:15 +0300 |
---|---|---|
committer | Yigit Sever | 2021-11-07 23:42:15 +0300 |
commit | 9fa9973c2d2f91cef7bdd26cb52064c13f4d682e (patch) | |
tree | 13aa64b09bc91e16f3dd3217bf3d647559af2cf9 /.config | |
parent | 9382166b5522a5d9e2d62e93e702b4d0886cedb4 (diff) | |
parent | fcb2237c01bcd2b7982bb844cea4cf9447f20d03 (diff) | |
download | dotfiles-9fa9973c2d2f91cef7bdd26cb52064c13f4d682e.tar.gz dotfiles-9fa9973c2d2f91cef7bdd26cb52064c13f4d682e.tar.bz2 dotfiles-9fa9973c2d2f91cef7bdd26cb52064c13f4d682e.zip |
Merge remote-tracking branch 'origin/main'
diffstat (limited to '.config')
-rw-r--r-- | .config/efm-langserver/config.yaml | 19 | ||||
-rw-r--r-- | .config/nvim/after/ftplugin/c.vim | 1 | ||||
-rw-r--r-- | .config/nvim/after/ftplugin/java.vim | 1 | ||||
-rw-r--r-- | .config/nvim/after/ftplugin/lua.vim | 1 | ||||
-rw-r--r-- | .config/nvim/after/ftplugin/markdown.vim | 1 | ||||
-rw-r--r-- | .config/nvim/after/ftplugin/python.vim | 4 | ||||
-rw-r--r-- | .config/nvim/after/ftplugin/rust.vim | 3 | ||||
-rw-r--r-- | .config/nvim/after/ftplugin/sh.vim | 1 | ||||
-rw-r--r-- | .config/nvim/after/ftplugin/tex.vim | 3 | ||||
-rw-r--r-- | .config/nvim/init.lua | 4 | ||||
-rw-r--r-- | .config/nvim/lua/plugin_settings.lua | 6 | ||||
-rw-r--r-- | .config/polybar/config##h.lowe | 1 |
12 files changed, 26 insertions, 19 deletions
diff --git a/.config/efm-langserver/config.yaml b/.config/efm-langserver/config.yaml new file mode 100644 index 0000000..40031b0 --- /dev/null +++ b/.config/efm-langserver/config.yaml | |||
@@ -0,0 +1,19 @@ | |||
1 | version: 2 | ||
2 | root-markers: | ||
3 | - .git/ | ||
4 | lint-debounce: 1s | ||
5 | tools: | ||
6 | sh-shellcheck: &sh-shellcheck | ||
7 | lint-command: 'shellcheck -f gcc -x' | ||
8 | lint-source: 'shellcheck' | ||
9 | lint-formats: | ||
10 | - '%f:%l:%c: %trror: %m' | ||
11 | - '%f:%l:%c: %tarning: %m' | ||
12 | - '%f:%l:%c: %tote: %m' | ||
13 | sh-shfmt: &sh-shfmt | ||
14 | format-command: 'shfmt -ci -s -bn -i 4 -sr' | ||
15 | format-stdin: true | ||
16 | languages: | ||
17 | sh: | ||
18 | - <<: *sh-shellcheck | ||
19 | - <<: *sh-shfmt | ||
diff --git a/.config/nvim/after/ftplugin/c.vim b/.config/nvim/after/ftplugin/c.vim index 49b3953..73fdd4b 100644 --- a/.config/nvim/after/ftplugin/c.vim +++ b/.config/nvim/after/ftplugin/c.vim | |||
@@ -1,4 +1,3 @@ | |||
1 | setlocal shiftwidth=8 | 1 | setlocal shiftwidth=8 |
2 | setlocal tabstop=8 | 2 | setlocal tabstop=8 |
3 | setlocal expandtab | 3 | setlocal expandtab |
4 | let b:ale_fixers = ['clang-format'] | ||
diff --git a/.config/nvim/after/ftplugin/java.vim b/.config/nvim/after/ftplugin/java.vim index 243baeb..5441d82 100644 --- a/.config/nvim/after/ftplugin/java.vim +++ b/.config/nvim/after/ftplugin/java.vim | |||
@@ -1,2 +1 @@ | |||
1 | let b:ale_linters = ['javac'] | ||
2 | let b:dispatch = 'javac %' | let b:dispatch = 'javac %' | |
diff --git a/.config/nvim/after/ftplugin/lua.vim b/.config/nvim/after/ftplugin/lua.vim deleted file mode 100644 index 5611ba5..0000000 --- a/.config/nvim/after/ftplugin/lua.vim +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | let b:ale_fixers = ['lua-format'] | ||
diff --git a/.config/nvim/after/ftplugin/markdown.vim b/.config/nvim/after/ftplugin/markdown.vim deleted file mode 100644 index 656bff4..0000000 --- a/.config/nvim/after/ftplugin/markdown.vim +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | let b:ale_linters = ['languagetool', 'proselint'] | ||
diff --git a/.config/nvim/after/ftplugin/python.vim b/.config/nvim/after/ftplugin/python.vim deleted file mode 100644 index 6bdca5e..0000000 --- a/.config/nvim/after/ftplugin/python.vim +++ /dev/null | |||
@@ -1,4 +0,0 @@ | |||
1 | let b:ale_fixers = ['black', 'isort'] | ||
2 | let b:ale_linters = ['flake8', 'bandit'] | ||
3 | let g:ale_python_flake8_options = '--max-line-length=88' | ||
4 | |||
diff --git a/.config/nvim/after/ftplugin/rust.vim b/.config/nvim/after/ftplugin/rust.vim index 40d2549..fb601d1 100644 --- a/.config/nvim/after/ftplugin/rust.vim +++ b/.config/nvim/after/ftplugin/rust.vim | |||
@@ -1,6 +1,3 @@ | |||
1 | let b:ale_fixers = ['rustfmt'] | ||
2 | let b:ale_linters = ['rls'] | ||
3 | |||
4 | setlocal tags=./rusty-tags.vi;/ | 1 | setlocal tags=./rusty-tags.vi;/ |
5 | 2 | ||
6 | autocmd BufWritePost *.rs :silent! exec "!rusty-tags vi --quiet --start-dir=" . expand('%:p:h') . "&" | redraw! | 3 | autocmd BufWritePost *.rs :silent! exec "!rusty-tags vi --quiet --start-dir=" . expand('%:p:h') . "&" | redraw! |
diff --git a/.config/nvim/after/ftplugin/sh.vim b/.config/nvim/after/ftplugin/sh.vim deleted file mode 100644 index 70f6252..0000000 --- a/.config/nvim/after/ftplugin/sh.vim +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | let b:ale_fixers = ['shfmt'] | ||
diff --git a/.config/nvim/after/ftplugin/tex.vim b/.config/nvim/after/ftplugin/tex.vim index 04307e4..27b002a 100644 --- a/.config/nvim/after/ftplugin/tex.vim +++ b/.config/nvim/after/ftplugin/tex.vim | |||
@@ -17,6 +17,3 @@ call sandwich#util#addlocal([{ | |||
17 | \ 'buns': ['\enquote{', '}'], | 17 | \ 'buns': ['\enquote{', '}'], |
18 | \ 'input': ['"'], | 18 | \ 'input': ['"'], |
19 | \ }]) | 19 | \ }]) |
20 | |||
21 | let b:ale_linters = ['chktex', 'texlab', 'proselint'] | ||
22 | let b:ale_fixers = ['latexindent'] | ||
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 4644f60..cd20fc3 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua | |||
@@ -11,10 +11,6 @@ | |||
11 | -- │ ▘▝▀▘▝▀▘│ | 11 | -- │ ▘▝▀▘▝▀▘│ |
12 | -- └────────┘ | 12 | -- └────────┘ |
13 | 13 | ||
14 | -- do not source the default filetype.vim | ||
15 | -- needed for filetype.nvim | ||
16 | vim.g.did_load_filetypes = 1 | ||
17 | |||
18 | require('plugins') | 14 | require('plugins') |
19 | require('settings') | 15 | require('settings') |
20 | require('plugin_settings') | 16 | require('plugin_settings') |
diff --git a/.config/nvim/lua/plugin_settings.lua b/.config/nvim/lua/plugin_settings.lua index ddc7371..277e196 100644 --- a/.config/nvim/lua/plugin_settings.lua +++ b/.config/nvim/lua/plugin_settings.lua | |||
@@ -353,6 +353,12 @@ for _, lsp in ipairs(servers) do | |||
353 | } | 353 | } |
354 | end | 354 | end |
355 | 355 | ||
356 | nvim_lsp['efm'].setup{ | ||
357 | on_attach = on_attach, | ||
358 | filetypes = { 'sh' }, | ||
359 | capabilities = require('cmp_nvim_lsp').update_capabilities(vim.lsp.protocol.make_client_capabilities()) | ||
360 | } | ||
361 | |||
356 | -- }}} nvim-lsp -- | 362 | -- }}} nvim-lsp -- |
357 | 363 | ||
358 | -- vista {{{ -- | 364 | -- vista {{{ -- |
diff --git a/.config/polybar/config##h.lowe b/.config/polybar/config##h.lowe index 8dd08f7..0dfb1b5 100644 --- a/.config/polybar/config##h.lowe +++ b/.config/polybar/config##h.lowe | |||
@@ -30,6 +30,7 @@ offset-x = 0 | |||
30 | offset-y = 0 | 30 | offset-y = 0 |
31 | radius = 0 | 31 | radius = 0 |
32 | fixed-center = true | 32 | fixed-center = true |
33 | enable-ipc = true | ||
33 | 34 | ||
34 | background = ${colors.background} | 35 | background = ${colors.background} |
35 | foreground = ${colors.foreground} | 36 | foreground = ${colors.foreground} |