From 7b5dc571a0a63f41e3d56998ed01108646c66f28 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Thu, 20 Mar 2025 20:04:44 -0500
Subject: [PATCH] feat: changed some deimos stuff

---
 .../wayland/waybar/config/settings.nix        |  4 ++--
 systems/deimos/config/filesystem.nix          | 20 ++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/modules/home/gui/desktop/wayland/waybar/config/settings.nix b/modules/home/gui/desktop/wayland/waybar/config/settings.nix
index fa44ac3..b94427d 100755
--- a/modules/home/gui/desktop/wayland/waybar/config/settings.nix
+++ b/modules/home/gui/desktop/wayland/waybar/config/settings.nix
@@ -104,8 +104,8 @@ in
       tooltip = false;
       format-muted = " Muted";
       on-click = "easyeffects";
-      on-scroll-up = "pactl set-sink-volume alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink +5% ; pamixer -i 5";
-      on-scroll-down = "pactl set-sink-volume alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink -5% ; pamixer -d 5";
+      on-scroll-up = "pactl set-sink-volume alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink +5% ; pactl set-sink-volume @DEFAULT_SINK@ 5%";
+      on-scroll-down = "pactl set-sink-volume alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink -5% ; pactl set-sink-volume @DEFAULT_SINK@ -5%";
       scroll-step = 5;
       format-icons = {
         headphone = "";
diff --git a/systems/deimos/config/filesystem.nix b/systems/deimos/config/filesystem.nix
index ea1e09f..59ed284 100755
--- a/systems/deimos/config/filesystem.nix
+++ b/systems/deimos/config/filesystem.nix
@@ -15,6 +15,8 @@ let
     ;
   inherit (flake.config.services.instances)
     samba
+    jellyfin
+    audiobookshelf
     ;
 
   synologySecrets = config.sops.secrets."network/synology".path;
@@ -33,6 +35,11 @@ in
         "samba0"
       ];
 
+      sambaFolders = [
+        audiobookshelf.name
+        jellyfin.name
+      ];
+
       synologyMounts = synologyDrive: {
         name = "${synology.${synologyDrive}.mount}";
         value = {
@@ -44,10 +51,10 @@ in
         };
       };
 
-      sambaMounts = sambaDrive: {
-        name = "${ceres.${sambaDrive}.mount}/${samba.paths.path1}";
+      sambaMounts = sambaDrive: folder: {
+        name = "${ceres.${sambaDrive}.mount}/${folder}";
         value = {
-          device = "${ceres.${sambaDrive}.device}/${samba.paths.path1}";
+          device = "${ceres.${sambaDrive}.device}/${folder}";
           fsType = "cifs";
           options = ceres.${sambaDrive}.options ++ [
             "credentials=${ceresSecrets}"
@@ -66,8 +73,11 @@ in
         options = deimos.boot.options;
       };
     }
-    // (builtins.listToAttrs (map synologyMounts synologyDrives))
-    // (builtins.listToAttrs (map sambaMounts sambaDrives));
+  # // (builtins.listToAttrs (map synologyMounts synologyDrives))
+  # // (builtins.listToAttrs (
+  #   builtins.concatMap (drive: map (folder: sambaMounts drive folder) sambaFolders) sambaDrives
+  # ))
+  ;
 
   swapDevices = [
     { device = "/dev/disk/by-uuid/fa814d6b-5ba9-48e6-8581-e6b5560a5038"; }