Compare commits
4 commits
7c7e9317db
...
184ef24913
| Author | SHA1 | Date | |
|---|---|---|---|
| 184ef24913 | |||
| 4da8981990 | |||
| f4c27362c4 | |||
| 7f4c0310db |
3 changed files with 6 additions and 8 deletions
|
|
@ -74,11 +74,10 @@
|
|||
pkgs,
|
||||
...
|
||||
}: {
|
||||
devShells.default =
|
||||
pkgs.mkShell {
|
||||
packages = [inputs'.clan-core.packages.clan-cli pkgs.alejandra];
|
||||
}
|
||||
// config.pre-commit.devShell;
|
||||
devShells.default = pkgs.mkShell {
|
||||
inherit (config.pre-commit.devShell) shellHook nativeBuildInputs;
|
||||
packages = [inputs'.clan-core.packages.clan-cli pkgs.alejandra];
|
||||
};
|
||||
pre-commit.settings.hooks = {
|
||||
alejandra.enable = true;
|
||||
check-merge-conflicts.enable = true;
|
||||
|
|
|
|||
|
|
@ -12,13 +12,13 @@ vim.opt.number = true
|
|||
vim.opt.relativenumber = true
|
||||
vim.opt.scrolloff = 4 -- lines of context
|
||||
vim.opt.shiftround = true -- round indent
|
||||
vim.opt.shiftwidth = 0 -- use tabstop value
|
||||
vim.opt.shiftwidth = 2
|
||||
vim.opt.softtabstop = 2
|
||||
vim.opt.shortmess:append({ c = true })
|
||||
vim.opt.signcolumn = "yes"
|
||||
vim.opt.smartcase = true
|
||||
vim.opt.splitbelow = true
|
||||
vim.opt.splitright = true
|
||||
vim.opt.tabstop = 2
|
||||
vim.opt.termguicolors = true
|
||||
vim.opt.undofile = true
|
||||
vim.opt.undolevels = 10000
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@
|
|||
enable = true;
|
||||
folding = true;
|
||||
nixvimInjections = true;
|
||||
settings.indent.enable = true;
|
||||
settings.highlight.enable = true;
|
||||
settings.incremental_selection = {
|
||||
enable = true;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue