goodnight

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"
@@ -22,7 +21,7 @@
 								clang-tools
 								marksman
 								nil
-								# nodePackages.bash-language-server
+								nodePackages.bash-language-server
 								nodePackages.vscode-css-languageserver-bin
 								nodePackages.vscode-langservers-extracted
 								shellcheck
@@ -52,6 +51,7 @@
 				indent-guides = {
 					render = true;
 					character = "▏";
+					rainbow-option = "dim";
 				};
 			};
 		};

helix/languages.nix

@@ -2,11 +2,21 @@
 
 {
   programs.helix.languages = {
+    language = [
+      {
+        name = "bash";
+        auto-format = true;
+        formatter = {
+          command = "${pkgs.shfmt}/bin/shfmt";
+          args = ["-i" "2"];
+        };
+      }
+    ];
     language-server = {
-      # bash-language-server = {
+      bash-language-server = {
-      #   command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server";
+        command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server";
-      #   args = ["start"];
+        args = ["start"];
-      # };
+      };
 
       clangd = {
         command = "${pkgs.clang-tools}/bin/clangd";

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;
 	};
 
 }