native_configs/neovim/init.lua

@@ -933,32 +933,6 @@ local inlay_hint_tsjs = {
   includeInlayVariableTypeHints = true,
 };
 
-local setup = {
-  ["nil_ls"] = function()
-    require('lspconfig').nil_ls.setup {
-      on_attach = on_attach,
-      capabilities = capabilities,
-      --- refer to https://github.com/oxalica/nil/blob/main/docs/configuration.md
-      --- for the list of configurations available for `nil_ls`
-      settings = {
-        ["nil"] = {
-          formatting = {
-            command = { "nix", "run", "nixpkgs#alejandra" },
-          },
-          nix = {
-            flake = {
-              -- calls `nix flake archive` to put a flake and its output to store
-              autoArchive = true,
-              -- auto eval flake inputs for improved completion
-              autoEvalInputs = true,
-            },
-          },
-        },
-      },
-    }
-  end,
-}
-
 require('mason-lspconfig').setup_handlers({
   -- default handler
   function(server_name)
@@ -1065,9 +1039,32 @@ require('mason-lspconfig').setup_handlers({
       },
     }
   end,
+  ["nil_ls"] = function()
+    require('lspconfig').nil_ls.setup {
+      on_attach = on_attach,
+      capabilities = capabilities,
+      --- refer to https://github.com/oxalica/nil/blob/main/docs/configuration.md
+      --- for the list of configurations available for `nil_ls`
+      settings = {
+        ["nil"] = {
+          formatting = {
+            command = { "nix", "run", "nixpkgs#alejandra" },
+          },
+          nix = {
+            flake = {
+              -- calls `nix flake archive` to put a flake and its output to store
+              autoArchive = true,
+              -- auto eval flake inputs for improved completion
+              autoEvalInputs = true,
+            },
+          },
+        },
+      },
+    }
+  end,
 })
 
-setup["nil_ls"]()
+require('lspconfig')["nil_ls"].setup {}
 require("rust-tools").setup {
   tools = {
     -- rust-tools options

nix/repo/home-configs/default.nix

@@ -63,7 +63,7 @@ in {
         base-modules
         ++ [
           home-profiles.nerd_font_module
-          home-profiles.git-pegasust
+          home-profiles.git-htran
           home-profiles.dev-packages
           home-profiles.zk
           home-modules.darwin-spotlight

nix/repo/nixConfig.nix

@@ -1,27 +0,0 @@
-{inputs, cell}: let
-  # decorator for now, for data collecting :)
-  nix-conf = a: a;
-in {
-  "htran@mbp" = nix-conf ''
-    accept-flake-config = true
-    experimental-features = nix-command flakes
-    post-build-hook = /etc/nix/upload-to-cache.sh
-    trusted-users = root htran hungtran hwtr
-    max-jobs = 8
-    cores = 12
-    # default is true for Linux, false for every one else 
-    # https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-sandbox
-    sandbox = true
-  '';
-  "hungtran@mba-m2" = nix-conf ''
-    accept-flake-config = true
-    experimental-features = nix-command flakes
-    post-build-hook = /etc/nix/upload-to-cache.sh
-    trusted-users = root htran hungtran hwtr
-    max-jobs = 7
-    cores = 8
-    # default is true for Linux, false for every one else 
-    # https://nixos.org/manual/nix/stable/command-ref/conf-file.html#conf-sandbox
-    sandbox = true
-  '';
-}