From d4bc904ac727ad860b74912c9d9be5f0f9a1d4ac Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 2 May 2025 17:49:25 +0200 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/26d499fc9f1d567283d5d56fcf367edd815dba1d?narHash=sha256-FHlSkNqFmPxPJvy%2B6fNLaNeWnF1lZSgqVCl/eWaJRc4%3D' (2025-04-12) → 'github:NixOS/nixpkgs/3e362ce63e16b9572d8c2297c04f7c19ab6725a5?narHash=sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0%3D' (2025-04-30) • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef?narHash=sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU%3D' (2025-04-17) → 'github:NixOS/nixpkgs/f02fddb8acef29a8b32f10a335d44828d7825b78?narHash=sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds%2Bhc%3D' (2025-05-01) • Updated input 'nixvim': 'github:nix-community/nixvim/d35dc6dfcae3ff1a0c72f2d59491a7d83e5505a3?narHash=sha256-YuQRMvqLVu%2Bghl2XzqXyVg/YevH/t3XHVCl7w%2BUrCH8%3D' (2025-04-19) → 'github:nix-community/nixvim/5bef8e43ce16ee704c7b9fa9f48a07ce81c5c05d?narHash=sha256-MpLljx/1dGnBIQlUswaUz/ZeOp44R3ngc1iBf4tyzyc%3D' (2025-04-29) --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index dddada5..195ec40 100644 --- a/flake.lock +++ b/flake.lock @@ -270,11 +270,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", + "lastModified": 1746055187, + "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", "type": "github" }, "original": { @@ -301,11 +301,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "type": "github" }, "original": { @@ -329,11 +329,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745068593, - "narHash": "sha256-YuQRMvqLVu+ghl2XzqXyVg/YevH/t3XHVCl7w+UrCH8=", + "lastModified": 1745963276, + "narHash": "sha256-MpLljx/1dGnBIQlUswaUz/ZeOp44R3ngc1iBf4tyzyc=", "owner": "nix-community", "repo": "nixvim", - "rev": "d35dc6dfcae3ff1a0c72f2d59491a7d83e5505a3", + "rev": "5bef8e43ce16ee704c7b9fa9f48a07ce81c5c05d", "type": "github" }, "original": { From 9425f55d8f64427b701e61327e818dac4bca294c Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Fri, 2 May 2025 21:22:25 +0200 Subject: [PATCH 2/2] improve vim config --- systems/common-cli.nix | 76 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 63 insertions(+), 13 deletions(-) diff --git a/systems/common-cli.nix b/systems/common-cli.nix index 67ec0c7..4da4392 100644 --- a/systems/common-cli.nix +++ b/systems/common-cli.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { @@ -8,32 +8,82 @@ enable = true; viAlias = true; vimAlias = true; - files = { - "ftplugin/nix.lua" = { - opts = { - tabstop = 8; - shiftwidth = 4; - softtabstop = 0; - expandtab = true; - smarttab = true; - background = "dark"; - mouse = ""; - }; + colorschemes.catppuccin.enable = true; + highlight.ExtraWhitespace.bg = "red"; # Highlight extra white spaces + performance = { + byteCompileLua = { + enable = true; + nvimRuntime = true; + configs = true; + plugins = true; }; }; + opts = { + updatetime = 100; # Faster completion + + # Line numbers + number = true; # Display the absolute line number of the current line + hidden = true; # Keep closed buffer open in the background + mouse = "a"; # Enable mouse control + mousemodel = "extend"; # Mouse right-click extends the current selection + splitbelow = true; # A new window is put below the current one + splitright = true; # A new window is put right of the current one + + modeline = true; # Tags such as 'vim:ft=sh' + modelines = 100; # Sets the type of modelines + undofile = true; # Automatically save and restore undo history + incsearch = true; # Incremental search: show match for partly typed search command + ignorecase = true; # When the search query is lower-case, match both lower and upper-case patterns + smartcase = true; # Override the 'ignorecase' option if the search pattern contains upper case characters + cursorline = true; # Highlight the screen line of the cursor + cursorcolumn = true; # Highlight the screen column of the cursor + signcolumn = "yes"; # Whether to show the signcolumn + laststatus = 3; # When to use a status line for the last window + fileencoding = "utf-8"; # File-content encoding for the current buffer + termguicolors = true; # Enables 24-bit RGB color in the |TUI| + wrap = false; # Prevent text from wrapping + + # Tab options + tabstop = 2; # Number of spaces a in the text stands for (local to buffer) + shiftwidth = 2; # Number of spaces used for each step of (auto)indent (local to buffer) + softtabstop = 0; # If non-zero, number of spaces to insert for a (local to buffer) + expandtab = true; # Expand to spaces in Insert mode (local to buffer) + autoindent = true; # Do clever autoindenting + + showmatch = true; # when closing a bracket, briefly flash the matching one + matchtime = 1; # duration of that flashing n deci-seconds + startofline = true; # motions like "G" also move to the first char + report = 9001; # disable "x more/fewer lines" messages + }; plugins = { lualine.enable = true; lsp = { enable = true; + inlayHints = true; servers = { nixd.enable = true; ruff.enable = true; }; }; + lspkind.enable = true; + lsp-lines.enable = true; + lsp-signature.enable = true; bufferline.enable = true; telescope.enable = true; which-key.enable = true; - treesitter.enable = true; + treesitter = { + enable = true; + settings = { + highlight = { + enable = true; + additional_vim_regex_highlighting = true; + }; + + indent = { + enable = true; + }; + }; + }; cmp = { enable = true; autoEnableSources = true;