| author |  Natalie Marks <nmarks413@gmail.com> 2025-05-27 19:56:17-07:00 |
| committer | Natalie Marks <nmarks413@gmail.com> 2025-05-27 19:56:17-07:00 |
| log | b3d5a281416e3e90bccea2e2dbaf204aacb3a21c |
| tree | 6f9348eeaa2349f9efbcfba026cefb7a013ab6c4 |
| parent | 27be81d9141e439bc75c782fb7f414e8d520f92f |
| signature | Commit is signed but in an unrecognized format. |
removed stylix, updated nvf
10 files changed, 138 insertions(+), 145 deletions(-)
- flake.lock
- flake.nix
lib
modules
neovim
users
natalie
flake.lock+24-108
| ... | @@ -238,24 +238,6 @@ | ... | @@ -238,24 +238,6 @@ |
| 238 | "inputs": { | 238 | "inputs": { |
| 239 | "systems": "systems" | 239 | "systems": "systems" |
| 240 | }, | 240 | }, |
| 241 | "locked": { | ||
| 242 | "lastModified": 1731533236, | ||
| 243 | "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", | ||
| 244 | "owner": "numtide", | ||
| 245 | "repo": "flake-utils", | ||
| 246 | "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", | ||
| 247 | "type": "github" | ||
| 248 | }, | ||
| 249 | "original": { | ||
| 250 | "owner": "numtide", | ||
| 251 | "repo": "flake-utils", | ||
| 252 | "type": "github" | ||
| 253 | } | ||
| 254 | }, | ||
| 255 | "flake-utils_2": { | ||
| 256 | "inputs": { | ||
| 257 | "systems": "systems_2" | ||
| 258 | }, | ||
| 259 | "locked": { | 241 | "locked": { |
| 260 | "lastModified": 1701680307, | 242 | "lastModified": 1701680307, |
| 261 | "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", | 243 | "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", |
| ... | @@ -270,9 +252,9 @@ | ... | @@ -270,9 +252,9 @@ |
| 270 | "type": "github" | 252 | "type": "github" |
| 271 | } | 253 | } |
| 272 | }, | 254 | }, |
| 273 | "flake-utils_3": { | 255 | "flake-utils_2": { |
| 274 | "inputs": { | 256 | "inputs": { |
| 275 | "systems": "systems_3" | 257 | "systems": "systems_2" |
| 276 | }, | 258 | }, |
| 277 | "locked": { | 259 | "locked": { |
| 278 | "lastModified": 1731533236, | 260 | "lastModified": 1731533236, |
| ... | @@ -288,9 +270,9 @@ | ... | @@ -288,9 +270,9 @@ |
| 288 | "type": "github" | 270 | "type": "github" |
| 289 | } | 271 | } |
| 290 | }, | 272 | }, |
| 291 | "flake-utils_4": { | 273 | "flake-utils_3": { |
| 292 | "inputs": { | 274 | "inputs": { |
| 293 | "systems": "systems_4" | 275 | "systems": "systems_3" |
| 294 | }, | 276 | }, |
| 295 | "locked": { | 277 | "locked": { |
| 296 | "lastModified": 1731533236, | 278 | "lastModified": 1731533236, |
| ... | @@ -306,9 +288,9 @@ | ... | @@ -306,9 +288,9 @@ |
| 306 | "type": "github" | 288 | "type": "github" |
| 307 | } | 289 | } |
| 308 | }, | 290 | }, |
| 309 | "flake-utils_5": { | 291 | "flake-utils_4": { |
| 310 | "inputs": { | 292 | "inputs": { |
| 311 | "systems": "systems_7" | 293 | "systems": "systems_6" |
| 312 | }, | 294 | }, |
| 313 | "locked": { | 295 | "locked": { |
| 314 | "lastModified": 1705309234, | 296 | "lastModified": 1705309234, |
| ... | @@ -324,9 +306,9 @@ | ... | @@ -324,9 +306,9 @@ |
| 324 | "type": "github" | 306 | "type": "github" |
| 325 | } | 307 | } |
| 326 | }, | 308 | }, |
| 327 | "flake-utils_6": { | 309 | "flake-utils_5": { |
| 328 | "inputs": { | 310 | "inputs": { |
| 329 | "systems": "systems_8" | 311 | "systems": "systems_7" |
| 330 | }, | 312 | }, |
| 331 | "locked": { | 313 | "locked": { |
| 332 | "lastModified": 1710146030, | 314 | "lastModified": 1710146030, |
| ... | @@ -342,9 +324,9 @@ | ... | @@ -342,9 +324,9 @@ |
| 342 | "type": "github" | 324 | "type": "github" |
| 343 | } | 325 | } |
| 344 | }, | 326 | }, |
| 345 | "flake-utils_7": { | 327 | "flake-utils_6": { |
| 346 | "inputs": { | 328 | "inputs": { |
| 347 | "systems": "systems_9" | 329 | "systems": "systems_8" |
| 348 | }, | 330 | }, |
| 349 | "locked": { | 331 | "locked": { |
| 350 | "lastModified": 1705309234, | 332 | "lastModified": 1705309234, |
| ... | @@ -360,21 +342,6 @@ | ... | @@ -360,21 +342,6 @@ |
| 360 | "type": "github" | 342 | "type": "github" |
| 361 | } | 343 | } |
| 362 | }, | 344 | }, |
| 363 | "flakey-profile": { | ||
| 364 | "locked": { | ||
| 365 | "lastModified": 1712898590, | ||
| 366 | "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", | ||
| 367 | "owner": "lf-", | ||
| 368 | "repo": "flakey-profile", | ||
| 369 | "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", | ||
| 370 | "type": "github" | ||
| 371 | }, | ||
| 372 | "original": { | ||
| 373 | "owner": "lf-", | ||
| 374 | "repo": "flakey-profile", | ||
| 375 | "type": "github" | ||
| 376 | } | ||
| 377 | }, | ||
| 378 | "fromYaml": { | 345 | "fromYaml": { |
| 379 | "flake": false, | 346 | "flake": false, |
| 380 | "locked": { | 347 | "locked": { |
| ... | @@ -547,48 +514,13 @@ | ... | @@ -547,48 +514,13 @@ |
| 547 | "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in" | 514 | "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in" |
| 548 | } | 515 | } |
| 549 | }, | 516 | }, |
| 550 | "lix": { | ||
| 551 | "flake": false, | ||
| 552 | "locked": { | ||
| 553 | "lastModified": 1746827285, | ||
| 554 | "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=", | ||
| 555 | "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a", | ||
| 556 | "type": "tarball", | ||
| 557 | "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a" | ||
| 558 | }, | ||
| 559 | "original": { | ||
| 560 | "type": "tarball", | ||
| 561 | "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz" | ||
| 562 | } | ||
| 563 | }, | ||
| 564 | "lix-module": { | ||
| 565 | "inputs": { | ||
| 566 | "flake-utils": "flake-utils", | ||
| 567 | "flakey-profile": "flakey-profile", | ||
| 568 | "lix": "lix", | ||
| 569 | "nixpkgs": [ | ||
| 570 | "nixpkgs" | ||
| 571 | ] | ||
| 572 | }, | ||
| 573 | "locked": { | ||
| 574 | "lastModified": 1746838955, | ||
| 575 | "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", | ||
| 576 | "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", | ||
| 577 | "type": "tarball", | ||
| 578 | "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz" | ||
| 579 | }, | ||
| 580 | "original": { | ||
| 581 | "type": "tarball", | ||
| 582 | "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz" | ||
| 583 | } | ||
| 584 | }, | ||
| 585 | "mnw": { | 517 | "mnw": { |
| 586 | "locked": { | 518 | "locked": { |
| 587 | "lastModified": 1747499976, | 519 | "lastModified": 1748278309, |
| 588 | "narHash": "sha256-YTiSI4WLbk0CleXeBheYmKZV6iqKyBpyoh1e+vcQzu4=", | 520 | "narHash": "sha256-JCeiMrUhFku44kfKsgiD9Ibzho4MblBD2WmOQYsQyTY=", |
| 589 | "owner": "Gerg-L", | 521 | "owner": "Gerg-L", |
| 590 | "repo": "mnw", | 522 | "repo": "mnw", |
| 591 | "rev": "72433a144c4ac16931e9148f78db4a0e4c147441", | 523 | "rev": "486a17ba1279ab2357cae8ff66b309db622f8831", |
| 592 | "type": "github" | 524 | "type": "github" |
| 593 | }, | 525 | }, |
| 594 | "original": { | 526 | "original": { |
| ... | @@ -599,7 +531,7 @@ | ... | @@ -599,7 +531,7 @@ |
| 599 | }, | 531 | }, |
| 600 | "moonlight": { | 532 | "moonlight": { |
| 601 | "inputs": { | 533 | "inputs": { |
| 602 | "flake-utils": "flake-utils_2", | 534 | "flake-utils": "flake-utils", |
| 603 | "nixpkgs": [ | 535 | "nixpkgs": [ |
| 604 | "nixpkgs" | 536 | "nixpkgs" |
| 605 | ] | 537 | ] |
| ... | @@ -686,7 +618,7 @@ | ... | @@ -686,7 +618,7 @@ |
| 686 | }, | 618 | }, |
| 687 | "nix-options-search": { | 619 | "nix-options-search": { |
| 688 | "inputs": { | 620 | "inputs": { |
| 689 | "flake-utils": "flake-utils_3", | 621 | "flake-utils": "flake-utils_2", |
| 690 | "gitignore": "gitignore", | 622 | "gitignore": "gitignore", |
| 691 | "nixpkgs": "nixpkgs" | 623 | "nixpkgs": "nixpkgs" |
| 692 | }, | 624 | }, |
| ... | @@ -850,20 +782,20 @@ | ... | @@ -850,20 +782,20 @@ |
| 850 | "nvf": { | 782 | "nvf": { |
| 851 | "inputs": { | 783 | "inputs": { |
| 852 | "flake-parts": "flake-parts", | 784 | "flake-parts": "flake-parts", |
| 853 | "flake-utils": "flake-utils_4", | 785 | "flake-utils": "flake-utils_3", |
| 854 | "mnw": "mnw", | 786 | "mnw": "mnw", |
| 855 | "nil": "nil", | 787 | "nil": "nil", |
| 856 | "nixpkgs": [ | 788 | "nixpkgs": [ |
| 857 | "nixpkgs" | 789 | "nixpkgs" |
| 858 | ], | 790 | ], |
| 859 | "systems": "systems_5" | 791 | "systems": "systems_4" |
| 860 | }, | 792 | }, |
| 861 | "locked": { | 793 | "locked": { |
| 862 | "lastModified": 1747525582, | 794 | "lastModified": 1748318168, |
| 863 | "narHash": "sha256-oEZ6DV4bPcNZIuwW5Kcd+/zT3PMkXse2kX/3jHoomGk=", | 795 | "narHash": "sha256-pUDVxHarStrDYxd2tztz4SjNflzFxuMMEC3SK9WLUK8=", |
| 864 | "owner": "notashelf", | 796 | "owner": "notashelf", |
| 865 | "repo": "nvf", | 797 | "repo": "nvf", |
| 866 | "rev": "d3a0e7029ac57eef1120225973247851c5b967b5", | 798 | "rev": "74ba4d955976af1422ea1f095968e547db70aa04", |
| 867 | "type": "github" | 799 | "type": "github" |
| 868 | }, | 800 | }, |
| 869 | "original": { | 801 | "original": { |
| ... | @@ -889,7 +821,6 @@ | ... | @@ -889,7 +821,6 @@ |
| 889 | "apple-fonts": "apple-fonts", | 821 | "apple-fonts": "apple-fonts", |
| 890 | "darwin": "darwin", | 822 | "darwin": "darwin", |
| 891 | "home-manager": "home-manager", | 823 | "home-manager": "home-manager", |
| 892 | "lix-module": "lix-module", | ||
| 893 | "moonlight": "moonlight", | 824 | "moonlight": "moonlight", |
| 894 | "nh": "nh", | 825 | "nh": "nh", |
| 895 | "nix-index-database": "nix-index-database", | 826 | "nix-index-database": "nix-index-database", |
| ... | @@ -1066,7 +997,7 @@ | ... | @@ -1066,7 +997,7 @@ |
| 1066 | "nixpkgs" | 997 | "nixpkgs" |
| 1067 | ], | 998 | ], |
| 1068 | "nur": "nur", | 999 | "nur": "nur", |
| 1069 | "systems": "systems_6", | 1000 | "systems": "systems_5", |
| 1070 | "tinted-foot": "tinted-foot", | 1001 | "tinted-foot": "tinted-foot", |
| 1071 | "tinted-kitty": "tinted-kitty", | 1002 | "tinted-kitty": "tinted-kitty", |
| 1072 | "tinted-schemes": "tinted-schemes", | 1003 | "tinted-schemes": "tinted-schemes", |
| ... | @@ -1207,21 +1138,6 @@ | ... | @@ -1207,21 +1138,6 @@ |
| 1207 | "type": "github" | 1138 | "type": "github" |
| 1208 | } | 1139 | } |
| 1209 | }, | 1140 | }, |
| 1210 | "systems_9": { | ||
| 1211 | "locked": { | ||
| 1212 | "lastModified": 1681028828, | ||
| 1213 | "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", | ||
| 1214 | "owner": "nix-systems", | ||
| 1215 | "repo": "default", | ||
| 1216 | "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", | ||
| 1217 | "type": "github" | ||
| 1218 | }, | ||
| 1219 | "original": { | ||
| 1220 | "owner": "nix-systems", | ||
| 1221 | "repo": "default", | ||
| 1222 | "type": "github" | ||
| 1223 | } | ||
| 1224 | }, | ||
| 1225 | "tinted-foot": { | 1141 | "tinted-foot": { |
| 1226 | "flake": false, | 1142 | "flake": false, |
| 1227 | "locked": { | 1143 | "locked": { |
| ... | @@ -1328,7 +1244,7 @@ | ... | @@ -1328,7 +1244,7 @@ |
| 1328 | "zig": { | 1244 | "zig": { |
| 1329 | "inputs": { | 1245 | "inputs": { |
| 1330 | "flake-compat": "flake-compat_3", | 1246 | "flake-compat": "flake-compat_3", |
| 1331 | "flake-utils": "flake-utils_5", | 1247 | "flake-utils": "flake-utils_4", |
| 1332 | "nixpkgs": "nixpkgs_3" | 1248 | "nixpkgs": "nixpkgs_3" |
| 1333 | }, | 1249 | }, |
| 1334 | "locked": { | 1250 | "locked": { |
| ... | @@ -1348,7 +1264,7 @@ | ... | @@ -1348,7 +1264,7 @@ |
| 1348 | "zig-overlay": { | 1264 | "zig-overlay": { |
| 1349 | "inputs": { | 1265 | "inputs": { |
| 1350 | "flake-compat": "flake-compat_4", | 1266 | "flake-compat": "flake-compat_4", |
| 1351 | "flake-utils": "flake-utils_7", | 1267 | "flake-utils": "flake-utils_6", |
| 1352 | "nixpkgs": [ | 1268 | "nixpkgs": [ |
| 1353 | "zls", | 1269 | "zls", |
| 1354 | "nixpkgs" | 1270 | "nixpkgs" |
| ... | @@ -1370,7 +1286,7 @@ | ... | @@ -1370,7 +1286,7 @@ |
| 1370 | }, | 1286 | }, |
| 1371 | "zls": { | 1287 | "zls": { |
| 1372 | "inputs": { | 1288 | "inputs": { |
| 1373 | "flake-utils": "flake-utils_6", | 1289 | "flake-utils": "flake-utils_5", |
| 1374 | "gitignore": "gitignore_3", | 1290 | "gitignore": "gitignore_3", |
| 1375 | "langref": "langref", | 1291 | "langref": "langref", |
| 1376 | "nixpkgs": "nixpkgs_4", | 1292 | "nixpkgs": "nixpkgs_4", |
flake.nix+6-6
| ... | @@ -3,10 +3,10 @@ | ... | @@ -3,10 +3,10 @@ |
| 3 | inputs = { | 3 | inputs = { |
| 4 | nixpkgs.url = "nixpkgs/nixos-unstable"; | 4 | nixpkgs.url = "nixpkgs/nixos-unstable"; |
| 5 | 5 | ||
| 6 | lix-module = { | 6 | # lix-module = { |
| 7 | url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; | 7 | # url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; |
| 8 | inputs.nixpkgs.follows = "nixpkgs"; | 8 | # inputs.nixpkgs.follows = "nixpkgs"; |
| 9 | }; | 9 | # }; |
| 10 | 10 | ||
| 11 | home-manager.url = "github:nix-community/home-manager/master"; | 11 | home-manager.url = "github:nix-community/home-manager/master"; |
| 12 | home-manager.inputs.nixpkgs.follows = "nixpkgs"; | 12 | home-manager.inputs.nixpkgs.follows = "nixpkgs"; |
| ... | @@ -47,7 +47,7 @@ | ... | @@ -47,7 +47,7 @@ |
| 47 | { | 47 | { |
| 48 | self, | 48 | self, |
| 49 | nixpkgs, | 49 | nixpkgs, |
| 50 | lix-module, | 50 | # lix-module, |
| 51 | nixos-cosmic, | 51 | nixos-cosmic, |
| 52 | darwin, | 52 | darwin, |
| 53 | ... | 53 | ... |
| ... | @@ -97,7 +97,7 @@ | ... | @@ -97,7 +97,7 @@ |
| 97 | inherit | 97 | inherit |
| 98 | overlays | 98 | overlays |
| 99 | nixpkgs | 99 | nixpkgs |
| 100 | lix-module | 100 | # lix-module |
| 101 | inputs | 101 | inputs |
| 102 | mkNeovim | 102 | mkNeovim |
| 103 | ; | 103 | ; |
lib/mkSystem.nix+2-2
| ... | @@ -2,7 +2,7 @@ | ... | @@ -2,7 +2,7 @@ |
| 2 | # particular architecture. | 2 | # particular architecture. |
| 3 | { | 3 | { |
| 4 | nixpkgs, | 4 | nixpkgs, |
| 5 | lix-module, | 5 | # lix-module, |
| 6 | overlays, | 6 | overlays, |
| 7 | inputs, | 7 | inputs, |
| 8 | mkNeovim, | 8 | mkNeovim, |
| ... | @@ -89,7 +89,7 @@ systemFunc { | ... | @@ -89,7 +89,7 @@ systemFunc { |
| 89 | 89 | ||
| 90 | # Use lix (alternative nix implementation) | 90 | # Use lix (alternative nix implementation) |
| 91 | # https://lix.systems/add-to-config/#flake-based-configurations | 91 | # https://lix.systems/add-to-config/#flake-based-configurations |
| 92 | lix-module.nixosModules.default | 92 | # lix-module.nixosModules.default |
| 93 | # (getInputModule "lix-module" "default") | 93 | # (getInputModule "lix-module" "default") |
| 94 | 94 | ||
| 95 | # Modules shared between nix-darwin and NixOS | 95 | # Modules shared between nix-darwin and NixOS |
modules/neovim/default.nix+8-4
| ... | @@ -3,7 +3,8 @@ | ... | @@ -3,7 +3,8 @@ |
| 3 | lib, | 3 | lib, |
| 4 | host, | 4 | host, |
| 5 | ... | 5 | ... |
| 6 | }: { | 6 | }: |
| 7 | { | ||
| 7 | # based on default options from upstream: | 8 | # based on default options from upstream: |
| 8 | # https://github.com/NotAShelf/nvf/blob/main/configuration.nix | 9 | # https://github.com/NotAShelf/nvf/blob/main/configuration.nix |
| 9 | # | 10 | # |
| ... | @@ -108,7 +109,7 @@ | ... | @@ -108,7 +109,7 @@ |
| 108 | explorer.replace_netrw = true; | 109 | explorer.replace_netrw = true; |
| 109 | dashboard = { | 110 | dashboard = { |
| 110 | sections = [ | 111 | sections = [ |
| 111 | {section = "header";} | 112 | { section = "header"; } |
| 112 | { | 113 | { |
| 113 | icon = " "; | 114 | icon = " "; |
| 114 | title = "Keymaps"; | 115 | title = "Keymaps"; |
| ... | @@ -132,12 +133,15 @@ | ... | @@ -132,12 +133,15 @@ |
| 132 | } | 133 | } |
| 133 | ]; | 134 | ]; |
| 134 | }; | 135 | }; |
| 135 | image.enable = true; | 136 | image = { |
| 137 | enable = true; | ||
| 138 | math.enabled = false; | ||
| 139 | }; | ||
| 136 | notifier.timeout = 3000; | 140 | notifier.timeout = 3000; |
| 137 | picker = { | 141 | picker = { |
| 138 | enable = true; | 142 | enable = true; |
| 139 | sources = { | 143 | sources = { |
| 140 | explorer = {}; | 144 | explorer = { }; |
| 141 | }; | 145 | }; |
| 142 | }; | 146 | }; |
| 143 | }; | 147 | }; |
users/natalie/laptop/home.nix+5
| ... | @@ -15,5 +15,10 @@ | ... | @@ -15,5 +15,10 @@ |
| 15 | sessionPath = [ | 15 | sessionPath = [ |
| 16 | "$HOME/.emacs.d/bin" | 16 | "$HOME/.emacs.d/bin" |
| 17 | ]; | 17 | ]; |
| 18 | |||
| 19 | packages = with pkgs; [ | ||
| 20 | #PDF viewer for VimTeX | ||
| 21 | skimpdf | ||
| 22 | ]; | ||
| 18 | }; | 23 | }; |
| 19 | } | 24 | } |
users/natalie/packages.nix+5-15
| ... | @@ -1,6 +1,7 @@ | ... | @@ -1,6 +1,7 @@ |
| 1 | # Packages installed with home-manager | 1 | # Packages installed with home-manager |
| 2 | {pkgs, ...}: | 2 | { pkgs, ... }: |
| 3 | with pkgs; [ | 3 | with pkgs; |
| 4 | [ | ||
| 4 | #general development | 5 | #general development |
| 5 | just | 6 | just |
| 6 | pkg-config | 7 | pkg-config |
| ... | @@ -35,7 +36,7 @@ with pkgs; [ | ... | @@ -35,7 +36,7 @@ with pkgs; [ |
| 35 | nh | 36 | nh |
| 36 | 37 | ||
| 37 | #terminal stuff | 38 | #terminal stuff |
| 38 | (btop.override {cudaSupport = true;}) | 39 | (btop.override { cudaSupport = true; }) |
| 39 | tmux | 40 | tmux |
| 40 | zellij | 41 | zellij |
| 41 | lazygit | 42 | lazygit |
| ... | @@ -62,15 +63,9 @@ with pkgs; [ | ... | @@ -62,15 +63,9 @@ with pkgs; [ |
| 62 | 63 | ||
| 63 | #media | 64 | #media |
| 64 | spotify | 65 | spotify |
| 65 | zathura | ||
| 66 | 66 | ||
| 67 | #language servers | 67 | #language servers |
| 68 | typst-live | 68 | typst-live |
| 69 | lua-language-server | ||
| 70 | nil | ||
| 71 | nixd | ||
| 72 | texlab | ||
| 73 | texlivePackages.chktex | ||
| 74 | 69 | ||
| 75 | #formatters/linters | 70 | #formatters/linters |
| 76 | stylua | 71 | stylua |
| ... | @@ -79,14 +74,10 @@ with pkgs; [ | ... | @@ -79,14 +74,10 @@ with pkgs; [ |
| 79 | 74 | ||
| 80 | #neovim deps | 75 | #neovim deps |
| 81 | # TODO: from clo, maybe u can remove all of these? i don't wanna break tho | 76 | # TODO: from clo, maybe u can remove all of these? i don't wanna break tho |
| 82 | lua51Packages.lua | ||
| 83 | lua51Packages.luarocks-nix | ||
| 84 | codespell | ||
| 85 | tree-sitter | 77 | tree-sitter |
| 86 | 78 | zathura | |
| 87 | #python | 79 | #python |
| 88 | pyright | 80 | pyright |
| 89 | basedpyright | ||
| 90 | ruff | 81 | ruff |
| 91 | python312Packages.python | 82 | python312Packages.python |
| 92 | python312Packages.pynvim | 83 | python312Packages.pynvim |
| ... | @@ -107,7 +98,6 @@ with pkgs; [ | ... | @@ -107,7 +98,6 @@ with pkgs; [ |
| 107 | 98 | ||
| 108 | #math | 99 | #math |
| 109 | texlive.combined.scheme-full | 100 | texlive.combined.scheme-full |
| 110 | zathura | ||
| 111 | 101 | ||
| 112 | #fun things | 102 | #fun things |
| 113 | cowsay | 103 | cowsay |
users/natalie/user.nix+1-1
| ... | @@ -3,7 +3,7 @@ rec { | ... | @@ -3,7 +3,7 @@ rec { |
| 3 | name = "Natalie"; # name/identifier | 3 | name = "Natalie"; # name/identifier |
| 4 | email = "nmarks413@gmail.com"; # email (used for certain configurations) | 4 | email = "nmarks413@gmail.com"; # email (used for certain configurations) |
| 5 | dotfilesDir = "~/.dotfiles"; # absolute path of the local repo | 5 | dotfilesDir = "~/.dotfiles"; # absolute path of the local repo |
| 6 | theme = "catppuccin-mocha"; # name of theme that stylix will use | 6 | theme = null; # name of theme that stylix will use |
| 7 | browser = "firefox"; # Default browser; must select one from ./user/app/browser/ | 7 | browser = "firefox"; # Default browser; must select one from ./user/app/browser/ |
| 8 | term = "ghostty"; # Default terminal command; | 8 | term = "ghostty"; # Default terminal command; |
| 9 | font = "iosevka"; # Selected font | 9 | font = "iosevka"; # Selected font |
users/natalie/vim.nix+14-2
| ... | @@ -39,12 +39,24 @@ | ... | @@ -39,12 +39,24 @@ |
| 39 | tabline = { | 39 | tabline = { |
| 40 | nvimBufferline.enable = true; | 40 | nvimBufferline.enable = true; |
| 41 | }; | 41 | }; |
| 42 | 42 | # nvf versions is VERY outdated | |
| 43 | # pluginOverrides = { | ||
| 44 | # hardtime-nvim = pkgs.fetchFromGitHub { | ||
| 45 | # owner = "m4xshen"; | ||
| 46 | # repo = "hardtime.nvim"; | ||
| 47 | # rev = "v1.0.1"; | ||
| 48 | # hash = "sha256-5tqiSuGvBJcr8l6anEBojXEaaxFS1P5T1ROr46ylVhk="; | ||
| 49 | # }; | ||
| 50 | # }; | ||
| 51 | startPlugins = [ | ||
| 52 | "nui-nvim" | ||
| 53 | ]; | ||
| 43 | binds = { | 54 | binds = { |
| 44 | hardtime-nvim = { | 55 | hardtime-nvim = { |
| 45 | enable = true; | 56 | enable = true; |
| 46 | setupOpts = { | 57 | setupOpts = { |
| 47 | restriction_mode = "block"; | 58 | disable_mouse = false; |
| 59 | restriction_mode = "warn"; | ||
| 48 | }; | 60 | }; |
| 49 | }; | 61 | }; |
| 50 | }; | 62 | }; |
users/natalie/vim/languages.nix+6
| ... | @@ -110,6 +110,12 @@ in | ... | @@ -110,6 +110,12 @@ in |
| 110 | tex = [ "chktex" ]; | 110 | tex = [ "chktex" ]; |
| 111 | haskell = [ "hlint" ]; | 111 | haskell = [ "hlint" ]; |
| 112 | }; | 112 | }; |
| 113 | |||
| 114 | linters = { | ||
| 115 | chktex = { | ||
| 116 | ignore_exitcode = true; | ||
| 117 | }; | ||
| 118 | }; | ||
| 113 | }; | 119 | }; |
| 114 | }; | 120 | }; |
| 115 | treesitter = { | 121 | treesitter = { |
users/natalie/vim/latex.nix+67-7
| ... | @@ -1,22 +1,29 @@ | ... | @@ -1,22 +1,29 @@ |
| 1 | {pkgs, ...}: { | 1 | { pkgs, host, ... }: |
| 2 | { | ||
| 2 | vim = { | 3 | vim = { |
| 4 | lazy.plugins.cmp-vimtex = { | ||
| 5 | enabled = true; | ||
| 6 | package = pkgs.vimPlugins.cmp-vimtex; | ||
| 7 | lazy = false; | ||
| 8 | |||
| 9 | }; | ||
| 3 | lazy.plugins.vimtex = { | 10 | lazy.plugins.vimtex = { |
| 4 | enabled = true; | 11 | enabled = true; |
| 5 | package = pkgs.vimPlugins.vimtex; | 12 | package = pkgs.vimPlugins.vimtex; |
| 6 | lazy = true; | 13 | lazy = false; |
| 7 | ft = "tex"; | ||
| 8 | }; | 14 | }; |
| 9 | 15 | ||
| 10 | globals = { | 16 | globals = { |
| 11 | tex_flavor = "latex"; | 17 | tex_flavor = "latex"; |
| 12 | maplocalleader = "\\"; | 18 | maplocalleader = "\\"; |
| 13 | vimtex_compiler_method = "latexmk"; | 19 | vimtex_compiler_method = "latexmk"; |
| 14 | vimtex_view_method = "zathura"; | 20 | vimtex_view_method = if host.darwin then "skim" else "zathura"; |
| 21 | vimtex_view_automatic = 1; | ||
| 15 | vimtex_compiler_latexmk = { | 22 | vimtex_compiler_latexmk = { |
| 16 | callback = 1; | 23 | callback = 1; |
| 17 | continuous = 1; | 24 | continuous = 1; |
| 18 | executable = "latexmk"; | 25 | executable = "latexmk"; |
| 19 | hooks = []; | 26 | hooks = [ ]; |
| 20 | options = [ | 27 | options = [ |
| 21 | "-verbose" | 28 | "-verbose" |
| 22 | "-file-line-error" | 29 | "-file-line-error" |
| ... | @@ -37,12 +44,65 @@ | ... | @@ -37,12 +44,65 @@ |
| 37 | ]; | 44 | ]; |
| 38 | }; | 45 | }; |
| 39 | 46 | ||
| 47 | autocomplete.blink-cmp = { | ||
| 48 | sourcePlugins = { | ||
| 49 | "blink.compat" = { | ||
| 50 | enable = true; | ||
| 51 | package = "blink-compat"; | ||
| 52 | module = "blink.compat.source"; | ||
| 53 | }; | ||
| 54 | }; | ||
| 55 | setupOpts = { | ||
| 56 | sources = { | ||
| 57 | default = [ "vimtex" ]; | ||
| 58 | providers = { | ||
| 59 | vimtex = { | ||
| 60 | name = "vimtex"; | ||
| 61 | module = "blink.compat.source"; | ||
| 62 | score_offset = 100; | ||
| 63 | }; | ||
| 64 | }; | ||
| 65 | }; | ||
| 66 | }; | ||
| 67 | }; | ||
| 68 | |||
| 69 | augroups = [ | ||
| 70 | { | ||
| 71 | name = "VimTeX Events"; | ||
| 72 | } | ||
| 73 | ]; | ||
| 74 | autocmds = [ | ||
| 75 | { | ||
| 76 | pattern = [ "VimtexEventViewReverse" ]; | ||
| 77 | event = [ "User" ]; | ||
| 78 | desc = "Return to nvim after reverse search"; | ||
| 79 | command = "call b:vimtex.viewer.xdo_focus_vim()"; | ||
| 80 | group = "VimTeX Events"; | ||
| 81 | } | ||
| 82 | { | ||
| 83 | pattern = [ "VimtexEventQuit" ]; | ||
| 84 | event = [ "User" ]; | ||
| 85 | desc = "Close pdf after exiting nvim"; | ||
| 86 | command = "VimtexClean"; | ||
| 87 | group = "VimTeX Events"; | ||
| 88 | } | ||
| 89 | |||
| 90 | { | ||
| 91 | pattern = [ "VimtexEventInitPost" ]; | ||
| 92 | event = [ "User" ]; | ||
| 93 | desc = "Start compiling when opening nvim to a tex file"; | ||
| 94 | command = "VimtexCompile"; | ||
| 95 | group = "VimTeX Events"; | ||
| 96 | } | ||
| 97 | |||
| 98 | ]; | ||
| 99 | |||
| 40 | lsp = { | 100 | lsp = { |
| 41 | servers = { | 101 | servers = { |
| 42 | texlab = { | 102 | texlab = { |
| 43 | enable = true; | 103 | enable = true; |
| 44 | cmd = ["${pkgs.texlab}/bin/texlab"]; | 104 | cmd = [ "${pkgs.texlab}/bin/texlab" ]; |
| 45 | filetypes = ["tex"]; | 105 | filetypes = [ "tex" ]; |
| 46 | }; | 106 | }; |
| 47 | }; | 107 | }; |
| 48 | }; | 108 | }; |