diff --git a/home/config/default.nix b/home/config/default.nix index 6b4eb40..5551b37 100644 --- a/home/config/default.nix +++ b/home/config/default.nix @@ -40,5 +40,5 @@ in { ".parallel/will-cite".text = ""; ".ssh/config".text = ssh.text; ".Wallpaper".source = config.module.wallpaper.path; - "media/template".source = ./template; + "template".source = ./template; } diff --git a/home/xdg/default.nix b/home/xdg/default.nix index 32538ea..a990b7c 100644 --- a/home/xdg/default.nix +++ b/home/xdg/default.nix @@ -5,11 +5,11 @@ desktop = "${homeDirectory}/"; documents = "${homeDirectory}/document/"; download = "${homeDirectory}/download/"; - music = "${homeDirectory}/media/music/"; - pictures = "${homeDirectory}/media/picture/"; - publicShare = "${homeDirectory}/media/share/"; - templates = "${homeDirectory}/media/template/"; - videos = "${homeDirectory}/media/video/"; + music = "${homeDirectory}/music/"; + pictures = "${homeDirectory}/picture/"; + publicShare = "${homeDirectory}/share/"; + templates = "${homeDirectory}/template/"; + videos = "${homeDirectory}/video/"; extraConfig = { XDG_TMP_DIR = "${homeDirectory}/tmp/"; }; diff --git a/host/x86_64-linux/home/Backup.nix b/host/x86_64-linux/home/Backup.nix index f60ef0b..20f7466 100644 --- a/host/x86_64-linux/home/Backup.nix +++ b/host/x86_64-linux/home/Backup.nix @@ -13,7 +13,7 @@ path_mount="/storage/cold_1" path_backup="''${path_mount}/backup" path_container="''${path_backup}/home" - path_media="/storage/cold_1/media /storage/cold_2/media" + path_media="/storage/cold_1 /storage/cold_2" # Check if backup drive is mounted. if [ ! -f "''${path_mount}"/.mount ]; then @@ -42,7 +42,7 @@ mv ''${container} ''${path_container}/ || report "Backup : Failed to save containers!" # Backup some media. - cd ''${path_src}/media/ + cd ''${path_src} paper=$(archive paper/) mv ''${paper} ''${path_backup}/paper/ || report "Backup : Failed to save paper!" cd - diff --git a/host/x86_64-linux/home/Container.nix b/host/x86_64-linux/home/Container.nix index 4117245..88cfde7 100644 --- a/host/x86_64-linux/home/Container.nix +++ b/host/x86_64-linux/home/Container.nix @@ -40,19 +40,19 @@ interface = "enp8s0"; localAccess = "10.0.0.0/24"; media = { - anime = [ "/storage/cold_1/media/anime" "/storage/cold_2/media/anime" ]; - book = [ "/storage/hot/media/book" ]; + anime = [ "/storage/cold_1/anime" "/storage/cold_2/anime" ]; + book = [ "/storage/hot/book" ]; download = [ "/storage/hot/download" ]; - manga = [ "/storage/cold_1/media/manga" "/storage/cold_2/media/manga" ]; - movie = [ "/storage/cold_1/media/movie" "/storage/cold_2/media/movie" ]; - music = [ "/storage/cold_2/media/music" "/storage/hot/media/music" ]; - paper = [ "/storage/hot/media/paper" ]; - porn = [ "/storage/cold_2/media/porn" ]; - photo = [ "/storage/hot/container/cloud/data/data/cakee/files/media/photo" "/storage/cold_1/backup/tmp/photo" ]; - show = [ "/storage/cold_1/media/show" "/storage/cold_2/media/show" ]; - study = [ "/storage/cold_1/media/study" "/storage/cold_2/media/study" ]; - work = [ "/storage/cold_2/media/work" ]; - youtube = [ "/storage/cold_1/media/youtube" "/storage/cold_2/media/youtube" ]; + manga = [ "/storage/cold_1/manga" "/storage/cold_2/manga" ]; + movie = [ "/storage/cold_1/movie" "/storage/cold_2/movie" ]; + music = [ "/storage/cold_2/music" "/storage/hot/music" ]; + paper = [ "/storage/hot/paper" ]; + porn = [ "/storage/cold_2/porn" ]; + photo = [ "/storage/hot/container/cloud/data/data/cakee/files/photo" "/storage/cold_1/backup/tmp/photo" ]; + show = [ "/storage/cold_1/show" "/storage/cold_2/show" ]; + study = [ "/storage/cold_1/study" "/storage/cold_2/study" ]; + work = [ "/storage/cold_2/work" ]; + youtube = [ "/storage/cold_1/youtube" "/storage/cold_2/youtube" ]; }; }; } diff --git a/host/x86_64-linux/home/Photoprocess.nix b/host/x86_64-linux/home/Photoprocess.nix index 273be8d..a77b97b 100644 --- a/host/x86_64-linux/home/Photoprocess.nix +++ b/host/x86_64-linux/home/Photoprocess.nix @@ -1,6 +1,6 @@ # Takes pictures from first photo dir, processes and stores to the second one. { util, pkgs, lib, ... } @args: let - imgInput = "/storage/hot/container/cloud/data/data/cakee/files/media/photo"; + imgInput = "/storage/hot/container/cloud/data/data/cakee/files/photo"; imgOutput = "/storage/cold_1/backup/tmp/photo"; in { systemd.services.photosprocess = let diff --git a/host/x86_64-linux/home/YaMusicDownload.nix b/host/x86_64-linux/home/YaMusicDownload.nix index 0c93fab..4e23377 100644 --- a/host/x86_64-linux/home/YaMusicDownload.nix +++ b/host/x86_64-linux/home/YaMusicDownload.nix @@ -1,5 +1,5 @@ { pkgs, util, lib, __findFile, ... }: let - storage = "/storage/hot/media/music"; + storage = "/storage/hot/music"; package = import { inherit pkgs; }; pattern = "#album-artist/#year_#album/#number_#title"; in {