diff --git a/flake.lock b/flake.lock index cd8356c..ee044d5 100644 --- a/flake.lock +++ b/flake.lock @@ -370,11 +370,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1734206930, - "narHash": "sha256-ejmbFHBqv3LizAZX2IALcgQtjjcrvCMmN8UHx/fqnaQ=", + "lastModified": 1734214493, + "narHash": "sha256-7oT9U7TlrCIj6wcn91/09EZoqC1P6CZ76m4fTphFltc=", "ref": "refs/heads/master", - "rev": "c12e26ae7dad1a1ef5ea08f42ab03b9586af22e3", - "revCount": 36, + "rev": "171821bc9b5e370888e893ce5057af7d0cf2fabf", + "revCount": 37, "type": "git", "url": "ssh://git@gitlab.com/CaptainJawZ/scripts-flake.git" }, diff --git a/modules/scripts/ffmpeg4discord.nix b/modules/scripts/ffmpeg4discord.nix index b24de0a..7e16814 100644 --- a/modules/scripts/ffmpeg4discord.nix +++ b/modules/scripts/ffmpeg4discord.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ inputs, lib, ... }: { imports = [ ./base.nix ]; config.my.scripts.ffmpeg4discord = { @@ -6,6 +6,6 @@ install = true; service = false; name = "ffmpeg4discord"; - package = pkgs.writeScriptBin "ffmpeg4discord" (builtins.readFile ../../scripts/ffmpeg4discord.py); + package = inputs.jawz-scripts.packages.x86_64-linux.ffmpeg4discord; }; } diff --git a/modules/scripts/ffmpreg.nix b/modules/scripts/ffmpreg.nix index dfd5578..021ae1a 100644 --- a/modules/scripts/ffmpreg.nix +++ b/modules/scripts/ffmpreg.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ inputs, lib, ... }: { imports = [ ./base.nix ]; config.my.scripts.ffmpreg = { @@ -6,6 +6,6 @@ install = true; service = false; name = "ffmpreg"; - package = pkgs.writeScriptBin "ffmpreg" (builtins.readFile ../../scripts/ffmpreg.sh); + package = inputs.jawz-scripts.packages.x86_64-linux.ffmpreg; }; } diff --git a/modules/scripts/find-dup-episode.nix b/modules/scripts/find-dup-episode.nix index af981f7..cfb721b 100644 --- a/modules/scripts/find-dup-episode.nix +++ b/modules/scripts/find-dup-episode.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ inputs, lib, ... }: { imports = [ ./base.nix ]; config.my.scripts.find-dup-episodes = { @@ -6,8 +6,6 @@ install = true; service = false; name = "find-dup-episodes"; - package = pkgs.writeScriptBin "find-dup-episodes" ( - builtins.readFile ../../scripts/find-dup-episodes.sh - ); + package = inputs.jawz-scripts.packages.x86_64-linux.find-dup-episodes; }; } diff --git a/modules/scripts/library-report.nix b/modules/scripts/library-report.nix index bd5296e..efdfbd8 100644 --- a/modules/scripts/library-report.nix +++ b/modules/scripts/library-report.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ inputs, lib, ... }: { imports = [ ./base.nix ]; config.my.scripts.library-report = { @@ -6,6 +6,6 @@ install = true; service = false; name = "library-report"; - package = pkgs.writeScriptBin "library-report" (builtins.readFile ../../scripts/library-report.sh); + package = inputs.jawz-scripts.packages.x86_64-linux.library-report; }; } diff --git a/modules/scripts/manage-library.nix b/modules/scripts/manage-library.nix index 59793ae..d3ce2e9 100644 --- a/modules/scripts/manage-library.nix +++ b/modules/scripts/manage-library.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ inputs, lib, ... }: { imports = [ ./base.nix ]; config.my.scripts.manage-library = { @@ -8,6 +8,6 @@ name = "manage-library"; timer = "00:30"; description = "scans the library directory and sorts files"; - package = pkgs.writeScriptBin "manage-library" (builtins.readFile ../../scripts/manage-library.sh); + package = inputs.jawz-scripts.packages.x86_64-linux.manage-library; }; } diff --git a/modules/scripts/pika-list.nix b/modules/scripts/pika-list.nix index 2c69f45..df6dbbd 100644 --- a/modules/scripts/pika-list.nix +++ b/modules/scripts/pika-list.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ inputs, lib, ... }: { imports = [ ./base.nix ]; config.my.scripts.pika-list = { @@ -6,6 +6,6 @@ install = true; service = false; name = "pika-list"; - package = pkgs.writeScriptBin "pika-list" (builtins.readFile ../../scripts/pika-list.sh); + package = inputs.jawz-scripts.packages.x86_64-linux.pika-list; }; } diff --git a/modules/scripts/run.nix b/modules/scripts/run.nix index 4d951dc..fd171e1 100644 --- a/modules/scripts/run.nix +++ b/modules/scripts/run.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ inputs, lib, ... }: { imports = [ ./base.nix ]; config.my.scripts.run = { @@ -6,6 +6,6 @@ install = true; service = false; name = "run"; - package = pkgs.writeScriptBin "run" (builtins.readFile ../../scripts/run.sh); + package = inputs.jawz-scripts.packages.x86_64-linux.run; }; } diff --git a/modules/scripts/split-dir.nix b/modules/scripts/split-dir.nix index 7190edc..c21c423 100644 --- a/modules/scripts/split-dir.nix +++ b/modules/scripts/split-dir.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, ... }: +{ inputs, lib, ... }: { imports = [ ./base.nix ]; config.my.scripts.split-dir = { @@ -6,6 +6,6 @@ install = true; service = false; name = "split-dir"; - package = pkgs.writeScriptBin "split-dir" (builtins.readFile ../../scripts/split-dir.sh); + package = inputs.jawz-scripts.packages.x86_64-linux.split-dir; }; } diff --git a/modules/scripts/stream-dl.nix b/modules/scripts/stream-dl.nix index a63a9ef..75b4c1f 100644 --- a/modules/scripts/stream-dl.nix +++ b/modules/scripts/stream-dl.nix @@ -1,4 +1,5 @@ { + inputs, pkgs, lib, config, @@ -9,7 +10,7 @@ options.my.units.stream-dl.enable = lib.mkEnableOption "enable"; config = let - stream-dl = pkgs.writeScriptBin "stream-dl" (builtins.readFile ../../scripts/stream-dl.sh); + stream-dl = inputs.jawz-scripts.packages.x86_64-linux.stream-dl; in { systemd.user = lib.mkIf config.my.units.stream-dl.enable { diff --git a/modules/scripts/update-dns.nix b/modules/scripts/update-dns.nix index 7385b75..4bb3f90 100644 --- a/modules/scripts/update-dns.nix +++ b/modules/scripts/update-dns.nix @@ -1,4 +1,5 @@ { + inputs, config, pkgs, lib, @@ -35,7 +36,7 @@ description = "Updates the IP of all my domains"; package = let - update-dns = pkgs.writeScriptBin "update-dns" (builtins.readFile ../../scripts/update-dns.sh); + update-dns = inputs.jawz-scripts.packages.x86_64-linux.update-dns; in pkgs.writeScriptBin "update-dns" '' #!/usr/bin/env nix-shell diff --git a/modules/servers/jellyfin.nix b/modules/servers/jellyfin.nix index 88f31c0..fedfc1a 100644 --- a/modules/servers/jellyfin.nix +++ b/modules/servers/jellyfin.nix @@ -1,4 +1,5 @@ { + inputs, lib, config, pkgs, @@ -6,7 +7,7 @@ }: let cfg = config.my.servers.jellyfin; - sub-sync = pkgs.writeScriptBin "sub-sync" (builtins.readFile ../../scripts/sub-sync.sh); + sub-sync = inputs.jawz-scripts.packages.x86_64-linux.sub-sync; sub-sync-path = [ pkgs.nix pkgs.bash diff --git a/modules/servers/nextcloud.nix b/modules/servers/nextcloud.nix index 8516b94..7fb3586 100644 --- a/modules/servers/nextcloud.nix +++ b/modules/servers/nextcloud.nix @@ -1,4 +1,5 @@ { + inputs, lib, config, pkgs, @@ -260,9 +261,7 @@ in nextcloud-cron.path = [ pkgs.perl ]; nextcloud-cronjob = let - nextcloud-cronjob = pkgs.writeScriptBin "nextcloud-cronjob" ( - builtins.readFile ../../scripts/nextcloud-cronjob.sh - ); + nextcloud-cronjob = inputs.jawz-scripts.packages.x86_64-linux.nextcloud-cronjob.sh; in { description = "Runs various nextcloud-related cronjobs"; diff --git a/modules/servers/plex-discord-bot.nix b/modules/servers/plex-discord-bot.nix new file mode 100644 index 0000000..7151931 --- /dev/null +++ b/modules/servers/plex-discord-bot.nix @@ -0,0 +1,22 @@ +{ lib, config, ... }: +let + cfg = config.my.servers.plex-discord-bot; + setup = import ./setup.nix { inherit lib config; }; + name = "plex-discord-bot"; +in +{ + options.my.servers.plex-discord-bot = setup.mkOptions name name 0; + config = { + virtualisation.oci-containers.containers.plex-discord-bot = lib.mkIf cfg.enable { + image = "ghcr.io/phin05/discord-rich-presence-plex:latest"; + environment = { + DRPP_UID = toString config.users.users.jawz.uid; + DRPP_GID = toString config.users.groups.users.gid; + }; + volumes = [ + "${config.my.containerData}/drpp:/app/data" + "/run/user/${toString config.users.users.jawz.uid}:/run/app" + ]; + }; + }; +}