diff --git a/modules/hosts/laptop/laptop.nix b/modules/hosts/laptop/laptop.nix index fc3420f..653ab16 100644 --- a/modules/hosts/laptop/laptop.nix +++ b/modules/hosts/laptop/laptop.nix @@ -26,6 +26,7 @@ catppuccin #librewolf nixcord + janitor ]; nixos = { diff --git a/modules/software/janitor-backend.nix b/modules/software/janitor-backend.nix index f4adb54..900c01f 100644 --- a/modules/software/janitor-backend.nix +++ b/modules/software/janitor-backend.nix @@ -1,4 +1,4 @@ -{ den, ... }: { +{ den.aspects.janitor-backend = { nixos = { pkgs, lib, config, ... }: let @@ -186,4 +186,4 @@ }; }; }; -} \ No newline at end of file +} diff --git a/modules/software/janitor.nix b/modules/software/janitor.nix index 03e8eb5..73bc3bf 100644 --- a/modules/software/janitor.nix +++ b/modules/software/janitor.nix @@ -5,17 +5,21 @@ nixos = { services.janitor = { enable = true; - interval = "5min"; + interval = "1min"; gracePeriod = 60; watchedDirs = [ "~/Downloads" ]; + rules = { "Pictures/Downloads" = [ "jpg" "jpeg" "png" "gif" "webp" "svg" "heic" "avif" "ico" ]; "Videos/Downloads" = [ "mp4" "mkv" "mov" "webm" "avi" "flv" ]; "Music/Downloads" = [ "mp3" "flac" "wav" "ogg" "m4a" "opus" ]; - "Documents/Downloads" = [ "pdf" "doc" "docx" "odt" "txt" "md" "epub" "ppt" "pptx" "xls" "xlsx" "csv" "iso" "zip" "tar" "gz" "bz2" "xz" "rar" "7z" ]; + "Documents/Downloads" = [ "pdf" "doc" "docx" "odt" "txt" "md" "epub" "ppt" "pptx" "xls" "xlsx" "csv" ]; + "Archives/Downloads" = [ "iso" "zip" "tar" "gz" "bz2" "xz" "rar" "7z" ]; "Fonts/Downloads" = [ "ttf" "otf" "woff" "woff2" ]; "3D/Downloads" = [ "blend" "obj" "fbx" "stl" "dae" "3ds" "3mf" ]; - # "Scripts/Downloads" = [ "sh" "py" "deb" "rpm" "appimage" "run" "jar" "exe" "msi" "lua" ]; + "Software/Downloads" = [ "deb" "rpm" "appimage" "jar" "exe" "msi" "flatpak" ]; + "Scripts/Downloads" = [ "sh" "py" "lua" ]; + "Games/Doom" = [ "wad" "pk3" ]; "Games/Switch" = [ "nsp" "xci" ]; "Games/3DS" = [ "3ds" "cia" ];