feat: changed some deimos stuff

This commit is contained in:
Nick 2025-03-20 20:04:44 -05:00
parent 4d1a19edfd
commit 7b5dc571a0
2 changed files with 17 additions and 7 deletions

View file

@ -104,8 +104,8 @@ in
tooltip = false; tooltip = false;
format-muted = " Muted"; format-muted = " Muted";
on-click = "easyeffects"; 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-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% ; pamixer -d 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; scroll-step = 5;
format-icons = { format-icons = {
headphone = ""; headphone = "";

View file

@ -15,6 +15,8 @@ let
; ;
inherit (flake.config.services.instances) inherit (flake.config.services.instances)
samba samba
jellyfin
audiobookshelf
; ;
synologySecrets = config.sops.secrets."network/synology".path; synologySecrets = config.sops.secrets."network/synology".path;
@ -33,6 +35,11 @@ in
"samba0" "samba0"
]; ];
sambaFolders = [
audiobookshelf.name
jellyfin.name
];
synologyMounts = synologyDrive: { synologyMounts = synologyDrive: {
name = "${synology.${synologyDrive}.mount}"; name = "${synology.${synologyDrive}.mount}";
value = { value = {
@ -44,10 +51,10 @@ in
}; };
}; };
sambaMounts = sambaDrive: { sambaMounts = sambaDrive: folder: {
name = "${ceres.${sambaDrive}.mount}/${samba.paths.path1}"; name = "${ceres.${sambaDrive}.mount}/${folder}";
value = { value = {
device = "${ceres.${sambaDrive}.device}/${samba.paths.path1}"; device = "${ceres.${sambaDrive}.device}/${folder}";
fsType = "cifs"; fsType = "cifs";
options = ceres.${sambaDrive}.options ++ [ options = ceres.${sambaDrive}.options ++ [
"credentials=${ceresSecrets}" "credentials=${ceresSecrets}"
@ -66,8 +73,11 @@ in
options = deimos.boot.options; options = deimos.boot.options;
}; };
} }
// (builtins.listToAttrs (map synologyMounts synologyDrives)) # // (builtins.listToAttrs (map synologyMounts synologyDrives))
// (builtins.listToAttrs (map sambaMounts sambaDrives)); # // (builtins.listToAttrs (
# builtins.concatMap (drive: map (folder: sambaMounts drive folder) sambaFolders) sambaDrives
# ))
;
swapDevices = [ swapDevices = [
{ device = "/dev/disk/by-uuid/fa814d6b-5ba9-48e6-8581-e6b5560a5038"; } { device = "/dev/disk/by-uuid/fa814d6b-5ba9-48e6-8581-e6b5560a5038"; }