diff --git a/flake.lock b/flake.lock index 3e248f7..ed78e43 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1741934125, - "narHash": "sha256-qwI47l3aKXRpDvmCKDbLV70iVfAqhpuKqT7qYHA4KJk=", + "lastModified": 1742213273, + "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "bea48d0bbe15fb3d758a8b6be865836c97056575", + "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", "type": "github" }, "original": { @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -426,11 +426,11 @@ ] }, "locked": { - "lastModified": 1741955947, - "narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", + "lastModified": 1742569620, + "narHash": "sha256-igC2cu+cPRB3E4QwKR+vGagyAtoyB+DrmWwDKm8jkaw=", "owner": "nix-community", "repo": "home-manager", - "rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", + "rev": "8a68f18e96bcab13e4f97bece61e6602298a3141", "type": "github" }, "original": { @@ -476,11 +476,11 @@ ] }, "locked": { - "lastModified": 1738664950, - "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", + "lastModified": 1742215578, + "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", + "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", "type": "github" }, "original": { @@ -563,11 +563,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1742161820, - "narHash": "sha256-MURJd3lgE1EGwBmJRAzk+AIzv84HUt1xla9XSy1BZMs=", + "lastModified": 1742563987, + "narHash": "sha256-P7rQo7SClIFU6OkUlnN01OqVWsjTMgmG/8gqhpXHfRI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "22154fa272201950a3d37e2a40d9dc3a9cc92329", + "rev": "c7f0519fafbf334a8f5088a8a0fc385732a24036", "type": "github" }, "original": { @@ -593,11 +593,11 @@ ] }, "locked": { - "lastModified": 1742164373, - "narHash": "sha256-O0SmKvUf5rnDczzVZbhImDzSvrsPwONI3GcWgLdsdzg=", + "lastModified": 1742550672, + "narHash": "sha256-q6v3nkJZdu45bwCuymQ+q3U7uwfA+M3GqsvZ0TgNsi4=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "0eb996c3ed89eeed3d493a310acd8eccb62838d9", + "rev": "7429a0ea78353dab6a7a9a3e8101db98a306957d", "type": "github" }, "original": { @@ -767,11 +767,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1742210751, - "narHash": "sha256-8zUpsvFLK8fi9oUP5AD4DyZlRM3uTzFF0b3q5KMKvCI=", + "lastModified": 1742460722, + "narHash": "sha256-u23NzXN2yez0nO2zEtEaChE/4jhtC8WvpM8OpwUsls8=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "ee8ee1f9f7cfd2c45de321ce6315c9cccb12c054", + "rev": "f883e669d147ac189b64ce403300a5a3e4de2c66", "type": "github" }, "original": { @@ -910,11 +910,11 @@ }, "mnw": { "locked": { - "lastModified": 1741647548, - "narHash": "sha256-UqVAeOylufUGIx7BXSneFHD8eI6n0sVwEY2noFENnSE=", + "lastModified": 1742255973, + "narHash": "sha256-XfEGVKatTgEMMOVb4SNp1LYLQOSzzrFTDMVDTZFyMVE=", "owner": "Gerg-L", "repo": "mnw", - "rev": "3fb89e600e26b91d1795cf8a1a34e11e084b4a04", + "rev": "b982dbd5e6d55d4438832b3567c09bc2a129649d", "type": "github" }, "original": { @@ -957,11 +957,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1739259093, - "narHash": "sha256-pltdsmg4oh1AVNrMbKUgx1VPbndVdCGID5mrBmRIdVI=", + "lastModified": 1742568248, + "narHash": "sha256-DLy7a13K73Se+UaRdFJa5QfPmnFvO2yoeg02c8ioR4k=", "owner": "nix-community", "repo": "nixd", - "rev": "065dcb4cb2f8269d6d15d2b2491a79cff47f9550", + "rev": "590eccaa079929daa58316f5386dbcc150e2d50d", "type": "github" }, "original": { @@ -972,11 +972,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1742180333, - "narHash": "sha256-SrvP0G0fxz35lvQxBhAeJOl6+BueIsxJ4azMX+l/kAU=", + "lastModified": 1742376361, + "narHash": "sha256-VFMgJkp/COvkt5dnkZB4D2szVdmF6DGm5ZdVvTUy61c=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "113cd3916682def185290145924fa30b30bda972", + "rev": "daaae13dff0ecc692509a1332ff9003d9952d7a9", "type": "github" }, "original": { @@ -987,11 +987,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741851582, - "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -1062,11 +1062,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1742069588, - "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -1165,11 +1165,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1741814789, - "narHash": "sha256-NbHsnnNwiYUcUaS4z8XK2tYpo3G8NXEKxaKkzMgMiLk=", + "lastModified": 1742559284, + "narHash": "sha256-PSSjCCqpJPkCagkkdLODBVVonGxgwU5dN2CYlFPNVNw=", "owner": "nix-community", "repo": "nixvim", - "rev": "33097dcf776d1fad0ff3842096c4e3546312f251", + "rev": "c980271267ef146a6c30394c611a97e077471cf2", "type": "github" }, "original": { @@ -1227,11 +1227,11 @@ ] }, "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", + "lastModified": 1741886583, + "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", "owner": "NuschtOS", "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", + "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", "type": "github" }, "original": { @@ -1251,11 +1251,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1742165405, - "narHash": "sha256-C58YM228AyQbwh8fOhmOzo8mmh5qEezTxrf7NbR+/K8=", + "lastModified": 1742471089, + "narHash": "sha256-wiGkhJcDdg2/wy4QxaudNsU98y7CzzZpB6pnjUrNNDQ=", "owner": "notashelf", "repo": "nvf", - "rev": "cacbac08fb0738ca26da8ae1c321cadb1fc7dd6d", + "rev": "3a28d05684f7f4e314eb4e56a5af624b648ab278", "type": "github" }, "original": { @@ -1274,11 +1274,11 @@ ] }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1742058297, + "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", "type": "github" }, "original": { @@ -1352,11 +1352,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1742209060, - "narHash": "sha256-47/1bOPBGhmAegF06nxLN15d/MClCAkk8s/+WOhJJAM=", + "lastModified": 1742406979, + "narHash": "sha256-r0aq70/3bmfjTP+JZs4+XV5SgmCtk1BLU4CQPWGtA7o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b33837ae3cfa012b65810891bebbee71fa4c0658", + "rev": "1770be8ad89e41f1ed5a60ce628dd10877cb3609", "type": "github" }, "original": { @@ -1371,11 +1371,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1742098581, - "narHash": "sha256-c8pnJi/Y8+whPi5aOs5qKshfh4vvRUqczaJIOc6Xdv8=", + "lastModified": 1742512598, + "narHash": "sha256-nFPhSSxrPrpkmFR6vQq8OpUS+lGIAxDCUKg+5/qcnR8=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "4b285681a73e73c4f961fb69163c0daa36a18d30", + "rev": "610654a0afe56766e639077d9d267148667a25e8", "type": "github" }, "original": { @@ -1406,11 +1406,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1742040559, - "narHash": "sha256-Hb3aw00C1/5ORiTCASwMd8vcLAl/GNJfyjXZyl/EKpc=", + "lastModified": 1742496983, + "narHash": "sha256-UpJrU0DEhNLVZwL/RPVOEUHCG6iDOVDoYelkmgS4V38=", "owner": "danth", "repo": "stylix", - "rev": "bcc674f1994396137438bac9d905971453d33b12", + "rev": "7e9906679d384472849272e5a5eef7adbdb1d87f", "type": "github" }, "original": { @@ -1712,11 +1712,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1742118087, - "narHash": "sha256-mPKaMiAlUHzT4rvEs5QDyYwvZgAzBsprlbE8Iso9bCg=", + "lastModified": 1742473605, + "narHash": "sha256-lRup6FeDmNNU/TEWNruU0Ohxi0Jd0AsDEnLBLSlwsTY=", "owner": "sxyazi", "repo": "yazi", - "rev": "8b3ce1838a1001a8506288e20f76e9b5d2b9a4c0", + "rev": "db0300c9029d56b5e1611839b49a50fa3f6f8b27", "type": "github" }, "original": { diff --git a/users/modules/programs/nvf/input.nix b/users/modules/programs/nvf/input.nix index 24affb8..49c2aa4 100644 --- a/users/modules/programs/nvf/input.nix +++ b/users/modules/programs/nvf/input.nix @@ -1,4 +1,5 @@ -{lib, ...}: { +{ lib, ... }: +{ programs.nvf.settings.vim = { autopairs.nvim-autopairs.enable = true; snippets.luasnip = { @@ -12,49 +13,45 @@ setupOpts = { enabled = lib.generators.mkLuaInline - /* - lua - */ - '' - --- Disable completion for markdown - function() - return not vim.tbl_contains({"markdown"}, vim.bo.filetype) - and vim.bo.buftype ~= "prompt" - and vim.b.completion ~= false - end - ''; + # lua + '' + --- Disable completion for markdown + function() + return not vim.tbl_contains({"markdown"}, vim.bo.filetype) + and vim.bo.buftype ~= "prompt" + and vim.b.completion ~= false + end + ''; cmdline = { enabled = true; sources = null; completion.menu.auto_show = false; }; - completion.menu.auto_show = - lib.generators.mkLuaInline - /* - lua - */ - '' - function(ctx) - --- Get the cursor position from the current window - local row, column = unpack(vim.api.nvim_win_get_cursor(0)) - --- Get the current row (1 is Neovim API giving us 1-based indexing) - --- Get the current column but don't return negative numbers - --- ignore_injections are to ignore embedded code - --- success is the result, node is the syntax node object - local success, node = pcall(vim.treesitter.get_node, { - pos = {row - 1, math.max(0, column - 1)}, - ignore_injections = false - }) - --- Types of nodes to ignore - local reject = {"comment", "line_comment", "block_comment", "string_start", "string_content", "string_end" } - --- If the node type is in the reject table, don't show the completion - if success and node and vim.tbl_contains(reject, node:type()) then - return false; - end - -- whatever other logic you want beyond this - return true - end - ''; + #completion.menu.auto_show = + # lib.generators.mkLuaInline + # # lua + # '' + # function(ctx) + # --- Get the cursor position from the current window + # local row, column = unpack(vim.api.nvim_win_get_cursor(0)) + # --- Get the current row (1 is Neovim API giving us 1-based indexing) + # --- Get the current column but don't return negative numbers + # --- ignore_injections are to ignore embedded code + # --- success is the result, node is the syntax node object + # local success, node = pcall(vim.treesitter.get_node, { + # pos = {row - 1, math.max(0, column - 1)}, + # ignore_injections = false + # }) + # --- Types of nodes to ignore + # local reject = {"comment", "line_comment", "block_comment", "string_start", "string_content", "string_end" } + # --- If the node type is in the reject table, don't show the completion + # if success and node and vim.tbl_contains(reject, node:type()) then + # return false; + # end + # -- whatever other logic you want beyond this + # return true + # end + # ''; # menu.auto_show = false; completion.documentation.auto_show_delay_ms = 0; signature.enabled = true;