diff --git a/flake.nix b/flake.nix
index d0eb6a5..5aa8b01 100644
--- a/flake.nix
+++ b/flake.nix
@@ -25,24 +25,26 @@
       system = "x86_64-linux";
     in
     {
-      nixosConfigurations = {
-        TARS = nixpkgs.lib.nixosSystem {
-          inherit system;
-          modules = [
-            ./nixos/configuration.nix
-            nixos-hardware.nixosModules.framework-amd-ai-300-series
-          ];
-          specialArgs = {
-            pkgs-stable = nixpkgs-stable.legacyPackages.${system};
-          };
+      nixosConfigurations.TARS = nixpkgs.lib.nixosSystem {
+        inherit system;
+
+        specialArgs = {
+          pkgs-stable = nixpkgs-stable.legacyPackages.${system};
         };
-      };
 
-      homeConfigurations.zeph = home-manager.lib.homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages.${system};
-        modules = [ ./home-manager/home.nix ];
-      };
+        modules = [
+          ./nixos/configuration.nix
+          nixos-hardware.nixosModules.framework-amd-ai-300-series
 
+          home-manager.nixosModules.home-manager
+
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+
+            home-manager.users.zeph = import ./home-manager/home.nix;
+          }
+        ];
+      };
     };
-
 }
diff --git a/home-manager/modules/fish.nix b/home-manager/modules/fish.nix
index 1ec2419..89235ae 100644
--- a/home-manager/modules/fish.nix
+++ b/home-manager/modules/fish.nix
@@ -4,7 +4,6 @@
     enable = true;
     interactiveShellInit = ''
       set fish_greeting
-      starship init fish | source
     '';
     shellAliases =
       let
@@ -13,7 +12,6 @@
       {
         rb = "sudo nixos-rebuild switch --flake ${flakeDir}";
         upg = "sudo nix flake update --flake ${flakeDir} && sudo nixos-rebuild switch --flake ${flakeDir}";
-        hms = "home-manager switch --flake ${flakeDir}";
         ed = "hx ${flakeDir}";
         ff = "fastfetch -c neofetch";
         ls = "lsd";
diff --git a/home-manager/modules/starship.nix b/home-manager/modules/starship.nix
index 9416b0b..8559c63 100644
--- a/home-manager/modules/starship.nix
+++ b/home-manager/modules/starship.nix
@@ -7,6 +7,7 @@
 {
   programs.starship = {
     enable = true;
+    enableFishIntegration = true;
 
     settings = {
       "$schema" = "https://starship.rs/config-schema.json";
diff --git a/nixos/pkgs.nix b/nixos/pkgs.nix
index 486b639..acdf8eb 100644
--- a/nixos/pkgs.nix
+++ b/nixos/pkgs.nix
@@ -84,6 +84,8 @@
       hyprshot
       mako
       swayosd
+
+      alacritty
     ])
     ++
       # Misbehaving packages