From b7a43f2740ce23960dff39ddb340afec63c2bea4 Mon Sep 17 00:00:00 2001 From: urec56 Date: Sun, 4 May 2025 17:04:20 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20=D0=B2?= =?UTF-8?q?=D0=B8=D0=BC=D0=B0,=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BF?= =?UTF-8?q?=D0=BA=D0=BC+=D0=BB=D0=BA=D0=BC=3D=D1=81=D0=BA=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- modules/nixos/xserver.nix | 1 + nvim/lua/custom/sessions.lua | 6 +++--- nvim/lua/kickstart/plugins/completion.lua | 4 ++-- nvim/lua/kickstart/plugins/lsp.lua | 6 +++++- nvim/lua/kickstart/settings.lua | 6 ------ 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 41dddea..33c2b63 100644 --- a/README.md +++ b/README.md @@ -570,4 +570,4 @@ Wifi - **Base0E** – **Class Names/Constructors**: Акцентный цвет для имён классов или конструкторов. Фиолетовый. - **Base0F** – **Deprecated Elements/Exceptions**: Обычно используется для устаревших элементов или исключений. Коричневый. -Эти цвета обеспечивают чёткую структуру для создания тем, где легко отличить синтаксические элементы или UI-компоненты. \ No newline at end of file +Эти цвета обеспечивают чёткую структуру для создания тем, где легко отличить синтаксические элементы или UI-компоненты. diff --git a/modules/nixos/xserver.nix b/modules/nixos/xserver.nix index 47f84b2..3e788a7 100644 --- a/modules/nixos/xserver.nix +++ b/modules/nixos/xserver.nix @@ -18,6 +18,7 @@ accelProfile = "flat"; scrollMethod = "button"; scrollButton = 9; # Узнать айди можно через `xev -event button | grep button` + middleEmulation = false; }; touchpad = { accelProfile = "flat"; diff --git a/nvim/lua/custom/sessions.lua b/nvim/lua/custom/sessions.lua index 8ffde53..d22b5b6 100644 --- a/nvim/lua/custom/sessions.lua +++ b/nvim/lua/custom/sessions.lua @@ -98,9 +98,9 @@ vim.api.nvim_create_autocmd('User', { nested = true, }) -vim.keymap.set('n', '', function() - restore_session() -end, { desc = 'Restore session' }) +-- vim.keymap.set('n', '', function() +-- restore_session() +-- end, { desc = 'Restore session' }) -- Session delete vim.keymap.set('n', 'Sd', function() diff --git a/nvim/lua/kickstart/plugins/completion.lua b/nvim/lua/kickstart/plugins/completion.lua index 2c7f887..95f1fba 100644 --- a/nvim/lua/kickstart/plugins/completion.lua +++ b/nvim/lua/kickstart/plugins/completion.lua @@ -68,12 +68,12 @@ return { -- This will auto-import if your LSP supports it. -- This will expand snippets if the LSP sent a snippet. -- [''] = cmp.mapping.confirm { select = true }, - [''] = cmp.mapping.confirm { select = true }, + [''] = cmp.mapping.confirm { select = true }, -- If you prefer more traditional completion keymaps, -- you can uncomment the following lines -- [''] = cmp.mapping.confirm { select = true }, - [''] = cmp.mapping.select_next_item(), + [''] = cmp.mapping.select_next_item(), [''] = cmp.mapping.select_prev_item(), -- Allows Up arrow to fall back without interacting with cmp diff --git a/nvim/lua/kickstart/plugins/lsp.lua b/nvim/lua/kickstart/plugins/lsp.lua index 524e292..9ed5b5e 100644 --- a/nvim/lua/kickstart/plugins/lsp.lua +++ b/nvim/lua/kickstart/plugins/lsp.lua @@ -216,7 +216,11 @@ return { lspconfig.nixd.setup {} -- Golang - lspconfig.gopls.setup {} + lspconfig.gopls.setup { + completion = { + unimported = false, + }, + } lspconfig.templ.setup {} -- Frontend diff --git a/nvim/lua/kickstart/settings.lua b/nvim/lua/kickstart/settings.lua index 32c865a..7e314d7 100644 --- a/nvim/lua/kickstart/settings.lua +++ b/nvim/lua/kickstart/settings.lua @@ -46,12 +46,6 @@ vim.api.nvim_create_autocmd('FileType', { end, }) --- Fix .sqlfluff highlight -vim.api.nvim_create_autocmd({ 'BufRead', 'BufNewFile' }, { - pattern = '*.sqlfluff', - command = 'set filetype=toml', -}) - -- Enable mouse mode, can be useful for resizing splits for example! vim.opt.mouse = 'a'