goodnight

flake.nix

@@ -14,12 +14,12 @@
     };
   };
 
-  outputs = inputs @ { nixpkgs, home-manager, ... }:
+  outputs = inputs:
     let
       system = "x86_64-linux";
-      pkgs = nixpkgs.legacyPackages.${system};
+      pkgs = inputs.nixpkgs.legacyPackages.${system};
     in {
-      homeConfigurations."tacocat" = home-manager.lib.homeManagerConfiguration {
+      homeConfigurations."tacocat" = inputs.home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
 
 				# Specify your home configuration modules here, for example,

helix/default.nix

@@ -11,8 +11,7 @@
 		# package = inputs.helix.packages."x86_64-linux".default;
 
 		package = inputs.helix.packages.${pkgs.system}.default.overrideAttrs (self: {
-					makeWrapperArgs = with pkgs;
+					makeWrapperArgs = with pkgs; self.makeWrapperArgs
-						self.makeWrapperArgs
 						or []
 						++ [
 							"--suffix"
@@ -52,34 +51,9 @@
 				indent-guides = {
 					render = true;
 					character = "▏";
+					rainbow-option = "dim";
 				};
 			};
 		};
-#		languages = {
-#			language = [{
-#				name = "nix";
-#				scope = "flake.nix";
-#				roots = [ "flake.nix" "flake.lock" ];
-#				injection-regex = "nix";
-#				auto-format = false;
-#				file-types = [ "nix" ];
-#				comment-token = "#";
-#				indent = {
-#					tab-width = 2;
-#					unit = "  ";
-#				};
-#				language-servers = [ "${pkgs.nil}" ];
-#				formatter = {
-#					command = "${pkgs.nixpkgs-fmt}";
-#				};
-#			}];
-#			grammar = [{
-#				name = "nix";
-#				source = {
-#					git = "https://github.com/nix-community/tree-sitter-nix";
-#					rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7";
-#				};
-#			}];
-#		};
 	};
 }

helix/languages.nix

@@ -2,6 +2,16 @@
 
 {
   programs.helix.languages = {
+    language = [
+      {
+        name = "bash";
+        auto-format = true;
+        formatter = {
+          command = "${pkgs.shfmt}/bin/shfmt";
+          args = ["-i" "2"];
+        };
+      }
+    ];
     language-server = {
       bash-language-server = {
         command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server";

shell/zsh.nix

@@ -6,11 +6,12 @@
 		enableAutosuggestions = true;
 		enableCompletion = true;
 		enableVteIntegration = true;
+		autocd = false;
 		cdpath = [
 			"/mnt/nixos/etc/nixos/"
 			"/mnt/stuff/school/"
 		];
-		defaultKeymap = null; # was "vicmd"
+		defaultKeymap = null;
 		dotDir = ".config/zsh";
 		history = {
 			ignoreSpace = true;
@@ -33,12 +34,21 @@
 			# strug
 			# bira
 		};
-		sessionVariables = {
+		# plugins = [
-
+		# 	{
-		};
+		# 		name = "zsh-syntax-highlighting";
+		# 		src = pkgs.fetchFromGitHub {
+		# 			owner = "zsh-users";
+		# 			repo = "zsh-syntax-highlighting";
+		# 			rev = "0.7.1";
+		# 			sha256 = "gOG0NLlaJfotJfs+SUhGgLTNOnGLjoqnUp54V9aFJg8=";
+		# 		};
+		# 	}
+		# ];
 		shellAliases = {
 			ls = "eza";
 		};
+		syntaxHighlighting.enable = true;
 	};
 
 }