diff --git a/hosts/home/home_common.nix b/hosts/home/home_common.nix
index e13b2e3..77f9f1e 100644
--- a/hosts/home/home_common.nix
+++ b/hosts/home/home_common.nix
@@ -17,24 +17,40 @@
     };
     tmux.enable = true;
     starship.enable = true;
-    zsh = {
+    nushell = {
       enable = true;
-      autosuggestion.enable = true;
-      enableCompletion = true;
-      syntaxHighlighting.enable = true;
-      autocd = true;
-      plugins = [
-        {
-          name = "zsh-nix-shell";
-          file = "nix-shell.plugin.zsh";
-          src = pkgs.fetchFromGitHub {
-            owner = "chisui";
-            repo = "zsh-nix-shell";
-            rev = "v0.8.0";
-            sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
-          };
+      shellAliases = {
+        cat = "bat";
+      };
+      extraConfig = ''
+        $env.config = {
+         show_banner: false,
         }
-      ];
+      '';
     };
+    carapace = {
+      enable = true;
+      enableNushellIntegration = true;
+    };
+    bat.enable = true;
+    # zsh = {
+    #   enable = true;
+    #   autosuggestion.enable = true;
+    #   enableCompletion = true;
+    #   syntaxHighlighting.enable = true;
+    #   autocd = true;
+    #   plugins = [
+    #     {
+    #       name = "zsh-nix-shell";
+    #       file = "nix-shell.plugin.zsh";
+    #       src = pkgs.fetchFromGitHub {
+    #         owner = "chisui";
+    #         repo = "zsh-nix-shell";
+    #         rev = "v0.8.0";
+    #         sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
+    #       };
+    #     }
+    #   ];
+    # };
   };
 }
diff --git a/hosts/home/tile.nix b/hosts/home/tile.nix
index e68e384..6484488 100644
--- a/hosts/home/tile.nix
+++ b/hosts/home/tile.nix
@@ -14,7 +14,7 @@
     alacritty = {enable = true;};
     wofi = {enable = true;};
     zathura = {enable = true;};
-    mpv = {enable = true;};
+   #mpv = {enable = true;};
     lf = {enable = true;};
   };
   home.packages = with pkgs; [
diff --git a/hosts/home/waybar.nix b/hosts/home/waybar.nix
index 341d946..3a9daef 100644
--- a/hosts/home/waybar.nix
+++ b/hosts/home/waybar.nix
@@ -15,7 +15,7 @@
         margin-right = 45;
         spacing = 15;
 
-        modules-left = ["sway/workspaces" "sway/mode" "hyprland/window"];
+        modules-left = ["sway/workspaces" "sway/mode"];
         modules-center = ["clock"];
         modules-right = ["pulseaudio" "network" "battery"];
 
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 910ef78..89fa47c 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -27,8 +27,8 @@
     gc.automatic = false;
     settings = {
       experimental-features = ["nix-command" "flakes"];
-      substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
-      trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
+      #substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
+      #trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
     };
   };
 
@@ -55,10 +55,6 @@
 
   services = {
     hardware.bolt = {enable = false;};
-    xserver = {
-      displayManager.gdm.enable = true;
-      desktopManager.gnome.enable = true;
-    };
     pipewire = {
       enable = true;
       alsa.enable = true;
@@ -71,7 +67,7 @@
       package = pkgs.ollama-intel;
     };
     auto-cpufreq = {
-      enable = false;
+      enable = true;
       settings = {
         battery = {
           governor = "powersave";
@@ -169,14 +165,20 @@
 
   programs = {
     zsh.enable = true;
+    regreet.enable = true;
+    hyprlock.enable = true;
+    hyprland = {
+      enable = true;
+      withUWSM = true;
+    };
   };
 
   users.users.k = {
     isNormalUser = true;
     description = "k";
     extraGroups = ["networkmanager" "wheel" "cdrom" "libvirtd"];
-    packages = with pkgs; [zsh];
-    shell = pkgs.zsh;
+    packages = with pkgs; [nushell];
+    shell = pkgs.nushell;
   };
 
   home-manager = {
@@ -187,22 +189,7 @@
   environment = {
     sessionVariables = {MOZ_USE_XINPUT2 = "1";};
     systemPackages = with pkgs; [
-config.boot.kernelPackages.perf
     ];
-    gnome.excludePackages = (with pkgs; [
-      atomix # puzzle game
-      cheese # webcam tool
-      epiphany # web browser
-      geary # email reader
-      gedit # text editor
-      gnome-characters
-      gnome-music
-      gnome-photos
-      gnome-tour
-      hitori # sudoku game
-      iagno # go game
-      tali # poker game
-    ]);
   };
 
   systemd.sleep.extraConfig = ''
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 3c5a879..2c946f3 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -6,7 +6,7 @@
 }: {
   imports = [
     ../home/home_common.nix
-    ../home/gnome.nix
+    ../home/hyprland.nix
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -22,6 +22,7 @@
 
       btop
       zip
+      emacs-gtk
 
       prismlauncher
       steam
@@ -39,14 +40,6 @@
       enableZshIntegration = true;
       nix-direnv.enable = true;
     };
-
-    emacs = {
-      enable = true;
-      package = pkgs.emacs-pgtk;
-      extraPackages = epkgs: [
-        epkgs.vterm
-      ];
-    };
   };
 
   services = {