diff --git a/home/core/cnst.nix b/home/core/cnst.nix
index d1456f7d..6fe310bf 100644
--- a/home/core/cnst.nix
+++ b/home/core/cnst.nix
@@ -1,4 +1,15 @@
 {
+  home.sessionVariables = {
+    BROWSER = "firefox";
+    EDITOR = "nvim";
+    TERM = "alacritty";
+    AMD_VULKAN_ICD = "RADV";
+    NIXOS_OZONE_WL = 1;
+    SDL_VIDEODRIVER = "wayland";
+    QT_QPA_PLATFORM = "wayland";
+    XDG_SESSION_TYPE = "wayland";
+    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+  };
   imports = [
     ./git
     ./hypr
diff --git a/home/extra/adam-pkgs/default.nix b/home/extra/adam-pkgs/default.nix
deleted file mode 100644
index b8c0e4f2..00000000
--- a/home/extra/adam-pkgs/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    # APPLICATIONS
-    alacritty
-    keepassxc
-    qbittorrent
-    ranger
-    webcord
-    calcurse
-    xfce.thunar
-
-    # UTILITY
-    wl-clipboard
-    xfce.thunar-volman
-    xfce.thunar-archive-plugin
-    gnome.file-roller
-    pamixer
-    pavucontrol
-    virt-manager
-    fastfetch
-    waybar
-    nwg-look
-    thefuck
-    gnome.adwaita-icon-theme
-
-    # NETWORK
-    wireguard-tools
-    networkmanagerapplet
-    wpa_supplicant
-
-    # SYSTEM
-    kdePackages.polkit-kde-agent-1
-    ntfs3g
-    btop
-    htop
-  ];
-}
diff --git a/home/extra/adam.nix b/home/extra/adam.nix
index 0069563a..f7eab9e4 100644
--- a/home/extra/adam.nix
+++ b/home/extra/adam.nix
@@ -34,7 +34,6 @@
     wpa_supplicant
 
     # SYSTEM
-    kdePackages.polkit-kde-agent-1
     ntfs3g
     btop
     htop
diff --git a/home/extra/cnst-pkgs/default.nix b/home/extra/cnst-pkgs/default.nix
deleted file mode 100644
index b8c0e4f2..00000000
--- a/home/extra/cnst-pkgs/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    # APPLICATIONS
-    alacritty
-    keepassxc
-    qbittorrent
-    ranger
-    webcord
-    calcurse
-    xfce.thunar
-
-    # UTILITY
-    wl-clipboard
-    xfce.thunar-volman
-    xfce.thunar-archive-plugin
-    gnome.file-roller
-    pamixer
-    pavucontrol
-    virt-manager
-    fastfetch
-    waybar
-    nwg-look
-    thefuck
-    gnome.adwaita-icon-theme
-
-    # NETWORK
-    wireguard-tools
-    networkmanagerapplet
-    wpa_supplicant
-
-    # SYSTEM
-    kdePackages.polkit-kde-agent-1
-    ntfs3g
-    btop
-    htop
-  ];
-}
diff --git a/home/extra/cnst.nix b/home/extra/cnst.nix
index 2ed7b7e6..edaad4ef 100644
--- a/home/extra/cnst.nix
+++ b/home/extra/cnst.nix
@@ -5,7 +5,6 @@
     ./neovim
     ./lutris
     ./mako
-    ./mangohud
   ];
   home.packages = with pkgs; [
     # APPLICATIONS
diff --git a/hosts/core/hyprland.nix b/hosts/core/hyprland.nix
index 447e0206..8c49ba25 100644
--- a/hosts/core/hyprland.nix
+++ b/hosts/core/hyprland.nix
@@ -1,13 +1,4 @@
 {pkgs, ...}: {
-  environment.variables = {
-    BROWSER = "firefox";
-    NIXOS_OZONE_WL = 1;
-    SDL_VIDEODRIVER = "wayland";
-    QT_QPA_PLATFORM = "wayland";
-    XDG_SESSION_TYPE = "wayland";
-    QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-  };
-
   programs.hyprland = {
     enable = true;
     package = pkgs.hyprland;
diff --git a/hosts/extra/gnome/default.nix b/hosts/extra/gnome/default.nix
new file mode 100644
index 00000000..03cf8282
--- /dev/null
+++ b/hosts/extra/gnome/default.nix
@@ -0,0 +1,10 @@
+{
+  services = {
+    xserver = {
+      desktopManager.gnome = {
+        enable = true;
+      };
+    };
+    gnome.games.enable = true;
+  };
+}
diff --git a/hosts/extra/steam/default.nix b/hosts/extra/steam/default.nix
index 42946f13..08263edd 100644
--- a/hosts/extra/steam/default.nix
+++ b/hosts/extra/steam/default.nix
@@ -1,5 +1,4 @@
 {pkgs, ...}: {
-  environment.variables.AMD_VULKAN_ICD = "RADV";
   programs = {
     steam = {
       enable = true;
@@ -19,7 +18,6 @@
             stdenv.cc.cc.lib
             libkrb5
             keyutils
-            mangohud
             SDL2
             SDL2_image
           ];
diff --git a/hosts/hardware/cnix.nix b/hosts/hardware/cnix.nix
index bacd1e27..492f0e1e 100644
--- a/hosts/hardware/cnix.nix
+++ b/hosts/hardware/cnix.nix
@@ -21,7 +21,6 @@
       enable = true;
       enable32Bit = true;
       extraPackages = with pkgs; [
-        lact
         libva
         vaapiVdpau
         libvdpau-va-gl
diff --git a/hosts/services/cnix.nix b/hosts/services/cnix.nix
index a6a57b62..ac05e86b 100644
--- a/hosts/services/cnix.nix
+++ b/hosts/services/cnix.nix
@@ -15,10 +15,10 @@
     greetd = {
       enable = true;
       settings = {
-        initial_session = {
-          command = "${pkgs.hyprland}/bin/Hyprland";
-          user = "cnst";
-        };
+        #        initial_session = {
+        #          command = "${pkgs.hyprland}/bin/Hyprland";
+        #          user = "cnst";
+        #        };
         default_session = {
           command = "${pkgs.greetd.tuigreet}/bin/tuigreet -r --remember-session";
           user = "greeter";