various things i forgot to commit

modules/home/default.nix

@@ -86,8 +86,8 @@ in
         };
       shellInit = ''
         batman --export-env | source
+        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
       '';
-      ##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
     };
   };
 }

users/natalie/laptop/configuration.nix

@@ -10,6 +10,8 @@
     macAppStoreApps = [ "wireguard" ];
   };
 
+  system.defaults.NSGlobalDomain."com.apple.trackpad.scaling" = 1.0;
+
   # Create /etc/zshrc that loads the nix-darwin environment.
   programs = {
     gnupg.agent.enable = true;

users/natalie/user.nix

@@ -7,7 +7,7 @@ rec {
   browser = "firefox"; # Default browser; must select one from ./user/app/browser/
   term = "ghostty"; # Default terminal command;
   font = "iosevka"; # Selected font
-  editor = "neovim"; # Default editor;
+  editor = "nvim"; # Default editor;
   timeZone = "America/Los_Angeles";
   sexuality = "bisexual";
 }

users/natalie/vim.nix

@@ -4,6 +4,10 @@
     ./vim/default.nix
   ];
   vim = {
+    #enable python provider
+    withPython3 = true;
+    python3Packages = [ "pynvim" ];
+
     options = {
       tabstop = 2;
       softtabstop = 2;

users/natalie/vim/coq.nix

@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+{
+
+  vim = {
+    # extraPackages = with pkgs; [
+    #   coq_8_20
+    #   coqPackages_8_20.stdlib
+    # ];
+    extraPlugins.Coqtail = {
+      # enabled = true;
+      package = pkgs.vimPlugins.Coqtail;
+      # lazy = true;
+      # ft = "coq";
+    };
+  };
+}

users/natalie/vim/default.nix

@@ -5,6 +5,8 @@
     ./languages.nix
     ./latex.nix
     ./lean.nix
+    ./coq.nix
     ./visuals.nix
+    ./mini.nix
   ];
 }

users/natalie/vim/keybinds.nix

@@ -19,7 +19,6 @@ in
       (mkKeymap "n" "<leader>ff" ":lua require('snacks').picker.files()<CR>" "Find File")
       (mkKeymap "n" "<leader>fg" ":lua require('snacks').picker.grep()<CR>" "Grep Files")
       # Lsp
-      (mkKeymap "n" "K" ":Lspsaga hover_doc<CR>" "Hover docs")
       (mkKeymap "n" "lr" ":lua vim.lsp.buf.rename()<CR>" "Rename")
       # (mkKeymap "n" "<leader>th" ":lua function() vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled()) end<CR>" "Toggle Inlay Hints")
     ];

users/natalie/vim/languages.nix

@@ -5,49 +5,57 @@
   pkgs,
   ...
 }:
-let
-  darwin = if host.darwin then "darwin" else "nixos";
-  flakePath = "/${if host.darwin then "Users" else "home"}/${user.username}/.dotfiles";
-
-  # BIG HACK DO NOT DO PLS
-
-  hostname = if host.darwin then "Natalies-MacBook-Air" else "nixos";
-in
 {
   vim = {
     extraPackages = with pkgs; [
       python312Packages.pylatexenc
+      nixd
     ];
     lsp = {
       lightbulb.enable = false;
-      lspsaga = {
+      # lspsaga = {
-        enable = true;
+      #   enable = true;
-        setupOpts = {
+      #   setupOpts = {
-          lightbulb = {
+      #     lightbulb = {
-            virtual_text = false;
+      #       virtual_text = false;
+      #     };
+      #   };
+      # };
+      inlayHints.enable = true;
+      servers = {
+        nil = {
+          settings.nil.nix.flake = {
+
+            autoArchive = true;
+            autoEvalInputs = true;
+
           };
         };
-      };
+        nixd = {
-      nvim-docs-view.enable = true;
+          settings.nixd = {
-      inlayHints.enable = true;
+            nixpkgs.expr = ''import "${flake.inputs.nixpkgs}" { }'';
-      servers.nixd.settings.nixd = {
+
-        nixpkgs.expr = ''import "<nixpkgs>" { }'';
+            options =
-        options =
+              {
-          {
+                home-manager = {
-            home-manager = {
+                  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'';
-              expr = ''(builtins.getFlake "${flakePath}").${darwin}Configurations.${hostname}.options.home-manager.users.type.getSubOptions [ ]'';
+                  # (builtins.getFlake "${flakePath}").${darwin}Configurations.${hostname}.options.home-manager.users.type.getSubOptions [ ]'';
-            };
+                };
-          }
+              }
-          // pkgs.lib.optionalAttrs host.darwin {
+              // pkgs.lib.optionalAttrs host.darwin {
-            nix-darwin = {
+                nix-darwin = {
-              expr = ''(builtins.getFlake "${flakePath}").darwinConfigurations.${hostname}.options'';
+                  expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules =  (import "${flake.inputs.darwin}/modules/module-list.nix"); check = false;})).options'';
-            };
+                  # (builtins.getFlake "${flakePath}").darwinConfigurations.${hostname}.options'';
-          }
+                };
-          // pkgs.lib.optionalAttrs host.linux {
+              }
-            nixos = {
+              // pkgs.lib.optionalAttrs host.linux {
-              expr = ''(builtins.getFlake "${flakePath}").nixosConfigurations.${hostname}.options'';
+                nixos = {
-            };
+                  expr = ''(let pkgs = import "${flake.inputs.nixpkgs}" { }; in (pkgs.lib.evalModules { modules =  (import "${flake.inputs.nixpkgs}/nixos/modules/module-list.nix"); check = false;})).options'';
+                  # (builtins.getFlake "${flakePath}").nixosConfigurations.${hostname}.options'';
+                };
+              };
           };
+        };
       };
       mappings = {
         codeAction = "<leader>ca";
@@ -55,7 +63,7 @@ in
         goToDefinition = "gd";
         listReferences = "gr";
         goToType = "gy";
-        hover = null;
+        hover = "K";
         nextDiagnostic = "<leader>d";
         openDiagnosticFloat = "<leader>df";
         renameSymbol = "rn";
@@ -91,7 +99,6 @@ in
         };
       };
     };
-
     diagnostics = {
       enable = true;
       config = {
@@ -177,5 +184,32 @@ in
         };
       };
     };
+
+    lazy.plugins."blink.pairs" = {
+      enabled = true;
+      package = pkgs.vimPlugins.blink-pairs;
+      setupModule = "blink.pairs";
+      setupOpts = {
+        mappings = {
+          # -- you can call require("blink.pairs.mappings").enable() and require("blink.pairs.mappings").disable() to enable/disable mappings at runtime
+          enabled = true;
+          # -- see the defaults: https://github.com/Saghen/blink.pairs/blob/main/lua/blink/pairs/config/mappings.lua#L10
+          pairs = [ ];
+        };
+        highlights = {
+          enabled = true;
+          groups = [
+            "BlinkPairsOrange"
+            "BlinkPairsPurple"
+            "BlinkPairsBlue"
+          ];
+          matchparen = {
+            enabled = true;
+            group = "MatchParen";
+          };
+        };
+        debug = false;
+      };
+    };
   };
 }

users/natalie/vim/mini.nix

@@ -0,0 +1,9 @@
+{ pkgs, ... }:
+{
+  vim = {
+    mini = {
+      icons.enable = true;
+      ai.enable = true;
+    };
+  };
+}

users/natalie/vim/visuals.nix

@@ -7,6 +7,22 @@
       };
     };
     ui = {
+      noice = {
+        enable = true;
+        setupOpts = {
+          lsp = {
+            progress.enabled = false;
+            signature.enabled = true;
+          };
+          presets = {
+            lsp_doc_border = true;
+            long_message_to_split = true;
+            inc_rename = false;
+            command_palette = false;
+            bottom_search = true;
+          };
+        };
+      };
       borders = {
         enable = true;
       };