diff --git a/common.nix b/common.nix
index 9c8005f..fab7f75 100644
--- a/common.nix
+++ b/common.nix
@@ -56,7 +56,6 @@ with builtins; {
       lolcat
       cool-retro-term
 
-      maven
       jetbrains.idea-ultimate
       jdk
 
diff --git a/modules/desktop/gaming.nix b/modules/desktop/gaming.nix
index 228c2c0..8e6b7bc 100644
--- a/modules/desktop/gaming.nix
+++ b/modules/desktop/gaming.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: let
   cfg = config.jade.desktop.gaming;
@@ -16,7 +15,6 @@ in
         home.packages = with pkgs; [
           lutris
           prismlauncher
-          legendary-gl
           wineWowPackages.stable
           dxvk_2
           vkd3d-proton
diff --git a/modules/firewall.nix b/modules/firewall.nix
index d790480..e10dec0 100644
--- a/modules/firewall.nix
+++ b/modules/firewall.nix
@@ -16,9 +16,6 @@
           80
           443
 
-          # syncthing web ui
-          8384
-
           # syncthing
           22000
 
diff --git a/modules/input/evremap.nix b/modules/input/evremap.nix
index cd4145e..24115de 100644
--- a/modules/input/evremap.nix
+++ b/modules/input/evremap.nix
@@ -2,7 +2,6 @@
   pkgs,
   config,
   lib,
-  utils,
   ...
 }: let
   cfg = config.jade.input.remapping;
diff --git a/modules/shell/carapace.nix b/modules/shell/carapace.nix
deleted file mode 100644
index 3bd3c24..0000000
--- a/modules/shell/carapace.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{...}: {
-  home-manager.users.jade = {pkgs, ...}: {
-    programs.carapace = {
-      enable = true;
-    };
-  };
-}
diff --git a/modules/shell/default.nix b/modules/shell/default.nix
index e3655dd..9ce0499 100644
--- a/modules/shell/default.nix
+++ b/modules/shell/default.nix
@@ -3,9 +3,6 @@
     ./helix.nix
     ./nu.nix
     ./starship.nix
-    ./zellij.nix
-    ./carapace.nix
-    ./direnv.nix
     ./tty.nix
     ./git.nix
     ./mprocs.nix
@@ -13,4 +10,8 @@
   ];
   programs.mosh.enable = true;
   programs.bat.enable = true;
+  home-manager.users.jade = {...}: {
+    programs.carapace.enable = true;
+    programs.direnv.enable = true;
+  };
 }
diff --git a/modules/shell/direnv.nix b/modules/shell/direnv.nix
deleted file mode 100644
index daa3707..0000000
--- a/modules/shell/direnv.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{...}: {
-  home-manager.users.jade = {pkgs, ...}: {
-    programs.direnv = {
-      enable = true;
-    };
-  };
-}
diff --git a/modules/shell/tty.nix b/modules/shell/tty.nix
index 2213f22..ee05300 100644
--- a/modules/shell/tty.nix
+++ b/modules/shell/tty.nix
@@ -58,8 +58,8 @@ in {
     enable = true;
     fonts = [
       {
-        name = "FiraCode Nerd Font";
-        package = pkgs.nerd-fonts.fira-code;
+        name = "Departure Mono Nerd Font";
+        package = pkgs.nerd-fonts.departure-mono;
       }
     ];
     extraConfig = "font-size=14";
diff --git a/modules/shell/zellij.nix b/modules/shell/zellij.nix
deleted file mode 100644
index 9e24251..0000000
--- a/modules/shell/zellij.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}: {
-  home-manager.users.jade = {pkgs, ...}: {
-    programs.zellij = {
-      enable = true;
-      settings = {
-        theme = "gruvbox-dark";
-        themes.gruvbox-dark = {
-          fg = "#d5c4a1";
-          bg = "#282828";
-          black = "#3C3836";
-          red = "#CC241D";
-          green = "#98971A";
-          yellow = "#D79921";
-          blue = "#3C8588";
-          magenta = "#B16286";
-          cyan = "#689D6A";
-          white = "#ebdbb2";
-          orange = "#D65D0E";
-        };
-        pane_frames = false;
-      };
-    };
-  };
-}