Compare commits

...

3 commits

Author SHA1 Message Date
0a5c8fb475
feat: Add linters 2025-03-16 16:35:28 -07:00
fd41fbaf5b
feat: extras.ui.edgy 2025-03-16 15:51:42 -07:00
9301482cda
ci: Make statix ignore generated code 2025-03-16 15:45:49 -07:00
5 changed files with 59 additions and 24 deletions

View file

@ -56,11 +56,11 @@
categoryDefinitions = { categoryDefinitions = {
pkgs, pkgs,
settings, # settings,
categories, # categories,
extra, # extra,
name, name,
mkNvimPlugin, # mkNvimPlugin,
... ...
}: { }: {
lspsAndRuntimeDeps = with pkgs; let lspsAndRuntimeDeps = with pkgs; let
@ -76,8 +76,12 @@
biome biome
codespell codespell
curl curl
deadnix
djlint
docker-compose-language-service docker-compose-language-service
dockerfile-language-server-nodejs dockerfile-language-server-nodejs
dotenv-linter
editorconfig-checker
emmet-language-server emmet-language-server
fd fd
fish-lsp fish-lsp
@ -87,12 +91,14 @@
grpcurl grpcurl
hadolint hadolint
helm-ls helm-ls
htmlhint
jq jq
lazygit lazygit
lua-language-server lua-language-server
markdownlint-cli2 markdownlint-cli2
marksman marksman
nil nil
nodePackages.alex
nodePackages.prettier nodePackages.prettier
npm-modules.css-variables-language-server npm-modules.css-variables-language-server
npm-modules.gh-actions-language-server npm-modules.gh-actions-language-server
@ -126,6 +132,7 @@
vue-language-server vue-language-server
yaml-language-server yaml-language-server
yamllint yamllint
zizmor
]; ];
}; };
@ -271,6 +278,9 @@
nvim-nio nvim-nio
# UI # UI
# edgy.nvim
edgy-nvim
# Mini Animate # Mini Animate
{ {
plugin = mini-animate; plugin = mini-animate;
@ -342,7 +352,7 @@
packageDefinitions = { packageDefinitions = {
nvim = { nvim = {
pkgs, pkgs,
mkNvimPlugin, # mkNvimPlugin,
... ...
}: { }: {
settings = { settings = {
@ -385,11 +395,13 @@
devShells.default = devenv.lib.mkShell { devShells.default = devenv.lib.mkShell {
inherit inputs pkgs; inherit inputs pkgs;
modules = [ modules = [
({ (
pkgs, # {
config, # pkgs,
... # config,
}: { # ...
# }:
_: {
packages = [ packages = [
defaultPackage defaultPackage
]; ];
@ -403,7 +415,8 @@
trim-trailing-whitespace.enable = true; trim-trailing-whitespace.enable = true;
no-commit-to-branch.enable = true; no-commit-to-branch.enable = true;
}; };
}) }
)
]; ];
}; };
}) })

View file

@ -76,6 +76,7 @@ require('nixCatsUtils.lazyCat').setup(
{ import = 'lazyvim.plugins.extras.test.core' }, { import = 'lazyvim.plugins.extras.test.core' },
{ import = 'lazyvim.plugins.extras.ui.edgy' },
{ import = 'lazyvim.plugins.extras.ui.mini-animate' }, { import = 'lazyvim.plugins.extras.ui.mini-animate' },
{ import = 'lazyvim.plugins.extras.ui.treesitter-context' }, { import = 'lazyvim.plugins.extras.ui.treesitter-context' },

View file

@ -2,3 +2,10 @@ vim.o.textwidth = 80
vim.o.colorcolumn = '+1' vim.o.colorcolumn = '+1'
vim.g.lazyvim_prettier_needs_config = true vim.g.lazyvim_prettier_needs_config = true
vim.filetype.add({
pattern = {
['%.env%.[%w_.-]+'] = 'sh.env',
['.*/.github/workflows/.*%.yml'] = 'yaml.ghaction',
},
})

View file

@ -3,12 +3,23 @@ return {
'mfussenegger/nvim-lint', 'mfussenegger/nvim-lint',
opts = { opts = {
linters_by_ft = { linters_by_ft = {
['*'] = { 'codespell' }, ['*'] = { 'codespell', 'editorconfig-checker', 'alex' },
bash = { 'shellcheck' }, bash = { 'shellcheck' },
css = { 'stylelint' }, css = { 'stylelint' },
django = { 'djlint' },
env = { 'dotenv-linter' },
ghaction = { 'zizmor' },
handlebars = { 'djlint' },
html = { 'htmlhint' },
jinja = { 'djlint' },
mustache = { 'djlint' },
nix = { 'deadnix', 'statix' },
nunjucks = { 'djlint' },
scss = { 'stylelint' }, scss = { 'stylelint' },
sh = { 'shellcheck' }, sh = { 'shellcheck' },
twig = { 'djlint' },
yaml = { 'yamllint' }, yaml = { 'yamllint' },
zsh = { 'zsh' },
}, },
}, },
}, },

3
statix.toml Normal file
View file

@ -0,0 +1,3 @@
disabled = []
nix_version = '2.4'
ignore = ['.devenv', 'packages/npm-modules']