diff --git a/flake.nix b/flake.nix
index 18b7539..d1bb426 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,12 @@
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
+			# pkgs = import nixpkgs {
+			# 	inherit system;
+			# 	config = {
+			# 		allowUnfree = true;
+			# 	};
+			# };
     in {
       homeConfigurations."tacocat" = home-manager.lib.homeManagerConfiguration {
         inherit pkgs;
@@ -24,7 +30,7 @@
 
         # Optionally use extraSpecialArgs
         # to pass through arguments to home.nix
-				extraSpecialArgs = {inherit inputs;};
+				extraSpecialArgs = {inherit inputs system;};
       };
     };
 }
diff --git a/home.nix b/home.nix
index 18f1c10..11f090e 100644
--- a/home.nix
+++ b/home.nix
@@ -7,9 +7,51 @@
 		stateVersion = "23.11";
 		packages = with pkgs; [
 			wineWowPackages.unstable
+			gcc-arm-embedded
 		];
 	};
 
+	programs.zsh = {
+		enable = true;
+		enableAutosuggestions = true;
+		enableCompletion = true;
+		enableVteIntegration = true;
+		cdpath = [
+			"/mnt/nixos/etc/nixos/"
+			"/mnt/stuff/school/"
+		];
+		defaultKeymap = "vicmd";
+		dotDir = ".config/zsh";
+		history = {
+			ignoreSpace = true;
+			path = "${config.xdg.dataHome}/zsh/zsh_history";
+			save = 10000;
+		};
+		historySubstringSearch.enable = true;
+		oh-my-zsh = {
+			enable = true;
+		};
+	};
+
+	programs.bash = {
+		enable = true;
+		enableCompletion = true;
+		enableVteIntegration = true;
+		bashrcExtra = ''
+
+if [ -d "$HOME/.local/bin" ] ; then
+		PATH="$HOME/.local/bin:$PATH"
+fi
+
+	'';
+	};
+
+	# gtk = {
+	# 	enable = true;
+	# 	theme.package = pkgs.adw-gtk3;
+	# 	theme.name = "adw-gtk3";
+	# };
+
   # Home Manager needs a bit of information about you and the paths it should
   # manage.
   # home.username = "tacocat";