From 3db92d8279a3eeeefbf55dcad77e36a8e9b15b81 Mon Sep 17 00:00:00 2001
From: Noah Pederson <noah@packetlost.dev>
Date: Sun, 19 May 2024 21:35:25 -0500
Subject: [PATCH] Sync w/ touma-wsl branch

---
 noah-home.nix    | 52 +++++++++++++++++++++++++++++++++++++++---------
 nvim/init.lua    |  3 +--
 nvim/lua/lsp.lua |  4 ++--
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/noah-home.nix b/noah-home.nix
index 9350dc8..8b5db6f 100644
--- a/noah-home.nix
+++ b/noah-home.nix
@@ -1,5 +1,5 @@
-
-{ pkgs, lib, ... }: let
+{ pkgs, lib, ... }:
+let
   unstable = import <nixos-unstable> {
     config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
       "jetbrains-toolbox"
@@ -53,6 +53,12 @@ in {
     opam
     rustup
     zig
+    scala_3
+    scalafmt
+    # scala LSP
+    unstable.metals
+    # Scala / Java build tool
+    sbt
     luarocks
     luajit
     lua-language-server
@@ -68,7 +74,12 @@ in {
     scdoc
     dockerfile-language-server-nodejs
     yaml-language-server
+    mkcert
     natscli
+    python3
+    python311Packages.pip
+    poetry
+    sqlite
     unstable.harec
     unstable.hare
     unstable.haredo
@@ -78,6 +89,7 @@ in {
     unstable.bun
     unstable.gh
     unstable.zed-editor
+    unstable.kraft
 
 
     # JetBrains
@@ -114,27 +126,49 @@ in {
     google-chrome
   ];
 
+  nix = {
+    settings.experimental-features = ["nix-command" "flakes"];
+  };
 
-  programs.fish.enable = true;
+  programs.fish = {
+    enable = true;
+    package = unstable.fish;
+  };
   programs.neovim = {
+    package = unstable.neovim-unwrapped;
     enable = true;
     defaultEditor = true;
-    extraPackages = with pkgs; [
-      fzf
-      ripgrep
-      luarocks
-    ];
+    withNodeJs = true;
+    withPython3 = true;
+    extraPackages = with pkgs; [ fzf ripgrep luarocks unstable.tree-sitter ];
   };
   programs.git = {
     enable = true;
     userName = "Noah Pederson";
     userEmail = "noah@packetlost.dev";
-    extraConfig.init.defaultBranch = "master";
+    extraConfig = {
+      sendemail = {
+        smtpserver = "smtp.migadu.com";
+        smtpuser = "noah@packetlost.dev";
+        smptencryption = "tls";
+        smtpserverport = 587;
+      };
+      init = {
+        defaultBranch = "master";
+      };
+      pull = {
+        rebase = true;
+      };
+      credential = {
+        helper = "cache";
+      };
+    };
     ignores = [
       ".direnv/"
       ".envrc"
       "flake.nix"
       "shell.nix"
+      ".env/"
       ".clj-kondo/"
     ];
   };
diff --git a/nvim/init.lua b/nvim/init.lua
index 87af420..897d41c 100644
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -226,8 +226,7 @@ require("nvim-treesitter.configs").setup(
             "vim",
             "zig",
             "uxntal",
-            "kdl",
-            "roc",
+            "kdl"
         }
     }
 )
diff --git a/nvim/lua/lsp.lua b/nvim/lua/lsp.lua
index b35c37f..8120d87 100644
--- a/nvim/lua/lsp.lua
+++ b/nvim/lua/lsp.lua
@@ -16,7 +16,7 @@ local util = require("lspconfig.util")
 -- Python LSP
 nvim_lsp.pylsp.setup(
     {
-        cmd = {"/home/noah/.envs/nvim/bin/pylsp"},
+        --cmd = {"/home/noah/.envs/nvim/bin/pylsp"},
         root_dir = function(fname)
             local root_files = {
                 "pants.toml",
@@ -105,7 +105,7 @@ local simple_lsps = {
     "zls",
     "tsserver",
     "eslint",
-    "roc_ls",
+    "metals",
 }
 -- #simple_lsps is the length of the table when treated as a list... funky!
 for _,v in pairs(simple_lsps) do
-- 
2.51.2