From a249babe177fdae35b07f3d9e58b6526155eceaa Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 4 Jan 2025 19:57:33 +0100 Subject: [PATCH] move music to Freon --- hosts/nixos/noximilien/configuration.nix | 2 +- profiles/http/services/navidrome.nix | 14 +++++++------- profiles/http/services/polaris.nix | 14 +++++++------- profiles/mounts/freon-nfs.nix | 8 ++++++++ profiles/mounts/reidun-nfs.nix | 19 ------------------- 5 files changed, 23 insertions(+), 34 deletions(-) diff --git a/hosts/nixos/noximilien/configuration.nix b/hosts/nixos/noximilien/configuration.nix index 34ccefe..5b126f5 100644 --- a/hosts/nixos/noximilien/configuration.nix +++ b/hosts/nixos/noximilien/configuration.nix @@ -46,7 +46,7 @@ #../../../profiles/http/services/microbin.nix # TODO: move out of home net #../../../profiles/http/services/owncast.nix #../../../profiles/http/services/paperless.nix - ../../../profiles/http/services/polaris.nix + /* ../../../profiles/http/services/polaris.nix */ #../../../profiles/http/services/resilio.nix ../../../profiles/http/services/roundcube.nix #../../../profiles/http/services/snappymail.nix # WIP diff --git a/profiles/http/services/navidrome.nix b/profiles/http/services/navidrome.nix index 7517794..5b79c3c 100644 --- a/profiles/http/services/navidrome.nix +++ b/profiles/http/services/navidrome.nix @@ -11,14 +11,14 @@ lib.mkIf (!config.virtualisation.isVmVariant) enable = true; settings = { # default hostname:port = "127.0.0.1:4533" - MusicFolder = "/mnt/reidun/Music/Albums"; + MusicFolder = "/mnt/freon/Music/Albums"; #MusicFolder = pkgs.linkFarm "navidrome-music-library" [ - # { name = "Albums"; path = "/mnt/reidun/Music/Albums"; } - # { name = "OST"; path = "/mnt/reidun/Music/OST"; } - # { name = "dojin.co"; path = "/mnt/reidun/Music/dojin.co"; } - # { name = "Touhou"; path = "/mnt/reidun/Music/Touhou"; } - # { name = "Kancolle"; path = "/mnt/reidun/Music/Kancolle"; } - # { name = "Vocaloid"; path = "/mnt/reidun/Music/Vocaloid"; } + # { name = "Albums"; path = "/mnt/freon/Music/Albums"; } + # { name = "OST"; path = "/mnt/freon/Music/OST"; } + # { name = "dojin.co"; path = "/mnt/freon/Music/dojin.co"; } + # { name = "Touhou"; path = "/mnt/freon/Music/Touhou"; } + # { name = "Kancolle"; path = "/mnt/freon/Music/Kancolle"; } + # { name = "Vocaloid"; path = "/mnt/freon/Music/Vocaloid"; } #]; UIWelcomeMessage = "Spis meg"; diff --git a/profiles/http/services/polaris.nix b/profiles/http/services/polaris.nix index 44409d0..c5793d8 100644 --- a/profiles/http/services/polaris.nix +++ b/profiles/http/services/polaris.nix @@ -18,13 +18,13 @@ "([Cc]over|COVER|[Ff]older|FOLDER|[Ff]ront|FRONT)\.(jpeg|JPEG|jpg|JPG|png|PNG|bmp|BMP|gif|GIF)"; #"(?i)(cover|folder|front)\.(jpeg|jpg|png|bmp|gif)"; mount_dirs = lib.mkIf (!config.virtualisation.isVmVariant) [ - { name = "Albums"; source = "/mnt/reidun/Music/Albums"; } - { name = "dojin.co"; source = "/mnt/reidun/Music/dojin.co"; } - { name = "Vocaloid"; source = "/mnt/reidun/Music/Vocaloid"; } - { name = "Touhou"; source = "/mnt/reidun/Music/Touhou"; } - { name = "OST"; source = "/mnt/reidun/Music/OST"; } - { name = "Kancolle"; source = "/mnt/reidun/Music/Kancolle"; } - { name = "Downloads"; source = "/mnt/reidun/Downloads/music"; } + { name = "Albums"; source = "/mnt/freon/Music/Albums"; } + { name = "dojin.co"; source = "/mnt/freon/Music/dojin.co"; } + { name = "Vocaloid"; source = "/mnt/freon/Music/Vocaloid"; } + { name = "Touhou"; source = "/mnt/freon/Music/Touhou"; } + { name = "OST"; source = "/mnt/freon/Music/OST"; } + { name = "Kancolle"; source = "/mnt/freon/Music/Kancolle"; } + { name = "Downloads"; source = "/mnt/freon/Downloads/music"; } ]; }; }; diff --git a/profiles/mounts/freon-nfs.nix b/profiles/mounts/freon-nfs.nix index 6d65417..c67a045 100644 --- a/profiles/mounts/freon-nfs.nix +++ b/profiles/mounts/freon-nfs.nix @@ -26,6 +26,14 @@ lib.mkIf (!config.virtualisation.isVmVariant) "/ISO" "/Games" "/Images" + "/Music" + "/Music/Albums" + "/Music/Kancolle" + "/Music/OST" + "/Music/Old" + "/Music/Touhou" + "/Music/Vocaloid" + "/Music/dojin.co" ]); } diff --git a/profiles/mounts/reidun-nfs.nix b/profiles/mounts/reidun-nfs.nix index c158018..f26bbec 100644 --- a/profiles/mounts/reidun-nfs.nix +++ b/profiles/mounts/reidun-nfs.nix @@ -22,27 +22,8 @@ lib.mkIf (!config.virtualisation.isVmVariant) # TODO: space in dirname is not supported in joinSets (map (mkMount "/mnt/reidun" "192.168.1.3:/Reidun/shared") [ "" - #"/Backups" #"/Comics" "/Downloads" - #"/Games" - #"/Games/Installable" - #"/Games/Portable" - #"/Games/ROMs" - #"/ISO" - #"/Images" - #"/Images/Collections" - #"/Images/Memes" - #"/Images/Pictures" - #"/Images/Wallpapers" - "/Music" - "/Music/Albums" - "/Music/Kancolle" - "/Music/OST" - "/Music/Old" - "/Music/Touhou" - "/Music/Vocaloid" - "/Music/dojin.co" "/Various" "/Various/Zotero" "/Various/resilio"