From a74acdc297190ef23f4a87898063d7f2484515bd Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustin@dustinswan.com>
Date: Sun, 20 Oct 2024 21:19:34 -0600
Subject: [PATCH] Just adding and cleaning

---
 home-cli.nix  | 18 ++++++++++++++----
 home-mac.nix  |  1 +
 home-nvim.nix | 22 ++++++++++++++++------
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/home-cli.nix b/home-cli.nix
index 817f9a3..d91714a 100644
--- a/home-cli.nix
+++ b/home-cli.nix
@@ -24,16 +24,22 @@ in
   home.packages = with pkgs; [
     fd # `fd PATTERN`; `fd` is like ls-R; `-e ext` searches by extension; `-g` for glob; `-H` searches hidden files; `-u` for unrestricted; `fd -e jpg -x convert {} {.}.png`
     mosh # like ssh but better on spotty networks
+    aider-chat
     w3m
     wget
-    httpie
+    httpie # HTTPie CLI — modern, user-friendly command-line HTTP client for the API era. JSON support, colors, sessions, downloads, plugins & more
+    monolith # CLI tool for saving complete web pages as a single HTML file
+    supabase-cli
     ngrok
     ddev
     # bitwarden-cli
     mkcert
     gnupg
-    rage
+    gitu # A TUI Git client inspired by Magit
+    rage # A simple, secure and modern file encryption tool (and Rust library) with small explicit keys, no config options, and UNIX-style composability
     sd
+    jq
+    sq
     cacert
     weechat
     sttr # string operations. e.g. sttr md5 "Hello World"; sttr snake "ChangeCase"
@@ -44,12 +50,14 @@ in
     nodejs
     pipx
     yarn
-    php83
+    # php83
     stack
     cargo
     ruby
+    llvm
+    blade-formatter
     # haskellPackages.ghcup
-    php83Packages.composer
+    # php83Packages.composer
     nodePackages.typescript-language-server
     nodePackages.stylelint
     nodePackages.js-beautify
@@ -75,6 +83,8 @@ in
     "$HOME/.local/bin"
     "$HOME/.cargo/bin"
     "$HOME/.npm-global/bin"
+    "/opt/homebrew/bin"
+    "/Users/dustinswan/Downloads/roc_nightly-macos_apple_silicon-2024-10-09-bf5b13e237f"
   ];
 
   xdg.enable = true;
diff --git a/home-mac.nix b/home-mac.nix
index 6eeb5ce..f11c445 100644
--- a/home-mac.nix
+++ b/home-mac.nix
@@ -9,6 +9,7 @@
   home.file.gpg-agent = {
     target = ".gnupg/gpg-agent.conf";
     text = ''
+      pinentry-program ${pkgs.pinentry_mac}/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac
       default-cache-ttl 86400
       max-cache-ttl 86400
     '';
diff --git a/home-nvim.nix b/home-nvim.nix
index aa93e93..c879124 100644
--- a/home-nvim.nix
+++ b/home-nvim.nix
@@ -34,12 +34,14 @@
       { key = "<leader>e"; action = "<cmd>Neotree toggle<cr>"; }
       { key = "<leader>ff"; action = "<cmd>Telescope find_files<cr>"; }
       { key = "<leader>fr"; action = "<cmd>Telescope oldfiles<cr>"; }
+      { key = "<leader>/"; action = "<cmd>Telescope live_grep<cr>"; }
       { key = "<leader>bd"; action = "<cmd>bdelete<cr>"; }
       { key = "<S-l>"; action = "<cmd>bnext<cr>"; }
       { key = "<S-h>"; action = "<cmd>bprev<cr>"; }
     ];
 
     plugins = {
+      avante.enable = true;
       bufferline.enable = true;
       cmp = {
         enable = true;
@@ -69,16 +71,23 @@
         servers = {
           eslint.enable = true;
           html.enable = true;
-          lua-ls.enable = true;
-          nil-ls.enable = true;
+          lua_ls.enable = true;
+          nil_ls.enable = true;
           # phpactor.enable = true;
           intelephense.enable = true;
+          intelephense.package = null;
           # rust-analyzer.enable = true;
-          tsserver.enable = true;
-
+          ts_ls.enable = true;
+          roc_ls.enable = true;
+          roc_ls.package = null;
         };
       };
-      lsp-format.enable = true;
+      none-ls = {
+        enable = true;
+        sources.formatting.blade_formatter.enable = true;
+        sources.formatting.blade_formatter.package = null;
+      };
+      # lsp-format.enable = true;
       lsp-lines.enable = true;
       neo-tree.enable = true;
       notify.enable = true;
@@ -92,13 +101,14 @@
         settings.org_default_notes_file = "~/Sync/Notes/Main.org";
       };
       persistence.enable = true;
-      surround.enable = true;
+      vim-surround.enable = true;
       telescope.enable = true;
       tmux-navigator.enable = true;
       todo-comments.enable = true;
       treesitter.enable = true;
       trouble.enable = true;
       ts-autotag.enable = true;
+      web-devicons.enable = true;
       which-key.enable = true;
     };
   };