From 9b760cafc15962716e2aebba8213e4d6319e08a5 Mon Sep 17 00:00:00 2001
From: xunuwu <xunuwu@gmail.com>
Date: Sun, 27 Oct 2024 14:44:58 +0100
Subject: [PATCH] more updating + fix smb secrets

---
 .sops.yaml                             |  6 +++---
 git-agecrypt.toml                      |  2 --
 hosts/machines/default.nix             |  2 +-
 hosts/machines/nixdesk/default.nix     |  1 +
 hosts/machines/nixdesk/samba-mount.nix | 15 ++++++++++-----
 pkgs/gamesand/default.nix              |  4 ++--
 6 files changed, 17 insertions(+), 13 deletions(-)
 delete mode 100644 git-agecrypt.toml

diff --git a/.sops.yaml b/.sops.yaml
index 5f13372..8933c7c 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -10,18 +10,18 @@ creation_rules:
     key_groups:
       - age:
         - *xun
-  - path_regex: profiles/secrets/global
+  - path_regex: systemProfiles/secrets/global
     key_groups:
       - age:
         - *xun
         - *nixdesk
         - *hopper
-  - path_regex: profiles/secrets/nixdesk
+  - path_regex: systemProfiles/secrets/nixdesk
     key_groups:
       - age:
         - *xun
         - *nixdesk
-  - path_regex: profiles/secrets/hopper
+  - path_regex: systemProfiles/secrets/hopper
     key_groups:
       - age:
         - *xun
diff --git a/git-agecrypt.toml b/git-agecrypt.toml
deleted file mode 100644
index 9f85c74..0000000
--- a/git-agecrypt.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-[config]
-"hosts/nixdesk/smbcreds" = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKqW5ZkBV2XCdF/ZhwC1DOfrgiLxCC2ym6BO7miHi05M xun@nixdesk"]
diff --git a/hosts/machines/default.nix b/hosts/machines/default.nix
index 52b6b73..52b0c81 100644
--- a/hosts/machines/default.nix
+++ b/hosts/machines/default.nix
@@ -109,7 +109,7 @@ in {
           # programs.gamemode # TEMP: TODO
           # programs.gamescope # TEMP: TODO
           # programs.steam # TEMP: TODO
-          programs.RE.default
+          # programs.RE.default
         ])
 
         {
diff --git a/hosts/machines/nixdesk/default.nix b/hosts/machines/nixdesk/default.nix
index 3a85001..335c889 100644
--- a/hosts/machines/nixdesk/default.nix
+++ b/hosts/machines/nixdesk/default.nix
@@ -25,6 +25,7 @@
       builtins.elem (lib.getName pkg) [
         "steam"
         "steam-original"
+        "steam-unwrapped"
         "apple_cursor" # bwuh this is NOT unfree!!
       ];
   };
diff --git a/hosts/machines/nixdesk/samba-mount.nix b/hosts/machines/nixdesk/samba-mount.nix
index e547861..e246c11 100644
--- a/hosts/machines/nixdesk/samba-mount.nix
+++ b/hosts/machines/nixdesk/samba-mount.nix
@@ -1,32 +1,37 @@
-{config, ...}: {
+{
+  config,
+  pkgs,
+  ...
+}: {
+  environment.systemPackages = [pkgs.cifs-utils];
   systemd.mounts = [
     {
       description = "smb hopper transmission download directory";
       what = "//192.168.50.97/transmission"; # hopper local ip
       where = "/server/transmission";
       type = "cifs";
-      options = builtins.readFile ./smbcreds;
+      options = "uid=xun,gid=users,credentials=${config.sops.secrets.samba.path}";
     }
     {
       description = "smb hopper vault";
       what = "//192.168.50.97/vault"; # hopper local ip
       where = "/server/vault";
       type = "cifs";
-      options = "uid=xun,gid=users," + (builtins.readFile ./smbcreds);
+      options = "uid=xun,gid=users,credentials=${config.sops.secrets.samba.path}";
     }
     {
       description = "smb hopper library";
       what = "//192.168.50.97/library"; # hopper local ip
       where = "/server/library";
       type = "cifs";
-      options = "uid=xun,gid=users," + (builtins.readFile ./smbcreds);
+      options = "uid=xun,gid=users,credentials=${config.sops.secrets.samba.path},vers=3.0";
     }
     {
       description = "smb hopper slskd files";
       what = "//192.168.50.97/slskd"; # hopper local ip
       where = "/server/slskd";
       type = "cifs";
-      options = "uid=xun,gid=users," + (builtins.readFile ./smbcreds);
+      options = "uid=xun,gid=users,credentials=${config.sops.secrets.samba.path}";
     }
   ];
 
diff --git a/pkgs/gamesand/default.nix b/pkgs/gamesand/default.nix
index 3268a66..9058dcc 100644
--- a/pkgs/gamesand/default.nix
+++ b/pkgs/gamesand/default.nix
@@ -1,11 +1,11 @@
 {
-  steamPackages,
+  steam-fhsenv-without-steam,
   symlinkJoin,
 }:
 symlinkJoin {
   name = "gamesand";
   paths = [
-    (steamPackages.steam-fhsenv-without-steam.override
+    (steam-fhsenv-without-steam.override
       {
         extraBwrapArgs = [
           "--ro-bind ./files /game/files"