diff options
Diffstat (limited to '.config')
| -rw-r--r-- | .config/i3/config | 6 | ||||
| -rw-r--r-- | .config/nvim/colors/mine.vim | 15 | ||||
| -rw-r--r-- | .config/nvim/lua/map.lua | 2 | ||||
| -rw-r--r-- | .config/nvim/lua/plugin/lsp.lua | 21 | ||||
| -rw-r--r-- | .config/nvim/lua/plugin/packer.lua | 1 |
5 files changed, 27 insertions, 18 deletions
diff --git a/.config/i3/config b/.config/i3/config index 2a534fe..1b3d58f 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -29,14 +29,14 @@ bindsym XF86AudioPrev exec --no-startup-id playerctl previous && $refresh_i3stat bindsym Print exec --no-startup-id flameshot gui -floating_modifier $mod - for_window [class="love"] floating enable for_window [instance="Godot_Engine"] floating enable gaps outer 2 gaps inner 6 +floating_modifier $mod + tiling_drag modifier titlebar bindsym $mod+Return exec i3-sensible-terminal @@ -56,7 +56,6 @@ bindsym $mod+Shift+$up move up bindsym $mod+Shift+$right move right bindsym $mod+g split h - bindsym $mod+v split v bindsym $mod+f fullscreen toggle @@ -71,7 +70,6 @@ bindsym $mod+space focus mode_toggle bindsym $mod+b focus parent - set $ws1 "1" set $ws2 "2" set $ws3 "3" diff --git a/.config/nvim/colors/mine.vim b/.config/nvim/colors/mine.vim index ccedf00..7e5ca45 100644 --- a/.config/nvim/colors/mine.vim +++ b/.config/nvim/colors/mine.vim @@ -4,6 +4,8 @@ hi clear let g:colors_name = "mine" hi! link Terminal Normal +hi! link TermCursor Cursor +hi! link TermCursorNC Cursor hi! link CurSearch Search hi! link CursorLineFold CursorLine hi! link CursorLineSign CursorLine @@ -12,17 +14,18 @@ hi! link PopupNotification Todo hi! link Character String hi ColorColumn guifg=#333333 guibg=#333333 gui=NONE +hi WinSeparator guifg=#222222 guibg=NONE gui=NONE hi CursorLine guifg=NONE guibg=NONE gui=NONE hi EndOfBuffer guifg=#222222 guibg=NONE gui=NONE hi SignColumn guifg=NONE guibg=NONE gui=NONE hi LineNr guifg=#666666 guibg=NONE gui=NONE -hi LineNrAbove guifg=#666666 guibg=NONE gui=NONE -hi LineNrBelow guifg=#666666 guibg=NONE gui=NONE -hi MatchParen guifg=#000000 guibg=#FF0000 gui=bold +hi LineNrAbove guifg=#888888 guibg=NONE gui=NONE +hi LineNrBelow guifg=#888888 guibg=NONE gui=NONE +hi MatchParen guifg=#FFFFFF guibg=#FF0000 gui=bold hi Normal guifg=#AAAAAA guibg=#111111 gui=NONE -hi Pmenu guifg=#ffffff guibg=#333333 gui=NONE -hi PmenuSel guifg=#333333 guibg=#ffffff gui=bold,underdouble -hi Search guifg=#333333 guibg=#ffff88 gui=bold,italic +hi Pmenu guifg=#FFFFFF guibg=#333333 gui=NONE +hi PmenuSel guifg=#333333 guibg=#FFFFFF gui=bold,underdouble +hi Search guifg=#333333 guibg=#FFFF88 gui=bold,italic hi Visual guifg=NONE guibg=#333333 gui=NONE hi Comment guifg=#777777 guibg=NONE gui=italic diff --git a/.config/nvim/lua/map.lua b/.config/nvim/lua/map.lua index ace41fb..94f57d2 100644 --- a/.config/nvim/lua/map.lua +++ b/.config/nvim/lua/map.lua @@ -59,3 +59,5 @@ vim.api.nvim_create_user_command("Wq", "wq", {bang=true}) vim.api.nvim_create_user_command("Wqa", "wqa", {bang=true}) vim.api.nvim_create_user_command("Q", "q", {bang=true}) vim.api.nvim_create_user_command("Qa", "qa", {bang=true}) + +vim.api.nvim_create_user_command("ClangFormat", "!clang-format -i %", {}) diff --git a/.config/nvim/lua/plugin/lsp.lua b/.config/nvim/lua/plugin/lsp.lua index 8e9d66f..0c02c4f 100644 --- a/.config/nvim/lua/plugin/lsp.lua +++ b/.config/nvim/lua/plugin/lsp.lua @@ -23,22 +23,27 @@ local cmp = require('cmp') cmp.setup { mapping = cmp.mapping.preset.insert({ -- `Enter` key to confirm completion - ['<CR>'] = cmp.mapping.confirm({select = false}), + ['<CR>'] = cmp.mapping.confirm({ select = false }), -- `Tab` key to navigate - ['<S-Tab>'] = cmp.mapping.select_prev_item({behavior = 'select'}), - ['<Tab>'] = cmp.mapping.select_next_item({behavior = 'select'}), + ['<S-Tab>'] = cmp.mapping.select_prev_item({ behavior = 'select' }), + ['<Tab>'] = cmp.mapping.select_next_item({ behavior = 'select' }), }) } +require("lsp-format").setup {} +require("lspconfig").clangd.setup { + on_attach = require("lsp-format").on_attach +} + lsp.on_attach(function(client, buffer) - local opts = { buffer=buffer, remap=false } + local opts = { buffer = buffer, remap = false } - vim.keymap.set("n", "<leader>ld", function() vim.lsp.buf.definition() end, opts) - vim.keymap.set("n", "<leader>h", function() vim.lsp.buf.hover() end, opts) - vim.keymap.set("n", "<leader>la", function() vim.lsp.buf.code_action() end, opts) + vim.keymap.set("n", "<leader>ld", function() vim.lsp.buf.definition() end, opts) + vim.keymap.set("n", "<leader>h", function() vim.lsp.buf.hover() end, opts) + vim.keymap.set("n", "<leader>la", function() vim.lsp.buf.code_action() end, opts) vim.keymap.set("n", "<leader>lrf", function() vim.lsp.buf.references() end, opts) vim.keymap.set("n", "<leader>lrn", function() vim.lsp.buf.rename() end, opts) - vim.keymap.set("n", "<leader>ls", function() vim.lsp.buf.signature_help() end, opts) + vim.keymap.set("n", "<leader>ls", function() vim.lsp.buf.signature_help() end, opts) end) lsp.setup() diff --git a/.config/nvim/lua/plugin/packer.lua b/.config/nvim/lua/plugin/packer.lua index 653b786..f03cca2 100644 --- a/.config/nvim/lua/plugin/packer.lua +++ b/.config/nvim/lua/plugin/packer.lua @@ -34,6 +34,7 @@ return require("packer").startup(function(use) use { "VonHeikemen/lsp-zero.nvim", requires = { + {"lukas-reineke/lsp-format.nvim"}, -- LSP Support {"neovim/nvim-lspconfig"}, {"williamboman/mason.nvim"}, |