diff --git a/common/desktop/default.nix b/common/desktop/default.nix
index 415aee01..94558676 100644
--- a/common/desktop/default.nix
+++ b/common/desktop/default.nix
@@ -32,8 +32,8 @@
     };
   };
 
-  hardware.pulseaudio.enable = false;
   services = {
+    pulseaudio.enable = false;
 
     # Enable my config for the gnome desktop environment
     v.gnome.enable = lib.mkDefault true;
@@ -80,7 +80,6 @@
     sbctl
   ]; # ++ (if config.virtualisation.podman.enable then [ pkgs.podman-compose ] else []);
 
-
   security.rtkit.enable = true;
 
   virtualisation = {
@@ -123,7 +122,6 @@
     adb.enable = true;
   };
 
-
   networking = {
     # Networking
     networkmanager.enable = true;
diff --git a/common/modules/gnome/default.nix b/common/modules/gnome/default.nix
index 9eb852e1..b3a2ddde 100644
--- a/common/modules/gnome/default.nix
+++ b/common/modules/gnome/default.nix
@@ -56,8 +56,9 @@ in
     # Add Home-manager dconf stuff
     home-manager.sharedModules = mkIf cfg.hm [ ./hm.nix ];
 
-    environment.gnome.excludePackages =
-      (with pkgs; [
+    environment.gnome.excludePackages = (
+      with pkgs;
+      [
         gnome-photos
         gnome-tour
         gnome-connections
@@ -78,13 +79,21 @@ in
         hitori # sudoku game
         gnome-notes
         gnome-weather
-      ]);
+        gnome-software
+      ]
+    );
+
+    services.gnome.evolution-data-server.enable = lib.mkForce false;
+    services.gnome.gnome-online-accounts.enable = false;
+    services.gnome.gnome-remote-desktop.enable = false;
+    services.gnome.gnome-user-share.enable = false;
+    services.gnome.rygel.enable = false;
+    services.gnome.tinysparql.enable = false;
+    services.gnome.localsearch.enable = false;
 
     # Services required for gnome
     programs.dconf.enable = true;
 
-
-
     # Extra gnome packages
     environment.systemPackages = with pkgs; [
       gnome-tweaks
diff --git a/flake.lock b/flake.lock
index 27c76aa0..c6355419 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1235,16 +1235,16 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1734649271,
-        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
+        "lastModified": 1735581264,
+        "narHash": "sha256-q4ocr/efe8RXw7/SPpTZVqw6GNRWTEMdOUMt66QephQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
+        "rev": "98f9d01a955f7d568df2d1d362481f5423318216",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "nixos-unstable",
+        "ref": "nixos-unstable-small",
         "type": "indirect"
       }
     },
diff --git a/flake.nix b/flake.nix
index 4c3913bb..dd8887e3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
   # * https://github.com/Infinidoge/nix-minecraft
 
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-unstable";
+    nixpkgs.url = "nixpkgs/nixos-unstable-small";
     flake-utils-plus.url = "github:gytis-ivaskevicius/flake-utils-plus";
     nur.url = "github:nix-community/NUR";
     colmena.url = "github:zhaofengli/colmena";
diff --git a/hosts/thalassa/aoife/default.nix b/hosts/thalassa/aoife/default.nix
index 22b10902..3a042ac9 100644
--- a/hosts/thalassa/aoife/default.nix
+++ b/hosts/thalassa/aoife/default.nix
@@ -58,10 +58,13 @@
       withUWSM = true;
     };
     hyprlock.enable = true;
+    evolution.enable = false;
   };
 
+
   services = {
     hypridle.enable = true;
+    xserver.displayManager.gdm.enable = true;
 
     flatpak.enable = true;
 
diff --git a/hosts/thalassa/aoife/hardware.nix b/hosts/thalassa/aoife/hardware.nix
index c59f8a25..0d5744e7 100644
--- a/hosts/thalassa/aoife/hardware.nix
+++ b/hosts/thalassa/aoife/hardware.nix
@@ -62,12 +62,11 @@
 
   powerManagement = {
     enable = true;
-    powertop.enable = true;
+    # powertop.enable = true;
   };
+
   security = {
     tpm2 = {
-
-      # tpm
       enable = true;
       pkcs11.enable = true; # expose /run/current-system/sw/lib/libtpm2_pkcs11.so
       tctiEnvironment.enable = true;
diff --git a/hosts/thalassa/aoife/home/hyprland.nix b/hosts/thalassa/aoife/home/hyprland.nix
index a98da69a..1f4f50cc 100644
--- a/hosts/thalassa/aoife/home/hyprland.nix
+++ b/hosts/thalassa/aoife/home/hyprland.nix
@@ -158,6 +158,7 @@ in
   # Needed as these services normally start after graphical-session-pre
   systemd.user.services.hyprpaper.Unit.After = lib.mkForce "graphical-session.target";
   systemd.user.services.waybar.Unit.After = lib.mkForce "graphical-session.target";
+  systemd.user.services.hypridle.Unit.After = lib.mkForce "graphical-session.target";
 
   wayland.windowManager.hyprland =
     let
@@ -267,6 +268,7 @@ in
             preserve_split = "yes";
             pseudotile = "yes";
           };
+
           gestures.workspace_swipe = true;
 
           misc = {
@@ -298,7 +300,7 @@ in
             ",XF86MonBrightnessDown,exec,${brightnessctl} -q s 5%-"
           ];
 
-          bindl = [ ",XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle" ];
+          bindl = [ ",XF86AudioMute, exec,${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle" ];
 
           bind =
             [