diff --git a/configuration.nix b/configuration.nix
index 249062b..1e50cad 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,180 +1,5 @@
 { config, pkgs, ... }:
 
-let
-  greetdApodDir = "/var/lib/greetd/apod";
-  greetdApodCurrent = "${greetdApodDir}/current";
-  swaySession = pkgs.writeTextDir "share/wayland-sessions/sway.desktop" ''
-    [Desktop Entry]
-    Name=Sway
-    Comment=An i3-compatible Wayland compositor
-    Exec=${config.programs.sway.package}/bin/sway
-    Type=Application
-    DesktopNames=sway
-  '';
-  regreetPasswordPrompt = pkgs.regreet.overrideAttrs (oldAttrs: {
-    postPatch = (oldAttrs.postPatch or "") + ''
-      substituteInPlace src/gui/model.rs \
-        --replace-fail $'        } else {\n            let username = if let Some(username) = self.get_current_username() {' \
-                       $'        } else if self.sys_util.get_sessions().len() == 1 {\n            let (session, sess_info) = self.sys_util.get_sessions().iter().next().expect("one session");\n            info!("No session selected; using only available session: {session}");\n            (Some(session.to_string()), Some(sess_info.clone()))\n        } else {\n            let username = if let Some(username) = self.get_current_username() {'
-
-      substituteInPlace src/gui/component.rs \
-        --replace-fail $'        // Set the default behaviour of pressing the Return key to act like the login button.\n        root.set_default_widget(Some(&widgets.ui.login_button));\n\n        AsyncComponentParts { model, widgets }' \
-                       $'        // Set the default behaviour of pressing the Return key to act like the login button.\n        root.set_default_widget(Some(&widgets.ui.login_button));\n\n        // Immediately start authentication so the password entry appears and receives focus.\n        sender.input(Self::Input::Login {\n            input: String::new(),\n            info: UserSessInfo::extract(\n                &widgets.ui.usernames_box,\n                &widgets.ui.username_entry,\n                &widgets.ui.sessions_box,\n                &widgets.ui.session_entry,\n            ),\n        });\n\n        AsyncComponentParts { model, widgets }'
-    '';
-  });
-  regreetState = pkgs.writeText "regreet-state.toml" ''
-    last_user = "jet"
-
-    [user_to_last_sess]
-    jet = "Sway"
-  '';
-  fetchGreetdApod = pkgs.writeShellApplication {
-    name = "greetd-apod-wallpaper";
-    runtimeInputs = [
-      pkgs.coreutils
-      pkgs.curl
-      pkgs.jq
-    ];
-    text = ''
-      set -euo pipefail
-
-      state_dir="${greetdApodDir}"
-      current_link="${greetdApodCurrent}"
-      user_current="/home/jet/.local/state/nasa-apod/current"
-      mkdir -p "$state_dir"
-      chmod 0755 "$state_dir"
-
-      install_current() {
-        local source="$1"
-        local target="$2"
-
-        if [ -s "$source" ]; then
-          cp --dereference --force "$source" "$target"
-          chmod 0644 "$target"
-          ln -sfn "$target" "$current_link"
-        fi
-      }
-
-      if [ ! -e "$current_link" ] && [ -e "$user_current" ]; then
-        install_current "$user_current" "$state_dir/bootstrap"
-      fi
-
-      read_api_key_file() {
-        local key_file="$1"
-
-        if [ -r "$key_file" ]; then
-          while IFS= read -r line; do
-            case "$line" in
-              NASA_API_KEY=*)
-                api_key="''${line#NASA_API_KEY=}"
-                ;;
-            esac
-          done < "$key_file"
-        fi
-      }
-
-      api_key="''${NASA_API_KEY:-}"
-      if [ -z "$api_key" ]; then
-        read_api_key_file "''${NASA_API_KEY_FILE:-/home/jet/.config/nasa-api.env}"
-      fi
-      if [ -z "$api_key" ]; then
-        read_api_key_file /etc/nasa-api.env
-      fi
-      if [ -z "$api_key" ]; then
-        api_key="DEMO_KEY"
-      fi
-
-      today="$(date +%F)"
-      for cached in "$state_dir/apod-$today".*; do
-        if [ -s "$cached" ]; then
-          ln -sfn "$cached" "$current_link"
-          exit 0
-        fi
-      done
-
-      api_curl_args=(
-        --fail
-        --silent
-        --show-error
-        --location
-        --connect-timeout 5
-        --max-time 20
-      )
-
-      image_curl_args=(
-        --fail
-        --silent
-        --show-error
-        --location
-        --retry 2
-        --retry-delay 5
-        --retry-max-time 120
-        --connect-timeout 10
-        --max-time 60
-      )
-
-      api_request="$(mktemp)"
-      trap 'rm -f "$api_request"' EXIT
-      {
-        printf '%s\n' 'url = "https://api.nasa.gov/planetary/apod"'
-        printf '%s\n' 'get'
-        printf 'data-urlencode = "api_key=%s"\n' "$api_key"
-        printf '%s\n' 'data-urlencode = "thumbs=True"'
-      } > "$api_request"
-      chmod 0600 "$api_request"
-
-      json="$(curl "''${api_curl_args[@]}" --config "$api_request" || true)"
-      if [ -z "$json" ]; then
-        exit 0
-      fi
-
-      media_type="$(printf '%s' "$json" | jq -r '.media_type // empty')"
-      case "$media_type" in
-        image)
-          image_url="$(printf '%s' "$json" | jq -r '.hdurl // .url // empty')"
-          ;;
-        video)
-          image_url="$(printf '%s' "$json" | jq -r '.thumbnail_url // empty')"
-          ;;
-        *)
-          exit 0
-          ;;
-      esac
-      if [ -z "$image_url" ]; then
-        exit 0
-      fi
-
-      ext="''${image_url##*.}"
-      ext="''${ext%%\?*}"
-      case "$ext" in
-        jpg|jpeg|png|webp) ;;
-        *) ext="jpg" ;;
-      esac
-
-      date_stamp="$(printf '%s' "$json" | jq -r '.date // empty')"
-      if [ -z "$date_stamp" ]; then
-        date_stamp="$(date +%F)"
-      fi
-
-      target="$state_dir/apod-$date_stamp.$ext"
-      tmp="$target.tmp"
-
-      if [ ! -s "$target" ]; then
-        if curl "''${image_curl_args[@]}" "$image_url" -o "$tmp" && [ -s "$tmp" ]; then
-          mv "$tmp" "$target"
-          chmod 0644 "$target"
-        else
-          rm -f "$tmp"
-        fi
-      fi
-
-      if [ -e "$target" ]; then
-        ln -sfn "$target" "$current_link"
-      fi
-    '';
-  };
-in
-
 {
   boot.loader.systemd-boot.enable = true;
   boot.loader.systemd-boot.configurationLimit = 3;
@@ -195,7 +20,6 @@ in
       };
     };
   };
-  services.blueman.enable = true;
 
   networking.networkmanager.enable = true;
   networking.networkmanager.settings = {
@@ -317,14 +141,13 @@ in
   # Codex currently probes the conventional FHS bubblewrap path.
   systemd.tmpfiles.rules = [
     "L+ /usr/bin/bwrap - - - - ${pkgs.bubblewrap}/bin/bwrap"
-    "d ${greetdApodDir} 0755 root root -"
   ];
 
   # Set Ghostty as default terminal
   xdg.terminal-exec = {
     enable = true;
     settings = {
-      default = [ "com.mitchellh.ghostty.desktop" ];
+      default = [ "ghostty.desktop" ];
     };
   };
 
@@ -332,107 +155,32 @@ in
 
   virtualisation.docker.enable = true;
 
-  programs.sway = {
-    enable = true;
-    wrapperFeatures.gtk = true;
-  };
+  services.displayManager.gdm.enable = true;
+  services.desktopManager.gnome.enable = true;
+  services.gnome.sushi.enable = true;
 
-  services.greetd = {
-    enable = true;
-    settings.default_session = {
-      command = "env GTK_USE_PORTAL=0 GDK_DEBUG=no-portals SESSION_DIRS=/run/current-system/sw/share/wayland-sessions XDG_DATA_DIRS=/run/current-system/sw/share ${pkgs.dbus}/bin/dbus-run-session ${pkgs.cage}/bin/cage -s -d -- ${config.programs.regreet.package}/bin/regreet";
-      user = "greeter";
-    };
-  };
-
-  programs.regreet = {
-    enable = true;
-    package = regreetPasswordPrompt;
-    font = {
-      package = pkgs.atkinson-hyperlegible-next;
-      name = "Atkinson Hyperlegible Next";
-      size = 16;
-    };
-    settings = {
-      background = {
-        path = greetdApodCurrent;
-        fit = "Cover";
-      };
-      GTK.application_prefer_dark_theme = true;
-      appearance.greeting_msg = "Welcome back";
-      widget.clock = {
-        format = "%a %b %d  %I:%M %p";
-        resolution = "1s";
-      };
-    };
-  };
-
-  services.accounts-daemon.enable = true;
-
-  age = {
-    identityPaths = [ "/home/jet/.ssh/id_ed25519" ];
-    secrets.nasa-api-env = {
-      file = ./secrets/nasa-api.env.age;
-      owner = "jet";
-      group = "users";
-      mode = "0400";
-    };
-  };
-
-  system.activationScripts.regreetDefaultSession.text = ''
-    ${pkgs.coreutils}/bin/install -D -m 0644 ${regreetState} /var/lib/regreet/state.toml
-    chown greeter:greeter /var/lib/regreet/state.toml
-  '';
-
-  fonts = {
-    packages = [
-      pkgs.atkinson-hyperlegible-next
-      pkgs.nerd-fonts.commit-mono
-    ];
-    fontconfig.defaultFonts = {
-      sansSerif = [ "Atkinson Hyperlegible Next" ];
-      serif = [ "Atkinson Hyperlegible Next" ];
-      monospace = [ "CommitMono Nerd Font" ];
-    };
-  };
-
-  systemd.services.greetd-apod-wallpaper = {
-    description = "Fetch NASA APOD wallpaper for greetd";
-    after = [ "network-online.target" ];
-    wants = [ "network-online.target" ];
-    serviceConfig = {
-      Type = "oneshot";
-      ExecStart = "${fetchGreetdApod}/bin/greetd-apod-wallpaper";
-      EnvironmentFile = "-${config.age.secrets.nasa-api-env.path}";
-      TimeoutStartSec = "3min";
-    };
-  };
-
-  systemd.timers.greetd-apod-wallpaper = {
-    wantedBy = [ "timers.target" ];
-    timerConfig = {
-      OnBootSec = "30s";
-      OnCalendar = "hourly";
-      Persistent = true;
-      Unit = "greetd-apod-wallpaper.service";
-    };
-  };
-
-  xdg.portal = {
-    enable = true;
-    wlr.enable = true;
-    config.common.default = [
-      "wlr"
-      "gtk"
-    ];
-    extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
-  };
-
-  programs.dconf.enable = true;
-  services.gvfs.enable = true;
-  services.udisks2.enable = true;
-  security.polkit.enable = true;
-  security.pam.services.swaylock = { };
+  # Remove default GNOME apps (keeping loupe and file-roller)
+  environment.gnome.excludePackages = with pkgs; [
+    epiphany # GNOME Web
+    gnome-calculator
+    gnome-calendar
+    gnome-characters
+    gnome-clocks
+    gnome-connections
+    gnome-console
+    gnome-contacts
+    gnome-maps
+    gnome-music
+    gnome-weather
+    gnome-text-editor
+    simple-scan
+    totem # Videos (have VLC)
+    yelp # Help docs
+    evince # PDF viewer (using Zen Browser)
+    geary # Email
+    gnome-tour
+    gnome-font-viewer # Have font-manager
+  ];
 
   services.printing.enable = true;
 
@@ -540,11 +288,9 @@ in
     docker
     docker-compose
     flatpak
-    swaySession
     wget
     nh
   ];
-  environment.pathsToLink = [ "/share/wayland-sessions" ];
 
   programs.steam.enable = true;
   programs.nix-index-database.comma.enable = true;
diff --git a/flake.lock b/flake.lock
index 012e292..c4041eb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,50 +1,5 @@
 {
   "nodes": {
-    "agenix": {
-      "inputs": {
-        "darwin": "darwin",
-        "home-manager": "home-manager",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1770165109,
-        "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=",
-        "owner": "ryantm",
-        "repo": "agenix",
-        "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ryantm",
-        "repo": "agenix",
-        "type": "github"
-      }
-    },
-    "darwin": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1744478979,
-        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
-        "owner": "lnl7",
-        "repo": "nix-darwin",
-        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "lnl7",
-        "ref": "master",
-        "repo": "nix-darwin",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -61,21 +16,6 @@
         "type": "github"
       }
     },
-    "flake-compat_2": {
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -100,18 +40,18 @@
     "ghostty": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "home-manager": "home-manager_2",
+        "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "systems": "systems_2",
+        "systems": "systems",
         "zig": "zig",
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1777971579,
-        "narHash": "sha256-9XQugqNfZ/s1CIbws5WL5vHuEAd9ZaOaEmWVXPWUs3A=",
+        "lastModified": 1777322026,
+        "narHash": "sha256-HHHgWuBssEBMfV5hOFdFxp0WUXiwfl20NfkjU/ZNuC8=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "f9a9d33b3a40a95ba01cfbc0f89586567932a22b",
+        "rev": "6590196661f769dd8f2b3e85d6c98262c4ec5b3b",
         "type": "github"
       },
       "original": {
@@ -127,11 +67,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1777776915,
-        "narHash": "sha256-okg6j5wIwTZmdrNhB1TOxpyLtJN9/fV6qXobWGpp+Y8=",
+        "lastModified": 1776999445,
+        "narHash": "sha256-vu2S5gnSTS4aDz25mr4yCrKh9sspPVlgD5KQQVHA4AM=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "87d5c05c4432a079d3b7aaa10cda1cfe1803c18c",
+        "rev": "3beb268068d23294a26b47eab43b0a13a2a3a951",
         "type": "github"
       },
       "original": {
@@ -142,27 +82,6 @@
       }
     },
     "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1745494811,
-        "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
       "inputs": {
         "nixpkgs": [
           "ghostty",
@@ -183,18 +102,18 @@
         "type": "github"
       }
     },
-    "home-manager_3": {
+    "home-manager_2": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1778009629,
-        "narHash": "sha256-nUoQtf4Zq7DRYJrfv904hjrxjAlWVP6a1pNNFKx3FCg=",
+        "lastModified": 1777476904,
+        "narHash": "sha256-EeLoE8n4+QCbteyAsYXxhfr97RFfWL1ga0xwfL6lpKw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "00ed86e58bb6979a7921859fd1615d19382eac5c",
+        "rev": "8c8e5389e75a36bee53920de8ee24f017b3ae03e",
         "type": "github"
       },
       "original": {
@@ -203,7 +122,7 @@
         "type": "github"
       }
     },
-    "home-manager_4": {
+    "home-manager_3": {
       "inputs": {
         "nixpkgs": [
           "zen-browser",
@@ -231,11 +150,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777787189,
-        "narHash": "sha256-2KUbS/HhzWW3kkkY1+RiWj9mJ76VEXw8lBJzcCFKzfY=",
+        "lastModified": 1777181277,
+        "narHash": "sha256-yVJbd07ortDRAttDFmDV5p220aOLTHgVAx//0nW/xW8=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "2dea2b920e7127b3afa8506713f23536651de312",
+        "rev": "b8eb7acee0f7604fe1bf6a5b3dcf5254369180fa",
         "type": "github"
       },
       "original": {
@@ -246,11 +165,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1777917524,
-        "narHash": "sha256-k+LVe9YaO2BEPB9AaCtTtOMCeGi4dxDo6gt4Un3qoPY=",
+        "lastModified": 1776983936,
+        "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "df7783100babf59001340a7a874ba3824e441ecb",
+        "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61",
         "type": "github"
       },
       "original": {
@@ -290,11 +209,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1777954456,
-        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+        "lastModified": 1777268161,
+        "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+        "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
         "type": "github"
       },
       "original": {
@@ -320,22 +239,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1777954456,
-        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts",
@@ -344,11 +247,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1778079488,
-        "narHash": "sha256-U1PhEC22cJVLFnBjkQWhEqIYhSOWDeOogdxZHQrMpbo=",
+        "lastModified": 1777487505,
+        "narHash": "sha256-yQHSwgvchnCOadkqfHfhWjVydkrEygelnepvP290jSw=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "2f38e20a84d12e411e699583d263cffc9d8d8563",
+        "rev": "7d72ac6ab71033702f8d607a25a8dcbf59e9a6d0",
         "type": "github"
       },
       "original": {
@@ -362,11 +265,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1778080414,
-        "narHash": "sha256-I3tfq8Rh+RUwnmGMypnkFoprlB1E6rm/y9yEiqsNF4c=",
+        "lastModified": 1777489904,
+        "narHash": "sha256-B9OPOkakuwJyMrN3rx/E5Kq1yEIKyS4vpiSot/EGhvg=",
         "owner": "anomalyco",
         "repo": "opencode",
-        "rev": "b9b854bf9f206e5c1c85cfd15d128bb3d0966e58",
+        "rev": "293877cb7e60610b4b0c25992dbab2169c6f614e",
         "type": "github"
       },
       "original": {
@@ -378,16 +281,14 @@
     },
     "root": {
       "inputs": {
-        "agenix": "agenix",
         "ghostty": "ghostty",
         "helix": "helix",
-        "home-manager": "home-manager_3",
+        "home-manager": "home-manager_2",
         "nix-index-database": "nix-index-database",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
         "nur": "nur",
         "opencode": "opencode",
-        "t3code": "t3code",
         "zen-browser": "zen-browser"
       }
     },
@@ -413,21 +314,6 @@
       }
     },
     "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
       "flake": false,
       "locked": {
         "lastModified": 1681028828,
@@ -443,38 +329,19 @@
         "type": "github"
       }
     },
-    "t3code": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "nixpkgs": "nixpkgs_5"
-      },
-      "locked": {
-        "lastModified": 1777991278,
-        "narHash": "sha256-tM0JFurV6BwOdmBcGi96th/dzgN9KQbkK7FKmdsM5Zo=",
-        "owner": "jetpham",
-        "repo": "nix-t3code",
-        "rev": "47257aeb62d037a0550294ec17698f59c4297444",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jetpham",
-        "repo": "nix-t3code",
-        "type": "github"
-      }
-    },
     "zen-browser": {
       "inputs": {
-        "home-manager": "home-manager_4",
+        "home-manager": "home-manager_3",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1778047595,
-        "narHash": "sha256-RquiPUl5fViU+hHRjilVcy+5XUowINmvMfk2lNdIAg8=",
+        "lastModified": 1777484394,
+        "narHash": "sha256-03QK/lM/m4f1FjC4ldYtp8NobTGRdwGC24XBY6Vcdqo=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "e361aeff090333c005bc12b3bcf3c8b44d867a4f",
+        "rev": "274e039947393bc90f45b8fc6d1af23e45937af0",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d0330c8..5fa5978 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,6 @@
     opencode = {
       url = "github:anomalyco/opencode/dev";
     };
-    t3code.url = "github:jetpham/nix-t3code";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
     zen-browser = {
       url = "github:0xc000022070/zen-browser-flake";
@@ -20,10 +19,6 @@
       url = "github:nix-community/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    agenix = {
-      url = "github:ryantm/agenix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nur = {
       url = "github:nix-community/NUR";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -48,7 +43,6 @@
             nixos-hardware.nixosModules.framework-amd-ai-300-series
             home-manager.nixosModules.home-manager
             inputs.nix-index-database.nixosModules.default
-            inputs.agenix.nixosModules.default
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
@@ -89,7 +83,6 @@
         pkgs.mkShell {
           packages = [
             pkgs.nh
-            inputs.agenix.packages.x86_64-linux.default
             nhs
           ];
         };
diff --git a/home-modules/browser.nix b/home-modules/browser.nix
index 70b4834..c04df2a 100644
--- a/home-modules/browser.nix
+++ b/home-modules/browser.nix
@@ -36,47 +36,8 @@
       isDefault = true;
       settings = {
         "identity.fxaccounts.enabled" = false;
-        "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
         "ui.prefersReducedMotion" = 1;
-        "zen.theme.border-radius" = 0;
-        "zen.theme.content-element-separation" = 0;
-        "zen.view.compact.show-sidebar-and-toolbar-on-hover" = true;
       };
-      userChrome = ''
-        @-moz-document url("chrome://browser/content/browser.xhtml") {
-          @media -moz-pref("zen.view.compact.hide-toolbar") {
-            :root[zen-compact-mode="true"]:not([customizing]):not([inDOMFullscreen="true"]):not([zen-single-toolbar="true"])
-              #zen-appcontent-navbar-wrapper:not([has-popup-menu]):not([zen-compact-mode-active]) {
-              pointer-events: none !important;
-            }
-
-            :root[zen-compact-mode="true"]:not([customizing]):not([inDOMFullscreen="true"]):not([zen-single-toolbar="true"])
-              #zen-appcontent-navbar-wrapper[zen-has-hover]:not([has-popup-menu]):not([zen-compact-mode-active]) {
-              height: var(--zen-element-separation) !important;
-              overflow: clip !important;
-            }
-
-            :root[zen-compact-mode="true"]:not([customizing]):not([inDOMFullscreen="true"]):not([zen-single-toolbar="true"])
-              #zen-appcontent-navbar-wrapper[zen-has-hover]:not([has-popup-menu]):not([zen-compact-mode-active])
-              #urlbar:not([breakout-extend="true"]) {
-              opacity: 0 !important;
-              pointer-events: none !important;
-            }
-
-            :root[zen-compact-mode="true"]:not([customizing]):not([inDOMFullscreen="true"]):not([zen-single-toolbar="true"])
-              #zen-appcontent-navbar-wrapper[zen-has-hover]:not([has-popup-menu]):not([zen-compact-mode-active])
-              #zen-appcontent-navbar-container {
-              opacity: 0 !important;
-            }
-
-            :root[zen-compact-mode="true"]:not([customizing]):not([inDOMFullscreen="true"]):not([zen-single-toolbar="true"])
-              #zen-appcontent-navbar-wrapper[zen-has-hover]:not([has-popup-menu]):not([zen-compact-mode-active])
-              .titlebar-buttonbox-container {
-              max-height: 0 !important;
-            }
-          }
-        }
-      '';
       extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
         ublock-origin
         onepassword-password-manager
@@ -89,7 +50,6 @@
         pay-by-privacy
         translate-web-pages
         user-agent-string-switcher
-        wappalyzer
         copy-selected-tabs-to-clipboard
         dearrow
         violentmonkey
diff --git a/home-modules/core.nix b/home-modules/core.nix
index a2c92e2..1912a41 100644
--- a/home-modules/core.nix
+++ b/home-modules/core.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  inputs,
-  pkgs,
-  ...
-}:
+{ config, inputs, ... }:
 
 {
   imports = [ inputs.zen-browser.homeModules.default ];
@@ -13,14 +8,8 @@
   home.stateVersion = "25.05";
 
   home.sessionVariables = {
-    BROWSER = "${pkgs.xdg-utils}/bin/xdg-open";
-    GH_BROWSER = "${pkgs.xdg-utils}/bin/xdg-open";
-    GIT_BROWSER = "${pkgs.xdg-utils}/bin/xdg-open";
-    MOZ_ENABLE_WAYLAND = "1";
-    NIXOS_OZONE_WL = "1";
+    BROWSER = "zen";
     TERMINAL = "ghostty";
-    XCURSOR_SIZE = "28";
-    XCURSOR_THEME = "Adwaita";
   };
 
   xdg.userDirs = {
@@ -30,27 +19,7 @@
 
   gtk = {
     enable = true;
-    theme = {
-      name = "Adwaita-dark";
-      package = pkgs.gnome-themes-extra;
-    };
-    font = {
-      name = "Atkinson Hyperlegible Next";
-      package = pkgs.atkinson-hyperlegible-next;
-      size = 11;
-    };
+    gtk4.theme = config.gtk.theme;
     gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
-    gtk4 = {
-      theme = config.gtk.theme;
-      extraConfig.gtk-application-prefer-dark-theme = 1;
-    };
-  };
-
-  home.pointerCursor = {
-    gtk.enable = true;
-    x11.enable = true;
-    name = "Adwaita";
-    package = pkgs.adwaita-icon-theme;
-    size = 28;
   };
 }
diff --git a/home-modules/default.nix b/home-modules/default.nix
index bd8bf83..1d3394b 100644
--- a/home-modules/default.nix
+++ b/home-modules/default.nix
@@ -10,7 +10,6 @@
     ./terminal.nix
     ./browser.nix
     ./desktop.nix
-    ./sway.nix
     ./opencode.nix
   ];
 }
diff --git a/home-modules/desktop.nix b/home-modules/desktop.nix
index a4ab9e5..a96f5da 100644
--- a/home-modules/desktop.nix
+++ b/home-modules/desktop.nix
@@ -1,4 +1,30 @@
-{ homeLib, ... }:
+{
+  pkgs,
+  homeLib,
+  hostname,
+  ...
+}:
+
+let
+  autostartEntries =
+    if hostname == "framework-work" then
+      [
+        "${homeLib.zenStartup}/share/applications/zen-startup.desktop"
+        "${homeLib.ghosttyZellijStartup}/share/applications/ghostty-zellij-startup.desktop"
+        "${pkgs.slack}/share/applications/slack.desktop"
+        "${homeLib.betterbirdStartup}/share/applications/betterbird-startup.desktop"
+      ]
+    else
+      [
+        "${homeLib.zenStartup}/share/applications/zen-startup.desktop"
+        "${homeLib.ghosttyZellijStartup}/share/applications/ghostty-zellij-startup.desktop"
+        "${homeLib.signalStartup}/share/applications/signal-startup.desktop"
+        "${pkgs.slack}/share/applications/slack.desktop"
+        "${homeLib.betterbirdStartup}/share/applications/betterbird-startup.desktop"
+        "${homeLib.vesktopStartup}/share/applications/vesktop-startup.desktop"
+        "${homeLib.zulipStartup}/share/applications/zulip-startup.desktop"
+      ];
+in
 
 {
   dconf.settings = {
@@ -6,12 +32,14 @@
       clock-format = "12h";
       clock-show-weekday = true;
       color-scheme = "prefer-dark";
-      cursor-size = 28;
-      cursor-theme = "Adwaita";
-      document-font-name = "Atkinson Hyperlegible Next 11";
       enable-animations = false;
-      font-name = "Atkinson Hyperlegible Next 11";
-      monospace-font-name = "CommitMono Nerd Font 11";
+      enable-hot-corners = false;
+    };
+    "org/gnome/system/location" = {
+      enabled = true;
+    };
+    "org/gnome/settings-daemon/plugins/power" = {
+      sleep-inactive-ac-type = "nothing";
     };
     "org/gtk/gtk4/settings/file-chooser" = {
       show-hidden = true;
@@ -20,6 +48,20 @@
       clock-format = "12h";
       show-hidden = true;
     };
+    "org/gnome/desktop/peripherals/touchpad" = {
+      disable-while-typing = false;
+    };
+    "org/gnome/shell" = {
+      disable-user-extensions = false;
+      enabled-extensions = [
+        "hidetopbar@mathieu.bidon.ca"
+        "wifiqrcode@glerro.pm.me"
+        "system-monitor@paradoxxx.zero.gmail.com"
+        "clipboard-indicator@tudmotu.com"
+        "emoji-copy@felipeftn"
+        "tailscale-gnome-qs@tailscale-qs.github.io"
+      ];
+    };
   };
 
   xdg.desktopEntries.extract-here = {
@@ -43,27 +85,37 @@
     noDisplay = true;
   };
 
-  xdg.desktopEntries.betterbird = {
-    name = "Betterbird";
-    comment = "Mail, RSS and newsgroups client";
-    exec = "${homeLib.betterbirdLauncher}/bin/betterbird-profile %u";
-    icon = "betterbird";
-    terminal = false;
-    type = "Application";
-    categories = [
-      "Network"
-      "Email"
-    ];
-    mimeType = [
-      "x-scheme-handler/mailto"
-      "message/rfc822"
-      "x-scheme-handler/webcal"
-      "x-scheme-handler/webcals"
-    ];
-    settings = {
-      StartupNotify = "false";
-      StartupWMClass = "eu.betterbird.Betterbird";
+  xdg.autostart = {
+    enable = true;
+    entries = autostartEntries;
+  };
+
+  home.file.".local/share/gnome-shell/extensions/tailscale-gnome-qs@tailscale-qs.github.io" = {
+    source = "${homeLib.tailscaleQsExtension}/share/gnome-shell/extensions/tailscale-gnome-qs@tailscale-qs.github.io";
+    recursive = true;
+  };
+
+  systemd.user.services.nasa-apod-wallpaper = {
+    Unit = {
+      Description = "Fetch NASA APOD wallpaper";
+      After = [ "graphical-session.target" ];
+      PartOf = [ "graphical-session.target" ];
     };
+    Service = {
+      Type = "oneshot";
+      ExecStart = "${homeLib.nasaApodWallpaper}/bin/nasa-apod-wallpaper";
+    };
+  };
+
+  systemd.user.timers.nasa-apod-wallpaper = {
+    Unit.Description = "Refresh NASA APOD wallpaper regularly";
+    Timer = {
+      OnStartupSec = "2m";
+      OnCalendar = "hourly";
+      Persistent = true;
+      Unit = "nasa-apod-wallpaper.service";
+    };
+    Install.WantedBy = [ "timers.target" ];
   };
 
   xdg.mimeApps = {
diff --git a/home-modules/lib.nix b/home-modules/lib.nix
index be210ee..549e4f2 100644
--- a/home-modules/lib.nix
+++ b/home-modules/lib.nix
@@ -6,10 +6,27 @@
 }:
 
 let
-  sshPublicKeys = (import ../ssh-public-keys.nix).jet;
   name = "Jet";
   email = "jet@extremist.software";
   sshSigningKey = "~/.ssh/id_ed25519";
+  sshPublicKeys = [
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE40ISu3ydCqfdpb26JYD5cIN0Fu0id/FDS+xjB5zpqu jet@extremist.software"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPyic30I+SaDw0Lz/EFpMNeHCwxpwPfkgfR6uz3g7io7 jet@corp.primitive.dev"
+  ];
+  tailscaleQsExtension = pkgs.stdenvNoCC.mkDerivation {
+    pname = "tailscale-gnome-qs";
+    version = "5";
+    src = pkgs.fetchzip {
+      url = "https://github.com/tailscale-qs/tailscale-gnome-qs/archive/refs/tags/v5.tar.gz";
+      sha256 = "0b9jy8pyxvpkxf3adlwq42kii14jn5g7xyxggjzg87pb5jg4zfg2";
+    };
+    dontBuild = true;
+    installPhase = ''
+      mkdir -p "$out/share/gnome-shell/extensions"
+      cp -r "$src/tailscale-gnome-qs@tailscale-qs.github.io" \
+        "$out/share/gnome-shell/extensions/tailscale-gnome-qs@tailscale-qs.github.io"
+    '';
+  };
   wrappedOpencode = pkgs.symlinkJoin {
     name = "opencode-wrapped";
     paths = [ pkgs.opencode ];
@@ -25,7 +42,7 @@ let
     rev = "4ae5198fb82fe28d7b452796152f2b1745051c77";
     hash = "sha256-NvDd3BSVeS10kYupLxo27VlKeeHPHrxyTb8EdVqrtQw=";
   };
-  betterbird = pkgs.stdenv.mkDerivation rec {
+  betterbird = pkgs.stdenvNoCC.mkDerivation rec {
     pname = "betterbird";
     version = "140.10.0esr-bb21";
 
@@ -34,52 +51,7 @@ let
       hash = "sha256-Uh55xWn/cjoIutX2xdM/jUWw9c2As8P4fefK5KQtbQo=";
     };
 
-    nativeBuildInputs = [
-      pkgs.autoPatchelfHook
-      pkgs.makeWrapper
-      pkgs.patchelfUnstable
-      pkgs.wrapGAppsHook3
-    ];
-
-    # Mozilla binaries use relrhack, which breaks if patchelf clobbers sections.
-    patchelfFlags = [ "--no-clobber-old-sections" ];
-
-    buildInputs = with pkgs; [
-      alsa-lib
-      atk
-      cairo
-      cups
-      dbus-glib
-      gdk-pixbuf
-      glib
-      gtk3
-      libGL
-      libdrm
-      libnotify
-      libpulseaudio
-      libstartup_notification
-      libva
-      libxkbcommon
-      mesa
-      nspr
-      nss
-      pango
-      pciutils
-      udev
-      libice
-      libsm
-      libx11
-      libxcomposite
-      libxcursor
-      libxdamage
-      libxext
-      libxfixes
-      libxi
-      libxrandr
-      libxrender
-      libxt
-      libxtst
-    ];
+    nativeBuildInputs = [ pkgs.makeWrapper ];
 
     sourceRoot = ".";
 
@@ -91,9 +63,6 @@ let
 
       ln -s "$out/lib/betterbird/betterbird" "$out/bin/betterbird"
 
-      gappsWrapperArgs+=(--argv0 "$out/bin/.betterbird-wrapped")
-      gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath buildInputs}")
-
       if [ -d "$out/lib/betterbird/chrome/icons/default" ]; then
         mkdir -p "$out/share/icons/hicolor/128x128/apps"
         cp "$out/lib/betterbird/chrome/icons/default/default128.png" "$out/share/icons/hicolor/128x128/apps/betterbird.png"
@@ -110,8 +79,7 @@ let
       Icon=betterbird
       Categories=Network;Email;
       MimeType=x-scheme-handler/mailto;message/rfc822;x-scheme-handler/webcal;x-scheme-handler/webcals;
-      StartupNotify=false
-      StartupWMClass=eu.betterbird.Betterbird
+      StartupNotify=true
       EOF
 
       runHook postInstall
@@ -125,28 +93,13 @@ let
       platforms = [ "x86_64-linux" ];
     };
   };
-  betterbirdLauncher = pkgs.writeShellApplication {
-    name = "betterbird-profile";
-    text = ''
-      set -euo pipefail
-
-      profile_root="''${HOME:-${config.home.homeDirectory}}/.thunderbird"
-      profile="$profile_root/betterbird-current"
-
-      if [ -d "$profile" ]; then
-        exec ${betterbird}/bin/betterbird --profile "$profile" "$@"
-      fi
-
-      exec ${betterbird}/bin/betterbird "$@"
-    '';
-  };
   nasaApodWallpaper = pkgs.writeShellApplication {
     name = "nasa-apod-wallpaper";
     runtimeInputs = [
       pkgs.coreutils
       pkgs.curl
+      pkgs.glib
       pkgs.jq
-      pkgs.sway
     ];
     text = ''
       set -euo pipefail
@@ -154,98 +107,38 @@ let
       state_dir="${config.home.homeDirectory}/.local/state/nasa-apod"
       current_link="$state_dir/current"
       mkdir -p "$state_dir"
-
-      read_api_key_file() {
-        local key_file="$1"
-
-        if [ -r "$key_file" ]; then
-          while IFS= read -r line; do
-            case "$line" in
-              NASA_API_KEY=*)
-                api_key="''${line#NASA_API_KEY=}"
-                ;;
-            esac
-          done < "$key_file"
-        fi
-      }
-
-      api_key="''${NASA_API_KEY:-}"
-      if [ -z "$api_key" ]; then
-        read_api_key_file "''${NASA_API_KEY_FILE:-${config.home.homeDirectory}/.config/nasa-api.env}"
-      fi
-      if [ -z "$api_key" ]; then
-        api_key="DEMO_KEY"
-      fi
-
-      api_curl_args=(
+      curl_args=(
         --fail
         --silent
         --show-error
         --location
-        --connect-timeout 5
-        --max-time 20
-      )
-
-      image_curl_args=(
-        --fail
-        --silent
-        --show-error
-        --location
-        --retry 2
-        --retry-delay 5
-        --retry-max-time 120
+        --retry 30
+        --retry-all-errors
+        --retry-delay 2
         --connect-timeout 10
-        --max-time 60
+        --max-time 300
       )
 
       set_wallpaper() {
         local target="$1"
 
-        if [ -n "''${SWAYSOCK:-}" ] && [ -n "''${WAYLAND_DISPLAY:-}" ]; then
-          swaymsg output "*" bg "$target" fill >/dev/null
-        fi
+        gsettings set org.gnome.desktop.background picture-uri "file://$target"
+        gsettings set org.gnome.desktop.background picture-uri-dark "file://$target"
+        gsettings set org.gnome.desktop.background picture-options 'zoom'
       }
 
-      if [ -e "$current_link" ]; then
-        set_wallpaper "$current_link"
-      fi
-
-      today="$(date +%F)"
-      for cached in "$state_dir/apod-$today".*; do
-        if [ -s "$cached" ]; then
-          ln -sfn "$cached" "$current_link"
-          set_wallpaper "$current_link"
-          exit 0
-        fi
-      done
-
-      api_request="$(mktemp)"
-      trap 'rm -f "$api_request"' EXIT
-      {
-        printf '%s\n' 'url = "https://api.nasa.gov/planetary/apod"'
-        printf '%s\n' 'get'
-        printf 'data-urlencode = "api_key=%s"\n' "$api_key"
-        printf '%s\n' 'data-urlencode = "thumbs=True"'
-      } > "$api_request"
-      chmod 0600 "$api_request"
-
-      json="$(curl "''${api_curl_args[@]}" --config "$api_request" || true)"
+      json="$(curl "''${curl_args[@]}" 'https://api.nasa.gov/planetary/apod?api_key=DEMO_KEY' || true)"
       if [ -z "$json" ]; then
         exit 0
       fi
 
       media_type="$(printf '%s' "$json" | jq -r '.media_type // empty')"
-      case "$media_type" in
-        image)
-          image_url="$(printf '%s' "$json" | jq -r '.hdurl // .url // empty')"
-          ;;
-        video)
-          image_url="$(printf '%s' "$json" | jq -r '.thumbnail_url // empty')"
-          ;;
-        *)
-          exit 0
-          ;;
-      esac
+
+      if [ "$media_type" != "image" ]; then
+        exit 0
+      fi
+
+      image_url="$(printf '%s' "$json" | jq -r '.hdurl // .url // empty')"
       if [ -z "$image_url" ]; then
         exit 0
       fi
@@ -264,17 +157,12 @@ let
       target="$state_dir/apod-$date_stamp.$ext"
       tmp="$target.tmp"
 
-      if [ ! -s "$target" ]; then
-        if curl "''${image_curl_args[@]}" "$image_url" -o "$tmp" && [ -s "$tmp" ]; then
-          mv "$tmp" "$target"
-        else
-          rm -f "$tmp"
-        fi
-      fi
-
-      if [ -e "$target" ]; then
+      if curl "''${curl_args[@]}" "$image_url" -o "$tmp" && [ -s "$tmp" ]; then
+        mv "$tmp" "$target"
         ln -sfn "$target" "$current_link"
-        set_wallpaper "$current_link"
+        set_wallpaper "$target"
+      else
+        rm -f "$tmp"
       fi
     '';
   };
@@ -455,7 +343,7 @@ let
     name = "betterbird-startup";
     desktopName = "Betterbird Startup";
     comment = "Launch Betterbird in fullscreen";
-    exec = "${betterbirdLauncher}/bin/betterbird-profile";
+    exec = "${betterbird}/bin/betterbird";
     terminal = false;
     noDisplay = true;
     categories = [ "Network" ];
@@ -475,7 +363,6 @@ in
     inherit
       betterbirdStartup
       betterbird
-      betterbirdLauncher
       email
       ghosttyZellijStartup
       greptileSkills
@@ -484,6 +371,7 @@ in
       signalStartup
       sshPublicKeys
       sshSigningKey
+      tailscaleQsExtension
       wrappedOpencode
       zenStartup
       zellijNewTabZoxide
diff --git a/home-modules/packages.nix b/home-modules/packages.nix
index ec813b7..9f5be49 100644
--- a/home-modules/packages.nix
+++ b/home-modules/packages.nix
@@ -1,9 +1,4 @@
-{
-  inputs,
-  pkgs,
-  homeLib,
-  ...
-}:
+{ pkgs, homeLib, ... }:
 
 {
   home.packages = with pkgs; [
@@ -13,7 +8,6 @@
     codex
     ffmpeg-full
     homeLib.wrappedOpencode
-    inputs.t3code.packages.${pkgs.stdenv.hostPlatform.system}.t3code-nightly
     skills
     homeLib.zellijNewTabZoxide
     homeLib.zellijSyncTabName
@@ -61,25 +55,13 @@
     linphone
     lmstudio
     homeLib.betterbird
-    blueman
-    brightnessctl
-    cliphist
-    fuzzel
-    grim
-    mako
-    nautilus
-    networkmanagerapplet
-    nwg-displays
-    playerctl
-    polkit_gnome
-    slurp
-    swaybg
-    swayidle
-    swaylock
-    waybar
-    wl-clipboard
-    xdg-utils
 
     nerd-fonts.commit-mono
+
+    gnomeExtensions.clipboard-indicator
+    gnomeExtensions.emoji-copy
+    gnomeExtensions.hide-top-bar
+    gnomeExtensions.system-monitor-next
+    gnomeExtensions.wifi-qrcode
   ];
 }
diff --git a/home-modules/sway.nix b/home-modules/sway.nix
deleted file mode 100644
index 5692b60..0000000
--- a/home-modules/sway.nix
+++ /dev/null
@@ -1,321 +0,0 @@
-{
-  config,
-  pkgs,
-  homeLib,
-  hostname,
-  osConfig ? null,
-  ...
-}:
-
-let
-  apodSecretEnvironmentFile =
-    if
-      osConfig != null
-      && osConfig ? age
-      && osConfig.age ? secrets
-      && builtins.hasAttr "nasa-api-env" osConfig.age.secrets
-    then
-      "-${osConfig.age.secrets."nasa-api-env".path}"
-    else
-      "-%h/.config/nasa-api.env";
-  apodCurrent = "${config.home.homeDirectory}/.local/state/nasa-apod/current";
-  swayOutputs = "${config.home.homeDirectory}/.config/sway/outputs";
-  lockCommand = pkgs.writeShellScript "sway-lock-apod" ''
-    set -euo pipefail
-
-    if [ -e "${apodCurrent}" ]; then
-      exec ${pkgs.swaylock}/bin/swaylock -f -i "${apodCurrent}" -s fill --color 000000
-    fi
-
-    exec ${pkgs.swaylock}/bin/swaylock -f --color 000000
-  '';
-  screenshotCommand = pkgs.writeShellScript "sway-screenshot" ''
-    set -euo pipefail
-
-    dir="$HOME/Pictures/Screenshots"
-    ${pkgs.coreutils}/bin/mkdir -p "$dir"
-    file="$dir/screenshot-$(${pkgs.coreutils}/bin/date +%Y%m%d-%H%M%S).png"
-
-    if geometry="$(${pkgs.slurp}/bin/slurp)"; then
-      ${pkgs.grim}/bin/grim -g "$geometry" "$file"
-      ${pkgs.wl-clipboard}/bin/wl-copy < "$file"
-    fi
-  '';
-  cliphistCommand = pkgs.writeShellScript "cliphist-fuzzel" ''
-    set -euo pipefail
-
-    ${pkgs.cliphist}/bin/cliphist list | ${pkgs.fuzzel}/bin/fuzzel --dmenu | ${pkgs.cliphist}/bin/cliphist decode | ${pkgs.wl-clipboard}/bin/wl-copy
-  '';
-  commonStartup = [
-    "${homeLib.nasaApodWallpaper}/bin/nasa-apod-wallpaper"
-    "${pkgs.waybar}/bin/waybar"
-    "${pkgs.mako}/bin/mako"
-    "${pkgs.networkmanagerapplet}/bin/nm-applet --indicator"
-    "${pkgs.blueman}/bin/blueman-applet"
-    "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"
-    "${pkgs.wl-clipboard}/bin/wl-paste --type text --watch ${pkgs.cliphist}/bin/cliphist store"
-    "${pkgs.wl-clipboard}/bin/wl-paste --type image --watch ${pkgs.cliphist}/bin/cliphist store"
-    "${pkgs.swayidle}/bin/swayidle -w timeout 300 '${lockCommand}' before-sleep '${lockCommand}'"
-  ];
-  workStartup = [
-    "${config.programs.zen-browser.package}/bin/zen-beta"
-    "${pkgs.ghostty}/bin/ghostty --fullscreen=true -e ${homeLib.zellijPersistentSession}/bin/zellij-persistent-session"
-    "${pkgs.slack}/bin/slack"
-    "${homeLib.betterbirdLauncher}/bin/betterbird-profile"
-  ];
-  personalStartup = [
-    "${config.programs.zen-browser.package}/bin/zen-beta"
-    "${pkgs.ghostty}/bin/ghostty --fullscreen=true -e ${homeLib.zellijPersistentSession}/bin/zellij-persistent-session"
-    "${pkgs.vesktop}/bin/vesktop --start-fullscreen"
-    "${homeLib.betterbirdLauncher}/bin/betterbird-profile"
-    "${pkgs.signal-desktop}/bin/signal-desktop --start-fullscreen"
-    "${pkgs.zulip}/bin/zulip --start-fullscreen"
-  ];
-  appStartup = if hostname == "framework-work" then workStartup else personalStartup;
-in
-
-{
-  wayland.windowManager.sway = {
-    enable = true;
-    systemd.enable = true;
-    wrapperFeatures.gtk = true;
-    config = null;
-    extraConfig = ''
-      set $mod Mod4
-
-      exec ${pkgs.dbus}/bin/dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway SWAYSOCK
-      exec ${pkgs.systemd}/bin/systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP SWAYSOCK
-
-      default_border none
-      default_floating_border none
-      hide_edge_borders both
-      gaps inner 0
-      gaps outer 0
-      smart_gaps off
-      focus_follows_mouse no
-      seat seat0 xcursor_theme Adwaita 28
-
-      input type:touchpad {
-        tap enabled
-        natural_scroll enabled
-        dwt disabled
-      }
-
-      include ${swayOutputs}
-      output * bg #000000 solid_color
-
-      bindsym $mod+d exec ${pkgs.fuzzel}/bin/fuzzel
-      bindsym $mod+p exec ${pkgs.nwg-displays}/bin/nwg-displays
-      bindsym $mod+b exec ${pkgs.procps}/bin/pkill -SIGUSR1 waybar
-      bindsym $mod+l exec ${lockCommand}
-      bindsym $mod+Shift+e exec ${pkgs.sway}/bin/swaymsg exit
-      bindsym $mod+Shift+r reload
-      bindsym $mod+Shift+q kill
-      bindsym $mod+f fullscreen toggle
-      bindsym $mod+c exec ${cliphistCommand}
-      bindsym Print exec ${screenshotCommand}
-      bindsym Sys_Req exec ${screenshotCommand}
-      bindsym $mod+Print exec ${screenshotCommand}
-
-      bindsym $mod+h focus left
-      bindsym $mod+j focus down
-      bindsym $mod+k focus up
-      bindsym $mod+Left focus left
-      bindsym $mod+Down focus down
-      bindsym $mod+Up focus up
-      bindsym $mod+Right focus right
-
-      bindsym XF86AudioMute exec ${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-      bindsym XF86AudioLowerVolume exec ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-      bindsym XF86AudioRaiseVolume exec ${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
-      bindsym XF86AudioPlay exec ${pkgs.playerctl}/bin/playerctl play-pause
-      bindsym XF86MonBrightnessDown exec ${pkgs.brightnessctl}/bin/brightnessctl set 5%-
-      bindsym XF86MonBrightnessUp exec ${pkgs.brightnessctl}/bin/brightnessctl set 5%+
-
-      bindsym $mod+1 workspace number 1
-      bindsym $mod+2 workspace number 2
-      bindsym $mod+3 workspace number 3
-      bindsym $mod+4 workspace number 4
-      bindsym $mod+5 workspace number 5
-      bindsym $mod+6 workspace number 6
-      bindsym $mod+7 workspace number 7
-      bindsym $mod+8 workspace number 8
-      bindsym $mod+9 workspace number 9
-      bindsym $mod+0 workspace number 10
-
-      bindsym $mod+Shift+1 move container to workspace number 1
-      bindsym $mod+Shift+2 move container to workspace number 2
-      bindsym $mod+Shift+3 move container to workspace number 3
-      bindsym $mod+Shift+4 move container to workspace number 4
-      bindsym $mod+Shift+5 move container to workspace number 5
-      bindsym $mod+Shift+6 move container to workspace number 6
-      bindsym $mod+Shift+7 move container to workspace number 7
-      bindsym $mod+Shift+8 move container to workspace number 8
-      bindsym $mod+Shift+9 move container to workspace number 9
-      bindsym $mod+Shift+0 move container to workspace number 10
-
-      for_window [app_id="zen"] move to workspace number 1, fullscreen enable
-      for_window [app_id="zen-beta"] move to workspace number 1, fullscreen enable
-      for_window [class="zen-beta"] move to workspace number 1, fullscreen enable
-      for_window [app_id="com.mitchellh.ghostty"] move to workspace number 2, fullscreen enable
-      for_window [class="Slack"] move to workspace number 3, fullscreen enable
-      for_window [app_id="slack"] move to workspace number 3, fullscreen enable
-      for_window [app_id="Slack"] move to workspace number 3, fullscreen enable
-      for_window [app_id="dev.vencord.Vesktop"] move to workspace number 3, fullscreen enable
-      for_window [app_id="vesktop"] move to workspace number 3, fullscreen enable
-      for_window [class="Betterbird"] move to workspace number 4, fullscreen enable
-      for_window [class="eu.betterbird.Betterbird"] move to workspace number 4, fullscreen enable
-      for_window [app_id="betterbird"] move to workspace number 4, fullscreen enable
-      for_window [app_id="Betterbird"] move to workspace number 4, fullscreen enable
-      for_window [class="Signal"] move to workspace number 5, fullscreen enable
-      for_window [app_id="signal"] move to workspace number 5, fullscreen enable
-      for_window [app_id="signal-desktop"] move to workspace number 5, fullscreen enable
-      for_window [class="Zulip"] move to workspace number 6, fullscreen enable
-      for_window [app_id="org.zulip.Zulip"] move to workspace number 6, fullscreen enable
-
-      ${pkgs.lib.concatMapStringsSep "\n" (command: "exec ${command}") commonStartup}
-      ${pkgs.lib.concatMapStringsSep "\n" (command: "exec ${command}") appStartup}
-    '';
-  };
-
-  programs.waybar = {
-    enable = true;
-    settings.mainBar = {
-      layer = "top";
-      position = "top";
-      mode = "hide";
-      start_hidden = true;
-      modules-left = [ ];
-      modules-center = [ "clock" ];
-      modules-right = [
-        "tray"
-        "network"
-        "bluetooth"
-        "wireplumber"
-        "battery"
-      ];
-      clock = {
-        format = "{:%a %b %d  %I:%M %p}";
-        tooltip-format = "{:%Y-%m-%d}";
-      };
-      network = {
-        format-wifi = "wifi {essid}";
-        format-disconnected = "wifi disconnected";
-        tooltip-format-wifi = "{ifname}: {ipaddr}";
-      };
-      bluetooth = {
-        format = "bt on";
-        format-disabled = "bt off";
-        format-off = "bt off";
-        format-connected = "bt {device_alias}";
-      };
-      wireplumber = {
-        format = "vol {volume}%";
-        format-muted = "muted";
-      };
-      battery = {
-        format = "bat {capacity}%";
-        format-charging = "chg {capacity}%";
-        format-plugged = "ac {capacity}%";
-        states.warning = 25;
-        states.critical = 10;
-      };
-      tray.spacing = 8;
-    };
-    style = ''
-      * {
-        border: none;
-        border-radius: 0;
-        font-family: "CommitMono Nerd Font", monospace;
-        font-size: 12px;
-        min-height: 0;
-      }
-
-      window#waybar {
-        background: #0d1117;
-        color: #f0f6fc;
-      }
-
-      #clock,
-      #tray,
-      #network,
-      #bluetooth,
-      #wireplumber,
-      #battery {
-        padding: 2px 8px;
-      }
-
-      #battery.warning {
-        color: #d29922;
-      }
-
-      #battery.critical,
-      #network.disconnected,
-      #wireplumber.muted {
-        color: #f85149;
-      }
-    '';
-  };
-
-  services.mako = {
-    enable = true;
-    settings = {
-      background-color = "#0d1117";
-      text-color = "#f0f6fc";
-      border-color = "#30363d";
-      border-radius = 0;
-      default-timeout = 5000;
-    };
-  };
-
-  programs.fuzzel = {
-    enable = true;
-    settings = {
-      main = {
-        font = "CommitMono Nerd Font:size=12";
-        terminal = "ghostty";
-      };
-      colors = {
-        background = "0d1117ff";
-        text = "f0f6fcff";
-        match = "3fb950ff";
-        selection = "238636ff";
-        selection-text = "ffffffff";
-        border = "30363dff";
-      };
-      border.radius = 0;
-    };
-  };
-
-  systemd.user.services.nasa-apod-wallpaper = {
-    Unit = {
-      Description = "Fetch NASA APOD wallpaper";
-      After = [ "graphical-session.target" ];
-      PartOf = [ "graphical-session.target" ];
-    };
-    Service = {
-      Type = "oneshot";
-      ExecStart = "${homeLib.nasaApodWallpaper}/bin/nasa-apod-wallpaper";
-      EnvironmentFile = apodSecretEnvironmentFile;
-      TimeoutStartSec = "3min";
-    };
-  };
-
-  systemd.user.timers.nasa-apod-wallpaper = {
-    Unit.Description = "Refresh NASA APOD wallpaper regularly";
-    Timer = {
-      OnStartupSec = "2m";
-      OnCalendar = "hourly";
-      Persistent = true;
-      Unit = "nasa-apod-wallpaper.service";
-    };
-    Install.WantedBy = [ "timers.target" ];
-  };
-
-  home.activation.ensureSwayOutputs = config.lib.dag.entryAfter [ "writeBoundary" ] ''
-    $DRY_RUN_CMD mkdir -p ${config.home.homeDirectory}/.config/sway
-    if [ ! -e ${swayOutputs} ]; then
-      $DRY_RUN_CMD touch ${swayOutputs}
-    fi
-  '';
-}
diff --git a/home-modules/terminal.nix b/home-modules/terminal.nix
index a8aa931..4139894 100644
--- a/home-modules/terminal.nix
+++ b/home-modules/terminal.nix
@@ -76,7 +76,7 @@
     };
   };
 
-  xdg.desktopEntries."com.mitchellh.ghostty" = {
+  xdg.desktopEntries.ghostty = {
     name = "Ghostty";
     genericName = "Terminal Emulator";
     exec = "${pkgs.ghostty}/bin/ghostty --fullscreen=true -e ${homeLib.zellijPersistentSession}/bin/zellij-persistent-session";
diff --git a/secrets/nasa-api.env.age b/secrets/nasa-api.env.age
deleted file mode 100644
index 302efbe..0000000
--- a/secrets/nasa-api.env.age
+++ /dev/null
@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 Ziw7aw +DWaSJE/UkXo6jnXZMElPreAbfHtMdzd2kxTlPUMPTc
-2I0jH1tG73LcRLO6UvxSOMD3T0XKKfXjuZCXhKGypFc
--> ssh-ed25519 LB5l3A qNcgWT2QN4NSpehI2ku+2+NKLS0Q93/D3Taqjd4+mFQ
-rEKPREqfGWXoZAuYeEkR1pMtc+/0JTqaTDL+My7jnWM
---- 1dVemchD/oaHJR0aeje1CTps9NahLLivBSfvQhqPJWQ
-�#��>h9�q��s����wiM�����n�z0�o�UM���R��4d�Vp���P�k�x_
���g�"�W��Nu���
TA��n
\ No newline at end of file
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
deleted file mode 100644
index 8012825..0000000
--- a/secrets/secrets.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-let
-  sshPublicKeys = import ../ssh-public-keys.nix;
-in
-
-{
-  "secrets/nasa-api.env.age".publicKeys = sshPublicKeys.jet;
-}
diff --git a/ssh-public-keys.nix b/ssh-public-keys.nix
deleted file mode 100644
index d3f836c..0000000
--- a/ssh-public-keys.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  jet = [
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE40ISu3ydCqfdpb26JYD5cIN0Fu0id/FDS+xjB5zpqu jet@extremist.software"
-    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPyic30I+SaDw0Lz/EFpMNeHCwxpwPfkgfR6uz3g7io7 jet@corp.primitive.dev"
-  ];
-}