authorgravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-06-12 15:14:43-07:00
committergravatar for nmarks413@gmail.comNatalie Marks <nmarks413@gmail.com> 2025-06-12 15:14:43-07:00
log381a06acdfa49cf25f6861a8c203480e6d7ab4f1
tree4c197530ba8d178dea282ca04959c7b627436bb3
parentbef0fb01c2d817455c311392f180e270b6af4c1e
signature Commit is signed but in an unrecognized format.

various things i forgot to commit

10 files changed, 120 insertions(+), 38 deletions(-)

modules/home/default.nix+1-1
...@@ -86,8 +86,8 @@ in...@@ -86,8 +86,8 @@ in
86 };86 };
87 shellInit = ''87 shellInit = ''
88 batman --export-env | source88 batman --export-env | source
89 test -r '/Users/${user.username}/.opam/opam-init/init.fish' && source '/Users/${user.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
89 '';90 '';
90 ##test -r '/Users/${user.username}/.opam/opam-init/init.fish' && source '/Users/${user.username}/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true
91 };91 };
92 };92 };
93}93}
users/natalie/laptop/configuration.nix+2
...@@ -10,6 +10,8 @@...@@ -10,6 +10,8 @@
10 macAppStoreApps = [ "wireguard" ];10 macAppStoreApps = [ "wireguard" ];
11 };11 };
1212
13 system.defaults.NSGlobalDomain."com.apple.trackpad.scaling" = 1.0;
14
13 # Create /etc/zshrc that loads the nix-darwin environment.15 # Create /etc/zshrc that loads the nix-darwin environment.
14 programs = {16 programs = {
15 gnupg.agent.enable = true;17 gnupg.agent.enable = true;
users/natalie/user.nix+1-1
...@@ -7,7 +7,7 @@ rec {...@@ -7,7 +7,7 @@ rec {
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 font9 font = "iosevka"; # Selected font
10 editor = "neovim"; # Default editor;10 editor = "nvim"; # Default editor;
11 timeZone = "America/Los_Angeles";11 timeZone = "America/Los_Angeles";
12 sexuality = "bisexual";12 sexuality = "bisexual";
13}13}
users/natalie/vim.nix+4
...@@ -4,6 +4,10 @@...@@ -4,6 +4,10 @@
4 ./vim/default.nix4 ./vim/default.nix
5 ];5 ];
6 vim = {6 vim = {
7 #enable python provider
8 withPython3 = true;
9 python3Packages = [ "pynvim" ];
10
7 options = {11 options = {
8 tabstop = 2;12 tabstop = 2;
9 softtabstop = 2;13 softtabstop = 2;
users/natalie/vim/coq.nix created+16
...@@ -0,0 +1,16 @@
1{ pkgs, ... }:
2{
3
4 vim = {
5 # extraPackages = with pkgs; [
6 # coq_8_20
7 # coqPackages_8_20.stdlib
8 # ];
9 extraPlugins.Coqtail = {
10 # enabled = true;
11 package = pkgs.vimPlugins.Coqtail;
12 # lazy = true;
13 # ft = "coq";
14 };
15 };
16}
users/natalie/vim/default.nix+2
...@@ -5,6 +5,8 @@...@@ -5,6 +5,8 @@
5 ./languages.nix5 ./languages.nix
6 ./latex.nix6 ./latex.nix
7 ./lean.nix7 ./lean.nix
8 ./coq.nix
8 ./visuals.nix9 ./visuals.nix
10 ./mini.nix
9 ];11 ];
10}12}
users/natalie/vim/keybinds.nix-1
...@@ -19,7 +19,6 @@ in...@@ -19,7 +19,6 @@ in
19 (mkKeymap "n" "<leader>ff" ":lua require('snacks').picker.files()<CR>" "Find File")19 (mkKeymap "n" "<leader>ff" ":lua require('snacks').picker.files()<CR>" "Find File")
20 (mkKeymap "n" "<leader>fg" ":lua require('snacks').picker.grep()<CR>" "Grep Files")20 (mkKeymap "n" "<leader>fg" ":lua require('snacks').picker.grep()<CR>" "Grep Files")
21 # Lsp21 # Lsp
22 (mkKeymap "n" "K" ":Lspsaga hover_doc<CR>" "Hover docs")
23 (mkKeymap "n" "lr" ":lua vim.lsp.buf.rename()<CR>" "Rename")22 (mkKeymap "n" "lr" ":lua vim.lsp.buf.rename()<CR>" "Rename")
24 # (mkKeymap "n" "<leader>th" ":lua function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) end<CR>" "Toggle Inlay Hints")23 # (mkKeymap "n" "<leader>th" ":lua function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) end<CR>" "Toggle Inlay Hints")
25 ];24 ];
users/natalie/vim/languages.nix+69-35
...@@ -5,49 +5,57 @@...@@ -5,49 +5,57 @@
5 pkgs,5 pkgs,
6 ...6 ...
7}:7}:
8let
9 darwin = if host.darwin then "darwin" else "nixos";
10 flakePath = "/${if host.darwin then "Users" else "home"}/${user.username}/.dotfiles";
11
12 # BIG HACK DO NOT DO PLS
13
14 hostname = if host.darwin then "Natalies-MacBook-Air" else "nixos";
15in
16{8{
17 vim = {9 vim = {
18 extraPackages = with pkgs; [10 extraPackages = with pkgs; [
19 python312Packages.pylatexenc11 python312Packages.pylatexenc
12 nixd
20 ];13 ];
21 lsp = {14 lsp = {
22 lightbulb.enable = false;15 lightbulb.enable = false;
23 lspsaga = {16 # lspsaga = {
24 enable = true;17 # enable = true;
25 setupOpts = {18 # setupOpts = {
26 lightbulb = {19 # lightbulb = {
27 virtual_text = false;20 # virtual_text = false;
21 # };
22 # };
23 # };
24 inlayHints.enable = true;
25 servers = {
26 nil = {
27 settings.nil.nix.flake = {
28
29 autoArchive = true;
30 autoEvalInputs = true;
31
28 };32 };
29 };33 };
30 };34 nixd = {
31 nvim-docs-view.enable = true;35 settings.nixd = {
32 inlayHints.enable = true;36 nixpkgs.expr = ''import "${flake.inputs.nixpkgs}" { }'';
33 servers.nixd.settings.nixd = {37
34 nixpkgs.expr = ''import "<nixpkgs>" { }'';38 options =
35 options =39 {
36 {40 home-manager = {
37 home-manager = {41 expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; lib = import "${flake.inputs.home-manager}/modules/lib/stdlib-extended.nix" pkgs.lib; in (lib.evalModules { modules = (import "${flake.inputs.home-manager}/modules/modules.nix") { inherit lib pkgs;check = false;}; })).options'';
38 expr = ''(builtins.getFlake "${flakePath}").${darwin}Configurations.${hostname}.options.home-manager.users.type.getSubOptions [ ]'';42 # (builtins.getFlake "${flakePath}").${darwin}Configurations.${hostname}.options.home-manager.users.type.getSubOptions [ ]'';
39 };43 };
40 }44 }
41 // pkgs.lib.optionalAttrs host.darwin {45 // pkgs.lib.optionalAttrs host.darwin {
42 nix-darwin = {46 nix-darwin = {
43 expr = ''(builtins.getFlake "${flakePath}").darwinConfigurations.${hostname}.options'';47 expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.darwin}/modules/module-list.nix"); check = false;})).options'';
44 };48 # (builtins.getFlake "${flakePath}").darwinConfigurations.${hostname}.options'';
45 }49 };
46 // pkgs.lib.optionalAttrs host.linux {50 }
47 nixos = {51 // pkgs.lib.optionalAttrs host.linux {
48 expr = ''(builtins.getFlake "${flakePath}").nixosConfigurations.${hostname}.options'';52 nixos = {
49 };53 expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules = (import "${flake.inputs.nixpkgs}/nixos/modules/module-list.nix"); check = false;})).options'';
54 # (builtins.getFlake "${flakePath}").nixosConfigurations.${hostname}.options'';
55 };
56 };
50 };57 };
58 };
51 };59 };
52 mappings = {60 mappings = {
53 codeAction = "<leader>ca";61 codeAction = "<leader>ca";
...@@ -55,7 +63,7 @@ in...@@ -55,7 +63,7 @@ in
55 goToDefinition = "gd";63 goToDefinition = "gd";
56 listReferences = "gr";64 listReferences = "gr";
57 goToType = "gy";65 goToType = "gy";
58 hover = null;66 hover = "K";
59 nextDiagnostic = "<leader>d";67 nextDiagnostic = "<leader>d";
60 openDiagnosticFloat = "<leader>df";68 openDiagnosticFloat = "<leader>df";
61 renameSymbol = "rn";69 renameSymbol = "rn";
...@@ -91,7 +99,6 @@ in...@@ -91,7 +99,6 @@ in
91 };99 };
92 };100 };
93 };101 };
94
95 diagnostics = {102 diagnostics = {
96 enable = true;103 enable = true;
97 config = {104 config = {
...@@ -177,5 +184,32 @@ in...@@ -177,5 +184,32 @@ in
177 };184 };
178 };185 };
179 };186 };
187
188 lazy.plugins."blink.pairs" = {
189 enabled = true;
190 package = pkgs.vimPlugins.blink-pairs;
191 setupModule = "blink.pairs";
192 setupOpts = {
193 mappings = {
194 # -- you can call require("blink.pairs.mappings").enable() and require("blink.pairs.mappings").disable() to enable/disable mappings at runtime
195 enabled = true;
196 # -- see the defaults: https://github.com/Saghen/blink.pairs/blob/main/lua/blink/pairs/config/mappings.lua#L10
197 pairs = [ ];
198 };
199 highlights = {
200 enabled = true;
201 groups = [
202 "BlinkPairsOrange"
203 "BlinkPairsPurple"
204 "BlinkPairsBlue"
205 ];
206 matchparen = {
207 enabled = true;
208 group = "MatchParen";
209 };
210 };
211 debug = false;
212 };
213 };
180 };214 };
181}215}
users/natalie/vim/mini.nix created+9
...@@ -0,0 +1,9 @@
1{ pkgs, ... }:
2{
3 vim = {
4 mini = {
5 icons.enable = true;
6 ai.enable = true;
7 };
8 };
9}
users/natalie/vim/visuals.nix+16
...@@ -7,6 +7,22 @@...@@ -7,6 +7,22 @@
7 };7 };
8 };8 };
9 ui = {9 ui = {
10 noice = {
11 enable = true;
12 setupOpts = {
13 lsp = {
14 progress.enabled = false;
15 signature.enabled = true;
16 };
17 presets = {
18 lsp_doc_border = true;
19 long_message_to_split = true;
20 inc_rename = false;
21 command_palette = false;
22 bottom_search = true;
23 };
24 };
25 };
10 borders = {26 borders = {
11 enable = true;27 enable = true;
12 };28 };