diff --git a/home/gnome/impl/dconf.nix b/home/gnome/impl/dconf.nix
index 4edf9c72..88a265af 100644
--- a/home/gnome/impl/dconf.nix
+++ b/home/gnome/impl/dconf.nix
@@ -58,6 +58,41 @@ in mkIf cfg.enable {
       resize-with-right-button = true;
     };
 
+    "${pd}/wm/keybindings" = {
+      move-to-workspace-1 = [ "<Shift><Super>1" ];
+      move-to-workspace-2 = [ "<Shift><Super>2" ];
+      move-to-workspace-3 = [ "<Shift><Super>3" ];
+      move-to-workspace-4 = [ "<Shift><Super>4" ];
+      switch-to-workspace-1 = [ "<Super>1" ];
+      switch-to-workspace-2 = [ "<Super>2" ];
+      switch-to-workspace-3 = [ "<Super>3" ];
+      switch-to-workspace-4 = [ "<Super>4" ];
+    };
+
+    "${ps}/keybindings" = {
+      switch-to-application-1 = [ ];
+      switch-to-application-2 = [ ];
+      switch-to-application-3 = [ ];
+      switch-to-application-4 = [ ];
+      switch-to-application-5 = [ ];
+      switch-to-application-6 = [ ];
+      switch-to-application-7 = [ ];
+      switch-to-application-8 = [ ];
+      switch-to-application-9 = [ ];
+    };
+
+    "${p}/settings-daemon/plugins/media-keys" = {
+      custom-keybindings = [
+        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
+      ];
+    };
+
+    "${p}/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
+      binding = "<Super>Return";
+      command = "kgx";
+      name = "Launch console";
+    };
+
     "${ptlp}" = {
       #default = "95894cfd-82f7-430d-af6e-84d168bc34f5";
       list = [
diff --git a/home/gnome/impl/nixos.nix b/home/gnome/impl/nixos.nix
index bd5d6ff1..41a5a517 100644
--- a/home/gnome/impl/nixos.nix
+++ b/home/gnome/impl/nixos.nix
@@ -17,10 +17,31 @@ in mkIf cfg.enable {
   hardware.pulseaudio.enable = false;
 
   environment.gnome.excludePackages = (with pkgs; [
+    snapshot
     gnome-tour
   ] ++ optionals config.global.flatpak.enable [
+    baobab
+    simple-scan
+    evince
+    file-roller
+    geary
+    loupe
+    seahorse
+    totem
+    epiphany
     gnome-calculator
+    gnome-calendar
+    gnome-connections
+    gnome-font-viewer
+    gnome-text-editor
   ]) ++ (with pkgs.gnome; [ ] ++ optionals config.global.flatpak.enable [
+    gnome-characters
+    gnome-clocks
+    gnome-contacts
+    gnome-logs
+    gnome-maps
+    gnome-music
+    gnome-weather
   ]);
 
   users.home.persist.directories = [ ".config/dconf" ];
diff --git a/home/gui/nixos.nix b/home/gui/nixos.nix
index 6b1fccd3..0e655654 100644
--- a/home/gui/nixos.nix
+++ b/home/gui/nixos.nix
@@ -30,7 +30,7 @@ in {
       dconf.enable = true;
     };
     services = mkIf gui {
-      blueman.enable = true;
+      blueman.enable = !config.global.flatpak.enable;
     };
   };
 }
diff --git a/home/util/home.nix b/home/util/home.nix
index 19d6eb0d..2c377008 100644
--- a/home/util/home.nix
+++ b/home/util/home.nix
@@ -14,14 +14,15 @@ in {
   ] ++ optionals config.passthrough.gui [
     gtk-engine-murrine
     gnome-themes-extra
-    xfce.thunar gimp
 
-    jellyfin-media-player
     mission-planner
-    betaflight-configurator
     inav-configurator
     inav-blackbox-tools
     (blhelisuite32.override { workdir = "${config.home.homeDirectory}/.blhelisuite32"; })
+  ] ++ optionals (config.passthrough.gui && !config.passthrough.flatpak.enable) [
+    xfce.thunar gimp
+    jellyfin-media-player
+    betaflight-configurator
     expresslrs-configurator
   ];
 
diff --git a/home/util/nixos.nix b/home/util/nixos.nix
index 4e55af9a..e69f027d 100644
--- a/home/util/nixos.nix
+++ b/home/util/nixos.nix
@@ -13,6 +13,8 @@ in {
     users.homeModules = [
       # this module passes util configuration to home-manager
       { passthrough.util = cfg; }
+      # this module passes flatpak configuration to home-manager
+      { passthrough.flatpak = config.global.flatpak; }
     ];
 
     programs.zsh.enable = true;