aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--nvim_alt/autocmd.vim3
-rw-r--r--nvim_alt/colorscheme.vim5
-rw-r--r--nvim_alt/completion.lua21
-rw-r--r--nvim_alt/ftplugin/c.vim9
-rw-r--r--nvim_alt/ftplugin/html.vim15
-rw-r--r--nvim_alt/ftplugin/markdown.vim3
-rw-r--r--nvim_alt/ftplugin/typescript.vim11
-rw-r--r--nvim_alt/ftplugin/vim.vim6
-rw-r--r--nvim_alt/init.vim8
-rw-r--r--nvim_alt/keymaps.vim84
-rw-r--r--nvim_alt/lsp.lua60
-rw-r--r--nvim_alt/plugins.vim153
-rw-r--r--nvim_alt/settings.vim82
-rw-r--r--nvim_alt/statusline.vim36
-rw-r--r--tmuxp/pim.yaml22
15 files changed, 0 insertions, 518 deletions
diff --git a/nvim_alt/autocmd.vim b/nvim_alt/autocmd.vim
deleted file mode 100644
index fb718c8..0000000
--- a/nvim_alt/autocmd.vim
+++ /dev/null
@@ -1,3 +0,0 @@
1"autocmd FileType html,css EmmetInstall
2"autocmd VimEnter * NERDTree | wincmd p
3"autocmd BufEnter * if winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() | quit | endif
diff --git a/nvim_alt/colorscheme.vim b/nvim_alt/colorscheme.vim
deleted file mode 100644
index 4484210..0000000
--- a/nvim_alt/colorscheme.vim
+++ /dev/null
@@ -1,5 +0,0 @@
1" Farbschema
2set termguicolors
3set background=dark
4colorscheme codedark
5
diff --git a/nvim_alt/completion.lua b/nvim_alt/completion.lua
deleted file mode 100644
index 747607e..0000000
--- a/nvim_alt/completion.lua
+++ /dev/null
@@ -1,21 +0,0 @@
1vim.api.nvim_create_autocmd("LspAttach", {
2 callback = function(ev)
3 local client = vim.lsp.get_client_by_id(ev.data.client_id)
4 -- if client and client:supports_method("textDocument/completion") then
5 -- vim.lsp.completion.enable(true, client.id, ev.buf, { autotrigger = true })
6 -- end
7
8 if client and not client:supports_method('textDocument/willSaveWaitUntil') and
9 client:supports_method('textDocument/formatting') then
10 vim.api.nvim_create_autocmd('BufWritePre', {
11 group = vim.api.nvim_create_augroup('my.lsp', { clear = false }),
12 buffer = ev.buf,
13 callback = function()
14 vim.lsp.buf.format({ bufnr = ev.buf, id = client.id, timeout_ms = 1000 })
15 end,
16 })
17 end
18 end,
19})
20
21vim.o.winborder = 'rounded'
diff --git a/nvim_alt/ftplugin/c.vim b/nvim_alt/ftplugin/c.vim
deleted file mode 100644
index 3fc55eb..0000000
--- a/nvim_alt/ftplugin/c.vim
+++ /dev/null
@@ -1,9 +0,0 @@
1setlocal cinoptions=:0,p0,t0
2setlocal cinwords=if,else,while,do,for,switch,case
3setlocal formatoptions=tcqr
4setlocal cindent
5setlocal indentexpr=nvim_treesitter#indent()
6
7setlocal foldenable
8setlocal foldmethod=expr
9setlocal foldexpr=nvim_treesitter#foldexpr()
diff --git a/nvim_alt/ftplugin/html.vim b/nvim_alt/ftplugin/html.vim
deleted file mode 100644
index fe513b6..0000000
--- a/nvim_alt/ftplugin/html.vim
+++ /dev/null
@@ -1,15 +0,0 @@
1setlocal tabstop=2
2setlocal softtabstop=2
3setlocal shiftwidth=2
4setlocal smarttab
5setlocal expandtab
6setlocal autoindent
7
8setlocal foldenable
9setlocal foldmethod=expr
10setlocal foldexpr=nvim_treesitter#foldexpr()
11
12let g:html_indent_script1='inc'
13let g:html_indent_style1='inc'
14let g:html_indent_autotags='html'
15let g:html_indent_inctags='head,body'
diff --git a/nvim_alt/ftplugin/markdown.vim b/nvim_alt/ftplugin/markdown.vim
deleted file mode 100644
index e5f14dc..0000000
--- a/nvim_alt/ftplugin/markdown.vim
+++ /dev/null
@@ -1,3 +0,0 @@
1setlocal wrap
2setlocal linebreak
3setlocal spell
diff --git a/nvim_alt/ftplugin/typescript.vim b/nvim_alt/ftplugin/typescript.vim
deleted file mode 100644
index 5f56854..0000000
--- a/nvim_alt/ftplugin/typescript.vim
+++ /dev/null
@@ -1,11 +0,0 @@
1setlocal tabstop=2
2setlocal softtabstop=2
3setlocal shiftwidth=2
4setlocal smarttab
5setlocal expandtab
6setlocal autoindent
7
8setlocal foldenable
9setlocal foldmethod=expr
10setlocal foldexpr=nvim_treesitter#foldexpr()
11
diff --git a/nvim_alt/ftplugin/vim.vim b/nvim_alt/ftplugin/vim.vim
deleted file mode 100644
index 1054984..0000000
--- a/nvim_alt/ftplugin/vim.vim
+++ /dev/null
@@ -1,6 +0,0 @@
1setlocal tabstop=2
2setlocal softtabstop=2
3setlocal shiftwidth=2
4setlocal smarttab
5setlocal expandtab
6setlocal autoindent
diff --git a/nvim_alt/init.vim b/nvim_alt/init.vim
deleted file mode 100644
index 96ecac9..0000000
--- a/nvim_alt/init.vim
+++ /dev/null
@@ -1,8 +0,0 @@
1source $HOME/.config/nvim/settings.vim
2source $HOME/.config/nvim/statusline.vim
3source $HOME/.config/nvim/autocmd.vim
4source $HOME/.config/nvim/keymaps.vim
5source $HOME/.config/nvim/plugins.vim
6source $HOME/.config/nvim/colorscheme.vim
7source $HOME/.config/nvim/lsp.lua
8source $HOME/.config/nvim/completion.lua
diff --git a/nvim_alt/keymaps.vim b/nvim_alt/keymaps.vim
deleted file mode 100644
index f03f451..0000000
--- a/nvim_alt/keymaps.vim
+++ /dev/null
@@ -1,84 +0,0 @@
1let mapleader=','
2
3" mit <CTRL>+<Page*> durch die Tabs schalten
4nnoremap <silent> <C-PageUp> :tabprevious<CR>
5nnoremap <silent> <C-PageDown> :tabnext<CR>
6
7" besseres Verhalten von <PageUp und <PageDown>
8map <silent> <PageUp> 1000<C-U>
9map <silent> <PageDown> 1000<C-D>
10imap <silent> <PageUp> <C-O>1000<C-U>
11imap <silent> <PageDown> <C-O>1000<C-D>
12
13" Verschiebe Zeilen mit ALT+j oder ALT+k
14nnoremap <A-j> :m .+1<CR>==
15nnoremap <A-k> :m .-2<CR>==
16inoremap <A-j> <Esc>:m .+1<CR>==gi
17inoremap <A-k> <Esc>:m .-2<CR>==gi
18vnoremap <A-j> :m '>+1<CR>gv=gv
19vnoremap <A-k> :m '<-2<CR>gv=gv
20
21" Absatzweises springen auf einer deutsche Tastatur
22nnoremap ö }
23nnoremap ä {
24xnoremap ö }
25xnoremap ä {
26onoremap ö }
27onoremap ä {
28
29" besseres Verhalten in umbrochenen Texten
30map j gj
31map k gk
32"map $ g$
33"map 0 g0
34
35" Funktionstasten
36nnoremap <silent> <F4> :NvimTreeToggle<CR>
37nnoremap <silent> <F5> :make<CR>
38
39" Telescope
40nnoremap <leader>ff <cmd>Telescope find_files<cr>
41nnoremap <leader>fg <cmd>Telescope live_grep<cr>
42nnoremap <leader>fb <cmd>Telescope buffers<cr>
43nnoremap <leader>fh <cmd>Telescope help_tags<cr>
44
45" LSP Keybindings
46lua << EOF
47vim.keymap.set("i", "<c-space>", function() vim.lsp.completion.get() end)
48
49-- map <cr> to <c-y> when the popup menu is visible
50vim.keymap.set("i", "<cr>", "pumvisible() ? '<c-y>' : '<cr>'", { expr = true })
51
52--[[
53vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
54vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
55vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
56vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
57
58vim.api.nvim_create_autocmd('LspAttach', {
59 group = vim.api.nvim_create_augroup('UserLspConfig', {}),
60 callback = function(ev)
61 vim.bo[ev.buf].omnifunc = 'v:lua.vim.lsp.omnifunc'
62
63 local opts = { buffer = ev.buf }
64 vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, opts)
65 vim.keymap.set('n', 'gd', vim.lsp.buf.definition, opts)
66 vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
67 vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, opts)
68 vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, opts)
69 vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, opts)
70 vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, opts)
71 vim.keymap.set('n', '<space>wl', function()
72 print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
73 end, opts)
74 vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
75 vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
76 vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, opts)
77 vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
78 vim.keymap.set('n', '<space>f', function()
79 vim.lsp.buf.format { async = true }
80 end, opts)
81 end,
82})
83]]
84EOF
diff --git a/nvim_alt/lsp.lua b/nvim_alt/lsp.lua
deleted file mode 100644
index fbb5066..0000000
--- a/nvim_alt/lsp.lua
+++ /dev/null
@@ -1,60 +0,0 @@
1vim.lsp.config.clangd = {
2 cmd = { '/usr/local/bin/clangd19', '--background-index', '--function-arg-placeholders' },
3 root_markers = { 'compile_commands.json', 'compile_flags.txt' },
4 filetypes = { 'c', 'cpp' },
5}
6
7vim.lsp.config.lua_ls = {
8 settings = {
9 Lua = {
10 runtime = {
11 version = 'LuaJIT',
12 },
13 diagnostics = {
14 globals = { 'vim' },
15 },
16 workspace = {
17 library = vim.api.nvim_get_runtime_file("", true),
18 },
19 telemetry = {
20 enable = false,
21 },
22 },
23 }
24}
25
26local project_library_path = "/home/t/.local/lib/node_modules"
27local ng_cmd = { "ngserver", "--stdio", "--tsProbeLocations", project_library_path, "--ngProbeLocations",
28 project_library_path }
29
30vim.lsp.config.angularls = {
31 cmd = ng_cmd,
32 on_new_config = function(new_config, new_root_dir)
33 new_config.cmd = ng_cmd
34 end,
35}
36
37vim.lsp.config.markdown_oxide = {
38 on_attach = on_attach,
39 cmd = {
40 'markdown-oxide'
41 }
42}
43
44vim.lsp.enable({
45 'clangd',
46 'lua_ls',
47 'angularls',
48 'cssls',
49 'html',
50 'ts_ls',
51 'vimls',
52 'jsonls',
53 'gopls',
54 'markdown_oxid'
55})
56
57vim.diagnostic.config({
58 virtual_text = true,
59 -- virtual_lines = true
60})
diff --git a/nvim_alt/plugins.vim b/nvim_alt/plugins.vim
deleted file mode 100644
index 4277d35..0000000
--- a/nvim_alt/plugins.vim
+++ /dev/null
@@ -1,153 +0,0 @@
1" automatische Installation von vim-plug
2let data_dir = has('nvim') ? stdpath('data') . '/site' : '~/.vim'
3if empty(glob(data_dir . '/autoload/plug.vim'))
4 silent execute '!curl -fLo '.data_dir.'/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
5endif
6
7" vim-plug
8call plug#begin()
9 Plug 'neovim/nvim-lspconfig'
10
11 Plug 'nvim-tree/nvim-web-devicons'
12 Plug 'nvim-tree/nvim-tree.lua'
13
14 Plug 'romainl/vim-cool'
15
16 Plug 'tpope/vim-repeat'
17 Plug 'tpope/vim-surround'
18
19 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
20
21 Plug 'windwp/nvim-autopairs'
22 Plug 'windwp/nvim-ts-autotag'
23
24 Plug 'lewis6991/gitsigns.nvim'
25
26 Plug 'RRethy/vim-illuminate'
27
28 " Telescope
29 Plug 'nvim-lua/plenary.nvim'
30 Plug 'nvim-telescope/telescope.nvim'
31
32 " Colorscheme
33 Plug 'tomasiser/vim-code-dark'
34call plug#end()
35
36lua << EOF
37
38-- nvim-tree
39vim.g.loaded_netrw = 1
40vim.g.loaded_netrwPlugin = 1
41
42require("nvim-tree").setup({
43 sort = {
44 sorter = "case_sensitive",
45 },
46 view = {
47 adaptive_size = true,
48 },
49 renderer = {
50 group_empty = true,
51 indent_markers = {
52 enable = true,
53 },
54 },
55 filters = {
56 dotfiles = true,
57 },
58})
59
60-- require('nvim-treesitter.configs').setup {
61-- ensure_installed = { "c", "cpp", "lua", "vim", "vimdoc", "typescript", "python", "html", "go", "gomod", "gosum" },
62-- sync_install = false,
63-- auto_install = false,
64-- highlight = {
65-- enable = true,
66-- additional_vim_regex_highlighting = true,
67-- },
68-- indent = {
69-- enable = true,
70-- }
71-- }
72
73require'nvim-treesitter'.install { "c", "cpp", "lua", "vim", "vimdoc", "typescript", "python", "html", "go", "gomod", "gosum" }
74
75require('nvim-autopairs').setup()
76
77require('nvim-ts-autotag').setup()
78
79require('gitsigns').setup()
80
81require('illuminate').configure({
82 -- providers: provider used to get references in the buffer, ordered by priority
83 providers = {
84 'lsp',
85 'treesitter',
86 'regex',
87 },
88 -- delay: delay in milliseconds
89 delay = 50,
90 -- filetype_overrides: filetype specific overrides.
91 -- The keys are strings to represent the filetype while the values are tables that
92 -- supports the same keys passed to .configure except for filetypes_denylist and filetypes_allowlist
93 filetype_overrides = {},
94 -- filetypes_denylist: filetypes to not illuminate, this overrides filetypes_allowlist
95 filetypes_denylist = {
96 'dirbuf',
97 'dirvish',
98 'fugitive',
99 },
100 -- filetypes_allowlist: filetypes to illuminate, this is overridden by filetypes_denylist
101 -- You must set filetypes_denylist = {} to override the defaults to allow filetypes_allowlist to take effect
102 filetypes_allowlist = {},
103 -- modes_denylist: modes to not illuminate, this overrides modes_allowlist
104 -- See `:help mode()` for possible values
105 modes_denylist = {},
106 -- modes_allowlist: modes to illuminate, this is overridden by modes_denylist
107 -- See `:help mode()` for possible values
108 modes_allowlist = {},
109 -- providers_regex_syntax_denylist: syntax to not illuminate, this overrides providers_regex_syntax_allowlist
110 -- Only applies to the 'regex' provider
111 -- Use :echom synIDattr(synIDtrans(synID(line('.'), col('.'), 1)), 'name')
112 providers_regex_syntax_denylist = {},
113 -- providers_regex_syntax_allowlist: syntax to illuminate, this is overridden by providers_regex_syntax_denylist
114 -- Only applies to the 'regex' provider
115 -- Use :echom synIDattr(synIDtrans(synID(line('.'), col('.'), 1)), 'name')
116 providers_regex_syntax_allowlist = {},
117 -- under_cursor: whether or not to illuminate under the cursor
118 under_cursor = true,
119 -- large_file_cutoff: number of lines at which to use large_file_config
120 -- The `under_cursor` option is disabled when this cutoff is hit
121 large_file_cutoff = nil,
122 -- large_file_config: config to use for large files (based on large_file_cutoff).
123 -- Supports the same keys passed to .configure
124 -- If nil, vim-illuminate will be disabled for large files.
125 large_file_overrides = nil,
126 -- min_count_to_highlight: minimum number of matches required to perform highlighting
127 min_count_to_highlight = 2,
128 -- should_enable: a callback that overrides all other settings to
129 -- enable/disable illumination. This will be called a lot so don't do
130 -- anything expensive in it.
131 should_enable = function(bufnr) return true end,
132 -- case_insensitive_regex: sets regex case sensitivity
133 case_insensitive_regex = false,
134})
135
136-- change the highlight style
137
138vim.api.nvim_set_hl(0, "IlluminatedWordText", { link = "MatchParen" })
139vim.api.nvim_set_hl(0, "IlluminatedWordRead", { link = "MatchParen" })
140vim.api.nvim_set_hl(0, "IlluminatedWordWrite", { link = "MatchParen" })
141
142--- auto update the highlight style on colorscheme change
143vim.api.nvim_create_autocmd({ "ColorScheme" }, {
144 pattern = { "*" },
145 callback = function(ev)
146 vim.api.nvim_set_hl(0, "IlluminatedWordText", { link = "MatchParen" })
147 vim.api.nvim_set_hl(0, "IlluminatedWordRead", { link = "MatchParen" })
148 vim.api.nvim_set_hl(0, "IlluminatedWordWrite", { link = "MatchParen" })
149 end
150})
151
152EOF
153
diff --git a/nvim_alt/settings.vim b/nvim_alt/settings.vim
deleted file mode 100644
index 1586c23..0000000
--- a/nvim_alt/settings.vim
+++ /dev/null
@@ -1,82 +0,0 @@
1" Allgemeine Einstellungen
2set number
3set cursorline
4set shortmess+=I
5set nowrap
6set nocompatible
7set ruler
8set wildmenu
9set noshowcmd
10set splitright
11set splitbelow
12set hidden
13set signcolumn=yes
14
15" Rechtsschreibprüfung
16set nospell
17set spelllang=de,en
18
19" Optionen für ^n-Vervollständigung
20set complete=.,w,b,u,t,i
21
22" bessere Suche
23set hlsearch
24set incsearch
25set ignorecase
26set smartcase
27
28" Sonderzeichen anzeigen
29set list
30set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
31set matchpairs+=<:>
32
33" automatisches Einlesen geänderter Dateien
34set autoread
35
36" Suche rekursiv
37set path+=**
38
39" Tabs
40set noexpandtab
41set tabstop=4
42set shiftwidth=4
43set softtabstop=0
44
45" Einrückungen
46set smartindent
47set autoindent
48set cindent
49
50" Faltungen
51set foldlevel=1000
52set foldcolumn=0
53
54" Autovervollständigung
55set completeopt=longest,menuone,noselect,popup
56
57" externe Programme
58set makeprg=gmake
59set autowrite
60
61" Guifont
62set guifont=JetBrains\ Mono\ Semibold:h12
63
64" provider
65let g:python3_host_prog='/usr/local/bin/python'
66let g:loaded_node_provider=0
67let g:loaded_ruby_provider=0
68let g:loaded_perl_provider=0
69
70" Swap files und UnDo
71set noswapfile
72set undofile
73set undolevels=10000
74set undoreload=10000
75
76" Clipboard
77set clipboard=unnamedplus
78
79" weitere Einstellungen
80syntax enable
81filetype plugin indent on
82
diff --git a/nvim_alt/statusline.vim b/nvim_alt/statusline.vim
deleted file mode 100644
index 069e632..0000000
--- a/nvim_alt/statusline.vim
+++ /dev/null
@@ -1,36 +0,0 @@
1" Statusline
2function! GitBranch()
3 return system("git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n'")
4endfunction
5
6function! StatuslineGit()
7 let l:branchname = GitBranch()
8 return strlen(l:branchname) > 0?' '.l:branchname.' ':''
9endfunction
10
11let g:currentmode={
12 \ 'n' : 'n',
13 \ 'v' : 'v',
14 \ 'V' : 'vl',
15 \ '' : 'vb',
16 \ 'i' : 'i',
17 \ 'R' : 'r',
18 \ 'Rv' : 'rv',
19 \ 'c' : 'c',
20 \ 't' : 'f',
21 \}
22
23set laststatus=2
24set statusline=
25set statusline+=%#PmenuSel#
26set statusline+=%{StatuslineGit()}
27set statusline+=%#Statusline#
28set statusline+=\ %f
29set statusline+=%m
30set statusline+=%=
31set statusline+=%#StatusLineNc#
32set statusline+=\ %y
33set statusline+=\ %{&fileencoding?&fileencoding:&encoding}
34set statusline+=\ %p%%
35set statusline+=\ %l:%c
36
diff --git a/tmuxp/pim.yaml b/tmuxp/pim.yaml
deleted file mode 100644
index e618df2..0000000
--- a/tmuxp/pim.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
1session_name: pim
2windows:
3 - window_name: news
4 panes:
5 - shell_command: newsboat
6 - window_name: mail
7 layout: main-vertical
8 options:
9 main-pane-width: 70%
10 panes:
11 - shell_command: neomutt
12 focus: true
13 - shell_command: while true; do; fdm fetch; sleep 1000; done
14 - window_name: calendar
15 panes:
16 - shell_command: wyrd
17 - window_name: tasks
18 panes:
19 - shell_command: vit
20 - window_name: shell
21 panes:
22 - null