From cee054498a920592b05699c68d06232f05cda3b6 Mon Sep 17 00:00:00 2001
From: Drew Haven <drew.haven@gmail.com>
Date: Tue, 4 Feb 2025 20:47:52 -0800
Subject: [PATCH] [Term] Moves terminal utils to terminal config.  [Vim] Messes
 with configs a bit

---
 home-manager/drew.nix                         | 19 ----------
 home-manager/features/config/neovim/init.lua  | 38 ++++++++++++++++++-
 .../config/neovim/lua/periodic/init.lua       | 37 ------------------
 home-manager/features/neovim.nix              |  2 +-
 home-manager/features/terminal.nix            | 26 +++++++++++++
 5 files changed, 64 insertions(+), 58 deletions(-)
 delete mode 100644 home-manager/features/config/neovim/lua/periodic/init.lua

diff --git a/home-manager/drew.nix b/home-manager/drew.nix
index 14679a1..02975ba 100644
--- a/home-manager/drew.nix
+++ b/home-manager/drew.nix
@@ -19,25 +19,6 @@
     git
     nix-prefetch-github
 
-    # Utilities
-    htop
-    btop
-    zip
-    xz
-    unzip
-    p7zip
-    httpie
-    neofetch
-    file
-    tree
-    jq
-    killall
-    ranger
-
-
-    # Networking
-    dnsutils
-    socat
     
     # Applications
     discord
diff --git a/home-manager/features/config/neovim/init.lua b/home-manager/features/config/neovim/init.lua
index 2d3b785..6e95120 100644
--- a/home-manager/features/config/neovim/init.lua
+++ b/home-manager/features/config/neovim/init.lua
@@ -1 +1,37 @@
-require("periodic")
\ No newline at end of file
+-- Leader must be set before lazy is setup.
+vim.g.mapleader = ","
+
+vim.cmd [[
+colorscheme decay-dark
+set autoindent
+set expandtab
+set smartindent
+set shiftwidth=2
+set tabstop=2
+set softtabstop=2
+filetype on
+]]
+
+-- Make sure sesssion options includes `localoptions` so that auto-sessions will start properly
+vim.o.sessionoptions="blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
+
+local telescope = require('telescope.builtin')
+
+vim.keymap.set("n", "<C-e>", "<cmd>RnvimrToggle<CR>", { noremap = true, silent = true })
+vim.keymap.set("n", "<C-n>", "<cmd>TabNext<CR>", { noremap = true, silent = true })
+vim.keymap.set("n", "<C-p>", telescope.find_files, { desc = "Telescope find files" })
+vim.keymap.set("n", "<C-t>", telescope.buffers, { desc = "Telescope buffers" })
+
+
+vim.filetype.add {
+    extension = {
+        rasi = 'rasi',
+    },
+    pattern = {
+        -- Some common config files and their types
+        ['.*/waybar/config'] = 'jsonc',
+        ['.*/mako/config'] = 'dosini',
+        ['.*/kitty/*.conf'] = 'bash',
+        ['.*/hypr/.*%.conf'] = 'hyprlang',
+    },
+}
diff --git a/home-manager/features/config/neovim/lua/periodic/init.lua b/home-manager/features/config/neovim/lua/periodic/init.lua
deleted file mode 100644
index 9bcdb36..0000000
--- a/home-manager/features/config/neovim/lua/periodic/init.lua
+++ /dev/null
@@ -1,37 +0,0 @@
-vim.g.mapleader = ","
-
-vim.cmd [[
-colorscheme decay-dark
-set autoindent
-set expandtab
-set smartindent
-set shiftwidth=2
-set tabstop=2
-set softtabstop=2
-filetype on
-
-]]
-
--- Make sure sesssion options includes `localoptions` so that auto-sessions will start properly
-vim.o.sessionoptions="blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions"
-
-local telescope = require('telescope.builtin')
-
-vim.keymap.set("n", "<C-e>", "<cmd>RnvimrToggle<CR>", { noremap = true, silent = true })
-vim.keymap.set("n", "<C-n>", "<cmd>TabNext<CR>", { noremap = true, silent = true })
-vim.keymap.set("n", "<C-p>", telescope.find_files, { desc = "Telescope find files" })
-vim.keymap.set("n", "<C-t>", telescope.buffers, { desc = "Telescope buffers" })
-
-
-vim.filetype.add {
-    extension = {
-        rasi = 'rasi',
-    },
-    pattern = {
-        -- Some common config files and their types
-        ['.*/waybar/config'] = 'jsonc',
-        ['.*/mako/config'] = 'dosini',
-        ['.*/kitty/*.conf'] = 'bash',
-        ['.*/hypr/.*%.conf'] = 'hyprlang',
-    },
-}
diff --git a/home-manager/features/neovim.nix b/home-manager/features/neovim.nix
index a6bacab..0f8cc23 100644
--- a/home-manager/features/neovim.nix
+++ b/home-manager/features/neovim.nix
@@ -23,7 +23,7 @@ in
     defaultEditor = true;
 
     plugins = with pkgs.vimPlugins; [
-      nvim-treesitter
+      nvim-treesitter.withAllGrammars
       surround-nvim
       telescope-nvim
       plenary-nvim # dependency of telescope
diff --git a/home-manager/features/terminal.nix b/home-manager/features/terminal.nix
index d8ae97f..c02271e 100644
--- a/home-manager/features/terminal.nix
+++ b/home-manager/features/terminal.nix
@@ -1,6 +1,32 @@
 # Configure my terminal of choice
 { pkgs, inputs, ... }:
 {
+
+  home.packages = with pkgs; [
+    # System
+    htop
+    btop
+    neofetch
+    killall
+
+    # Files
+    zip
+    xz
+    unzip
+    p7zip
+    file
+    tree
+    ranger
+
+    # Networking
+    dnsutils
+    socat
+    httpie
+
+    # Other
+    jq
+  ];
+
   programs.alacritty = {
     enable = true;
     settings = {