From 168f9fe0567d64e199608315040c4a37d08e7833 Mon Sep 17 00:00:00 2001 From: harry123 Date: Tue, 11 Mar 2025 18:09:12 +0100 Subject: [PATCH 1/2] split files --- config/config.nix | 23 +++++++++++++++++++++++ config/default.nix | 22 +--------------------- 2 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 config/config.nix diff --git a/config/config.nix b/config/config.nix new file mode 100644 index 0000000..b9f472e --- /dev/null +++ b/config/config.nix @@ -0,0 +1,23 @@ +{ ... }: +{ + colorschemes.catppuccin = { + enable = true; + settings.flavour = "latte"; + }; + + globalOpts = { + number = true; + relativenumber = true; + + signcolumn = "yes"; + + # Tab defaults (might get overwritten by an LSP server) + tabstop = 4; + shiftwidth = 4; + softtabstop = 0; + expandtab = true; + smarttab = true; + }; + + globals.mapleader = " "; +} diff --git a/config/default.nix b/config/default.nix index eb4d76f..58c4fba 100644 --- a/config/default.nix +++ b/config/default.nix @@ -3,26 +3,6 @@ imports = [ ./bufferline.nix ./plugins.nix + ./config.nix ]; - - colorschemes.catppuccin = { - enable = true; - settings.flavour = "latte"; - }; - - globalOpts = { - number = true; - relativenumber = true; - - signcolumn = "yes"; - - # Tab defaults (might get overwritten by an LSP server) - tabstop = 4; - shiftwidth = 4; - softtabstop = 0; - expandtab = true; - smarttab = true; - }; - - globals.mapleader = " "; } From 90257dc9a5d53cd2c05c90949c2e65740229e701 Mon Sep 17 00:00:00 2001 From: harry123 Date: Tue, 11 Mar 2025 20:53:53 +0100 Subject: [PATCH 2/2] my stupid ass forgor the file import... --- config/config.nix | 4 ++-- config/default.nix | 1 + config/keys.nix | 2 ++ config/plugins.nix | 10 +++++++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/config/config.nix b/config/config.nix index b9f472e..0c7e5db 100644 --- a/config/config.nix +++ b/config/config.nix @@ -12,8 +12,8 @@ signcolumn = "yes"; # Tab defaults (might get overwritten by an LSP server) - tabstop = 4; - shiftwidth = 4; + tabstop = 2; + shiftwidth = 2; softtabstop = 0; expandtab = true; smarttab = true; diff --git a/config/default.nix b/config/default.nix index 58c4fba..39ffac1 100644 --- a/config/default.nix +++ b/config/default.nix @@ -4,5 +4,6 @@ ./bufferline.nix ./plugins.nix ./config.nix + ./keys.nix ]; } diff --git a/config/keys.nix b/config/keys.nix index 9d0261e..da2e4b9 100644 --- a/config/keys.nix +++ b/config/keys.nix @@ -2,11 +2,13 @@ keymaps = [ # chad tree { + mode = "n"; action = "CHADopen"; key = "e"; options = { desc = "Open ChadTree"; }; } + ]; } diff --git a/config/plugins.nix b/config/plugins.nix index 3b6bf91..f419ae7 100644 --- a/config/plugins.nix +++ b/config/plugins.nix @@ -12,7 +12,11 @@ asm_lsp.enable = true; gopls.enable = true; java_language_server.enable = true; - rust-analyzer.enable = true; + rust_analyzer = { + enable = true; + installRustc = true; + installCargo = true; + }; nil_ls.enable = true; marksman.enable = true; }; @@ -74,6 +78,8 @@ enable = true; }; + lualine.enable = true; + neotest = { enable = true; adapters = { @@ -83,5 +89,7 @@ go.enable = true; }; }; + + lsp-lines.enable = true; }; }