authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-05-27 19:56:17-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-05-27 19:56:17-07:00
logb3d5a281416e3e90bccea2e2dbaf204aacb3a21c
tree6f9348eeaa2349f9efbcfba026cefb7a013ab6c4
parent27be81d9141e439bc75c782fb7f414e8d520f92f
signature Commit is signed but in an unrecognized format.

removed stylix, updated nvf

10 files changed, 138 insertions(+), 145 deletions(-)

flake.lock+24-108
......@@ -238,24 +238,6 @@
238238 "inputs": {
239239 "systems": "systems"
240240 },
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 },
259241 "locked": {
260242 "lastModified": 1701680307,
261243 "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
......@@ -270,9 +252,9 @@
270252 "type": "github"
271253 }
272254 },
273 "flake-utils_3": {
255 "flake-utils_2": {
274256 "inputs": {
275 "systems": "systems_3"
257 "systems": "systems_2"
276258 },
277259 "locked": {
278260 "lastModified": 1731533236,
......@@ -288,9 +270,9 @@
288270 "type": "github"
289271 }
290272 },
291 "flake-utils_4": {
273 "flake-utils_3": {
292274 "inputs": {
293 "systems": "systems_4"
275 "systems": "systems_3"
294276 },
295277 "locked": {
296278 "lastModified": 1731533236,
......@@ -306,9 +288,9 @@
306288 "type": "github"
307289 }
308290 },
309 "flake-utils_5": {
291 "flake-utils_4": {
310292 "inputs": {
311 "systems": "systems_7"
293 "systems": "systems_6"
312294 },
313295 "locked": {
314296 "lastModified": 1705309234,
......@@ -324,9 +306,9 @@
324306 "type": "github"
325307 }
326308 },
327 "flake-utils_6": {
309 "flake-utils_5": {
328310 "inputs": {
329 "systems": "systems_8"
311 "systems": "systems_7"
330312 },
331313 "locked": {
332314 "lastModified": 1710146030,
......@@ -342,9 +324,9 @@
342324 "type": "github"
343325 }
344326 },
345 "flake-utils_7": {
327 "flake-utils_6": {
346328 "inputs": {
347 "systems": "systems_9"
329 "systems": "systems_8"
348330 },
349331 "locked": {
350332 "lastModified": 1705309234,
......@@ -360,21 +342,6 @@
360342 "type": "github"
361343 }
362344 },
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 },
378345 "fromYaml": {
379346 "flake": false,
380347 "locked": {
......@@ -547,48 +514,13 @@
547514 "url": "https://raw.githubusercontent.com/ziglang/zig/0fb2015fd3422fc1df364995f9782dfe7255eccd/doc/langref.html.in"
548515 }
549516 },
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 },
585517 "mnw": {
586518 "locked": {
587 "lastModified": 1747499976,
588 "narHash": "sha256-YTiSI4WLbk0CleXeBheYmKZV6iqKyBpyoh1e+vcQzu4=",
519 "lastModified": 1748278309,
520 "narHash": "sha256-JCeiMrUhFku44kfKsgiD9Ibzho4MblBD2WmOQYsQyTY=",
589521 "owner": "Gerg-L",
590522 "repo": "mnw",
591 "rev": "72433a144c4ac16931e9148f78db4a0e4c147441",
523 "rev": "486a17ba1279ab2357cae8ff66b309db622f8831",
592524 "type": "github"
593525 },
594526 "original": {
......@@ -599,7 +531,7 @@
599531 },
600532 "moonlight": {
601533 "inputs": {
602 "flake-utils": "flake-utils_2",
534 "flake-utils": "flake-utils",
603535 "nixpkgs": [
604536 "nixpkgs"
605537 ]
......@@ -686,7 +618,7 @@
686618 },
687619 "nix-options-search": {
688620 "inputs": {
689 "flake-utils": "flake-utils_3",
621 "flake-utils": "flake-utils_2",
690622 "gitignore": "gitignore",
691623 "nixpkgs": "nixpkgs"
692624 },
......@@ -850,20 +782,20 @@
850782 "nvf": {
851783 "inputs": {
852784 "flake-parts": "flake-parts",
853 "flake-utils": "flake-utils_4",
785 "flake-utils": "flake-utils_3",
854786 "mnw": "mnw",
855787 "nil": "nil",
856788 "nixpkgs": [
857789 "nixpkgs"
858790 ],
859 "systems": "systems_5"
791 "systems": "systems_4"
860792 },
861793 "locked": {
862 "lastModified": 1747525582,
863 "narHash": "sha256-oEZ6DV4bPcNZIuwW5Kcd+/zT3PMkXse2kX/3jHoomGk=",
794 "lastModified": 1748318168,
795 "narHash": "sha256-pUDVxHarStrDYxd2tztz4SjNflzFxuMMEC3SK9WLUK8=",
864796 "owner": "notashelf",
865797 "repo": "nvf",
866 "rev": "d3a0e7029ac57eef1120225973247851c5b967b5",
798 "rev": "74ba4d955976af1422ea1f095968e547db70aa04",
867799 "type": "github"
868800 },
869801 "original": {
......@@ -889,7 +821,6 @@
889821 "apple-fonts": "apple-fonts",
890822 "darwin": "darwin",
891823 "home-manager": "home-manager",
892 "lix-module": "lix-module",
893824 "moonlight": "moonlight",
894825 "nh": "nh",
895826 "nix-index-database": "nix-index-database",
......@@ -1066,7 +997,7 @@
1066997 "nixpkgs"
1067998 ],
1068999 "nur": "nur",
1069 "systems": "systems_6",
1000 "systems": "systems_5",
10701001 "tinted-foot": "tinted-foot",
10711002 "tinted-kitty": "tinted-kitty",
10721003 "tinted-schemes": "tinted-schemes",
......@@ -1207,21 +1138,6 @@
12071138 "type": "github"
12081139 }
12091140 },
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 },
12251141 "tinted-foot": {
12261142 "flake": false,
12271143 "locked": {
......@@ -1328,7 +1244,7 @@
13281244 "zig": {
13291245 "inputs": {
13301246 "flake-compat": "flake-compat_3",
1331 "flake-utils": "flake-utils_5",
1247 "flake-utils": "flake-utils_4",
13321248 "nixpkgs": "nixpkgs_3"
13331249 },
13341250 "locked": {
......@@ -1348,7 +1264,7 @@
13481264 "zig-overlay": {
13491265 "inputs": {
13501266 "flake-compat": "flake-compat_4",
1351 "flake-utils": "flake-utils_7",
1267 "flake-utils": "flake-utils_6",
13521268 "nixpkgs": [
13531269 "zls",
13541270 "nixpkgs"
......@@ -1370,7 +1286,7 @@
13701286 },
13711287 "zls": {
13721288 "inputs": {
1373 "flake-utils": "flake-utils_6",
1289 "flake-utils": "flake-utils_5",
13741290 "gitignore": "gitignore_3",
13751291 "langref": "langref",
13761292 "nixpkgs": "nixpkgs_4",
flake.nix+6-6
......@@ -3,10 +3,10 @@
33 inputs = {
44 nixpkgs.url = "nixpkgs/nixos-unstable";
55
6 lix-module = {
7 url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
8 inputs.nixpkgs.follows = "nixpkgs";
9 };
6 # lix-module = {
7 # url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
8 # inputs.nixpkgs.follows = "nixpkgs";
9 # };
1010
1111 home-manager.url = "github:nix-community/home-manager/master";
1212 home-manager.inputs.nixpkgs.follows = "nixpkgs";
......@@ -47,7 +47,7 @@
4747 {
4848 self,
4949 nixpkgs,
50 lix-module,
50 # lix-module,
5151 nixos-cosmic,
5252 darwin,
5353 ...
......@@ -97,7 +97,7 @@
9797 inherit
9898 overlays
9999 nixpkgs
100 lix-module
100 # lix-module
101101 inputs
102102 mkNeovim
103103 ;
lib/mkSystem.nix+2-2
......@@ -2,7 +2,7 @@
22# particular architecture.
33{
44 nixpkgs,
5 lix-module,
5 # lix-module,
66 overlays,
77 inputs,
88 mkNeovim,
......@@ -89,7 +89,7 @@ systemFunc {
8989
9090 # Use lix (alternative nix implementation)
9191 # https://lix.systems/add-to-config/#flake-based-configurations
92 lix-module.nixosModules.default
92 # lix-module.nixosModules.default
9393 # (getInputModule "lix-module" "default")
9494
9595 # Modules shared between nix-darwin and NixOS
modules/neovim/default.nix+8-4
......@@ -3,7 +3,8 @@
33 lib,
44 host,
55 ...
6}: {
6}:
7{
78 # based on default options from upstream:
89 # https://github.com/NotAShelf/nvf/blob/main/configuration.nix
910 #
......@@ -108,7 +109,7 @@
108109 explorer.replace_netrw = true;
109110 dashboard = {
110111 sections = [
111 {section = "header";}
112 { section = "header"; }
112113 {
113114 icon = " ";
114115 title = "Keymaps";
......@@ -132,12 +133,15 @@
132133 }
133134 ];
134135 };
135 image.enable = true;
136 image = {
137 enable = true;
138 math.enabled = false;
139 };
136140 notifier.timeout = 3000;
137141 picker = {
138142 enable = true;
139143 sources = {
140 explorer = {};
144 explorer = { };
141145 };
142146 };
143147 };
users/natalie/laptop/home.nix+5
......@@ -15,5 +15,10 @@
1515 sessionPath = [
1616 "$HOME/.emacs.d/bin"
1717 ];
18
19 packages = with pkgs; [
20 #PDF viewer for VimTeX
21 skimpdf
22 ];
1823 };
1924}
users/natalie/packages.nix+5-15
......@@ -1,6 +1,7 @@
11# Packages installed with home-manager
2{pkgs, ...}:
3with pkgs; [
2{ pkgs, ... }:
3with pkgs;
4[
45 #general development
56 just
67 pkg-config
......@@ -35,7 +36,7 @@ with pkgs; [
3536 nh
3637
3738 #terminal stuff
38 (btop.override {cudaSupport = true;})
39 (btop.override { cudaSupport = true; })
3940 tmux
4041 zellij
4142 lazygit
......@@ -62,15 +63,9 @@ with pkgs; [
6263
6364 #media
6465 spotify
65 zathura
6666
6767 #language servers
6868 typst-live
69 lua-language-server
70 nil
71 nixd
72 texlab
73 texlivePackages.chktex
7469
7570 #formatters/linters
7671 stylua
......@@ -79,14 +74,10 @@ with pkgs; [
7974
8075 #neovim deps
8176 # 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
8577 tree-sitter
86
78 zathura
8779 #python
8880 pyright
89 basedpyright
9081 ruff
9182 python312Packages.python
9283 python312Packages.pynvim
......@@ -107,7 +98,6 @@ with pkgs; [
10798
10899 #math
109100 texlive.combined.scheme-full
110 zathura
111101
112102 #fun things
113103 cowsay
users/natalie/user.nix+1-1
......@@ -3,7 +3,7 @@ rec {
33 name = "Natalie"; # name/identifier
44 email = "nmarks413@gmail.com"; # email (used for certain configurations)
55 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
77 browser = "firefox"; # Default browser; must select one from ./user/app/browser/
88 term = "ghostty"; # Default terminal command;
99 font = "iosevka"; # Selected font
users/natalie/vim.nix+14-2
......@@ -39,12 +39,24 @@
3939 tabline = {
4040 nvimBufferline.enable = true;
4141 };
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 ];
4354 binds = {
4455 hardtime-nvim = {
4556 enable = true;
4657 setupOpts = {
47 restriction_mode = "block";
58 disable_mouse = false;
59 restriction_mode = "warn";
4860 };
4961 };
5062 };
users/natalie/vim/languages.nix+6
......@@ -110,6 +110,12 @@ in
110110 tex = [ "chktex" ];
111111 haskell = [ "hlint" ];
112112 };
113
114 linters = {
115 chktex = {
116 ignore_exitcode = true;
117 };
118 };
113119 };
114120 };
115121 treesitter = {
users/natalie/vim/latex.nix+67-7
......@@ -1,22 +1,29 @@
1{pkgs, ...}: {
1{ pkgs, host, ... }:
2{
23 vim = {
4 lazy.plugins.cmp-vimtex = {
5 enabled = true;
6 package = pkgs.vimPlugins.cmp-vimtex;
7 lazy = false;
8
9 };
310 lazy.plugins.vimtex = {
411 enabled = true;
512 package = pkgs.vimPlugins.vimtex;
6 lazy = true;
7 ft = "tex";
13 lazy = false;
814 };
915
1016 globals = {
1117 tex_flavor = "latex";
1218 maplocalleader = "\\";
1319 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;
1522 vimtex_compiler_latexmk = {
1623 callback = 1;
1724 continuous = 1;
1825 executable = "latexmk";
19 hooks = [];
26 hooks = [ ];
2027 options = [
2128 "-verbose"
2229 "-file-line-error"
......@@ -37,12 +44,65 @@
3744 ];
3845 };
3946
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
40100 lsp = {
41101 servers = {
42102 texlab = {
43103 enable = true;
44 cmd = ["${pkgs.texlab}/bin/texlab"];
45 filetypes = ["tex"];
104 cmd = [ "${pkgs.texlab}/bin/texlab" ];
105 filetypes = [ "tex" ];
46106 };
47107 };
48108 };