diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix
index 9ea00f3..5774132 100644
--- a/hosts/brontes/configuration.nix
+++ b/hosts/brontes/configuration.nix
@@ -9,7 +9,6 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    inputs.home-manager.nixosModules.home-manager
     ../../modules
     ./home.nix
   ];
@@ -24,19 +23,20 @@
     powerOnBoot = true;
   };
 
-  services.blueman.enable = true;
-
   #: Power Consumption {{{
   services.logind = {
     powerKey = "hibernate";
   };
   #: }}}
-
-  xdg.portal.enable = true;
-
+  xdg = {
+    portal.enable = true;
+    mime.enable = true;
+  };
   services = {
     displayManager.sddm.enable = true;
     dbus.enable = true;
+    blueman.enable = true;
+    pipewire.enable = true;
 
     tailscale = {
       enable = true;
@@ -74,7 +74,6 @@
         "libvirtd" # VM OPs
         "dialout" # Necessary for serial port interactions
       ];
-      shell = pkgs.fish;
     };
   };
 
diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix
index f0687a5..fd3d088 100644
--- a/hosts/brontes/home.nix
+++ b/hosts/brontes/home.nix
@@ -2,9 +2,15 @@
   pkgs,
   username,
   config,
+  inputs,
   ...
 }:
 {
+  imports = [
+    ../../modules/home-manager.nix
+    inputs.home-manager.nixosModules.home-manager
+  ];
+
   home-manager.users.${username} = {
     imports = [
       ../../home/rofi
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index 95ec256..11dbf8b 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -10,7 +10,6 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    inputs.home-manager.nixosModules.home-manager
     ../../modules
     ./home.nix
   ];
@@ -37,7 +36,8 @@
     layout = "fr";
     variant = "";
   };
-
+  xdg.mime.enable = true;
+  services.pipewire.enable = true;
   systemd.sleep.extraConfig = ''
     HibernateDelaySec=1200
   '';
diff --git a/hosts/marr/home.nix b/hosts/marr/home.nix
index fd30850..56edcd0 100644
--- a/hosts/marr/home.nix
+++ b/hosts/marr/home.nix
@@ -2,9 +2,15 @@
   username,
   pkgs,
   config,
+  inputs,
   ...
 }:
 {
+  imports = [
+    ../../modules/home-manager.nix
+    inputs.home-manager.nixosModules.home-manager
+  ];
+
   home-manager.users.${username} = {
     imports = [
       ../../home/sway
diff --git a/modules/default.nix b/modules/default.nix
index 165eab4..5469633 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -5,10 +5,8 @@
     ./locale.nix
     ./networking.nix
     ./fonts.nix
-    ./secrets.nix
     ./portals.nix
     ./env.nix
-    ./home-manager.nix
 
     ./programs/firefox.nix
     ./programs/thunderbird.nix
diff --git a/modules/home-manager.nix b/modules/home-manager.nix
index 8e0104d..23075ba 100644
--- a/modules/home-manager.nix
+++ b/modules/home-manager.nix
@@ -1,4 +1,9 @@
-{ self, inputs, ... }:
+{
+  self,
+  inputs,
+  lib,
+  ...
+}:
 {
   home-manager = {
     backupFileExtension = "backup";
diff --git a/modules/programs/ssh.nix b/modules/programs/ssh.nix
index bf85321..a174fc4 100644
--- a/modules/programs/ssh.nix
+++ b/modules/programs/ssh.nix
@@ -4,6 +4,4 @@
       "github.com".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl";
     };
   };
-
-  services.openssh.enable = true;
 }
diff --git a/modules/secrets.nix b/modules/secrets.nix
deleted file mode 100644
index c2643c9..0000000
--- a/modules/secrets.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  age.secrets.rustypaste = {
-    file = ../secrets/rustypaste.age;
-    owner = "ny";
-  };
-}
diff --git a/modules/system/audio.nix b/modules/system/audio.nix
index 1cdbd4f..1936245 100644
--- a/modules/system/audio.nix
+++ b/modules/system/audio.nix
@@ -1,7 +1,6 @@
 {
   # Enables wireplumber automatically
   services.pipewire = {
-    enable = true;
     alsa = {
       enable = true;
       support32Bit = true;
diff --git a/modules/system/mime.nix b/modules/system/mime.nix
index 87c851e..d1ede29 100644
--- a/modules/system/mime.nix
+++ b/modules/system/mime.nix
@@ -1,6 +1,5 @@
 {
   xdg.mime = {
-    enable = true;
     defaultApplications =
       let
         fileManager = "org.gnome.Nautilus.desktop";
diff --git a/modules/themes/default.nix b/modules/themes/default.nix
index 9ae4888..c4ade54 100644
--- a/modules/themes/default.nix
+++ b/modules/themes/default.nix
@@ -8,9 +8,9 @@
   };
 
   environment.systemPackages = with pkgs; [
-    vimix-icon-theme
-    pop-icon-theme
+    #vimix-icon-theme
+    #pop-icon-theme
     catppuccin-papirus-folders
-    catppuccin-kvantum
+    #catppuccin-kvantum
   ];
 }