diff --git a/hosts/cnix/default.nix b/hosts/cnix/default.nix
index 7158e014..f16cc39f 100644
--- a/hosts/cnix/default.nix
+++ b/hosts/cnix/default.nix
@@ -34,6 +34,8 @@ in {
     ../extra/nix-ld
     ../extra/workstation
     ../extra/gamemode
+    ../extra/gamescope
+    ../extra/bottles
     ../services/cnix.nix
     ../services/pipewire.nix
     ../hardware/cnix.nix
diff --git a/hosts/core/default.nix b/hosts/core/default.nix
index f7555354..7ab26d06 100644
--- a/hosts/core/default.nix
+++ b/hosts/core/default.nix
@@ -11,6 +11,7 @@
     ./zsh.nix
     ./cnix-pkgs.nix
     ./fonts.nix
+    ./hyprland.nix
   ];
   home-manager = {
     # useGlobalPkgs = true;
@@ -31,32 +32,34 @@
 
   environment = {
     localBinInPath = true;
-    systemPackages = [
+    systemPackages = with pkgs; [
       # Core
-      pkgs.git
-      pkgs.sbctl
-      pkgs.niv
+      git
+      sbctl
+      niv
+      nix-output-monitor
+      nvd
 
       # Util
-      pkgs.stow
-      pkgs.wget
-      pkgs.curl
-      pkgs.ripgrep
-      pkgs.python312Packages.oauth2
-      pkgs.python312Packages.httplib2
-      pkgs.killall
-      pkgs.tree-sitter
-      pkgs.lazygit
-      pkgs.tmux
-      pkgs.tmuxifier
-      pkgs.unzip
-      pkgs.p7zip
-      pkgs.unrar
-      pkgs.xdg-utils
-      pkgs.xdg-user-dirs
-      pkgs.udiskie
-      pkgs.wlroots
-      pkgs.fzf
+      stow
+      wget
+      curl
+      ripgrep
+      python312Packages.oauth2
+      python312Packages.httplib2
+      killall
+      tree-sitter
+      lazygit
+      tmux
+      tmuxifier
+      unzip
+      p7zip
+      unrar
+      xdg-utils
+      xdg-user-dirs
+      udiskie
+      wlroots
+      fzf
     ];
   };
 }
diff --git a/hosts/core/hyprland.nix b/hosts/core/hyprland.nix
index e3696d90..787c5b86 100644
--- a/hosts/core/hyprland.nix
+++ b/hosts/core/hyprland.nix
@@ -3,13 +3,6 @@
     enable = true;
     package = pkgs.hyprland;
     xwayland.enable = true;
-    systemd = {
-      enable = true;
-      extraCommands = [
-        "systemctl --user stop graphical-session.target"
-        "systemctl --user start hyprland-session.target"
-      ];
-    };
   };
   environment.sessionVariables = {
     NIXOS_OZONE_WL = "1";
diff --git a/hosts/extra/bottles/default.nix b/hosts/extra/bottles/default.nix
new file mode 100644
index 00000000..c0ec8f1e
--- /dev/null
+++ b/hosts/extra/bottles/default.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.systemPackages = [pkgs.bottles-unwrapped];
+}