diff --git a/common/default.nix b/common/default.nix
index b116779..af82d52 100644
--- a/common/default.nix
+++ b/common/default.nix
@@ -78,7 +78,7 @@
       extraConfig = ''
         unix_sock_group = "qemu-libvirtd"
       '';
-      
+
       onBoot = "ignore";
     };
     spiceUSBRedirection.enable = true;
diff --git a/common/modules/packages.nix b/common/modules/packages.nix
index c5aa5dc..5c1ed46 100644
--- a/common/modules/packages.nix
+++ b/common/modules/packages.nix
@@ -64,14 +64,12 @@
     distrobox
     docker-buildx
     docker-compose
-    dog
     element-desktop
     eza
     ffmpeg-full
     ffmpegthumbnailer
     file
     file-roller
-    firmware-manager
     flat-remix-gnome
     flat-remix-gtk
     flatpak-xdg-utils
@@ -120,6 +118,7 @@
     ncdu
     nil
     nixfmt
+    nixfmt-tree
     ntfs3g
     nufraw-thumbnailer
     obsidian
diff --git a/desktop/hardware-configuration.nix b/desktop/hardware-configuration.nix
index 355b101..5a34cda 100644
--- a/desktop/hardware-configuration.nix
+++ b/desktop/hardware-configuration.nix
@@ -13,7 +13,7 @@
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
-  
+
   boot = {
     initrd = {
       kernelModules = [ ];
diff --git a/desktop/modules/default.nix b/desktop/modules/default.nix
index 12ba516..025c1ef 100644
--- a/desktop/modules/default.nix
+++ b/desktop/modules/default.nix
@@ -2,7 +2,9 @@
 
 {
   imports = [
+    ./flatpak.nix
     ./gdm-monitors.nix
+    ./gnome.nix
     ./packages.nix
     ./programs.nix
     ./services.nix
diff --git a/desktop/modules/flatpak.nix b/desktop/modules/flatpak.nix
new file mode 100644
index 0000000..0aac9d8
--- /dev/null
+++ b/desktop/modules/flatpak.nix
@@ -0,0 +1,10 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+
+}
diff --git a/desktop/modules/gnome.nix b/desktop/modules/gnome.nix
new file mode 100644
index 0000000..48331c8
--- /dev/null
+++ b/desktop/modules/gnome.nix
@@ -0,0 +1,14 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+  environment = {
+    systemPackages = with pkgs.gnomeExtensions; [
+      control-monitor-brightness-and-volume-with-ddcutil
+    ];
+  };
+}
diff --git a/flake.lock b/flake.lock
index e1021fc..1965bc2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -177,11 +177,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1771439456,
-        "narHash": "sha256-HtQgNJrjYvZdpqpPJddF+TxGCazNyxvA8umbDcjrxT8=",
+        "lastModified": 1771482645,
+        "narHash": "sha256-MpAKyXfJRDTgRU33Hja+G+3h9ywLAJJNRq4Pjbb4dQs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f84d6f6cd5f17d594439710f40349ba7d0706f4b",
+        "rev": "724cf38d99ba81fbb4a347081db93e2e3a9bc2ae",
         "type": "github"
       },
       "original": {
diff --git a/laptop/hardware-configuration.nix b/laptop/hardware-configuration.nix
index 99206d7..3455fe0 100644
--- a/laptop/hardware-configuration.nix
+++ b/laptop/hardware-configuration.nix
@@ -36,7 +36,7 @@
       "i915.enable_fbc=1"
       "i915.enable_psr=0"
       "i915.fastboot=1"
-      "i915.enable_dc=2" 
+      "i915.enable_dc=2"
       "video=eDP-1:1920x1080@60e"
     ];
   };
diff --git a/laptop/modules/default.nix b/laptop/modules/default.nix
index 6875650..a7cc8e1 100644
--- a/laptop/modules/default.nix
+++ b/laptop/modules/default.nix
@@ -3,6 +3,8 @@
 {
   imports = [
     ./attic.nix
+    ./flatpak.nix
+    ./gnome.nix
     ./packages.nix
     ./programs.nix
     ./services.nix
diff --git a/laptop/modules/flatpak.nix b/laptop/modules/flatpak.nix
new file mode 100644
index 0000000..0aac9d8
--- /dev/null
+++ b/laptop/modules/flatpak.nix
@@ -0,0 +1,10 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+
+}
diff --git a/laptop/modules/gnome.nix b/laptop/modules/gnome.nix
new file mode 100644
index 0000000..cad9c44
--- /dev/null
+++ b/laptop/modules/gnome.nix
@@ -0,0 +1,13 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+  environment = {
+    systemPackages = with pkgs.gnomeExtensions; [
+    ];
+  };
+}
diff --git a/laptop/modules/services.nix b/laptop/modules/services.nix
index 0b55787..6c0f2a2 100644
--- a/laptop/modules/services.nix
+++ b/laptop/modules/services.nix
@@ -6,13 +6,25 @@
   services.power-profiles-daemon.enable = false;
   services.tlp = {
     enable = true;
+    pd.enable = true;
+
     settings = {
+      TLP_AUTO_SWITCH = 1;
+
+      CPU_DRIVER_OPMODE_ON_AC = "active";
+      CPU_DRIVER_OPMODE_ON_BAT = "active";
+      CPU_DRIVER_OPMODE_ON_SAV = "active";
       CPU_SCALING_GOVERNOR_ON_AC = "performance";
       CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
       CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power";
       CPU_ENERGY_PERF_POLICY_ON_AC = "balance_performance";
       CPU_MIN_PERF_ON_BAT = 0;
       CPU_MAX_PERF_ON_BAT = 80;
+
+      WIFI_PWR_ON_AC = "off";
+      WIFI_PWR_ON_BAT = "on";
+
+      MEM_SLEEP_ON_BAT = "deep";
     };
   };
 }