Skip to content

Commit 4544054

Browse files
DieracDeltaDieracDelta
committed
feat: improvements to formatting
1 parent b06c6f8 commit 4544054

File tree

6 files changed

+368
-281
lines changed

6 files changed

+368
-281
lines changed

‎.stylua.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
indent_type = "Spaces"
2+
indent_width = 2

‎flake.lock‎

Lines changed: 52 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 121 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
description = "Neovim config";
33

44
inputs = {
5+
nixfmt.url = "github:nixos/nixfmt";
56

67
mnw.url = "github:Gerg-L/mnw";
78
blamer-nvim-src.url = "github:psjay/blamer.nvim";
@@ -316,7 +317,10 @@
316317
lze-flk.overlays.default
317318
lzextras-flk.overlays.default
318319
(prev: final: {
319-
nodejs = final.nodejs.overrideAttrs(oldAttrs: {doCheck = false;});
320+
nixfmt = inputs.nixfmt.packages.${system}.nixfmt;
321+
nodejs = final.nodejs.overrideAttrs (oldAttrs: {
322+
doCheck = false;
323+
});
320324
# credit: gerg/mnw
321325
neovim' = import "${neovim-nightly}/flake/packages/neovim.nix" {
322326
inherit (final) lib pkgs;
@@ -326,8 +330,7 @@
326330
nodeName = lock.nodes.root.inputs.neovim-src;
327331
input = lock.nodes.${nodeName}.locked;
328332
in
329-
builtins.trace input
330-
pkgs.fetchFromGitHub {
333+
builtins.trace input pkgs.fetchFromGitHub {
331334
inherit (input) owner repo rev;
332335
hash = input.narHash;
333336
};
@@ -415,6 +418,7 @@
415418

416419
# })
417420
(prev: final: {
421+
nixfmt = inputs.nixfmt.packages.${system}.nixfmt;
418422
# credit: gerg/mnw
419423
neovim' = import "${neovim-nightly}/flake/packages/neovim.nix" {
420424
inherit (final) lib pkgs;
@@ -424,8 +428,7 @@
424428
nodeName = lock.nodes.root.inputs.neovim-src;
425429
input = lock.nodes.${nodeName}.locked;
426430
in
427-
builtins.trace input
428-
pkgs.fetchFromGitHub {
431+
builtins.trace input pkgs.fetchFromGitHub {
429432
inherit (input) owner repo rev;
430433
hash = input.narHash;
431434
};
@@ -435,109 +438,115 @@
435438
];
436439
});
437440
# plugin, config file
438-
requiredPluginList = with pkgs; [
439-
# lazy loading
440-
vimPlugins.lze
441-
vimPlugins.lzextras
442-
colorful-winsep-nvim
443-
vimPlugins.markid
444-
blamer-nvim
445-
446-
447-
# essentials
448-
which-key
449-
450-
# aesthetics
451-
gruvbox-nvim
452-
vimPlugins.lualine-nvim
453-
vimPlugins.tabline-nvim
454-
vimPlugins.nvim-web-devicons
455-
456-
# telescope
457-
telescope-nvim
458-
vimPlugins.telescope-file-browser-nvim
459-
telescope-ui-select
460-
vimPlugins.yazi-nvim
461-
462-
# github
463-
gitlinker-nvim
464-
465-
# misc
466-
vimPlugins.surround-nvim
467-
vimPlugins.undotree
468-
colorizer
469-
470-
vimPlugins.dressing-nvim
471-
vimPlugins.nui-nvim
472-
vimPlugins.render-markdown-nvim
473-
vimPlugins.img-clip-nvim
474-
# git
475-
vimPlugins.neogit
476-
477-
vimPlugins.gitsigns-nvim
478-
479-
480-
# autopairs
481-
vimPlugins.nvim-autopairs
482-
483-
# lsp
484-
485-
vimPlugins.nvim-nio # async-io
486-
vimPlugins.rust-vim # for formatting
487-
vimPlugins.image-nvim
488-
typst-vim
489-
vimPlugins.vim-ormolu # haskell
490-
vimPlugins.coq_nvim
491-
vimPlugins.lsp_signature-nvim
492-
vimPlugins.lspkind-nvim
493-
lsp-config
494-
vimPlugins.plenary-nvim
495-
vimPlugins.popup-nvim
496-
497-
fidget
498-
vimPlugins.trouble-nvim
499-
copilot-lua
500-
# copilot-cmp
501-
node-type-nvim
502-
floating-input
503-
504-
symbols-nvim
505-
506-
# treesitter
507-
nvim-async
508-
(nvim-ufo.overrideAttrs (oa: {doCheck = false;}))
509-
comment-nvim
510-
#vimPlugins.nvim-treesitter-context
511-
#vimPlugins.nvim-treesitter-textobjects
512-
#nvim-treesitter
513-
514-
# (builtins.attrValues ((lib.filterAttrs (n: v: !(builtins.elem v ["comment"]))) pkgs.vimPlugins.nvim-treesitter.grammarPlugins))
515-
516-
((pkgs.vimPlugins.nvim-treesitter.overrideAttrs (oldAttrs: {
517-
src = pkgs.nvim-treesitter-src;
518-
})).withAllGrammars)
519-
520-
# (builtins.trace (lib.filterAttrs (name: val: name != "comment") pkgs.vimPlugins.nvim-treesitter.grammarPlugins)
521-
vimPlugins.telescope-zoxide
522-
# )
523-
vimPlugins.nvim-ts-autotag
524-
vimPlugins.rainbow-delimiters-nvim
525-
vim-illuminate
526-
ts-node-action
527-
528-
# TODO lazy load these
529-
vimPlugins.typescript-tools-nvim
530-
vimPlugins.crates-nvim
531-
coqtail
532-
coq-lsp-nvim
533-
]
534-
# ++ lib.optional (system != "aarch64-darwin") [
535-
# rust-owl.packages.${system}.rustowl-nvim
536-
# ]
537-
++
538-
(pkgs.vimPlugins.nvim-treesitter.grammarPlugins
539-
|> (lib.filterAttrs (n: _: !(builtins.elem n [ "comment" ])))
540-
|> builtins.attrValues);
441+
requiredPluginList =
442+
with pkgs;
443+
[
444+
# lazy loading
445+
vimPlugins.lze
446+
vimPlugins.lzextras
447+
colorful-winsep-nvim
448+
vimPlugins.markid
449+
blamer-nvim
450+
451+
# essentials
452+
which-key
453+
454+
# aesthetics
455+
gruvbox-nvim
456+
vimPlugins.lualine-nvim
457+
vimPlugins.tabline-nvim
458+
vimPlugins.nvim-web-devicons
459+
460+
# telescope
461+
telescope-nvim
462+
vimPlugins.telescope-file-browser-nvim
463+
telescope-ui-select
464+
vimPlugins.yazi-nvim
465+
466+
# github
467+
gitlinker-nvim
468+
469+
# misc
470+
vimPlugins.surround-nvim
471+
vimPlugins.undotree
472+
colorizer
473+
474+
vimPlugins.dressing-nvim
475+
vimPlugins.nui-nvim
476+
vimPlugins.render-markdown-nvim
477+
vimPlugins.img-clip-nvim
478+
# git
479+
vimPlugins.neogit
480+
481+
vimPlugins.gitsigns-nvim
482+
483+
# autopairs
484+
vimPlugins.nvim-autopairs
485+
486+
# lsp
487+
488+
vimPlugins.nvim-nio # async-io
489+
vimPlugins.rust-vim # for formatting
490+
vimPlugins.image-nvim
491+
typst-vim
492+
vimPlugins.vim-ormolu # haskell
493+
vimPlugins.coq_nvim
494+
vimPlugins.lsp_signature-nvim
495+
vimPlugins.lspkind-nvim
496+
lsp-config
497+
vimPlugins.plenary-nvim
498+
vimPlugins.popup-nvim
499+
500+
vimPlugins.conform-nvim
501+
502+
fidget
503+
vimPlugins.trouble-nvim
504+
copilot-lua
505+
# copilot-cmp
506+
node-type-nvim
507+
floating-input
508+
509+
symbols-nvim
510+
511+
# treesitter
512+
nvim-async
513+
(nvim-ufo.overrideAttrs (oa: {
514+
doCheck = false;
515+
}))
516+
comment-nvim
517+
#vimPlugins.nvim-treesitter-context
518+
#vimPlugins.nvim-treesitter-textobjects
519+
#nvim-treesitter
520+
521+
# (builtins.attrValues ((lib.filterAttrs (n: v: !(builtins.elem v ["comment"]))) pkgs.vimPlugins.nvim-treesitter.grammarPlugins))
522+
523+
((pkgs.vimPlugins.nvim-treesitter.overrideAttrs (oldAttrs: {
524+
src = pkgs.nvim-treesitter-src;
525+
})).withAllGrammars
526+
)
527+
528+
# (builtins.trace (lib.filterAttrs (name: val: name != "comment") pkgs.vimPlugins.nvim-treesitter.grammarPlugins)
529+
vimPlugins.telescope-zoxide
530+
# )
531+
vimPlugins.nvim-ts-autotag
532+
vimPlugins.rainbow-delimiters-nvim
533+
vim-illuminate
534+
ts-node-action
535+
536+
# TODO lazy load these
537+
vimPlugins.typescript-tools-nvim
538+
vimPlugins.crates-nvim
539+
coqtail
540+
coq-lsp-nvim
541+
]
542+
# ++ lib.optional (system != "aarch64-darwin") [
543+
# rust-owl.packages.${system}.rustowl-nvim
544+
# ]
545+
++ (
546+
pkgs.vimPlugins.nvim-treesitter.grammarPlugins
547+
|> (lib.filterAttrs (n: _: !(builtins.elem n [ "comment" ])))
548+
|> builtins.attrValues
549+
);
541550

542551
luaModules = [
543552
"essentials"
@@ -571,6 +580,8 @@
571580
};
572581
extraBinPath = builtins.attrValues {
573582
inherit (pkgs)
583+
nixfmt
584+
ruff
574585
ripgrep
575586
git
576587
terraform-ls
@@ -585,6 +596,8 @@
585596
deadnix
586597
statix
587598
imagemagick
599+
shellcheck
600+
shfmt
588601
;
589602
};
590603
extraLuaPackages = ps: [ ps.magick ];

0 commit comments

Comments
 (0)