diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix
index 1b7a03e..aca06da 100644
--- a/modules/home/desktop/hyprland/default.nix
+++ b/modules/home/desktop/hyprland/default.nix
@@ -175,7 +175,7 @@ in {
 
         "$terminal" = "ghostty";
         "$dlauncher" = "tofi-drun";
-        "$launcher" = "tofi-run";
+        "$launcher" = "tofi-run | xargs hyprctl dispatch exec --";
         "$screenLocker" = "hyprlock";
         "$webBrowser" = "io.github.zen_browser.zen";
         "$clipboardManager" = "copyq menu";
@@ -489,9 +489,9 @@ in {
           position = "bottom";
           height = 40;
           spacing = 6;
-          margin-left = 6;
-          margin-right = 6;
-          margin-bottom = 6;
+          margin-left = 11;
+          margin-right = 11;
+          margin-bottom = 8;
           reload_style_on_change = true;
           modules-left = [
             #"custom/notification"
@@ -907,205 +907,6 @@ in {
         }
       '';
     };
-
-    # stylix.targets.wofi.enable = false;
-    programs.rofi = {
-      enable = false;
-      theme = {
-        window = {
-          height = 360;
-          border = 3;
-        };
-
-        inputbar = {
-          children = ["prompt" "entry"];
-          border-radius = 5;
-          padding = 2;
-        };
-
-        prompt = {
-          padding = 6;
-          border-radius = 3;
-          margin = "20px 0px 0px 20px";
-        };
-
-        textbox-prompt-colon = {
-          expand = false;
-          str = "~>";
-        };
-
-        entry = {
-          padding = 6;
-          margin = "20px 0px 0px 10px";
-        };
-
-        listview = {
-          border = "0px 0px 0px";
-          padding = "6px 0px 0px";
-          margin = "10px 0px 0px 20px";
-          columns = 2;
-          lines = 5;
-        };
-
-        element = {
-          padding = 5;
-        };
-
-        element-icon = {
-          size = 25;
-        };
-
-        mode-switcher = {
-          spacing = 0;
-        };
-
-        button = {
-          padding = 10;
-          vertical-align = "0.5";
-          horizontal-align = "0.5";
-        };
-
-        message = {
-          margin = 2;
-          padding = 2;
-          border-radius = 5;
-        };
-
-        textbox = {
-          padding = 6;
-          margin = "20 0 0 20";
-        };
-      };
-      extraConfig = {
-        show-icons = true;
-        modi = "run,drun,window";
-        kb-primary-paste = "Control+V,Shift+Insert";
-        kb-secondary-paste = "Control+v,Insert";
-      };
-    };
-    programs.wofi = {
-      enable = false;
-      settings = {
-        show = "drun";
-        width = "450";
-        height = "350";
-        always_parse_args = true;
-        show_all = true;
-        term = "wezterm";
-        hide_scroll = true;
-        print_command = true;
-        insensitive = true;
-        prompt = "~>";
-        columns = 2;
-        halign = "fill";
-        #valign = "fill";
-        line_wrap = "char";
-        dynamic_lines = false;
-      };
-      style = lib.mkDefault ''
-        @define-color base00 #${config.lib.stylix.colors.base00};
-        @define-color base01 #${config.lib.stylix.colors.base01};
-        @define-color base02 #${config.lib.stylix.colors.base02};
-        @define-color base03 #${config.lib.stylix.colors.base03};
-        @define-color base04 #${config.lib.stylix.colors.base04};
-        @define-color base05 #${config.lib.stylix.colors.base05};
-        @define-color base06 #${config.lib.stylix.colors.base06};
-        @define-color base07 #${config.lib.stylix.colors.base07};
-        @define-color base08 #${config.lib.stylix.colors.base08};
-        @define-color base09 #${config.lib.stylix.colors.base09};
-        @define-color base0A #${config.lib.stylix.colors.base0A};
-        @define-color base0B #${config.lib.stylix.colors.base0B};
-        @define-color base0C #${config.lib.stylix.colors.base0C};
-        @define-color base0D #${config.lib.stylix.colors.base0D};
-        @define-color base0E #${config.lib.stylix.colors.base0E};
-        @define-color base0F #${config.lib.stylix.colors.base0F};
-
-        * {
-        /* font-family: ${config.stylix.fonts.serif.name}, monospace; */
-            font-size: 16px;
-        }
-
-        /* Window */
-        window {
-            margin: 0px;
-            padding: 8px;
-            border: 4px solid @base0D;
-            border-radius: 16px;
-            background-color: @base00;
-        }
-
-        /* Inner Box */
-        #inner-box {
-            margin: 5px;
-            padding: 10px;
-            border: none;
-            background-color: @base00;
-        }
-        /* Outer Box */
-        #outer-box {
-            margin: 5px;
-            padding: 10px;
-            border: none;
-            background-color: @base00;
-        }
-
-        /* Scroll */
-        #scroll {
-            margin: 0px;
-            padding: 10px;
-            border: none;
-            background-color: @base00;
-        }
-
-        /* Input */
-        #input {
-            margin: 5px 20px;
-            padding: 10px;
-            border: none;
-            border-radius: 7px;
-            color: @base05;
-            background-color: @base00;
-        }
-
-        #input image {
-            border: none;
-            color: @base08;
-        }
-
-        #input * {
-            outline: 4px solid @base0C!important;
-        }
-
-        /* Text */
-        #text {
-            margin: 5px;
-            border: none;
-            color: @base05;
-        }
-
-        #entry {
-            background-color: @base00;
-        }
-
-        #entry arrow {
-            border: none;
-            color: @base0E;
-        }
-
-        /* Selected Entry */
-        #entry:selected {
-            border: 0.11em solid @base0D;
-        }
-
-        #entry:selected #text {
-            color: @base0C;
-        }
-
-        #entry:drop(active) {
-            background-color: @base0A!important;
-        }
-      '';
-    };
     programs.tofi = {
       enable = true;
       settings = {
@@ -1117,7 +918,7 @@ in {
         padding-left = 6;
         padding-bottom = 2;
         padding-top = 2;
-        margin-bottom = 6;
+        margin-bottom = 8;
         border-width = 3;
         corner-radius = 16;
         outline-width = 0;
@@ -1128,344 +929,6 @@ in {
         prompt-text = "~>";
       };
     };
-    programs.walker = {
-      enable = false;
-      package = pkgs.walker;
-      runAsService = true;
-      config = {
-        activation_mode.labels = "neiotsra";
-        # theme = "stylix";
-        as_window = false;
-        builtins = {
-          applications = {
-            actions = {enabled = true;};
-            context_aware = true;
-            name = "applications";
-            placeholder = "Applications";
-            prioritize_new = true;
-            refresh = true;
-            show_generic = false;
-            show_icon_when_single = true;
-            show_sub_when_single = true;
-            weight = 5;
-          };
-          calc = {
-            icon = "accessories-calculator";
-            min_chars = 4;
-            name = "calc";
-            placeholder = "Calculator";
-            weight = 5;
-          };
-          clipboard = {
-            image_height = 300;
-            max_entries = 10;
-            name = "clipboard";
-            placeholder = "Clipboard";
-            switcher_only = true;
-            weight = 5;
-          };
-          commands = {
-            icon = "utilities-terminal";
-            name = "commands";
-            placeholder = "Commands";
-            switcher_only = true;
-            weight = 5;
-          };
-          custom_commands = {
-            icon = "utilities-terminal";
-            name = "custom_commands";
-            placeholder = "Custom Commands";
-            weight = 5;
-          };
-          dmenu = {
-            name = "dmenu";
-            placeholder = "Dmenu";
-            switcher_only = true;
-            weight = 5;
-          };
-          emojis = {
-            history = true;
-            name = "emojis";
-            placeholder = "Emojis";
-            switcher_only = true;
-            typeahead = true;
-            weight = 5;
-          };
-          finder = {
-            concurrency = 8;
-            icon = "folder";
-            ignore_gitignore = true;
-            name = "finder";
-            placeholder = "Finder";
-            refresh = true;
-            switcher_only = true;
-            weight = 5;
-          };
-          runner = {
-            generic_entry = false;
-            history = true;
-            icon = "utilities-terminal";
-            name = "runner";
-            placeholder = "Runner";
-            refresh = true;
-            typeahead = true;
-            weight = 5;
-          };
-          ssh = {
-            history = true;
-            icon = "preferences-system-network";
-            name = "ssh";
-            placeholder = "SSH";
-            refresh = true;
-            switcher_only = true;
-            weight = 5;
-          };
-          switcher = {
-            name = "switcher";
-            placeholder = "Switcher";
-            prefix = "/";
-            weight = 5;
-          };
-          # websearch = {
-          #   engines = ["google"];
-          #   icon = "applications-internet";
-          #   name = "websearch";
-          #   placeholder = "Websearch";
-          #   weight = 5;
-          # };
-          windows = {
-            icon = "view-restore";
-            name = "windows";
-            placeholder = "Windows";
-            weight = 5;
-          };
-        };
-        disable_click_to_close = false;
-        force_keyboard_focus = true;
-        list = {
-          max_entries = 50;
-          show_initial_entries = true;
-          single_click = true;
-        };
-        search = {
-          delay = 0;
-          force_keyboard_focus = true;
-          history = true;
-          placeholder = "Search...";
-        };
-      };
-      theme = {
-        layout = {
-          ui = {
-            anchors = {
-              bottom = false;
-              left = false;
-              right = false;
-              top = false;
-            };
-            window = {
-              h_align = "center";
-              v_align = "center";
-              box = {
-                width = 500;
-                height = 300;
-                h_align = "center";
-                v_align = "center";
-                spacing = 12;
-                orientation = "vertical";
-                # margins = {
-                #   bottom = 200;
-                #   top = 200;
-                #   start = 200;
-                # };
-                search = {
-                  margins = {
-                    bottom = 0;
-                    top = 0;
-                    start = 8;
-                    end = 8;
-                  };
-                  spacing = 12;
-                  # v_align = "baseline";
-                  h_align = "top";
-                  h_expand = true;
-                  v_expand = true;
-                };
-                scroll = {
-                  h_align = "fill";
-                  v_align = "fill";
-                  h_expand = false;
-                  overlay_scrolling = true;
-                  list = {
-                    # max_height = 300;
-                    margins = {
-                      bottom = 8;
-                      top = 0;
-                      start = 8;
-                      end = 8;
-                    };
-                    always_show = true;
-                    v_align = "fill";
-                    h_align = "bottom";
-                    h_expand = true;
-                    v_expand = true;
-                    item = {
-                      icon.theme = "${config.gtk.iconTheme.name}";
-                      spacing = 4;
-                      activation_label = {
-                        h_align = "end";
-                        # v_align = "bottom";
-                        h_expand = false;
-                        justify = "right";
-                        spacing = 4;
-                        margins.end = 12;
-                        # x_align = 1;
-                      };
-                      text = {
-                        h_align = "start";
-                        h_expand = true;
-                        revert = true;
-                        wrap = true;
-                      };
-                    };
-                  };
-                };
-              };
-            };
-          };
-        };
-        style = ''
-          @define-color base00 #${config.lib.stylix.colors.base00};
-          @define-color base01 #${config.lib.stylix.colors.base01};
-          @define-color base02 #${config.lib.stylix.colors.base02};
-          @define-color base03 #${config.lib.stylix.colors.base03};
-          @define-color base04 #${config.lib.stylix.colors.base04};
-          @define-color base05 #${config.lib.stylix.colors.base05};
-          @define-color base06 #${config.lib.stylix.colors.base06};
-          @define-color base07 #${config.lib.stylix.colors.base07};
-          @define-color base08 #${config.lib.stylix.colors.base08};
-          @define-color base09 #${config.lib.stylix.colors.base09};
-          @define-color base0A #${config.lib.stylix.colors.base0A};
-          @define-color base0B #${config.lib.stylix.colors.base0B};
-          @define-color base0C #${config.lib.stylix.colors.base0C};
-          @define-color base0D #${config.lib.stylix.colors.base0D};
-          @define-color base0E #${config.lib.stylix.colors.base0E};
-          @define-color base0F #${config.lib.stylix.colors.base0F};
-
-            #window,
-            #box,
-            #search,
-            #password,
-            #input,
-            #typeahead,
-            #spinner,
-            #list,
-            child,
-            scrollbar,
-            slider,
-            #item,
-            #text,
-            #label,
-            #sub,
-            #activationlabel {
-              all: unset;
-            }
-
-            #window {
-              background: none;
-              color: @base05;
-            }
-
-            #box {
-              border-radius: 20px;
-              border-width: 4px;
-              border-color: @base0D;
-              background: @base00;
-            }
-
-            #search {
-              background: @base01;
-              border-radius: 12px;
-              padding: 8px;
-            }
-
-            #password,
-            #input,
-            #typeahead {
-              background: none;
-              box-shadow: none;
-              border-radius: 12px;
-            }
-
-            #input > *:first-child,
-            #typeahead > *:first-child {
-              margin-right: 12px;
-              border-radius: 12px;
-            }
-
-            /* #spinner {
-            } */
-
-            #typeahead {
-              color: @base05;
-            }
-
-            #input placeholder {
-              opacity: 0.5;
-            }
-
-            #list {
-              padding: 8px;
-              border-radius: 12px;
-              background: @base01;
-            }
-
-            child {
-              box-shadow: none;
-            }
-
-            child:selected,
-            child:hover {
-              box-shadow: none;
-              border-radius: 8px;
-              background: @base02;
-            }
-
-            #item {
-              padding: 4px;
-            }
-
-            /* #icon {
-            }
-
-            #text {
-            }
-
-            #label {
-            } */
-
-            #sub {
-              font-size: smaller;
-              opacity: 0.5;
-            }
-
-            #activationlabel {
-              opacity: 0.5;
-            }
-
-            .activation #activationlabel {
-              opacity: 1;
-              color: @base05;
-            }
-
-            .activation #text,
-            .activation #icon,
-            .activation #search {
-              opacity: 0.5;
-            }
-        '';
-      };
-    };
     services.swaync = {
       enable = true;
       settings = {
@@ -1730,7 +1193,6 @@ in {
           {
             monitor = "";
             text = "$LAYOUT"; #"cmd[update:1000] ${pkgs.uutils-coreutils-noprefix}/bin/echo $(${pkgs.uutils-coreutils-noprefix}/bin/date +%H:%M:%S)";
-            #text = "$TIME
             text_align = "center";
             font_size = 16;
             font_family = "${config.stylix.fonts.serif.name}";
@@ -1791,29 +1253,31 @@ in {
       wl-clipboard-rs
       libqalculate
     ];
-    xdg.mime.enable = true;
-    xdg.mimeApps = {
-      enable = true;
-      defaultApplications = let
-        file_manager = ["org.gnome.Nautilus.desktop"];
-        web_browser = ["re.sonny.Junction.desktop"];
-        image_viewer = ["org.gnome.Loupe.desktop"];
-        video_player = ["io.github.celluloid_player.Celluloid.desktop"];
-        pdf_reader = ["org.gnome.Evince.desktop"];
-      in {
-        "inode/directory" = file_manager;
-        "video/x-matroska" = video_player;
-        "video/mp4" = video_player;
-        "video/mpeg" = video_player;
-        "video/x-mpeg" = video_player;
-        "image/png" = image_viewer;
-        "image/jpeg" = image_viewer;
-        "application/pdf" = pdf_reader;
-        "text/html" = web_browser;
-        "x-scheme-handler/http" = web_browser;
-        "x-scheme-handler/https" = web_browser;
-        "x-scheme-handler/about" = web_browser;
-        "x-scheme-handler/unknown" = web_browser;
+    xdg = {
+      mime.enable = true;
+      mimeApps = {
+        enable = true;
+        defaultApplications = let
+          file_manager = ["org.gnome.Nautilus.desktop"];
+          web_browser = ["re.sonny.Junction.desktop"];
+          image_viewer = ["org.gnome.Loupe.desktop"];
+          video_player = ["io.github.celluloid_player.Celluloid.desktop"];
+          pdf_reader = ["org.gnome.Evince.desktop"];
+        in {
+          "inode/directory" = file_manager;
+          "video/x-matroska" = video_player;
+          "video/mp4" = video_player;
+          "video/mpeg" = video_player;
+          "video/x-mpeg" = video_player;
+          "image/png" = image_viewer;
+          "image/jpeg" = image_viewer;
+          "application/pdf" = pdf_reader;
+          "text/html" = web_browser;
+          "x-scheme-handler/http" = web_browser;
+          "x-scheme-handler/https" = web_browser;
+          "x-scheme-handler/about" = web_browser;
+          "x-scheme-handler/unknown" = web_browser;
+        };
       };
     };
     systemd.user = {
@@ -1837,10 +1301,6 @@ in {
           };
         };
       in {
-        # udiskie = mkGraphicalService {};
-        # waybar = mkGraphicalService {};
-        # wlsunset = mkGraphicalService {};
-        # network-manager-applet = mkGraphicalService {};
         copyq = mkGraphicalService {
           Service =
             graphicalService.Service
diff --git a/modules/home/programs/shell/fish.nix b/modules/home/programs/shell/fish.nix
index d42dae1..79e4084 100644
--- a/modules/home/programs/shell/fish.nix
+++ b/modules/home/programs/shell/fish.nix
@@ -32,7 +32,7 @@ in {
       fish = {
         enable = true;
         shellAliases = {
-          # cd = "z";
+          cd = "z";
           cat = "bat";
           la = "ls -a";
           l = "ls -la";