latest work

This commit is contained in:
ari committed 2024-10-22 09:46:41 -04:00
1 parent 587c0d7b59
commit c38597d137
9 files changed
+97 -57

No files matched your search

+4 -16
View File
@@ -32,22 +32,10 @@ in
nwg-bar # logout window
]);
system.userActivationScripts.hyprlandMineConfig.text = ''
rm -f "$HOME/.config/hypr"
if [[ ! -h "$HOME/.config/hypr" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/hypr" "$HOME/.config/hypr"
fi
rm -f "$HOME/.config/waybar"
if [[ ! -h "$HOME/.config/waybar" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/waybar" "$HOME/.config/waybar"
fi
rm -f "$HOME/.config/nwg-bar"
if [[ ! -h "$HOME/.config/nwg-bar" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/nwg-bar" "$HOME/.config/nwg-bar"
fi
rm -f "$HOME/.config/dunst"
if [[ ! -h "$HOME/.config/dunst" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/dunst" "$HOME/.config/dunst"
fi
ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/hypr" "$HOME/.config/hypr"
ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/waybar" "$HOME/.config/waybar"
ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/nwg-bar" "$HOME/.config/nwg-bar"
ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/dunst" "$HOME/.config/dunst"
'';
};
}
+1 -4
View File
@@ -17,10 +17,7 @@ in
xdotool
];
system.userActivationScripts.hyprlandMineConfig.text = ''
rm -f "$HOME/.config/libinput-gestures.conf"
if [[ ! -h "$HOME/.config/libinput-gestures.conf" ]]; then
ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/libinput-gestures.conf" "$HOME/.config/libinput-gestures.conf"
fi
ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/libinput-gestures.conf" "$HOME/.config/libinput-gestures.conf"
'';
};
}
+13 -7
View File
@@ -2,22 +2,28 @@
let
cfg = config.skyg.server.arrs;
ifAdd = cond: add: if cond then [ add ] else [ ];
mkEnsureUser = name: {
inherit name;
ensureDBOwnership = true;
ensureClauses.login = true;
ensureClauses.createdb = true;
};
in
{
config = lib.mkIf cfg.enable {
services.postgresql = {
enable = true;
settings.port = cfg.database.port;
dataDir = cfg.database.dataDir;
dataDir = "${cfg.rootDataDir}/db";
ensureDatabases =
(ifAdd cfg.prowlarr cfg.prowlarr.user) ++
(ifAdd cfg.radarr cfg.radarr.user) ++
(ifAdd cfg.sonarr cfg.sonarr.user)
(ifAdd cfg.prowlarr.enable cfg.prowlarr.user) ++
(ifAdd cfg.radarr.enable cfg.radarr.user) ++
(ifAdd cfg.sonarr.enable cfg.sonarr.user)
;
ensureUsers =
(ifAdd cfg.prowlarr cfg.prowlarr.user) ++
(ifAdd cfg.radarr cfg.radarr.user) ++
(ifAdd cfg.sonarr cfg.sonarr.user)
(ifAdd cfg.prowlarr.enable (mkEnsureUser cfg.prowlarr.user)) ++
(ifAdd cfg.radarr.enable (mkEnsureUser cfg.radarr.user)) ++
(ifAdd cfg.sonarr.enable (mkEnsureUser cfg.sonarr.user))
;
};
};
+8 -12
View File
@@ -2,16 +2,13 @@
let
cfg = config.skyg.server.arrs;
dbPort = 5432;
rootDataDir = "/var/lib/arrs";
makeConfig = { port, name, uid, gid }: {
enable = lib.mkEnableOption "Enable ${name}";
package = lib.mkPackageOption pkgs name { };
openFirewall = lib.mkEnableOption "Open port for ${name}";
dataDir = lib.mkOption {
type = lib.types.str;
default = "/var/lib/arrs/${name}";
description = "data directory for ${name}";
};
user = lib.mkOption {
type = lib.types.str;
default = name;
@@ -21,11 +18,11 @@ let
default = name;
};
uid = lib.mkOption {
type = lib.types.str;
type = lib.types.number;
default = uid;
};
gid = lib.mkOption {
type = lib.types.str;
type = lib.types.number;
default = gid;
};
port = lib.mkOption {
@@ -46,17 +43,16 @@ in
"Enable Arr Stack Store";
openFirewall = lib.mkEnableOption
"Open Firewall ports for services";
rootDataDir = lib.mkOption {
type = lib.types.str;
default = rootDataDir;
};
};
skyg.server.arrs.database = {
port = lib.mkOption {
type = lib.types.int;
default = dbPort;
};
dataDir = lib.mkOption {
description = "Data folder for db";
type = lib.types.str;
default = "/var/lib/postgresql/arrs";
};
};
skyg.server.arrs.prowlarr = makeConfig {
name = "prowlarr";
+45 -4
View File
@@ -1,23 +1,64 @@
{ config, lib, ... }:
{ config, lib, pkgs, ... }:
let
cfg = config.skyg.server.arrs.prowlarr;
dataDir = "${config.skyg.server.arrs.rootDataDir}/prowlarr";
configXMLFile = pkgs.writeTextFile {
name = "config.xml";
text = ''
<Config>
<LogLevel>info</LogLevel>
<EnableSsl>False</EnableSsl>
<Port>${toString(cfg.port)}</Port>
<UrlBase></UrlBase>
<BindAddress>*</BindAddress>
<UpdateMechanism>BuiltIn</UpdateMechanism>
<LaunchBrowser>False</LaunchBrowser>
<Branch>main</Branch>
<PostgresUser>prowlarr</PostgresUser>
<PostgresPort>${toString(config.skyg.server.arrs.database.port)}</PostgresPort>
<PostgresHost>0.0.0.0</PostgresHost>
<PostgresMainDb>prowlarr</PostgresMainDb>
<PostgresLogDb>prowlarr-log</PostgresLogDb>
<InstanceName>SkyG Prowlarr</InstanceName>
<AuthenticationMethod>External</AuthenticationMethod>
<AuthenticationRequired>Enabled</AuthenticationRequired>
</Config>
'';
};
in
{
config = lib.mkIf cfg.enable {
users.users.${cfg.user} = {
uid = cfg.uid;
isSystemUser = true;
group = cfg.group;
};
users.groups.${cfg.group} = {
gid = cfg.gid;
members = [
cfg.user
config.skyg.user.name
];
};
users.groups.www-data.members = [
cfg.user
];
systemd.services.prowlarr = {
description = "Prowlarr";
after = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
preStart = ''
ln -sfn "${dataDir}/config.xml" "${configXMLFile}"
'';
serviceConfig = {
User = cfg.user;
Group = cfg.group;
WorkingDirectory = cfg.dataDir;
WorkingDirectory = dataDir;
Type = "simple";
DynamicUser = true;
StateDirectory = "prowlarr";
ExecStart = "${lib.getExe cfg.package} -nobrowser -data=${cfg.dataDir}";
ExecStart = "${lib.getExe cfg.package} -nobrowser -data=${dataDir}";
Restart = "on-failure";
};
environment.HOME = "/var/empty";