From e5f3027ce633b73b14548dc400f82704ec2b0c71 Mon Sep 17 00:00:00 2001
From: cnst <adamhilmersson@gmail.com>
Date: Sun, 4 Aug 2024 15:31:21 +0200
Subject: [PATCH] changes

---
 home/profiles/cnst/default.nix            | 1 +
 home/profiles/toothpick/default.nix       | 1 +
 hosts/default.nix                         | 2 +-
 system/etc/xserver/amd/hhkbse/default.nix | 7 ++++---
 system/opt/gaming.nix                     | 3 ---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/home/profiles/cnst/default.nix b/home/profiles/cnst/default.nix
index 4454834b..33d2fb80 100644
--- a/home/profiles/cnst/default.nix
+++ b/home/profiles/cnst/default.nix
@@ -31,6 +31,7 @@
       EDITOR = "nvim";
       TERM = "foot";
 
+      STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/cnst/.steam/root/compatibilitytools.d"; # proton and steam compat
       QT_QPA_PLATFORM = "wayland";
       SDL_VIDEODRIVER = "wayland";
       XDG_SESSION_TYPE = "wayland";
diff --git a/home/profiles/toothpick/default.nix b/home/profiles/toothpick/default.nix
index 31d347ad..23b99163 100644
--- a/home/profiles/toothpick/default.nix
+++ b/home/profiles/toothpick/default.nix
@@ -31,6 +31,7 @@
       EDITOR = "nvim";
       TERM = "foot";
 
+      STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/toothpick/.steam/root/compatibilitytools.d"; # proton and steam compat
       QT_QPA_PLATFORM = "wayland-egl";
       SDL_VIDEODRIVER = "wayland";
       XDG_SESSION_TYPE = "wayland";
diff --git a/hosts/default.nix b/hosts/default.nix
index d8ad2729..f9f9e982 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -27,7 +27,7 @@
           "${mod}/etc/graphics/amd"
           "${mod}/etc/logitech"
           "${mod}/etc/network/cnix"
-          "${mod}/etc/xserver/amd"
+          "${mod}/etc/xserver/amd/hhkbse"
           "${mod}/nix/nh/cnix"
           {
             home-manager = {
diff --git a/system/etc/xserver/amd/hhkbse/default.nix b/system/etc/xserver/amd/hhkbse/default.nix
index 29c2106e..67b9f701 100644
--- a/system/etc/xserver/amd/hhkbse/default.nix
+++ b/system/etc/xserver/amd/hhkbse/default.nix
@@ -1,4 +1,6 @@
-{
+{self, ...}: let
+  path = "${self}/hosts/cnix/xkb/symbols";
+in {
   services.xserver = {
     enable = true;
     videoDrivers = ["amdgpu"];
@@ -6,10 +8,9 @@
       extraLayouts.hhkbse = {
         description = "HHKBse by cnst";
         languages = ["se"];
-        symbolsFile = /home/cnst/.nix-config/hosts/cnix/xkb/symbols/hhkbse;
+        symbolsFile = "${path}/hhkbse";
       };
       layout = "hhkbse";
-      # dir = "/home/cnst/.nix-config/nixos/xkb";
       variant = "";
       options = "lv3:rwin_switch";
     };
diff --git a/system/opt/gaming.nix b/system/opt/gaming.nix
index 514a3b93..3534b6e3 100644
--- a/system/opt/gaming.nix
+++ b/system/opt/gaming.nix
@@ -13,8 +13,5 @@
       protonup
       winetricks
     ];
-    sessionVariables = {
-      STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/cnst/.steam/root/compatibilitytools.d";
-    };
   };
 }