From c9c41d1d3f0f2d419756d96eec6e7dcb57ab3fcf Mon Sep 17 00:00:00 2001
From: Aria Nolan <aria@chytrid.org>
Date: Tue, 13 Feb 2024 20:09:30 -0500
Subject: [PATCH] neovim treesitter, formatting

---
 flake.nix                            |  6 ++---
 users/tacocat/home.nix               |  2 +-
 users/tacocat/neovim/default.nix     | 36 +++++++++++++++-------------
 users/tacocat/programs/radioboat.nix |  2 +-
 users/tacocat/programs/vim.nix       | 13 ++++------
 users/tacocat/shell/bash.nix         | 10 ++++----
 6 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/flake.nix b/flake.nix
index 613e2c8..97b4f69 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,9 +29,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-matlab = {
-			inputs.nixpkgs.follows = "nixpkgs";
-			url = "gitlab:doronbehar/nix-matlab";
-  	};
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "gitlab:doronbehar/nix-matlab";
+    };
   };
 
   # pass in the urls defined above
diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix
index 7bd8e61..b0b108a 100644
--- a/users/tacocat/home.nix
+++ b/users/tacocat/home.nix
@@ -24,7 +24,7 @@
       "$HOME/.dotnet"
     ];
     packages = with pkgs; [
-    	matlab
+      matlab
       mpv
       krita
       notesnook
diff --git a/users/tacocat/neovim/default.nix b/users/tacocat/neovim/default.nix
index 4594ee6..b1a20ee 100644
--- a/users/tacocat/neovim/default.nix
+++ b/users/tacocat/neovim/default.nix
@@ -7,8 +7,8 @@
       setUpBar = false;
     };
     clipboard = {
-    	providers.wl-copy.enable = true;
-			register = "unnamedplus";
+      providers.wl-copy.enable = true;
+      register = "unnamedplus";
     };
     options = {
       number = true;
@@ -16,20 +16,24 @@
       tabstop = 2;
       shiftwidth = 2;
       expandtab = false;
-			scrolloff = 5;
-			autoindent = true;
-			copyindent = true;
-			signcolumn = "yes";
-			cursorline = true;
-			showmode = false;
+      scrolloff = 5;
+      autoindent = true;
+      copyindent = true;
+      signcolumn = "yes";
+      cursorline = true;
+      showmode = false;
+    };
+    plugins = {
+      lightline = {
+        enable = true;
+      };
+      gitsigns = {
+        enable = true;
+      };
+      treesitter = {
+        enable = true;
+        nixvimInjections = true;
+      };
     };
-		plugins = {
-			lightline = {
-				enable = true;
-			};
-			gitsigns = {
-				enable = true;
-			};
-		};
   };
 }
diff --git a/users/tacocat/programs/radioboat.nix b/users/tacocat/programs/radioboat.nix
index 8f107f0..de30b65 100644
--- a/users/tacocat/programs/radioboat.nix
+++ b/users/tacocat/programs/radioboat.nix
@@ -1,5 +1,5 @@
 {pkgs, ...}: {
-  home.packages = [ pkgs.radioboat ];
+  home.packages = [pkgs.radioboat];
 
   xdg.configFile."radioboat/urls.csv".text = ''
     url,"name"
diff --git a/users/tacocat/programs/vim.nix b/users/tacocat/programs/vim.nix
index cdb61f3..ee5a58f 100644
--- a/users/tacocat/programs/vim.nix
+++ b/users/tacocat/programs/vim.nix
@@ -1,6 +1,4 @@
-{pkgs, ...}:
-
-let
+{pkgs, ...}: let
   rose-pine-vim = pkgs.vimUtils.buildVimPlugin {
     name = "rose-pine-vim";
     src = pkgs.fetchFromGitHub {
@@ -30,7 +28,6 @@ let
     url = "http://ftp.vim.org/vim/runtime/spell/en.latin1.sug";
     sha256 = "00ibcbj2b2krwd5zl9zl671db44k3fl59sz1yymb9ydkpkj9gpp6";
   };
-
 in {
   programs.vim = {
     enable = true;
@@ -84,10 +81,10 @@ in {
   };
 
   home.file.".vim/after/plugin/terminus.vim".text = ''
-    let &t_SI="\e[6 q"
-    let &t_EI="\e[2 q"
-    let &t_Cs = "\e[4:3m"
-	  let &t_Ce = "\e[4:0m"
+     let &t_SI="\e[6 q"
+     let &t_EI="\e[2 q"
+     let &t_Cs = "\e[4:3m"
+    let &t_Ce = "\e[4:0m"
   '';
 
   home.file.".vim/after/ftplugin/markdown.vim".text = ''
diff --git a/users/tacocat/shell/bash.nix b/users/tacocat/shell/bash.nix
index 017f72e..5e373c7 100644
--- a/users/tacocat/shell/bash.nix
+++ b/users/tacocat/shell/bash.nix
@@ -3,11 +3,11 @@
     enable = true;
     enableCompletion = true;
     enableVteIntegration = true;
-     profileExtra = ''
-       ssh-add ~/.ssh/git_school
-       ssh-add ~/.ssh/git_personal
-       ssh-add ~/.ssh/id_ed25519
-     '';
+    profileExtra = ''
+      ssh-add ~/.ssh/git_school
+      ssh-add ~/.ssh/git_personal
+      ssh-add ~/.ssh/id_ed25519
+    '';
     bashrcExtra = ''
 
       PS1='[\u@\h \W]\$ '