diff --git a/home/default.nix b/home/default.nix
index 46d95c0..0e297cb 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,14 +1,17 @@
 # This file contains default settings used across different systems
 {
   imports = [
+    ./graphical
+    ./terminal
+
     ./hyprland
     ./hyprlock
     ./foot.nix
-    ./graphical
-    ./terminal
     ./rofi
     ./sway
     ./sway/swayidle.nix
     ./waybar
+    ./hyprpaper
+    ./swaync
   ];
 }
diff --git a/home/sway/default.nix b/home/sway/default.nix
index 232e414..cb6b577 100644
--- a/home/sway/default.nix
+++ b/home/sway/default.nix
@@ -115,7 +115,6 @@ lib.mkIf osConfig.programs.sway.enable {
         #: }}}
         #: Startup {{{
         startup = [
-          { command = "${pkgs.swayidle}/bin/swayidle -C ${homeDirectory}/.config/swayidle/config"; }
           { command = "${pkgs.swaynotificationcenter}/bin/swaync"; }
           { command = "${pkgs.nextcloud-client}/bin/nextcloud --background"; }
           { command = "${pkgs.kdeconnect}/bin/kdeconnect-indicator"; }
diff --git a/home/swaync/default.nix b/home/swaync/default.nix
index aade8b1..ceccb7d 100644
--- a/home/swaync/default.nix
+++ b/home/swaync/default.nix
@@ -1,31 +1,22 @@
-{ lib, ... }:
+{ lib, config, ... }:
 let
-  enable = true;
+  inherit (lib) mkIf;
+
   swayncFolder = ".config/swaync";
   themes = import ./themes;
 in
-{
+mkIf config.services.swaync.enable {
+  services.swaync = {
+    style = themes.gruvbox;
+    settings = import ./config.nix;
+  };
 
-  home.file =
-    {
-      swaync-config = {
-        inherit enable;
-        target = "${swayncFolder}/config.json";
-        text = builtins.toJSON (import ./config.nix);
-      };
-
-      swaync-theme = {
-        inherit enable;
-        target = "${swayncFolder}/style.css";
-        text = themes.gruvbox;
-      };
+  home.file = lib.mapAttrs' (
+    name: value:
+    lib.nameValuePair "swaync-theme-${name}" {
+      enable = true;
+      target = "${swayncFolder}/${name}.css";
+      text = value;
     }
-    // lib.mapAttrs' (
-      name: value:
-      lib.nameValuePair "swaync-theme-${name}" {
-        inherit enable;
-        target = "${swayncFolder}/${name}.css";
-        text = value;
-      }
-    ) themes;
+  ) themes;
 }
diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix
index 79ca1bf..8a15c6e 100644
--- a/hosts/brontes/home.nix
+++ b/hosts/brontes/home.nix
@@ -8,11 +8,8 @@
   home-manager.users.${username} = {
     imports = [
       ../../home/rofi
-      ../../home/swaync
-      ../../home/hyprpaper
       ../../home/themes/catppuccin.nix
       ../../home
-      ../../home/sway/swayidle.nix
     ];
 
     programs.direnv = {
@@ -27,6 +24,7 @@
     services = {
       blueman-applet.enable = true;
       swayidle.enable = true;
+      swaync.enable = true;
     };
 
     home = {
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index 325db7a..594a3de 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -72,8 +72,6 @@
     };
   };
 
-  services.printing.enable = true;
-
   #: Virtualisation {{{
   virtualisation.docker = {
     enable = false;
@@ -123,14 +121,16 @@
   };
   #:}}}
 
-  services.fwupd.enable = true;
-
-  services.dbus.enable = true;
+  services = {
+    dbus.enable = true;
+    fwupd.enable = true;
+    gvfs.enable = true;
+    printing.enable = true;
+  };
 
   xdg.portal.enable = true;
 
-  services.gvfs.enable = true;
-
+  media.enableAll = true;
   # Configure console keymap
   console.keyMap = "fr";
 
@@ -152,8 +152,6 @@
 
   services.gnome.gnome-keyring.enable = true;
 
-  services.flatpak.enable = true;
-
   environment.variables = {
     ELECTRON_OZONE_PLATFORM_HINT = "auto";
     MOZ_ENABLE_WAYLAND = 1;
diff --git a/hosts/marr/home.nix b/hosts/marr/home.nix
index f1a9e7b..d33a5c4 100644
--- a/hosts/marr/home.nix
+++ b/hosts/marr/home.nix
@@ -20,8 +20,6 @@
       };
     };
 
-    services.blueman-applet.enable = true;
-
     programs.direnv = {
       enable = true;
       nix-direnv.enable = true;
@@ -33,6 +31,12 @@
       vscode.enable = true;
     };
 
+    services = {
+      swaync.enable = true;
+      blueman-applet.enable = true;
+      swayidle.enable = true;
+    };
+
     home = {
       stateVersion = config.system.stateVersion;
       inherit username;
@@ -45,14 +49,12 @@
         loupe
         seahorse
         gimp
-        vlc
         thunderbird
         keepassxc
         nautilus
         protonmail-bridge-gui
         varia
         signal-desktop
-        calibre
         foot
 
         # Proprietary