diff --git a/configuration.nix b/configuration.nix
index 0bd6310..0f13d6c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -77,10 +77,16 @@
   users.users.chexit = {
     isNormalUser = true;
     description = "chexit";
-    shell = pkgs.zsh;
+    shell = pkgs.fish;
     extraGroups = [ "networkmanager" "wheel" "docker" ];
   };
 
+  programs._1password.enable = true;
+  programs._1password-gui = {
+    enable = true;
+    polkitPolicyOwners = [ "chexit" ];
+  };
+
   programs.throne = {
     enable = true;
     tunMode.enable = true;
diff --git a/home.nix b/home.nix
index b6d3cd1..182493b 100644
--- a/home.nix
+++ b/home.nix
@@ -1,22 +1,21 @@
-{ pkgs, ... }:
+{ ... }:
 
 {
   home.username = "chexit";
   home.homeDirectory = "/home/chexit";
   home.stateVersion = "25.11";
 
-  programs.zsh = {
+  programs.fish = {
     enable = true;
-    enableCompletion = true;
-    autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
-    initContent = ''
-      source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
-    '';
     shellAliases = {
       rebuild = "sudo nixos-rebuild switch --flake ~/nixos-config#chexit";
     };
   };
 
+  programs.starship = {
+    enable = true;
+    enableFishIntegration = true;
+  };
+
   programs.home-manager.enable = true;
 }
diff --git a/shell.nix b/shell.nix
index b27c8ca..d81c197 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,5 +1,5 @@
 { ... }:
 
 {
-  programs.zsh.enable = true;
+  programs.fish.enable = true;
 }