diff --git a/home/qenya/firefox.nix b/home/qenya/firefox.nix
index 66b202d..23642f8 100644
--- a/home/qenya/firefox.nix
+++ b/home/qenya/firefox.nix
@@ -2,9 +2,10 @@
 
 let
   inherit (lib) mkIf;
+  isGraphical = osConfig.services.xserver.enable;
 in
 {
-  programs.firefox = lib.mkIf osConfig.qenya.base-graphical.enable {
+  programs.firefox = lib.mkIf isGraphical {
     enable = true;
 
     # coming in 24.11
diff --git a/home/qenya/packages.nix b/home/qenya/packages.nix
index 97d7442..785ce1c 100644
--- a/home/qenya/packages.nix
+++ b/home/qenya/packages.nix
@@ -2,6 +2,7 @@
 
 let
   inherit (lib) optionals;
+  isGraphical = osConfig.services.xserver.enable;
 in
 {
   home.packages = with pkgs; [
@@ -12,7 +13,7 @@ in
     fortune
     cowsay
     lolcat
-  ] ++ optionals osConfig.qenya.base-graphical.enable [
+  ] ++ optionals isGraphical [
     bitwarden
     discord
     feishin
diff --git a/home/qenya/vscode.nix b/home/qenya/vscode.nix
index 6a09189..764fc8f 100644
--- a/home/qenya/vscode.nix
+++ b/home/qenya/vscode.nix
@@ -2,9 +2,10 @@
 
 let
   inherit (lib) mkIf;
+  isGraphical = osConfig.services.xserver.enable;
 in
 {
-  programs.vscode = mkIf osConfig.qenya.base-graphical.enable {
+  programs.vscode = mkIf isGraphical {
     enable = true;
     enableExtensionUpdateCheck = false;
     enableUpdateCheck = false;