From 042a5a069c38308b80895746b88ba3167d2ef0c3 Mon Sep 17 00:00:00 2001
From: Evan Reichard <evan@reichard.io>
Date: Fri, 8 Sep 2023 08:41:16 -0400
Subject: [PATCH] Update Channels & Configuration

---
 README.md                      | 24 ++++++++++++++++++++++++
 home.nix                       |  2 +-
 nvim/config/lua/base.lua       |  4 ++--
 nvim/config/lua/lsp-config.lua |  4 +---
 nvim/default.nix               | 14 ++++----------
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 71f703b..3110b30 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,25 @@
 # Nix Home Manager Configuration
+
+## Upgrade
+
+```
+# Update System Channels
+sudo nix-channel --add https://nixos.org/channels/nixpkgs-23.05-darwin nixpkgs
+sudo nix-channel --update
+
+# Update Home Manager
+nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.05.tar.gz home-manager
+nix-channel --update
+
+# Build Home Manager
+home-manager switch
+```
+
+## Clean Garbage
+
+NOTE: This will remove previous generations
+
+```
+nix-collect-garbage --delete-old
+sudo nix-collect-garbage --delete-old
+```
diff --git a/home.nix b/home.nix
index 033d1ef..43cf4a2 100644
--- a/home.nix
+++ b/home.nix
@@ -20,7 +20,7 @@ in
   # Home Manager Config
   home.username = "evanreichard";
   home.homeDirectory = "/Users/evanreichard";
-  home.stateVersion = "22.05";
+  home.stateVersion = "23.05";
   programs.home-manager.enable = true;
 
   # Global Packages
diff --git a/nvim/config/lua/base.lua b/nvim/config/lua/base.lua
index 3f2963a..e57a42e 100644
--- a/nvim/config/lua/base.lua
+++ b/nvim/config/lua/base.lua
@@ -39,9 +39,9 @@ local diagnostics_active = true
 local toggle_diagnostics = function()
     diagnostics_active = not diagnostics_active
     if diagnostics_active then
-        vim.diagnostic.show()
+        vim.diagnostic.enable()
     else
-        vim.diagnostic.hide()
+        vim.diagnostic.disable()
     end
 end
 
diff --git a/nvim/config/lua/lsp-config.lua b/nvim/config/lua/lsp-config.lua
index a829a1b..e1823d8 100644
--- a/nvim/config/lua/lsp-config.lua
+++ b/nvim/config/lua/lsp-config.lua
@@ -99,10 +99,8 @@ null_ls.setup({
         null_ls.builtins.formatting.nixpkgs_fmt,
         null_ls.builtins.formatting.lua_format,
         null_ls.builtins.formatting.prettier, null_ls.builtins.formatting.gofmt,
-        null_ls.builtins.diagnostics.sqlfluff
-            .with({extra_args = {"--dialect", "ansi"}}),
+        null_ls.builtins.diagnostics.sqlfluff,
         null_ls.builtins.formatting.sqlfluff
-            .with({extra_args = {"--dialect", "ansi"}})
     },
     on_attach = function(client, bufnr)
         if client.supports_method("textDocument/formatting") then
diff --git a/nvim/default.nix b/nvim/default.nix
index a7474da..1c2d9a4 100644
--- a/nvim/default.nix
+++ b/nvim/default.nix
@@ -48,22 +48,14 @@ in
       # ------------------
       lualine-nvim # Bottom Line
       noice-nvim # UI Tweaks
+      nvim-notify # Noice Dependency
       nord-nvim # Theme
       nvim-web-devicons # Dev Icons
 
       # ------------------
       # --- Treesitter ---
       # ------------------
-      (
-        nvim-treesitter.withPlugins (
-          # Exclude Outdated Packages (Causes Issues)
-          plugins: with pkgs; subtractLists [
-            tree-sitter-grammars.tree-sitter-bash
-            tree-sitter-grammars.tree-sitter-kotlin
-          ]
-            tree-sitter.allGrammars
-        )
-      )
+      nvim-treesitter.withAllGrammars
 
       # ------------------
       # ----- Silicon ----
@@ -106,6 +98,7 @@ in
       # Telescope Dependencies
       ripgrep
       fd
+      tree-sitter
 
       # LSP Dependencies
       nodePackages.pyright
@@ -113,6 +106,7 @@ in
       nodePackages.typescript-language-server
       nodePackages.vscode-langservers-extracted
       gopls
+      go
 
       # Formatters
       luaformatter