From 34f8e2640ff17b9377abbffbf6afc6bca3694cf4 Mon Sep 17 00:00:00 2001
From: stitchy <stitchy@stitchy.moe>
Date: Thu, 1 Aug 2024 09:44:24 +0000
Subject: [PATCH] nyadministrator

---
 config/eww/scripts/get-active-workspace | 2 +-
 config/zshrc                            | 1 +
 users/nyadmin/default.nix               | 2 +-
 users/stitchynyan/default.nix           | 4 ++++
 users/stitchynyan/home.nix              | 1 +
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/eww/scripts/get-active-workspace b/config/eww/scripts/get-active-workspace
index 7bb8fe3..6f7fc6b 100755
--- a/config/eww/scripts/get-active-workspace
+++ b/config/eww/scripts/get-active-workspace
@@ -2,5 +2,5 @@
 
 hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id'
 
-socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - |
+socat -u UNIX-CONNECT:/run/user/1000/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - |
   stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}'
diff --git a/config/zshrc b/config/zshrc
index 08c0894..3348032 100755
--- a/config/zshrc
+++ b/config/zshrc
@@ -100,6 +100,7 @@ export NOTMUCH_CONFIG=${XDG_CONFIG_HOME-~/.config}/notmuch/config
 export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
 export KDEHOME="$XDG_CONFIG_HOME"/kde
 export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle
+export GNUPGHOME=${XDG_DATA_HOME-~/.config}/gnupg
 export GPG_TTY=$(tty)
 export SDL_VIDEODRIVER=wayland
 export GOPATH="$XDG_DATA_HOME"
diff --git a/users/nyadmin/default.nix b/users/nyadmin/default.nix
index b9d96ca..3057e1a 100644
--- a/users/nyadmin/default.nix
+++ b/users/nyadmin/default.nix
@@ -6,7 +6,7 @@
    isNormalUser = true;
    shell = pkgs.zsh;
    home = "/home/nyadmin";
-   description = "Administrator~";
+   description = "nyadministrator~";
    extraGroups = [ "wheel" "kvm" "libvirt" "docker" ];
    initialHashedPassword = "$y$j9T$XguIcj/AVXsWW/MxSYAGh0$TivGAa0z8KNCli2mKTd24vtqimpadNzqMFwfbeh0p30";
    openssh.authorizedKeys.keys = [
diff --git a/users/stitchynyan/default.nix b/users/stitchynyan/default.nix
index 7dacc17..4864b00 100644
--- a/users/stitchynyan/default.nix
+++ b/users/stitchynyan/default.nix
@@ -13,6 +13,10 @@
       "steam-run"
       ];
 
+  hardware = {
+    opentabletdriver.enable = true;
+  };
+
   programs = {
     firefox.enable = true;
     hyprland.enable = true;
diff --git a/users/stitchynyan/home.nix b/users/stitchynyan/home.nix
index 076884e..8a90b2a 100644
--- a/users/stitchynyan/home.nix
+++ b/users/stitchynyan/home.nix
@@ -125,6 +125,7 @@ in
     services = {
       gpg-agent = {
         enable = true;
+        enableScDaemon = false;
         enableSshSupport = true;
         defaultCacheTtl = 34560000;
         maxCacheTtl = 34560000;