From ffa4d52ba45dc55e1f34c962d1fb4ac036c1afe9 Mon Sep 17 00:00:00 2001 From: Superredstone Date: Wed, 23 Sep 2026 18:12:00 +0200 Subject: [PATCH] chore: minor cleanup --- config/keybindings.nix | 2 ++ config/opts.nix | 1 - config/plugins/blink-indent.nix | 10 ---------- config/plugins/cmp.nix | 2 -- config/plugins/comment.nix | 5 ----- config/plugins/default.nix | 3 +-- config/plugins/guess-indent.nix | 6 ++++++ config/plugins/lsp.nix | 1 - flake.lock | 21 +++++---------------- flake.nix | 6 +++++- 10 files changed, 19 insertions(+), 38 deletions(-) delete mode 100644 config/plugins/blink-indent.nix create mode 100644 config/plugins/guess-indent.nix diff --git a/config/keybindings.nix b/config/keybindings.nix index ed19f8e..e2da4b7 100644 --- a/config/keybindings.nix +++ b/config/keybindings.nix @@ -14,6 +14,7 @@ in { key = ""; action = ":w"; + options = defaultOptions; } { key = ""; @@ -38,6 +39,7 @@ in { action = ":ToggleTerm direction=float"; key = "t"; + options = defaultOptions; } { action = ""; diff --git a/config/opts.nix b/config/opts.nix index d9972ef..beee919 100644 --- a/config/opts.nix +++ b/config/opts.nix @@ -14,6 +14,5 @@ termguicolors = true; expandtab = false; gdefault = true; - cursorlineopt = "both"; }; } diff --git a/config/plugins/blink-indent.nix b/config/plugins/blink-indent.nix deleted file mode 100644 index 99980bc..0000000 --- a/config/plugins/blink-indent.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ ... }: -{ - plugins.guess-indent = { - enable = true; - settings = { - underline.enable = true; - static.enable = true; - }; - }; -} diff --git a/config/plugins/cmp.nix b/config/plugins/cmp.nix index 4369731..e55227c 100644 --- a/config/plugins/cmp.nix +++ b/config/plugins/cmp.nix @@ -12,8 +12,6 @@ { name = "nvim_lsp_signature_help"; } { name = "path"; } { name = "buffer"; } - { name = "dap"; } - { name = "blink-emoji"; } { name = "blink-ripgrep"; } ]; mapping = { diff --git a/config/plugins/comment.nix b/config/plugins/comment.nix index a2ba163..1e82978 100644 --- a/config/plugins/comment.nix +++ b/config/plugins/comment.nix @@ -4,11 +4,6 @@ enable = true; settings = { sticky = true; - - toggler = { - block = ""; - line = ""; - }; }; }; } diff --git a/config/plugins/default.nix b/config/plugins/default.nix index 9f83f87..2cea5eb 100644 --- a/config/plugins/default.nix +++ b/config/plugins/default.nix @@ -1,7 +1,7 @@ { ... }: { imports = [ - ./blink-indent.nix + ./guess-indent.nix ./cmp.nix ./comment.nix ./cursorline.nix @@ -16,7 +16,6 @@ neo-tree.enable = true; web-devicons.enable = true; bufferline.enable = true; - nvim-autopairs.enable = true; notify.enable = true; toggleterm.enable = true; treesitter.enable = true; diff --git a/config/plugins/guess-indent.nix b/config/plugins/guess-indent.nix new file mode 100644 index 0000000..87c3b74 --- /dev/null +++ b/config/plugins/guess-indent.nix @@ -0,0 +1,6 @@ +{ ... }: +{ + plugins.guess-indent = { + enable = true; + }; +} diff --git a/config/plugins/lsp.nix b/config/plugins/lsp.nix index 7d7f898..573fcad 100644 --- a/config/plugins/lsp.nix +++ b/config/plugins/lsp.nix @@ -23,7 +23,6 @@ jsonls.enable = true; phpactor.enable = true; qmlls.enable = true; - pylsp.enable = true; ruff.enable = true; slint_lsp.enable = true; }; diff --git a/flake.lock b/flake.lock index 53a8c04..531d794 100644 --- a/flake.lock +++ b/flake.lock @@ -42,23 +42,10 @@ "nixpkgs": { "locked": { "lastModified": 1790149054, - "narHash": "sha256-fcRceL4EcNlsCY2GWwzfIVrJyjbA2lpQSuljkc8UXOw=", - "rev": "8825bebf6324e0579d012936eff73379af284b6d", - "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1078395.8825bebf6324/nixexprs.tar.zst" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1789724158, - "narHash": "sha256-nlKgrm0dsVhOSopKheVBCcOpiIticufPPVLdVOI0euA=", + "narHash": "sha256-FfjXg6mAzKQBCY+7V9keGWOXG4DV2Eym/qA987lFl8A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0a3468a402c449992505b6a9fc5b06580141b750", + "rev": "8825bebf6324e0579d012936eff73379af284b6d", "type": "github" }, "original": { @@ -71,7 +58,9 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_2" }, "locked": { diff --git a/flake.nix b/flake.nix index 82e0d4b..2597077 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,11 @@ description = "My Neovim configuration"; inputs = { - nixvim.url = "github:nix-community/nixvim"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + nixvim = { + url = "github:nix-community/nixvim"; + inputs.nixpkgs.follows = "nixpkgs"; + }; flake-utils.url = "github:numtide/flake-utils"; };