Compare commits

...

4 commits

2 changed files with 39 additions and 2 deletions

View file

@ -42,11 +42,20 @@ in
withPython3 = true; withPython3 = true;
extraLuaConfig = builtins.readFile ./init.lua; extraLuaConfig = builtins.readFile ./init.lua;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
sumneko-lua-language-server black
isort
nil nil
nixpkgs-fmt
rustfmt
shfmt
stylua stylua
sumneko-lua-language-server
taplo
yamlfmt
]; ];
plugins = with pkgs.vimPlugins; [ plugins = with pkgs.vimPlugins; [
nvim-autopairs
nvim-lastplace
catppuccin-nvim catppuccin-nvim
cmp-nvim-lsp cmp-nvim-lsp
cmp_luasnip cmp_luasnip
@ -74,6 +83,7 @@ in
plenary-nvim # for telescope, neogit plenary-nvim # for telescope, neogit
telescope-nvim telescope-nvim
which-key-nvim which-key-nvim
gitsigns-nvim
]; ];
}; };
}; };

View file

@ -192,7 +192,24 @@ require("formatter").setup({
-- "lua" filetype -- "lua" filetype
require("formatter.filetypes.lua").stylua, require("formatter.filetypes.lua").stylua,
}, },
nix = {
require("formatter.filetypes.nix").nixpkgs_fmt,
},
python = {
require("formatter.filetypes.python").black,
},
rust = {
require("formatter.filetypes.rust").rustfmt,
},
sh = {
require("formatter.filetypes.sh").shfmt,
},
toml = {
require("formatter.filetypes.toml").taplo,
},
yaml = {
require("formatter.filetypes.yaml").yamlfmt,
},
-- Use the special "*" filetype for defining formatter configurations on -- Use the special "*" filetype for defining formatter configurations on
-- any filetype -- any filetype
["*"] = { ["*"] = {
@ -413,3 +430,13 @@ orgmode.setup({
org_agenda_files = { "~/Notes/org" }, org_agenda_files = { "~/Notes/org" },
org_default_notes_file = "~/Notes/org/refile.org", org_default_notes_file = "~/Notes/org/refile.org",
}) })
require("gitsigns").setup()
require("nvim-lastplace").setup({
lastplace_ignore_buftype = { "quickfix", "nofile", "help" },
lastplace_ignore_filetype = { "gitcommit", "gitrebase", "svn", "hgcommit" },
lastplace_open_folds = true,
})
require("nvim-autopairs").setup({})