From 6dee74d3670e1da6ffa4627c1b91eac8cbd32ae8 Mon Sep 17 00:00:00 2001 From: osbm Date: Sat, 8 Mar 2025 00:29:33 +0300 Subject: [PATCH] yippie --- config/options.nix | 13 ++++++------- plugins/default.nix | 14 ++++++++------ plugins/lsp/default.nix | 1 + plugins/lsp/python.nix | 5 +++++ 4 files changed, 20 insertions(+), 13 deletions(-) create mode 100644 plugins/lsp/python.nix diff --git a/config/options.nix b/config/options.nix index be7d9d1..30543b2 100644 --- a/config/options.nix +++ b/config/options.nix @@ -8,13 +8,12 @@ list = true; listchars = "tab:» ,trail:·,multispace:·,lead: ,nbsp:⎕"; - # when i press tab i want to see spaces - expandtab = true; - tabstop = 4; # Number of spaces that a in the file counts for. - shiftwidth = 4; # how many spaces are added in an indent - softtabstop = 4; # how many spaces are added when pressing tab - smarttab = - true; # When on, a in front of a line inserts blanks according to 'shiftwidth'. 'tabstop' or 'softtabstop' is used in other places. + # 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 # TODO: i want to see 4 spaces when i press tab in python and 2 spaces in nix using setlocal # is it possible for me to set this per language? diff --git a/plugins/default.nix b/plugins/default.nix index c69b086..84fd410 100644 --- a/plugins/default.nix +++ b/plugins/default.nix @@ -13,12 +13,14 @@ todo-comments.enable = true; lualine.enable = true; - cmp = { - # TODO read what this does - # basically, it's a completion plugin - enable = true; - autoEnableSources = true; - }; + # cmp = { + # # TODO read what this does + # # basically, it's a completion plugin + # enable = true; + # autoEnableSources = true; + # }; + cmp-nvim-lsp.enable = true; + oil.enable = true; # shell scripting diff --git a/plugins/lsp/default.nix b/plugins/lsp/default.nix index fbdc4aa..d008afc 100644 --- a/plugins/lsp/default.nix +++ b/plugins/lsp/default.nix @@ -1,6 +1,7 @@ { imports = [ ./nix.nix + ./python.nix ]; plugins.lsp.servers = { typos_lsp = { diff --git a/plugins/lsp/python.nix b/plugins/lsp/python.nix new file mode 100644 index 0000000..4bc0f9b --- /dev/null +++ b/plugins/lsp/python.nix @@ -0,0 +1,5 @@ +{ + plugins.lsp.servers.pyright = { + enable = true; + }; +} \ No newline at end of file