aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/neovim/nvim/after/ftplugin/c.lua2
-rw-r--r--modules/neovim/nvim/after/ftplugin/cpp.lua2
-rw-r--r--modules/neovim/nvim/lua/config/lsp.lua2
-rw-r--r--modules/neovim/nvim/lua/config/settings.lua6
-rw-r--r--modules/pass/default.nix2
5 files changed, 10 insertions, 4 deletions
diff --git a/modules/neovim/nvim/after/ftplugin/c.lua b/modules/neovim/nvim/after/ftplugin/c.lua
new file mode 100644
index 0000000..8b6f83d
--- /dev/null
+++ b/modules/neovim/nvim/after/ftplugin/c.lua
@@ -0,0 +1,2 @@
+vim.o.tabstop=8
+vim.o.tabstop=8
diff --git a/modules/neovim/nvim/after/ftplugin/cpp.lua b/modules/neovim/nvim/after/ftplugin/cpp.lua
new file mode 100644
index 0000000..2d48451
--- /dev/null
+++ b/modules/neovim/nvim/after/ftplugin/cpp.lua
@@ -0,0 +1,2 @@
+vim.o.tabstop=2
+vim.o.shiftwidth=2
diff --git a/modules/neovim/nvim/lua/config/lsp.lua b/modules/neovim/nvim/lua/config/lsp.lua
index 82cedab..887dbe7 100644
--- a/modules/neovim/nvim/lua/config/lsp.lua
+++ b/modules/neovim/nvim/lua/config/lsp.lua
@@ -18,7 +18,7 @@ require('blink.cmp').setup({
},
menu = {
border = "rounded",
- auto_show = false,
+ auto_show = true,
},
documentation = { window = { border = 'rounded' } },
},
diff --git a/modules/neovim/nvim/lua/config/settings.lua b/modules/neovim/nvim/lua/config/settings.lua
index 7893730..47d3630 100644
--- a/modules/neovim/nvim/lua/config/settings.lua
+++ b/modules/neovim/nvim/lua/config/settings.lua
@@ -13,9 +13,11 @@ vim.opt.fillchars = {eob = " "}
--vim.o.smd = false
--vim.opt.laststatus = 3
vim.opt.pumheight = 6
-vim.opt.shiftwidth = 8
-vim.opt.tabstop = 8
vim.opt.expandtab = true
vim.o.mouse=""
vim.o.guicursor=""
vim.o.swapfile=false
+vim.opt.foldmethod = "expr"
+vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
+--vim.opt.foldcolumn = "0"
+vim.opt.foldlevel = 99
diff --git a/modules/pass/default.nix b/modules/pass/default.nix
index fb24ab1..a92c331 100644
--- a/modules/pass/default.nix
+++ b/modules/pass/default.nix
@@ -56,7 +56,7 @@ in
enable = true;
settings = {
PASSWORD_STORE_DIR = "${config.home.homeDirectory}/.password-store";
- PASSWORD_STORE_CHARACTER_SET="[:alnum:]*!@^&_\-=[]|;~,./?";
+ PASSWORD_STORE_CHARACTER_SET=''[:alnum:]*!@^&_\-=[]|;~,./?'';
PASSWORD_STORE_CLIP_TIME="25";
PASSWORD_STORE_KEY=cfg.key;
PASSWORD_STORE_ENABLE_EXTENSIONS = if cfg.enableExtensions then "1" else "0";