Compare commits
No commits in common. "c9dac34ee03cb408d611e51be9a2a7b4cba80427" and "b26149af9834734892973b5cce47ee10954eca9d" have entirely different histories.
c9dac34ee0
...
b26149af98
2 changed files with 3 additions and 40 deletions
|
@ -42,20 +42,11 @@ in
|
||||||
withPython3 = true;
|
withPython3 = true;
|
||||||
extraLuaConfig = builtins.readFile ./init.lua;
|
extraLuaConfig = builtins.readFile ./init.lua;
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [
|
||||||
black
|
|
||||||
isort
|
|
||||||
nil
|
|
||||||
nixpkgs-fmt
|
|
||||||
rustfmt
|
|
||||||
shfmt
|
|
||||||
stylua
|
|
||||||
sumneko-lua-language-server
|
sumneko-lua-language-server
|
||||||
taplo
|
nil
|
||||||
yamlfmt
|
stylua
|
||||||
];
|
];
|
||||||
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
|
||||||
|
@ -83,7 +74,6 @@ in
|
||||||
plenary-nvim # for telescope, neogit
|
plenary-nvim # for telescope, neogit
|
||||||
telescope-nvim
|
telescope-nvim
|
||||||
which-key-nvim
|
which-key-nvim
|
||||||
gitsigns-nvim
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -192,24 +192,7 @@ 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
|
||||||
["*"] = {
|
["*"] = {
|
||||||
|
@ -430,13 +413,3 @@ 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({})
|
|
||||||
|
|
Loading…
Reference in a new issue