From 2a9c0ccfe1e67e9343985ab91fa8ebd24b46e266 Mon Sep 17 00:00:00 2001
From: Joe Frikker <jfrikker@gmail.com>
Date: Tue, 19 Dec 2023 17:24:00 -0500
Subject: [PATCH] wip

---
 home-manager/home-fish.nix   |  1 -
 home-manager/home-tmux.nix   |  2 +-
 home-manager/home.nix        | 19 ++++++++++---------
 nvim/lua/config/options.lua  |  2 ++
 nvim/lua/plugins/lsp.lua     |  2 +-
 nvim/lua/plugins/plugins.lua | 10 +++++++++-
 6 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/home-manager/home-fish.nix b/home-manager/home-fish.nix
index a03833c..1ca1065 100644
--- a/home-manager/home-fish.nix
+++ b/home-manager/home-fish.nix
@@ -2,7 +2,6 @@ pkgs:
   {
     enable = true;
     shellAliases = {
-        cd = "z";
         du = "dust";
         http = "xh";
         https = "xh";
diff --git a/home-manager/home-tmux.nix b/home-manager/home-tmux.nix
index 53ff3d7..12c0cbd 100644
--- a/home-manager/home-tmux.nix
+++ b/home-manager/home-tmux.nix
@@ -21,7 +21,7 @@ set -g @thumbs-unique enabled
             '';
         }
     ];
-    shell = pkgs.fish + "/bin/fish";
+    shell = pkgs.zsh + "/bin/zsh";
     shortcut = "Space";
     tmuxinator.enable = true;
     extraConfig = ''
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 4e850e8..95db086 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -49,7 +49,7 @@
         pkgs.awscli
         pkgs.bashInteractive
         pkgs.du-dust
-        pkgs.emacs29
+        # pkgs.emacs29
         pkgs.fd
         pkgs.fend
         pkgs.gh
@@ -62,16 +62,16 @@
         # pkgs.inconsolata-nerdfont
         pkgs.jdt-language-server
         pkgs.just
-        pkgs.jsonnet
+        # pkgs.jsonnet
         pkgs.kubectl
-        pkgs.maven
+        # pkgs.maven
         pkgs.mysql-client
         # pkgs.neovide
         pkgs.neovim
-        pkgs.nodejs-16_x
+        # pkgs.nodejs-16_x
         pkgs.nodePackages.typescript-language-server
         # pkgs.postgresql
-        (pkgs.python3.withPackages (p: [p.ipython p.pyyaml p.boto3]))
+        # (pkgs.python3.withPackages (p: [p.ipython p.pyyaml p.boto3]))
         pkgs.ripgrep
         pkgs.rlwrap
         # pkgs.rust-analyzer
@@ -85,7 +85,7 @@
         pkgs.tokei
         pkgs.xh
         # pkgs.xonsh
-        pkgs.yarn
+        # pkgs.yarn
         # pkgs.zellij
     ];
 
@@ -112,14 +112,15 @@
     # programs.gh.enable = true;
     programs.git.enable = true;
     programs.git.delta.enable = true;
-    programs.java.enable = true;
-    programs.java.package = pkgs.jdk17;
+    # programs.java.enable = true;
+    # programs.java.package = pkgs.jdk17;
     programs.jq.enable = true;
     programs.k9s.enable = true;
     programs.lazygit.enable = true;
     programs.starship = import ./home-starship.nix pkgs;
     programs.tmux = import ./home-tmux.nix pkgs;
-    programs.zoxide.enable = true;
+    # programs.zoxide.enable = true;
+    programs.zsh = import ./home-zsh.nix;
 
     # programs.neovim = import ./home-neovim.nix pkgs;
 }
diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua
index a29944c..da0c386 100644
--- a/nvim/lua/config/options.lua
+++ b/nvim/lua/config/options.lua
@@ -10,3 +10,5 @@ opt.tabstop = 4
 opt.sidescrolloff = 0
 opt.shiftwidth = 4
 opt.relativenumber = false
+
+vim.g.autoformat = false
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index 18e55ac..d9264b2 100644
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -6,7 +6,7 @@ return {
     --   { "mfussenegger/nvim-jdtls" },
     -- },
     opts = {
-      autoformat = false,
+      -- autoformat = false,
       --   servers = {
       --     jdtls = {},
       --   },
diff --git a/nvim/lua/plugins/plugins.lua b/nvim/lua/plugins/plugins.lua
index 833b6ce..dbbb25b 100644
--- a/nvim/lua/plugins/plugins.lua
+++ b/nvim/lua/plugins/plugins.lua
@@ -32,6 +32,14 @@ return {
     enabled = false,
   },
   -- {
+  --   "L3MON4D3/LuaSnip",
+  --   enabled = false,
+  -- },
+  {
+    "rafamadriz/friendly-snippets",
+    enabled = false,
+  },
+  -- {
   --   "ggandor/leap-spooky.nvim",
   --   enabled = true,
   --   opts = {
@@ -92,7 +100,7 @@ return {
       local cmp = require("cmp")
       opts.sources = cmp.config.sources({
         { name = "nvim_lsp" },
-        { name = "luasnip" },
+        -- { name = "luasnip" },
       })
       return opts
     end,