From c436386945431ea070429e826d4cb76228557408 Mon Sep 17 00:00:00 2001 From: Kopatz <7265381+Kropatz@users.noreply.github.com> Date: Thu, 21 Dec 2023 12:09:09 +0100 Subject: [PATCH] update vim config --- .config/nvim/init.lua | 8 ++--- .../lua/custom/plugins/treesitter-context.lua | 31 ++++++++++--------- flake.nix | 1 + 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 4b4fff6..827d60c 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -188,9 +188,10 @@ require('lazy').setup({ }, build = ':TSUpdate', }, - {'romgrk/barbar.nvim', + { + 'romgrk/barbar.nvim', dependencies = { - 'lewis6991/gitsigns.nvim', -- OPTIONAL: for git status + 'lewis6991/gitsigns.nvim', -- OPTIONAL: for git status 'nvim-tree/nvim-web-devicons', -- OPTIONAL: for file icons }, init = function() vim.g.barbar_auto_setup = false end, @@ -253,7 +254,7 @@ vim.o.ignorecase = true vim.o.smartcase = true -- Keep signcolumn on by default -vim.wo.signcolumn = 'yes' +vim.wo.signcolumn = 'number' -- Decrease update time vim.o.updatetime = 250 @@ -563,4 +564,3 @@ vim.opt.termguicolors = true -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et - diff --git a/.config/nvim/lua/custom/plugins/treesitter-context.lua b/.config/nvim/lua/custom/plugins/treesitter-context.lua index 934eaef..6585d67 100644 --- a/.config/nvim/lua/custom/plugins/treesitter-context.lua +++ b/.config/nvim/lua/custom/plugins/treesitter-context.lua @@ -3,19 +3,20 @@ return { version = "*", lazy = false, config = function() - require('treesitter-context').setup{ - enable = true, -- Enable this plugin (Can be enabled/disabled later via commands) - max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit. - min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit. - line_numbers = true, - multiline_threshold = 20, -- Maximum number of lines to collapse for a single context line - trim_scope = 'outer', -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer' - mode = 'cursor', -- Line used to calculate context. Choices: 'cursor', 'topline' - -- Separator between context and content. Should be a single character string, like '-'. - -- When separator is set, the context will only show up when there are at least 2 lines above cursorline. - separator = nil, - zindex = 20, -- The Z-index of the context window - on_attach = nil, -- (fun(buf: integer): boolean) return false to disable attaching - } + require('treesitter-context').setup { + enable = true, -- Enable this plugin (Can be enabled/disabled later via commands) + max_lines = 1, -- How many lines the window should span. Values <= 0 mean no limit. + min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit. + line_numbers = true, + multiline_threshold = 20, -- Maximum number of lines to collapse for a single context line + trim_scope = 'outer', -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer' + mode = 'cursor', -- Line used to calculate context. Choices: 'cursor', 'topline' + -- Separator between context and content. Should be a single character string, like '-'. + -- When separator is set, the context will only show up when there are at least 2 lines above cursorline. + separator = nil, + zindex = 20, -- The Z-index of the context window + on_attach = nil, -- (fun(buf: integer): boolean) return false to disable attaching + } end, -} \ No newline at end of file +} + diff --git a/flake.nix b/flake.nix index 6f2ace1..f1afa07 100644 --- a/flake.nix +++ b/flake.nix @@ -124,6 +124,7 @@ ./modules/gpg.nix #./modules/virt-manager.nix dont need atm ./modules/flatpak.nix + ./modules/docker.nix ./modules/nftables.nix ./modules/noise-supression.nix ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })