diff --git a/README.md b/README.md
index 84bd067..e1c0ac8 100644
--- a/README.md
+++ b/README.md
@@ -12,13 +12,11 @@ GNU GPL3
 This configuration was only made possible through the help of some amazing
 people! Below are all the repositories I took inspiration from, check them out!
 
-- [jacekpoz](https://git.jacekpoz.pl/jacekpoz/niksos.git)
-- [dragyx](https://github.com/dragyx/nichts)
-- [sioodmy](https://github.com/sioodmy/dotfiles)
-- [Henrik Lissner](https://github.com/hlissner/dotfiles)
-- [diniamo](https://github.com/diniamo/niqs)
-- [fufexan](https://github.com/fufexan)
-- [lokasku](https://github.com/lokasku/nix-config)
-- [NotAShelf](https://github.com/notashelf/nyx)
-- [viperML](https://github.com/viperml/dotfiles)
-- [atagen](https://git.atagen.co/atagen/nix)
+[jacekpoz](https://git.jacekpoz.pl/jacekpoz/niksos.git)
+[dragyx](https://github.com/dragyx/nichts)
+[sioodmy](https://github.com/sioodmy/dotfiles)
+[Henrik Lissner](https://github.com/hlissner/dotfiles)
+[diniamo](https://github.com/diniamo/niqs) [fufexan](https://github.com/fufexan)
+[lokasku](https://github.com/lokasku/nix-config)
+[NotAShelf](https://github.com/notashelf/nyx)
+[viperML](https://github.com/viperml/dotfiles)
diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix
index e6582de..7a512ae 100644
--- a/hosts/hermit/configuration.nix
+++ b/hosts/hermit/configuration.nix
@@ -10,8 +10,10 @@
   i18n.defaultLocale = "en_US.UTF-8";
   console.keyMap = "uk";
   boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
-  services.fstrim.enable = lib.mkDefault true;
-
+  services = {
+    fstrim.enable = lib.mkDefault true;
+    thermald.enable = true;
+  };
   programs = {
     nix-ld.enable = false;
     gnupg.agent = {
@@ -20,12 +22,6 @@
     };
   };
 
-  meta.system = {
-    isWorkstation = true;
-    isGraphical = true;
-    isLaptop = true;
-  };
-
   modules = {
     wms.wayland.enable = true;
     # desktops.niri.enable = true;
@@ -43,6 +39,7 @@
         systemd-boot.enable = true;
         lanzaboote.enable = true;
       };
+      impermanence.enable = false;
       services = {
         owncloud.enable = true;
       };
@@ -55,7 +52,9 @@
         };
       };
       programs = {
-        editors.helix.enable = true;
+        editors = {
+          helix.enable = true;
+        };
         steam.enable = true;
       };
       sound.enable = true;
@@ -66,12 +65,14 @@
       uwsm.enable = false;
       greetd.enable = false;
       cups.enable = true;
-      media.mpd.enable = true;
 
+      media.mpd = {
+        enable = true;
+      };
+    };
+    other = {
+      system.username = "cr";
     };
-
-    other.system.username = "cr";
-
     programs = {
       ssh.enable = true;
       nh.enable = true;
diff --git a/hosts/hermit/hardware-configuration.nix b/hosts/hermit/hardware-configuration.nix
index 01d9cc1..e9442b8 100644
--- a/hosts/hermit/hardware-configuration.nix
+++ b/hosts/hermit/hardware-configuration.nix
@@ -40,20 +40,19 @@
     '';
   };
 
-  # Not setting these udev rules seems to improve Zed's performance by a bit.
-  # services.udev.extraRules = ''
-  #   # Remove NVIDIA USB xHCI Host Controller devices, if present
-  #   ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{power/control}="auto", ATTR{remove}="1"
+  services.udev.extraRules = ''
+    # Remove NVIDIA USB xHCI Host Controller devices, if present
+    ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{power/control}="auto", ATTR{remove}="1"
 
-  #   # Remove NVIDIA USB Type-C UCSI devices, if present
-  #   ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{power/control}="auto", ATTR{remove}="1"
+    # Remove NVIDIA USB Type-C UCSI devices, if present
+    ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{power/control}="auto", ATTR{remove}="1"
 
-  #   # Remove NVIDIA Audio devices, if present
-  #   ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{power/control}="auto", ATTR{remove}="1"
+    # Remove NVIDIA Audio devices, if present
+    ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{power/control}="auto", ATTR{remove}="1"
 
-  #   # Remove NVIDIA VGA/3D controller devices
-  #   ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x03[0-9]*", ATTR{power/control}="auto", ATTR{remove}="1"
-  # '';
+    # Remove NVIDIA VGA/3D controller devices
+    ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x03[0-9]*", ATTR{power/control}="auto", ATTR{remove}="1"
+  '';
 
   #  swapDevices =
   #    [ { device = "/dev/disk/by-uuid/3518272e-1051-41e2-a7f0-f5c744e46789"; }
diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix
index 268228f..7b3e61c 100644
--- a/hosts/hermit/programs.nix
+++ b/hosts/hermit/programs.nix
@@ -9,6 +9,7 @@
       anki
       asciinema
       bacon
+      brave
       cachix
       calc
       cargo-info
diff --git a/modules/other/xdg.mod.nix b/modules/other/xdg.mod.nix
index d7d131e..a08b632 100644
--- a/modules/other/xdg.mod.nix
+++ b/modules/other/xdg.mod.nix
@@ -6,13 +6,13 @@
 let
   inherit (config.meta.mainUser) username;
 
-  primary_browser = "zen-beta.desktop";
+  primary_browser = "Librewolf.desktop";
   mail_client = "thunderbird.desktop";
   file_manager = "nautilus.desktop";
   media_player = "mpv.desktop";
   image_viewer = "imv.desktop";
   text_editor = "helix.desktop";
-  terminal = "com.mitchellh.ghostty";
+  terminal = "foot.desktop";
   pdf_viewer = "zathura.desktop";
 in
 {
@@ -28,14 +28,6 @@ in
     autostart.enable = true;
     menus.enable = true;
     icons.enable = true;
-    terminal-exec = {
-      enable = true;
-      settings = {
-        default = [
-          "com.mitchellh.ghostty.desktop"
-        ];
-      };
-    };
     mime = {
       enable = true;
       defaultApplications = {
diff --git a/modules/packages/packages.mod.nix b/modules/packages/packages.mod.nix
index 7b03fc6..5ccabc0 100644
--- a/modules/packages/packages.mod.nix
+++ b/modules/packages/packages.mod.nix
@@ -108,8 +108,6 @@ in
         ty
         python3
         comma
-        radicle-tui
-        radicle-node
       ]
       ++ [
         nil
diff --git a/modules/programs/cli/jj.mod.nix b/modules/programs/cli/jj.mod.nix
index 1e04814..4ec0a1c 100644
--- a/modules/programs/cli/jj.mod.nix
+++ b/modules/programs/cli/jj.mod.nix
@@ -88,7 +88,6 @@ let
     };
     ui = {
       default-command = "log";
-      diff-editor = singleton ":builtin";
       diff-formatter = [
         "${getExe pkgs.difftastic}"
         "--color"
diff --git a/modules/programs/gui/brave.mod.nix b/modules/programs/gui/brave.mod.nix
index e69cfe7..ebf9db9 100644
--- a/modules/programs/gui/brave.mod.nix
+++ b/modules/programs/gui/brave.mod.nix
@@ -32,10 +32,10 @@ let
 in
 {
   environment.systemPackages = [
-    # brave-wrapped
+    brave-wrapped
   ];
   programs.chromium = {
-    enable = false;
+    enable = true;
 
     # This sets a bunch of flags to make Brave usable.
     # This was made possible through several similar projects,
diff --git a/modules/programs/other/nix-index.mod.nix b/modules/programs/other/nix-index.mod.nix
index 15bf72b..86c94b1 100644
--- a/modules/programs/other/nix-index.mod.nix
+++ b/modules/programs/other/nix-index.mod.nix
@@ -1,8 +1,9 @@
 {
   programs = {
-    # We disable this and use nix-index instead. (Rust >>> Pearl)
-    command-not-found.enable = false;
-
+    # We have to disable this and use nix-index instead. (Rust >>> Pearl)
+    command-not-found = {
+      enable = false;
+    };
     nix-index = {
       enable = true;
     };
diff --git a/modules/style/qt.mod.nix b/modules/style/qt.mod.nix
index ba4c93f..76769ed 100644
--- a/modules/style/qt.mod.nix
+++ b/modules/style/qt.mod.nix
@@ -41,11 +41,5 @@ in
       enable = true;
       platformTheme = "qt5ct";
     };
-    environment.systemPackages = with pkgs; [
-      qt6.qtwayland
-      kdePackages.breeze
-      kdePackages.breeze-icons
-      qt6.qtsvg # needed to load breeze icons
-    ];
   };
 }
diff --git a/modules/system/hardware/graphics.mod.nix b/modules/system/hardware/graphics.mod.nix
index 797553a..063e26e 100644
--- a/modules/system/hardware/graphics.mod.nix
+++ b/modules/system/hardware/graphics.mod.nix
@@ -8,8 +8,6 @@ let
   inherit (lib.modules) mkDefault mkIf;
   inherit (lib.options) mkEnableOption;
 
-  inherit (config.meta.system) isGraphical;
-
   cfg = config.modules.system.hardware;
 in
 {
@@ -19,14 +17,11 @@ in
     };
     amd.enable = mkEnableOption "AMD graphics drivers";
   };
-  config = mkIf isGraphical {
+  config = {
     hardware = {
       graphics = {
         enable = true;
-        extraPackages = [
-          pkgs.nvidia-vaapi-driver
-          pkgs.intel-media-driver
-        ];
+        extraPackages = [ pkgs.nvidia-vaapi-driver ];
       };
 
       nvidia = mkIf cfg.nvidia.enable {
@@ -35,13 +30,13 @@ in
         # Whether to enable kernel modesetting when using the NVIDIA proprietary driver.
         # Enabling this causes the proprietary NVIDIA driver to provide its own
         # framebuffer device, which can cause Wayland compositors to work when
-        # they otherwise wouldn’t.
+        # they otherwise wouldn’t. .
         modesetting.enable = true;
 
         # nvidia-settings is useless on NixOS.
         nvidiaSettings = false;
 
-        # Fixes sleep on nvidia devices.
+        # fixes sleep on nvidia devices
         powerManagement = {
           enable = true;
           finegrained = false;
diff --git a/modules/wms/niri/config.nix b/modules/wms/niri/config.nix
index 85748bc..5bdc799 100644
--- a/modules/wms/niri/config.nix
+++ b/modules/wms/niri/config.nix
@@ -6,7 +6,7 @@
   leaf,
   flag,
   tagctl,
-  zen-browser,
+
 }:
 let
   inherit (lib.meta) getExe getExe';
@@ -112,6 +112,7 @@ in
     ])
     (leaf "background-color" "transparent")
   ])
+  (leaf "spawn-at-startup" "waybar")
   (plain "environment" [
     (leaf "DISPLAY" ":0")
   ])
@@ -223,81 +224,23 @@ in
     (plain "Mod+Shift+Slash" [ (flag "show-hotkey-overlay") ])
     (plain "Mod+Return" [ (leaf "spawn" <| getExe pkgs.ghostty) ])
     (plain "Mod+Shift+Return" [
-      (leaf "spawn-sh" [
+      (leaf "spawn" [
+        (getExe pkgs.bash)
+        "-c"
         "${getExe pkgs.niri} msg action spawn -- ${getExe pkgs.ghostty}; sleep 0.2; ${getExe pkgs.niri} msg action consume-or-expel-window-left"
       ])
     ])
 
-    (plain "Mod+0" [
-      (leaf "spawn" [
-        tagctl
-        "toggle-tag"
-        "0"
-      ])
-    ])
-    (plain "Mod+1" [
-      (leaf "spawn" [
-        tagctl
-        "toggle-tag"
-        "1"
-      ])
-    ])
-    (plain "Mod+2" [
-      (leaf "spawn" [
-        tagctl
-        "toggle-tag"
-        "2"
-      ])
-    ])
-    (plain "Mod+3" [
-      (leaf "spawn" [
-        tagctl
-        "toggle-tag"
-        "3"
-      ])
-    ])
-    (plain "Mod+4" [
-      (leaf "spawn" [
-        tagctl
-        "toggle-tag"
-        "4"
-      ])
-    ])
-    (plain "Mod+5" [
-      (leaf "spawn" [
-        tagctl
-        "toggle-tag"
-        "5"
-      ])
-    ])
-    (plain "Mod+6" [
-      (leaf "spawn" [
-        tagctl
-        "toggle-tag"
-        "6"
-      ])
-    ])
-    (plain "Mod+7" [
-      (leaf "spawn" [
-        tagctl
-        "toggle-tag"
-        "7"
-      ])
-    ])
-    (plain "Mod+8" [
-      (leaf "spawn" [
-        tagctl
-        "toggle-tag"
-        "8"
-      ])
-    ])
-    (plain "Mod+9" [
-      (leaf "spawn" [
-        tagctl
-        "toggle-tag"
-        "9"
-      ])
-    ])
+    (plain "Mod+0" [ (leaf "spawn" [tagctl "toggle-tag" "0"]) ])
+    (plain "Mod+1" [ (leaf "spawn" [tagctl "toggle-tag" "1"]) ])
+    (plain "Mod+2" [ (leaf "spawn" [tagctl "toggle-tag" "2"]) ])
+    (plain "Mod+3" [ (leaf "spawn" [tagctl "toggle-tag" "3"]) ])
+    (plain "Mod+4" [ (leaf "spawn" [tagctl "toggle-tag" "4"]) ])
+    (plain "Mod+5" [ (leaf "spawn" [tagctl "toggle-tag" "5"]) ])
+    (plain "Mod+6" [ (leaf "spawn" [tagctl "toggle-tag" "6"]) ])
+    (plain "Mod+7" [ (leaf "spawn" [tagctl "toggle-tag" "7"]) ])
+    (plain "Mod+8" [ (leaf "spawn" [tagctl "toggle-tag" "8"]) ])
+    (plain "Mod+9" [ (leaf "spawn" [tagctl "toggle-tag" "9"]) ])
 
     # (plain "Mod+0" [ (leaf "focus-workspace" 0) ])
     # (plain "Mod+1" [ (leaf "focus-workspace" 1) ])
@@ -309,77 +252,17 @@ in
     # (plain "Mod+7" [ (leaf "focus-workspace" 7) ])
     # (plain "Mod+8" [ (leaf "focus-workspace" 8) ])
     # (plain "Mod+9" [ (leaf "focus-workspace" 9) ])
-    #
-    (plain "Mod+Shift+0" [
-      (leaf "spawn" [
-        tagctl
-        "toggle"
-        "0"
-      ])
-    ])
-    (plain "Mod+Shift+1" [
-      (leaf "spawn" [
-        tagctl
-        "toggle"
-        "1"
-      ])
-    ])
-    (plain "Mod+Shift+2" [
-      (leaf "spawn" [
-        tagctl
-        "toggle"
-        "2"
-      ])
-    ])
-    (plain "Mod+Shift+3" [
-      (leaf "spawn" [
-        tagctl
-        "toggle"
-        "3"
-      ])
-    ])
-    (plain "Mod+Shift+4" [
-      (leaf "spawn" [
-        tagctl
-        "toggle"
-        "4"
-      ])
-    ])
-    (plain "Mod+Shift+5" [
-      (leaf "spawn" [
-        tagctl
-        "toggle"
-        "5"
-      ])
-    ])
-    (plain "Mod+Shift+6" [
-      (leaf "spawn" [
-        tagctl
-        "toggle"
-        "6"
-      ])
-    ])
-    (plain "Mod+Shift+7" [
-      (leaf "spawn" [
-        tagctl
-        "toggle"
-        "7"
-      ])
-    ])
-    (plain "Mod+Shift+8" [
-      (leaf "spawn" [
-        tagctl
-        "toggle"
-        "8"
-      ])
-    ])
-    (plain "Mod+Shift+9" [
-      (leaf "spawn" [
-        tagctl
-        "toggle"
-        "9"
-      ])
-    ])
+    # 
+    (plain "Mod+Shift+0" [ (leaf "spawn" [tagctl "toggle" "0"]) ])
+    (plain "Mod+Shift+1" [ (leaf "spawn" [tagctl "toggle" "1"]) ])
+    (plain "Mod+Shift+2" [ (leaf "spawn" [tagctl "toggle" "2"]) ])
+    (plain "Mod+Shift+3" [ (leaf "spawn" [tagctl "toggle" "3"]) ])
+    (plain "Mod+Shift+4" [ (leaf "spawn" [tagctl "toggle" "4"]) ])
+    (plain "Mod+Shift+5" [ (leaf "spawn" [tagctl "toggle" "5"]) ])
+    (plain "Mod+Shift+6" [ (leaf "spawn" [tagctl "toggle" "6"]) ])
+    (plain "Mod+Shift+7" [ (leaf "spawn" [tagctl "toggle" "7"]) ])
+    (plain "Mod+Shift+8" [ (leaf "spawn" [tagctl "toggle" "8"]) ])
+    (plain "Mod+Shift+9" [ (leaf "spawn" [tagctl "toggle" "9"]) ])
 
     # (plain "Mod+Shift+0" [ (leaf "move-column-to-workspace" 0) ])
     # (plain "Mod+Shift+1" [ (leaf "move-column-to-workspace" 1) ])
@@ -392,80 +275,20 @@ in
     # (plain "Mod+Shift+8" [ (leaf "move-column-to-workspace" 8) ])
     # (plain "Mod+Shift+9" [ (leaf "move-column-to-workspace" 9) ])
 
-    (plain "Mod+Ctrl+0" [
-      (leaf "spawn" [
-        tagctl
-        "exclusive-tag"
-        "0"
-      ])
-    ])
-    (plain "Mod+Ctrl+1" [
-      (leaf "spawn" [
-        tagctl
-        "exclusive-tag"
-        "1"
-      ])
-    ])
-    (plain "Mod+Ctrl+2" [
-      (leaf "spawn" [
-        tagctl
-        "exclusive-tag"
-        "2"
-      ])
-    ])
-    (plain "Mod+Ctrl+3" [
-      (leaf "spawn" [
-        tagctl
-        "exclusive-tag"
-        "3"
-      ])
-    ])
-    (plain "Mod+Ctrl+4" [
-      (leaf "spawn" [
-        tagctl
-        "exclusive-tag"
-        "4"
-      ])
-    ])
-    (plain "Mod+Ctrl+5" [
-      (leaf "spawn" [
-        tagctl
-        "exclusive-tag"
-        "5"
-      ])
-    ])
-    (plain "Mod+Ctrl+6" [
-      (leaf "spawn" [
-        tagctl
-        "exclusive-tag"
-        "6"
-      ])
-    ])
-    (plain "Mod+Ctrl+7" [
-      (leaf "spawn" [
-        tagctl
-        "exclusive-tag"
-        "7"
-      ])
-    ])
-    (plain "Mod+Ctrl+8" [
-      (leaf "spawn" [
-        tagctl
-        "exclusive-tag"
-        "8"
-      ])
-    ])
-    (plain "Mod+Ctrl+9" [
-      (leaf "spawn" [
-        tagctl
-        "exclusive-tag"
-        "9"
-      ])
-    ])
-
+    (plain "Mod+Ctrl+0" [ (leaf "spawn" [tagctl "exclusive-tag" "0"]) ])
+    (plain "Mod+Ctrl+1" [ (leaf "spawn" [tagctl "exclusive-tag" "1"]) ])
+    (plain "Mod+Ctrl+2" [ (leaf "spawn" [tagctl "exclusive-tag" "2"]) ])
+    (plain "Mod+Ctrl+3" [ (leaf "spawn" [tagctl "exclusive-tag" "3"]) ])
+    (plain "Mod+Ctrl+4" [ (leaf "spawn" [tagctl "exclusive-tag" "4"]) ])
+    (plain "Mod+Ctrl+5" [ (leaf "spawn" [tagctl "exclusive-tag" "5"]) ])
+    (plain "Mod+Ctrl+6" [ (leaf "spawn" [tagctl "exclusive-tag" "6"]) ])
+    (plain "Mod+Ctrl+7" [ (leaf "spawn" [tagctl "exclusive-tag" "7"]) ])
+    (plain "Mod+Ctrl+8" [ (leaf "spawn" [tagctl "exclusive-tag" "8"]) ])
+    (plain "Mod+Ctrl+9" [ (leaf "spawn" [tagctl "exclusive-tag" "9"]) ])
+    
     (plain "Ctrl+Print" [ (flag "screenshot-screen") ])
     (plain "Mod+Alt+L" [ (leaf "spawn" <| getExe pkgs.swaylock) ])
-    (plain "Mod+B" [ (leaf "spawn" <| getExe zen-browser) ])
+    (plain "Mod+B" [ (leaf "spawn" <| getExe pkgs.brave) ])
     (plain "Mod+BracketLeft" [ (flag "consume-or-expel-window-left") ])
     (plain "Mod+BracketRight" [ (flag "consume-or-expel-window-right") ])
     (plain "Mod+C" [ (flag "center-column") ])
diff --git a/modules/wms/niri/niri.mod.nix b/modules/wms/niri/niri.mod.nix
index d09e4ec..dc56fed 100644
--- a/modules/wms/niri/niri.mod.nix
+++ b/modules/wms/niri/niri.mod.nix
@@ -14,7 +14,6 @@ let
   inherit (lib) getFlakePkg';
 
   niri-tag = inputs.niri-tag.packages.${builtins.currentSystem}.unstable;
-  zen-browser = getFlakePkg' inputs.zen-browser-flake "beta";
   tagctl = getExe' niri-tag "tagctl";
 
   cfg = config.modules.desktops.niri;
@@ -58,7 +57,6 @@ let
         lib
         pkgs
         tagctl
-        zen-browser
         ;
     }
   );
diff --git a/modules/wms/portal.mod.nix b/modules/wms/portal.mod.nix
index e126203..cfe7b3f 100644
--- a/modules/wms/portal.mod.nix
+++ b/modules/wms/portal.mod.nix
@@ -6,7 +6,7 @@
 }:
 let
   inherit (lib.modules) mkIf;
-  inherit (lib.lists) singleton;
+  inherit (lib.lists) optional;
 in
 {
   xdg.portal = {
@@ -29,20 +29,15 @@ in
           "gnome"
           "gtk"
         ];
-        "org.freedesktop.impl.portal.Access" = "gtk";
-        "org.freedesktop.impl.portal.Notification" = "gtk";
         "org.freedesktop.impl.portal.Secret" = [
           "gnome-keyring"
         ];
       };
     };
   };
-  environment = {
-    # Needed for xdg-desktop-portal-gnome.
-    systemPackages = singleton pkgs.nautilus;
-    pathsToLink = [
-      "/share/xdg-desktop-portal"
-      "/share/applications"
-    ];
-  };
+
+  environment.pathsToLink = [
+    "/share/xdg-desktop-portal"
+    "/share/applications"
+  ];
 }