diff --git a/base.nix b/base.nix
index 4526a0b..f4bb7d6 100644
--- a/base.nix
+++ b/base.nix
@@ -12,18 +12,10 @@
     curl
     wget
     git
+    git-crypt
     tmux
     psmisc
   ];
 
   environment.variables.EDITOR = "vim";
-
-  boot.binfmt.registrations.appimage = {
-    wrapInterpreterInShell = false;
-    interpreter = "${pkgs.appimage-run}/bin/appimage-run";
-    recognitionType = "magic";
-    offset = 0;
-    mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
-    magicOrExtension = ''\x7fELF....AI\x02'';
-  };
 }
diff --git a/hosts/flynode/default.nix b/hosts/flynode/default.nix
index 555a992..7ff9cda 100644
--- a/hosts/flynode/default.nix
+++ b/hosts/flynode/default.nix
@@ -5,6 +5,7 @@
 {
   imports = [
     ./hardware-configuration.nix
+    ../../roles/laptop.nix
     ../../roles/zfs.nix
     ../../base.nix
     ../../users/root.nix
@@ -14,7 +15,7 @@
     ../../roles/nix-ld.nix
     ../../roles/tailscale.nix
     ../../roles/podman.nix
-    ../../roles/gnome.nix
+    ../../roles/mate.nix
     ../../roles/flatpak.nix
     ../../roles/games.nix
   ];
diff --git a/roles/gnome.nix b/roles/gnome.nix
index 634f2ff..5fcf467 100644
--- a/roles/gnome.nix
+++ b/roles/gnome.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 
 {
+
   imports = [
     ./gui.nix
   ];
@@ -15,6 +16,4 @@
     gnome-console
     gnome-tour
   ];
-
-  environment.systemPackages = with pkgs; [ gnome-tweaks ];
 }
diff --git a/roles/gui.nix b/roles/gui.nix
index ddec6dc..ee1f73e 100644
--- a/roles/gui.nix
+++ b/roles/gui.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 
 {
+
   imports = [
     ./pipewire.nix
     ./non-virtual.nix
diff --git a/roles/tlp.nix b/roles/laptop.nix
similarity index 100%
rename from roles/tlp.nix
rename to roles/laptop.nix
diff --git a/roles/mate.nix b/roles/mate.nix
index 11fd8d7..2e376fc 100644
--- a/roles/mate.nix
+++ b/roles/mate.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 
 {
+
   imports = [
     ./gui.nix
   ];
diff --git a/users/nolan/desktop.nix b/users/nolan/desktop.nix
index d12585b..19435b6 100644
--- a/users/nolan/desktop.nix
+++ b/users/nolan/desktop.nix
@@ -8,7 +8,6 @@
       keepassxc
       podman-desktop
       devpod
-      gjs
       unstable.fractal
       element-desktop
       discord