diff --git a/homeConfig/dotfiles/nvim/lua/config/autocmds.lua b/homeConfig/dotfiles/nvim/lua/config/autocmds.lua index a65251c..242e75b 100644 --- a/homeConfig/dotfiles/nvim/lua/config/autocmds.lua +++ b/homeConfig/dotfiles/nvim/lua/config/autocmds.lua @@ -105,26 +105,6 @@ cmp.setup({ s = cmp.mapping.confirm({ select = true }), c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }), }), - -- Lazyvim default - -- [""] = cmp.mapping(function(fallback) - -- if vim.fn.pumvisible() == 1 then - -- vim.fn.feedkeys(vim.api.nvim_replace_termcodes("", true, true, true), "n") - -- elseif luasnip.expand_or_jumpable() then - -- vim.fn.feedkeys(vim.api.nvim_replace_termcodes("luasnip-expand-or-jump", true, true, true), "") - -- else - -- fallback() - -- end - -- end, { "i", "s" }), - - -- [""] = cmp.mapping(function(fallback) - -- if vim.fn.pumvisible() == 1 then - -- vim.fn.feedkeys(vim.api.nvim_replace_termcodes("", true, true, true), "n") - -- elseif luasnip.jumpable(-1) then - -- vim.fn.feedkeys(vim.api.nvim_replace_termcodes("luasnip-jump-prev", true, true, true), "") - -- else - -- fallback() - -- end - -- end, { "i", "s" }), }, }) diff --git a/homeConfig/dotfiles/nvim/lua/config/options.lua b/homeConfig/dotfiles/nvim/lua/config/options.lua index 3ea1454..51db980 100644 --- a/homeConfig/dotfiles/nvim/lua/config/options.lua +++ b/homeConfig/dotfiles/nvim/lua/config/options.lua @@ -1,3 +1,8 @@ -- Options are automatically loaded before lazy.nvim startup -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Add any additional options here + +vim.opt.tabstop = 4 +vim.opt.shiftwidth = 4 +vim.opt.softtabstop = 4 +vim.opt.expandtab = true diff --git a/homeConfig/home.nix b/homeConfig/home.nix index 1ba04c6..a6f421a 100644 --- a/homeConfig/home.nix +++ b/homeConfig/home.nix @@ -76,7 +76,6 @@ # LSPs nodePackages.eslint nodePackages.vscode-langservers-extracted - nodePackages.prettier nodePackages.typescript-language-server nodePackages.diagnostic-languageserver nodePackages.pyright @@ -87,8 +86,6 @@ nil marksman sumneko-lua-language-server - stylua - ]; # PROGRAM CONFIGS @@ -112,7 +109,7 @@ # GPG SSH AGENT home.sessionVariables = { SSH_AUTH_SOCK = "${config.xdg.dataHome}/gnupg/S.gpg-agent.ssh"; - }; + }; # DOTFILE SYMLINKS