diff --git a/flake.lock b/flake.lock
index 03dff39..fdd746f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -111,11 +111,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782103446,
-        "narHash": "sha256-+vMR3KPBVoY9nJrQI9qje5H1vmv51dJgMYkUuYimtJg=",
+        "lastModified": 1782702263,
+        "narHash": "sha256-8/MG4Su7PhnynrmsVO61IeAfrK7GuUEu+E+gwbhy1QQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d8dac1f668fd861369571be3678ec75b1573e7e3",
+        "rev": "789a35fbdeb3c46b260096daa0b321c11be527ea",
         "type": "github"
       },
       "original": {
@@ -163,11 +163,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1781577229,
-        "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=",
+        "lastModified": 1782467914,
+        "narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f",
+        "rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
         "type": "github"
       },
       "original": {
diff --git a/home/Riva.nix b/home/Riva.nix
index 97c879b..bc07aba 100644
--- a/home/Riva.nix
+++ b/home/Riva.nix
@@ -1,5 +1,4 @@
 {
-  inputs,
   config,
   pkgs,
   ...
@@ -12,28 +11,13 @@
     dirs = [
       "/home/user/.dotfiles"
       "/home/server/.cache/fzgo/entries/d/|home|user|Workspace"
-      "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Thomas"
-      "/home/server/.cache/fzgo/entries/d/|home|server|Storage|Shared"
     ];
   };
 in {
   imports = [
     (import ./utils/fzgo_links.nix {inherit config pkgs fzgo_paths;})
-    (import ./utils/desktop.nix {inherit inputs config pkgs;})
     ./ssh
   ];
 
   programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/Riva/id_ed25519";
-
-  home.packages = with pkgs; [
-    distrobox
-    jq
-    rclone
-  ];
-  wayland.windowManager.hyprland.settings = {
-    monitor = [
-      "Virtual-1,2560x1440,0x0,1"
-    ];
-    input.kb_options = "compose:rctrl, caps:super, altwin:swap_alt_win";
-  };
 }
diff --git a/home/utils/common.nix b/home/utils/common.nix
index 5364a7b..e932947 100644
--- a/home/utils/common.nix
+++ b/home/utils/common.nix
@@ -20,16 +20,17 @@
   targets.genericLinux.enable = true;
   programs.home-manager.enable = true;
   home.packages = with pkgs; [
+    inputs.worktimer.packages.${pkgs.stdenv.hostPlatform.system}.default
     htop
     ghostscript
     waypipe
     tree
-    inputs.worktimer.packages.${pkgs.stdenv.hostPlatform.system}.default
     usbutils
     gocryptfs
     sshfs
     ncdu
     jq
+    rclone
   ];
   home.sessionVariables = {
     XDG_CONFIG_HOME = "${config.xdg.configHome}";
diff --git a/hosts/Riva/default.nix b/hosts/Riva/default.nix
index b2d1e28..cb29d38 100644
--- a/hosts/Riva/default.nix
+++ b/hosts/Riva/default.nix
@@ -6,19 +6,9 @@
 }: {
   imports = [
     (import ../Common/default.nix {inherit inputs config pkgs;})
-    (import ../Common/nvidia.nix {inherit pkgs config;})
-    # (import ../Common/desktop.nix { inherit inputs pkgs config; })
   ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
-
-  # services.sunshine = {
-  #     enable = true;
-  #     autoStart = false;
-  #     capSysAdmin = true;
-  #     openFirewall = true;
-  # };
-
   boot.kernelParams = ["mitigations=off"];
 
   zramSwap.enable = true;
@@ -53,8 +43,12 @@
     enable = false;
   };
   networking.nameservers = ["192.168.1.2"];
-  programs.steam = {
+  services.tailscale = {
     enable = true;
-    gamescopeSession.enable = true;
+    extraUpFlags = [
+      "--login-server=https://headscale.thomasave.be"
+      "--accept-routes"
+    ];
+    authKeyFile = "/home/user/.secrets/Tailscale/Riva/authkey";
   };
 }