diff --git a/home/modules/baseline.nix b/home/modules/baseline.nix
index a8471d6..83472a0 100644
--- a/home/modules/baseline.nix
+++ b/home/modules/baseline.nix
@@ -20,7 +20,6 @@ in {
 
       packages = with pkgs; [
         calc
-        dysk
         file
         gcc
         htop
diff --git a/home/modules/gui/fonts.nix b/home/modules/gui/fonts.nix
index b74c094..1830208 100644
--- a/home/modules/gui/fonts.nix
+++ b/home/modules/gui/fonts.nix
@@ -8,7 +8,7 @@
     enable = true;
     defaultFonts = {
       monospace = [
-        "JetBrainsMono Nerd Font"
+        "JetBrains Mono"
         "Noto Sans Mono CJK SC"
         "Noto Sans Mono"
         "Noto Color Emoji"
@@ -31,10 +31,11 @@
   # with fonts.packages buy im too lazy to check
   home.packages = with pkgs; [
     jetbrains-mono
-    nerd-fonts.jetbrains-mono
     noto-fonts
     noto-fonts-cjk-sans
     noto-fonts-emoji
     noto-fonts-extra
+    nerd-fonts.fira-code
+    nerd-fonts.droid-sans-mono
   ];
 }
diff --git a/home/modules/gui/mako.nix b/home/modules/gui/mako.nix
index ad6fd11..7f0dde4 100644
--- a/home/modules/gui/mako.nix
+++ b/home/modules/gui/mako.nix
@@ -18,7 +18,7 @@ in {
         progress-color = "over #FFFFFF";
         border-radius = 0;
         default-timeout = 7000;
-        font = "JetBrainsMono Nerd Font 10";
+        font = "JetBrains Mono 10";
         icons = true;
         ignore-timeout = false;
         layer = "top";
diff --git a/home/modules/gui/sway.nix b/home/modules/gui/sway.nix
index 3028f3d..676cf70 100644
--- a/home/modules/gui/sway.nix
+++ b/home/modules/gui/sway.nix
@@ -62,7 +62,7 @@ in {
         };
 
         fonts = {
-          names = ["JetBrainsMono Nerd Font"];
+          names = ["JetBrains Mono"];
           style = "Regular";
           size = 8.0;
         };
@@ -136,7 +136,7 @@ in {
         keybindings = let
           mod = config.wayland.windowManager.sway.config.modifier;
           grimshot = getExe pkgs.sway-contrib.grimshot;
-          bemenuCommand = ''bemenu-run --center --width-factor 0.2 --fixed-height --list 10 --scrollbar none --auto-select --accept-single --fn "JetBrainsMono Nerd Font 12" --prompt "" --tb "#000000" --tf "#EAEAEA" --fb "#000000" --ff "#EAEAEA" --cb "#EAEAEA" --cf "#000000" --nb "#000000" --nf "#EAEAEA" --sb "#000000" --sf "#EAEAEA" --hb "#000000" --hf "#EAEAEA" --fbb "#000000" --fbf "#000000" --ab "#000000" --af "#EAEAEA"'';
+          bemenuCommand = ''bemenu-run --center --width-factor 0.2 --fixed-height --list 10 --scrollbar none --auto-select --accept-single --fn "JetBrains Mono 12" --prompt "" --tb "#000000" --tf "#EAEAEA" --fb "#000000" --ff "#EAEAEA" --cb "#EAEAEA" --cf "#000000" --nb "#000000" --nf "#EAEAEA" --sb "#000000" --sf "#EAEAEA" --hb "#000000" --hf "#EAEAEA" --fbb "#000000" --fbf "#000000" --ab "#000000" --af "#EAEAEA"'';
         in
           mkOptionDefault {
             "${mod}+a" = "focus parent";
diff --git a/home/modules/gui/waybar.nix b/home/modules/gui/waybar.nix
index 7f37784..3e4db09 100644
--- a/home/modules/gui/waybar.nix
+++ b/home/modules/gui/waybar.nix
@@ -48,16 +48,16 @@ in {
             tooltip = false;
           };
           "cpu" = {
-            format = " {usage}%";
+            format = "cpu {usage}%";
             tooltip = false;
           };
           "memory" = {
-            format = " {percentage}%";
+            format = "mem {percentage}%";
             tooltip = true;
             tooltip-format = "{used}/{total}";
           };
           "disk" = {
-            format = " {specific_used:0.0f}/{specific_total:0.0f}";
+            format = "disk {specific_used:0.0f}/{specific_total:0.0f}";
             unit = "GiB";
             tooltip = false;
           };
@@ -68,7 +68,7 @@ in {
       };
       style = ''
         * {
-          font-family: "JetBrainsMono Nerd Font", monospace;
+          font-family: "JetBrains Mono", monospace;
           font-size: 12px;
           font-weight: 500;
           border: none;
diff --git a/home/modules/halloy.nix b/home/modules/halloy.nix
index 7988917..48c3806 100644
--- a/home/modules/halloy.nix
+++ b/home/modules/halloy.nix
@@ -15,7 +15,6 @@ in {
       enable = true;
       settings = {
         theme = "macawCustom";
-        font.size = 16;
         preview.enabled = false;
         sidebar = {
           buffer_action = "replace-pane";
diff --git a/home/modules/neovim.nix b/home/modules/neovim.nix
index e5ba52a..7bed139 100644
--- a/home/modules/neovim.nix
+++ b/home/modules/neovim.nix
@@ -40,66 +40,8 @@ in {
       '';
 
       plugins = with pkgs.vimPlugins; [
-        barbar-nvim
-        nvim-web-devicons
         vim-nix
         vim-visual-multi
-        {
-          plugin = nvim-tree-lua;
-          type = "lua";
-          config = ''
-            require("nvim-tree").setup({
-              renderer = {
-                icons = {
-                  show = {
-                    file = true,
-                    folder = true,
-                    folder_arrow = true,
-                    git = true,
-                  },
-                  glyphs = {
-                    git = {
-                      unstaged = "",
-                      staged = "",
-                      unmerged = "",
-                      renamed = "",
-                      untracked = "",
-                      deleted = "",
-                      ignored = "",
-                    },
-                  },
-                },
-              },
-              view = {
-                width = 30,
-                side = 'left',
-              },
-              sync_root_with_cwd = true, --fix to open cwd with tree
-              respect_buf_cwd = true,
-              update_cwd = true,
-              update_focused_file = {
-                enable = true,
-                update_cwd = true,
-                update_root = true,
-              },
-            })
-
-            vim.g.nvim_tree_respect_buf_cwd = 1
-
-            -- use g? for bindings help while in tree
-          '';
-        }
-        {
-          plugin = gruvbox-nvim;
-          type = "lua";
-          config = ''
-            require("gruvbox").setup({
-              contrast = "high",
-            })
-            vim.o.background = "dark"
-            vim.cmd([[colorscheme gruvbox]])
-          '';
-        }
       ];
     };
     home.sessionVariables = {
diff --git a/home/modules/terminal.nix b/home/modules/terminal.nix
index cf86f0d..bc6b553 100644
--- a/home/modules/terminal.nix
+++ b/home/modules/terminal.nix
@@ -15,10 +15,10 @@ in {
         settings = {
           main = {
             term = "xterm-256color";
-            font = "JetBrainsMono Nerd Font:style=Medium:size=15";
-            font-bold = "JetBrainsMono Nerd Font:style=Bold:size=15";
-            font-italic = "JetBrainsMono Nerd Font:style=Italic:size=15";
-            font-bold-italic = "JetBrainsMono Nerd Font:style=Bold Italic:size=15";
+            font = "JetBrains Mono:style=Medium:size=15";
+            font-bold = "JetBrains Mono:style=Bold:size=15";
+            font-italic = "JetBrains Mono:style=Italic:size=15";
+            font-bold-italic = "JetBrains Mono:style=Bold Italic:size=15";
             dpi-aware = "yes";
             initial-window-size-pixels = "1200x600";
           };
diff --git a/home/modules/zed.nix b/home/modules/zed.nix
index 7148c24..1b79e2a 100644
--- a/home/modules/zed.nix
+++ b/home/modules/zed.nix
@@ -40,7 +40,7 @@ in {
         };
         autosave = "on_focus_change";
         auto_update = false;
-        buffer_font_family = "JetBrainsMono Nerd Font";
+        buffer_font_family = "JetBrains Mono";
         buffer_font_size = 22;
         hide_mouse = "never";
         minimap.show = "auto";
diff --git a/sys/modules/baseline.nix b/sys/modules/baseline.nix
index fd594b7..7c876a3 100644
--- a/sys/modules/baseline.nix
+++ b/sys/modules/baseline.nix
@@ -55,7 +55,6 @@ in {
 
     fonts.packages = with pkgs; [
       jetbrains-mono
-      nerd-fonts.jetbrains-mono
       noto-fonts
       noto-fonts-cjk-sans
       noto-fonts-emoji
diff --git a/sys/modules/gtklock.nix b/sys/modules/gtklock.nix
index 5d9721d..3600b41 100644
--- a/sys/modules/gtklock.nix
+++ b/sys/modules/gtklock.nix
@@ -26,7 +26,7 @@ in {
         window {
           background-color: black;
           color: #eaeaea;
-          font-family: "JetBrainsMono Nerd Font", monospace;
+          font-family: "JetBrains Mono", monospace;
           font-size: 14px;
         }