diff --git a/lib/mkmachine.nix b/lib/mkmachine.nix
index 1b3b014..6c36191 100644
--- a/lib/mkmachine.nix
+++ b/lib/mkmachine.nix
@@ -37,7 +37,6 @@ import "${nixpkgs}/nixos/lib/eval-config.nix" {
     (import "${inputs.impermanence}/nixos.nix")
     (import inputs.lanzaboote).nixosModules.lanzaboote
     (import inputs.lila).nixosModules.hash-collection
-    (import "${inputs.nixos-cosmic}/module.nix")
     (import "${inputs.arkheon}/module.nix")
     {
       home-manager.useGlobalPkgs = true;
diff --git a/lon.lock b/lon.lock
index f13edac..7c8c1be 100644
--- a/lon.lock
+++ b/lon.lock
@@ -170,16 +170,6 @@
       "url": "https://github.com/nix-community/nixos-anywhere/archive/51d347d35caec995d36d1450cb5bb183318c7fb7.tar.gz",
       "hash": "sha256-LrCxIU6laEf4JD1QtOBNr+PASY6CbNPpUrjLIUizt+Y="
     },
-    "nixos-cosmic": {
-      "type": "GitHub",
-      "fetchType": "tarball",
-      "owner": "lilyinstarlight",
-      "repo": "nixos-cosmic",
-      "branch": "main",
-      "revision": "ba83685fb3f4422dfcf3c01a0b3a9dc4b803714d",
-      "url": "https://github.com/lilyinstarlight/nixos-cosmic/archive/ba83685fb3f4422dfcf3c01a0b3a9dc4b803714d.tar.gz",
-      "hash": "sha256-9hZQO3Ll2tP2Jw+msNuHg+Sa4l7aqJ0TMjx5DH3fUZQ="
-    },
     "nixpkgs": {
       "type": "GitHub",
       "fetchType": "tarball",
diff --git a/machines/gallifrey/default.nix b/machines/gallifrey/default.nix
index 59034c5..0484d7b 100644
--- a/machines/gallifrey/default.nix
+++ b/machines/gallifrey/default.nix
@@ -43,11 +43,13 @@
 
   disko = import ./disko.nix;
 
-  services.desktopManager.cosmic.enable = true;
-  services.displayManager.cosmic-greeter.enable = true;
-
   boot.extraModulePackages = [ config.boot.kernelPackages.nvidia_x11 ];
-  services.xserver.videoDrivers = [ "nvidia" ];
+  services.xserver = {
+    enable = true;
+    videoDrivers = [ "nvidia" ];
+    displayManager.gdm.enable = true;
+    desktopManager.gnome.enable = true;
+  };
 
   hardware.graphics.enable = true;
   hardware.nvidia = {
@@ -56,7 +58,7 @@
     powerManagement.finegrained = false;
     open = false;
     nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.beta;
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
   };
 
   programs.xwayland.enable = true;
@@ -101,6 +103,8 @@
     sbctl
     ddcutil
     xorg.xinit
+    gnomeExtensions.dash-to-dock
+    gnomeExtensions.tailscale-status
   ];
 
   environment.persistence."/persistent" = {
@@ -108,6 +112,7 @@
     directories = [
       "/var/lib"
       "/var/log"
+      "/etc/NetworkManager/system-connections"
     ];
     files = [
       "/etc/machine-id"
diff --git a/machines/gallifrey/home-julien.nix b/machines/gallifrey/home-julien.nix
index c02b14a..03a4353 100644
--- a/machines/gallifrey/home-julien.nix
+++ b/machines/gallifrey/home-julien.nix
@@ -34,6 +34,17 @@
       };
     };
 
+    programs.atuin = {
+      enable = true;
+      enableFishIntegration = true;
+    };
+
+    dconf.settings = {
+      "org/gnome/shell" = {
+        welcome-dialog-last-shown-version = "999"; # prevent popup until gnome version 999 :)
+      };
+    };
+
     programs.obs-studio = {
       enable = true;
       plugins = with pkgs; [ obs-studio-plugins.obs-vkcapture ];
@@ -79,11 +90,17 @@
       zotero
       emacsPackages.jinx
       hunspellDicts.en_US
+      rstudio
     ];
 
     fonts.fontconfig.enable = true;
 
     home.persistence."/persistent/home/julien" = {
+      files = [
+        ".config/gnome-initial-setup-done"
+        ".config/monitors.xml"
+        ".config/background"
+      ];
       directories = [
         "Pictures"
         "Documents"
@@ -93,6 +110,7 @@
         ".config/cosmic"
         ".local/share/direnv"
         ".local/state/cosmic-comp"
+        ".local/share/atuin"
         ".config/Signal"
         ".cache/spotify"
         ".config/spotify"
@@ -100,6 +118,7 @@
         ".emacs.d"
         ".gnupg"
         "Zotero"
+        ".config/dconf"
       ];
       allowOther = true;
     };