From 8115900d7c4914d4c4a876386e5585abd4bf14ab Mon Sep 17 00:00:00 2001 From: Jimbo Date: Thu, 24 Oct 2024 06:20:31 -0400 Subject: [PATCH] Enable compression, change the mpd path, disable MC server backups --- hosts/cyberspark/system/hardware/default.nix | 24 +++++++++---------- modules/system/services/pc/mpd/default.nix | 4 ++-- .../server/minecraft/common/default.nix | 4 ---- 3 files changed, 14 insertions(+), 18 deletions(-) diff --git a/hosts/cyberspark/system/hardware/default.nix b/hosts/cyberspark/system/hardware/default.nix index 3c433e6..7d60b9e 100644 --- a/hosts/cyberspark/system/hardware/default.nix +++ b/hosts/cyberspark/system/hardware/default.nix @@ -53,7 +53,7 @@ "/srv/minecraft" = { device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; fsType = "btrfs"; - options = [ "subvol=@minecraft" ]; + options = [ "subvol=@minecraft" "compress=zstd" ]; }; "/.snapshots" = { device = "/dev/disk/by-uuid/b8b7ed47-c98c-4a49-af01-b2832dde1287"; @@ -70,52 +70,52 @@ "/export/JimboNFS/Downloads" = { device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; fsType = "btrfs"; - options = [ "subvol=@downloads" ]; + options = [ "subvol=@downloads" "compress=zstd" ]; }; "/export/JimboNFS/Documents" = { device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; fsType = "btrfs"; - options = [ "subvol=@docs" ]; + options = [ "subvol=@docs" "compress=zstd" ]; }; "/export/JimboNFS/Photos" = { device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; fsType = "btrfs"; - options = [ "subvol=@photos" ]; + options = [ "subvol=@photos" "compress=zstd" ]; }; "/export/JimboNFS/Videos/Random" = { device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; fsType = "btrfs"; - options = [ "subvol=@videos-random" ]; + options = [ "subvol=@videos-random" "compress=zstd" ]; }; "/export/JimboNFS/Videos/Media" = { device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; fsType = "btrfs"; - options = [ "subvol=@videos-media" ]; + options = [ "subvol=@videos-media" "compress=zstd" ]; }; "/export/JimboNFS/Music/Synced" = { device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; fsType = "btrfs"; - options = [ "subvol=@music-synced" ]; + options = [ "subvol=@music-synced" "compress=zstd" ]; }; "/export/JimboNFS/Music/Unsynced" = { device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; fsType = "btrfs"; - options = [ "subvol=@music-unsynced" ]; + options = [ "subvol=@music-unsynced" "compress=zstd" ]; }; "/export/JimboNFS/Projects" = { device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; fsType = "btrfs"; - options = [ "subvol=@projects" ]; + options = [ "subvol=@projects" "compress=zstd" ]; }; "/export/JimboNFS/School" = { device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; fsType = "btrfs"; - options = [ "subvol=@school" ]; + options = [ "subvol=@school" "compress=zstd" ]; }; - "/export/JimboNFS/Snapshots" = { + "/export/JimboNFS/.snapshots" = { device = "/dev/disk/by-uuid/acf95700-8669-45c7-9a72-bf3215b3c325"; fsType = "btrfs"; - options = [ "subvol=@snapshots" ]; + options = [ "subvol=@snapshots" "compress=zstd" ]; }; }; diff --git a/modules/system/services/pc/mpd/default.nix b/modules/system/services/pc/mpd/default.nix index 6d866ec..e91251c 100644 --- a/modules/system/services/pc/mpd/default.nix +++ b/modules/system/services/pc/mpd/default.nix @@ -4,8 +4,8 @@ enable = true; user = "jimbo"; group = "users"; - musicDirectory = "/home/jimbo/JimboNFS/Music"; - playlistDirectory = "/home/jimbo/JimboNFS/Music/Playlists"; + musicDirectory = "/home/jimbo/JimboNFS/Music/Synced"; + playlistDirectory = "/home/jimbo/JimboNFS/Music/Synced/Playlists"; extraConfig = '' audio_output { type "pipewire" diff --git a/modules/system/services/server/minecraft/common/default.nix b/modules/system/services/server/minecraft/common/default.nix index 0e90356..a432b53 100644 --- a/modules/system/services/server/minecraft/common/default.nix +++ b/modules/system/services/server/minecraft/common/default.nix @@ -27,10 +27,6 @@ # Common plugins paperSymlinks = { - "plugins/Backuper.jar" = builtins.fetchurl { - url = "https://cdn.modrinth.com/data/7cMAqMND/versions/DqtME18V/Backuper-3.1.0.jar"; - sha256 = "0lml9mz8ky2g9iy5xb61s15biwlbxfi5w4mfamxfin2kl4w6ggq9"; - }; "plugins/BungeeGuard.jar" = builtins.fetchurl { url = "https://github.com/lucko/BungeeGuard/releases/download/v1.3.3/BungeeGuard.jar"; sha256 = "0cackavwk7kl71hn1i78hcvkdp7q81srq35nranpvysbmm8v34vk";