diff --git a/flake.lock b/flake.lock
index abfcd23..d5a72b0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-DuhR3y0gPZG0AJ2FDd+nUKzQMwT+c/DFIUWNDQ5Uyx4=",
-        "path": "/nix/store/62wvwsq5r9rmlv9y8gmx7jndgk2kbhsg-source/home/ags",
+        "path": "/nix/store/k25y4bqyl7cxf8pjl1wa7qaxj4lc0z4a-source/home/ags",
         "type": "path"
       },
       "original": {
-        "path": "/nix/store/62wvwsq5r9rmlv9y8gmx7jndgk2kbhsg-source/home/ags",
+        "path": "/nix/store/k25y4bqyl7cxf8pjl1wa7qaxj4lc0z4a-source/home/ags",
         "type": "path"
       }
     },
diff --git a/flake.nix b/flake.nix
index 3a4989a..8f7f842 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,15 +43,8 @@
                     (self: super: { utillinux = super.util-linux; })
                 ]; }
                 {
-                    nixpkgs.config.allowUnfree = true;
                     networking.hostName = host;
-                    boot.loader.systemd-boot.enable = true;
                     time.timeZone = "Europe/Brussels";
-
-                    programs.hyprland = {
-                        enable = true;
-                        package = inputs.hyprland.packages.${pkgs.system}.hyprland;
-                    };
                     nix.settings = {
                         substituters = [
                             "https://hyprland.cachix.org"
@@ -67,14 +60,6 @@
                         trusted-users = [ "root" user ];
                         auto-optimise-store = true;
                     };
-
-                    nix.gc = {
-                        automatic = true;
-                        dates = "daily";
-                        options = "--delete-older-than 2d";
-                    };
-
-
                     users.users.${user} = {
                         isNormalUser = true;
                         extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
@@ -91,16 +76,12 @@
                         ];
                         shell = pkgs.zsh;
                     };
-
                     system.stateVersion = "23.11";
-                    environment.sessionVariables.NIXOS_OZONE_WL = "1"; # hint electron apps to use wayland:
                 }
                 home-manager.nixosModules.home-manager
                 {
                     home-manager = {
-                        extraSpecialArgs = {
-                            inherit inputs;
-                        }; # allows access to flake inputs in hm modules
+                        extraSpecialArgs = { inherit inputs; };
                         useGlobalPkgs = true;
                         useUserPackages = true;
                         users.${user} = { imports = [ ./home/${host}.nix ]; };
diff --git a/home/Riva.nix b/home/Riva.nix
index 731c43a..d24aaf3 100644
--- a/home/Riva.nix
+++ b/home/Riva.nix
@@ -2,32 +2,15 @@
 
 {
     imports = [
-        (import ./utils/desktop.nix { inherit inputs config pkgs; })
+        (import ./utils/common.nix { inherit inputs config pkgs; })
+        (import ./utils/python.nix { inherit inputs config pkgs; })
+        ./ssh
     ];
 
     programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Riva/id_ed25519";
 
     home.packages = with pkgs; [
         distrobox
-        wl-clipboard
         jq
-        evince
     ];
-    wayland.windowManager.hyprland.settings = {
-        "$mainMod" =  pkgs.lib.mkForce "ALT_L";
-        "$altMod" = pkgs.lib.mkForce "SUPER";
-        monitor = [
-            "Virtual-1,2000x1200@60,0x0,1"
-        ];
-        general.gaps_out = 1;
-    };
-    services.hyprpaper = {
-        settings = {
-            wallpaper = [
-                "Virtual-1,${./hyprland/files/wallpaper.png}"
-            ];
-        };
-    };
-    programs.alacritty.settings.font.size = 12;
-    programs.kitty.font.size = 12;
 }
diff --git a/hosts/Common/default.nix b/hosts/Common/default.nix
index 7a66461..6696a88 100644
--- a/hosts/Common/default.nix
+++ b/hosts/Common/default.nix
@@ -1,11 +1,15 @@
 { pkgs, ... }:
 {
+    environment.sessionVariables.NIXOS_OZONE_WL = "1"; # hint electron apps to use wayland:
+
+    nixpkgs.config.allowUnfree = true;
     security.polkit.enable = true;
     security.rtkit.enable = true;
     programs.zsh.enable = true;
     networking.firewall.enable = false;
     programs.nix-ld.enable = true;
 
+    boot.loader.systemd-boot.enable = true;
     boot.loader.systemd-boot.memtest86.enable = true;
     boot.loader.systemd-boot.netbootxyz.enable = true;
     boot.loader.timeout = 1;
@@ -54,6 +58,12 @@
         docker-compose
     ];
 
+    nix.gc = {
+        automatic = true;
+        dates = "daily";
+        options = "--delete-older-than 2d";
+    };
+
     virtualisation.containers.enable = true;
     virtualisation = {
         podman = {
diff --git a/hosts/Common/desktop.nix b/hosts/Common/desktop.nix
index 7fa49aa..2d44784 100644
--- a/hosts/Common/desktop.nix
+++ b/hosts/Common/desktop.nix
@@ -1,7 +1,12 @@
-{ pkgs, ... }:
+{ pkgs, inputs, ... }:
 {
     services.udev.packages = [ pkgs.yubikey-personalization ];
 
+    programs.hyprland = {
+        enable = true;
+        package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+    };
+
     hardware.graphics = {
         enable = true;
     };
diff --git a/hosts/Riva/default.nix b/hosts/Riva/default.nix
index da1f618..50f0c6d 100644
--- a/hosts/Riva/default.nix
+++ b/hosts/Riva/default.nix
@@ -4,7 +4,6 @@ let
 in {
     imports = [
         (import ../Common/default.nix { inherit inputs config pkgs; })
-        (import ../Common/desktop.nix { inherit inputs pkgs config; })
         (import ../Common/nfs.nix { inherit pkgs serverIP; })
     ];
 
@@ -26,13 +25,4 @@ in {
             }];
         };
     };
-
-    services.sunshine = {
-        enable = true;
-        autoStart = true;
-        capSysAdmin = true;
-        openFirewall = true;
-    };
-
-    services.greetd.enable = false;
 }