diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 24a5209..121e2a4 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -12,7 +12,10 @@ lib.mkIf osConfig.programs.hyprland.enable {
     settings = {
       "$mod" = "SUPER";
 
-      monitor = ",preferred,auto,auto";
+      monitor = [
+        "DP-2,1920x1080@144, 1920x0, 1"
+        "HDMI-A-1,1920x1080@60, 0x0, 1"
+      ];
 
       general = {
         gaps_in = 5;
@@ -94,9 +97,11 @@ lib.mkIf osConfig.programs.hyprland.enable {
       bind =
         [
           "$mod, D, exec, rofi -config ${config.home.homeDirectory}/.config/rofi/config.rasi -show combi -automatic-save-to-history"
+          "$mod, E, exec, ${pkgs.gnome.nautilus}/bin/nautilus"
           "$mod, Return, exec, ${pkgs.alacritty}/bin/alacritty"
           "$mod SHIFT, Q, killactive,"
-
+          "$mod SHIFT, P, exec, rofi -show -p -modi p:rofi-power-menu"
+          "$mod SHIFT, C, exec, hyprctl reload"
           "$mod, left, movefocus, l"
           "$mod, right, movefocus, r"
           "$mod, up, movefocus, u"
@@ -105,7 +110,8 @@ lib.mkIf osConfig.programs.hyprland.enable {
           # Example special workspace (scratchpad)
           "$mod, S, togglespecialworkspace, magic"
           "$mod SHIFT, S, movetoworkspace, special:magic"
-
+          "$mod, X, fullscreen, 1"
+          "$mod, F, fullscreen, 0"
           "$mod, N, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t"
         ]
         ++ (
diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix
index a029154..302ad42 100644
--- a/hosts/brontes/configuration.nix
+++ b/hosts/brontes/configuration.nix
@@ -1,23 +1,17 @@
 {
-  config,
   pkgs,
-  lib,
   inputs,
-  system,
   username,
   hostname,
   ...
 }:
-let
-  stateVersion = "24.05";
-  homeDirectory = "/home/${username}";
-in
 {
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
     inputs.home-manager.nixosModules.home-manager
     ../../modules
+    ./home.nix
   ];
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -41,43 +35,7 @@ in
     fish.enable = true;
     firefox.enable = true;
     thunderbird.enable = true;
-  };
-
-  home-manager.backupFileExtension = "backup";
-  home-manager.users.${username} = {
-    imports = [
-      ../../home/firefox
-      ../../home/fish
-      ../../home/neovim
-      ../../home/thunderbird
-      ../../home/git
-      ../../home/rofi
-      ../../home/sway/swaync
-      ../../home/sway/waybar
-      ../../home/hyprland
-    ];
-
-    programs.direnv = {
-      enable = true;
-      nix-direnv.enable = true;
-    };
-
-    home = {
-      inherit stateVersion;
-      inherit username;
-      inherit homeDirectory;
-
-      packages =
-        let
-          scripts = import ../../home/scripts/list.nix { inherit pkgs; };
-          programs = with pkgs; [
-            keepassxc
-            nextcloud-client
-            cliphist
-          ];
-        in
-        programs ++ scripts;
-    };
+    hyprland.enable = true;
   };
 
   users = {
@@ -94,21 +52,23 @@ in
       shell = pkgs.fish;
     };
   };
+
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
   };
+
+  services.gnome.gnome-keyring.enable = true;
   environment.systemPackages = with pkgs; [
     fish
     git
-    firefox
     htop
-    alacritty
     eza
     bat
-    kdeconnect
     swaynotificationcenter
+    pipewire
+    wireplumber
   ];
 
-  system.stateVersion = stateVersion;
+  system.stateVersion = "24.05";
 }
diff --git a/hosts/brontes/hardware-configuration.nix b/hosts/brontes/hardware-configuration.nix
index e9796bb..d107e2c 100644
--- a/hosts/brontes/hardware-configuration.nix
+++ b/hosts/brontes/hardware-configuration.nix
@@ -4,7 +4,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }:
diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix
new file mode 100644
index 0000000..441523b
--- /dev/null
+++ b/hosts/brontes/home.nix
@@ -0,0 +1,77 @@
+{
+  pkgs,
+  stateVersion,
+  username,
+  config,
+  ...
+}:
+{
+  home-manager.users.${username} = {
+    imports = [
+      ../../home/firefox
+      ../../home/fish
+      ../../home/neovim
+      ../../home/thunderbird
+      ../../home/git
+      ../../home/rofi
+      ../../home/sway/swaync
+      ../../home/sway/waybar
+      ../../home/hyprland
+    ];
+
+    programs.direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
+
+    services.blueman-applet.enable = true;
+
+    home = {
+      stateVersion = config.system.stateVersion;
+      inherit username;
+
+      packages =
+        let
+          scripts = import ../../home/scripts/list.nix { inherit pkgs; };
+          programs = with pkgs; [
+            keepassxc
+            nextcloud-client
+            cliphist
+            digikam
+            fragments
+            element-desktop
+            libreoffice
+            loupe
+            gnome.seahorse
+            gimp
+            vlc
+            thunderbird
+            keepassxc
+            gnome.nautilus
+            rofi-power-menu
+            lollypop
+            protonmail-bridge-gui
+            varia
+            signal-desktop
+            calibre
+            alacritty
+
+            # CLI tools
+            delta
+            fzf
+            jhead
+            fdupes
+            exiftool
+            sshfs
+            zip
+            unzip
+            lazygit
+            fd
+            ripgrep
+
+          ];
+        in
+        programs ++ scripts;
+    };
+  };
+}
diff --git a/modules/default.nix b/modules/default.nix
index f07ab36..cb4f4e7 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -11,5 +11,6 @@
     ./programs/lazygit.nix
     ./programs/steam.nix
     ./programs/hyprland.nix
+    ./home-manager.nix
   ];
 }
diff --git a/modules/home-manager.nix b/modules/home-manager.nix
new file mode 100644
index 0000000..937d5d1
--- /dev/null
+++ b/modules/home-manager.nix
@@ -0,0 +1,5 @@
+{
+  home-manager = {
+    backupFileExtension = "backup";
+  };
+}
diff --git a/modules/programs/hyprland.nix b/modules/programs/hyprland.nix
index b147fd1..1b0f938 100644
--- a/modules/programs/hyprland.nix
+++ b/modules/programs/hyprland.nix
@@ -1 +1 @@
-{ programs.hyprland.enable = true; }
+{ lib, config, ... }: lib.mkIf config.programs.hyprland.enable { }
diff --git a/modules/programs/sway.nix b/modules/programs/sway.nix
index 2ca8194..cd50ec6 100644
--- a/modules/programs/sway.nix
+++ b/modules/programs/sway.nix
@@ -4,7 +4,7 @@
   lib,
   ...
 }:
-lib.mkIf config.programs.firefox.enable {
+lib.mkIf config.programs.sway.enable {
   programs.sway = {
     wrapperFeatures.gtk = true;
     extraPackages = with pkgs; [