authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-08-02 14:36:50-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-08-02 14:36:50-07:00
log866298a4f1e129b290d2fcfbdb5f53c7fc67af27
tree66869d7b065b15754aa30407690f0e845f26c896
parent52af6ce1425b8eda3f5c4a582f229a76579cbb4c
signature Commit is signed but in an unrecognized format.

updates

5 files changed, 168 insertions(+), 64 deletions(-)

; created+147
......@@ -0,0 +1,147 @@
1{
2 flake,
3 user,
4 host,
5 pkgs,
6 ...
7}:
8{
9 vim = {
10 extraPackages = with pkgs; [
11 python312Packages.pylatexenc
12
13 ];
14
15 languages = {
16 python.format.type = "ruff";
17 markdown = {
18 enable = true;
19 extensions.render-markdown-nvim = {
20 enable = true;
21 };
22 };
23 };
24
25 formatter.conform-nvim = {
26 enable = true;
27 setupOpts = {
28 formatters_by_ft = {
29 fish = [ "fish_indent" ];
30 tex = [ "latexindent" ];
31 };
32 };
33 };
34 diagnostics = {
35 enable = true;
36 config = {
37 virtual_text = {
38 format = pkgs.lib.generators.mkLuaInline ''
39 function(diagnostic)
40 return string.format("%s (%s)", diagnostic.message, diagnostic.source)
41 end
42 '';
43 };
44 };
45 nvim-lint = {
46 enable = true;
47 linters_by_ft = {
48 nix = [ "statix" ];
49 tex = [ "chktex" ];
50 haskell = [ "hlint" ];
51 };
52
53 linters = {
54 chktex = {
55 ignore_exitcode = true;
56 };
57 };
58 };
59 };
60 treesitter = {
61 enable = true;
62 fold = true;
63 addDefaultGrammars = true;
64 highlight = {
65 additionalVimRegexHighlighting = true;
66 };
67
68 grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
69 markdown_inline
70 markdown
71 ];
72
73 highlight.enable = true;
74 indent.enable = false;
75 };
76
77 visuals = {
78 fidget-nvim = {
79 setupOpts = {
80 logger.level = "trace";
81 };
82 };
83 };
84
85 ui = {
86 nvim-ufo = {
87 enable = true;
88 };
89 };
90 autocomplete.blink-cmp = {
91 enable = true;
92 mappings = {
93 close = null;
94 complete = null;
95 confirm = null;
96 next = null;
97 previous = null;
98 scrollDocsDown = null;
99 scrollDocsUp = null;
100 };
101
102 setupOpts = {
103 keymap = {
104 preset = "super-tab";
105 };
106 completion = {
107 ghost_text.enabled = false;
108 list.selection.preselect = true;
109 trigger = {
110 show_in_snippet = true;
111 };
112 accept.auto_brackets.enabled = true;
113 };
114 signature = {
115 enabled = true;
116 };
117 };
118 };
119
120 lazy.plugins."blink.pairs" = {
121 enabled = true;
122 package = pkgs.vimPlugins.blink-pairs;
123 setupModule = "blink.pairs";
124 setupOpts = {
125 mappings = {
126 # -- you can call require("blink.pairs.mappings").enable() and require("blink.pairs.mappings").disable() to enable/disable mappings at runtime
127 enabled = true;
128 # -- see the defaults: https://github.com/Saghen/blink.pairs/blob/main/lua/blink/pairs/config/mappings.lua#L10
129 pairs = [ ];
130 };
131 highlights = {
132 enabled = true;
133 groups = [
134 "BlinkPairsOrange"
135 "BlinkPairsPurple"
136 "BlinkPairsBlue"
137 ];
138 matchparen = {
139 enabled = true;
140 group = "MatchParen";
141 };
142 };
143 debug = false;
144 };
145 };
146 };
147}
flake.lock+16-39
......@@ -83,7 +83,10 @@
8383 },
8484 "flake-parts": {
8585 "inputs": {
86 "nixpkgs-lib": "nixpkgs-lib"
86 "nixpkgs-lib": [
87 "nvf",
88 "nixpkgs"
89 ]
8790 },
8891 "locked": {
8992 "lastModified": 1749398372,
......@@ -137,7 +140,10 @@
137140 },
138141 "flake-utils_3": {
139142 "inputs": {
140 "systems": "systems_3"
143 "systems": [
144 "nvf",
145 "systems"
146 ]
141147 },
142148 "locked": {
143149 "lastModified": 1731533236,
......@@ -155,7 +161,7 @@
155161 },
156162 "flake-utils_4": {
157163 "inputs": {
158 "systems": "systems_5"
164 "systems": "systems_4"
159165 },
160166 "locked": {
161167 "lastModified": 1705309234,
......@@ -173,7 +179,7 @@
173179 },
174180 "flake-utils_5": {
175181 "inputs": {
176 "systems": "systems_6"
182 "systems": "systems_5"
177183 },
178184 "locked": {
179185 "lastModified": 1710146030,
......@@ -191,7 +197,7 @@
191197 },
192198 "flake-utils_6": {
193199 "inputs": {
194 "systems": "systems_7"
200 "systems": "systems_6"
195201 },
196202 "locked": {
197203 "lastModified": 1705309234,
......@@ -389,21 +395,6 @@
389395 "type": "github"
390396 }
391397 },
392 "nixpkgs-lib": {
393 "locked": {
394 "lastModified": 1748740939,
395 "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
396 "owner": "nix-community",
397 "repo": "nixpkgs.lib",
398 "rev": "656a64127e9d791a334452c6b6606d17539476e2",
399 "type": "github"
400 },
401 "original": {
402 "owner": "nix-community",
403 "repo": "nixpkgs.lib",
404 "type": "github"
405 }
406 },
407398 "nixpkgs_2": {
408399 "locked": {
409400 "lastModified": 1751984180,
......@@ -459,18 +450,19 @@
459450 "nixpkgs": [
460451 "nixpkgs"
461452 ],
462 "systems": "systems_4"
453 "systems": "systems_3"
463454 },
464455 "locked": {
465 "lastModified": 1752075018,
466 "narHash": "sha256-RJnQJooI1Jc7U4gvEKErbiIcgqGtEeUWddvxIjQfP58=",
456 "lastModified": 1753085278,
457 "narHash": "sha256-jOGYaMh4KBhzTqer3G66ki17CL7e822PExkcgWiQoWE=",
467458 "owner": "notashelf",
468459 "repo": "nvf",
469 "rev": "9aa90885640d19b1375e6dec75c6cb125ac0f0c2",
460 "rev": "08991be77a9f641facbddeca619388727661427d",
470461 "type": "github"
471462 },
472463 "original": {
473464 "owner": "notashelf",
465 "ref": "v0.8",
474466 "repo": "nvf",
475467 "type": "github"
476468 }
......@@ -698,21 +690,6 @@
698690 "type": "github"
699691 }
700692 },
701 "systems_7": {
702 "locked": {
703 "lastModified": 1681028828,
704 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
705 "owner": "nix-systems",
706 "repo": "default",
707 "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
708 "type": "github"
709 },
710 "original": {
711 "owner": "nix-systems",
712 "repo": "default",
713 "type": "github"
714 }
715 },
716693 "zen-browser": {
717694 "inputs": {
718695 "nixpkgs": [
flake.nix+1-1
......@@ -12,7 +12,7 @@
1212 apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
1313 apple-fonts.inputs.nixpkgs.follows = "nixpkgs";
1414
15 nvf.url = "github:notashelf/nvf";
15 nvf.url = "github:notashelf/nvf/v0.8";
1616 nvf.inputs.nixpkgs.follows = "nixpkgs";
1717
1818 darwin.url = "github:lnl7/nix-darwin/master";
modules/neovim/default.nix+4-4
......@@ -101,24 +101,24 @@
101101 lua.enable = true;
102102 # sort-lines: off
103103
104 ts.format.enable = true; # deno fmt is enabled elsewhere
105104 nix = {
106105 enable = true;
107106 format.type = "nixfmt"; # looks so much nicer
108 lsp.options.autoArchive = true;
109107 };
110108 };
111109 formatter.conform-nvim = {
112110 enable = true;
113 setupOpts.formatters_by_ft = {
111 setupOpts = {
112 formatters_by_ft = {
114113 typescript = [ "deno_fmt" ];
115114 typescriptreact = [ "deno_fmt" ];
116115 javascript = [ "deno_fmt" ];
117116 javascriptreact = [ "deno_fmt" ];
118117 };
119 setupOpts.formatters.deno_fmt = {
118 formatters.deno_fmt = {
120119 command = lib.meta.getExe pkgs.deno;
121120 };
121 };
122122 };
123123 filetree = {
124124 neo-tree = {
test.ts deleted-20
......@@ -1,20 +0,0 @@
1const option = collectionDetails
2 .fields
3 .find(
4 (field): field is { type: "Option", slug: string, validations: WebflowValidations["Option"] } =>
5 field.slug === fieldData.path
6 )!
7 .validations;
8
9 if (fieldData.type
10"Option" && typeof rawValue
11"string")
12return (
13(
14collectionDetails.fields. find (predicate: (field) ⇒ field.slug
15| WebflowValidations["Option"]
16| undefined
17fieldData.path) ?. validations as
18)?. options.find(predicate: (option) ⇒ option.id
19rawValue) ?. name ?? fullMatch
20);