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
+96 -56

No files matched your search

+1
View File
@@ -7,6 +7,7 @@ devenv.local.nix
# tmp # tmp
tmp tmp
result.diff
# direnv # direnv
.direnv .direnv
Generated
+12 -12
View File
@@ -266,11 +266,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1727393223, "lastModified": 1728696962,
"narHash": "sha256-1jKdnW3CvFbz6m/neIr48XGqMY7eQYDHei9WNvQ+JLA=", "narHash": "sha256-zhLDfVImuWQgwczQ+pxdwteWPiULTwYLzJNGluwcO4A=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "89657e8162b3f453a6e1c7c0ce598cc77ab61e96", "rev": "b744a190a610460e51fd2dbd10cf2bfc42711fe8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -313,11 +313,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1727129439, "lastModified": 1728627514,
"narHash": "sha256-nPyrcFm6FSk7CxzVW4x2hu62aLDghNcv9dX6DF3dXw8=", "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "babc25a577c3310cce57c72d5bed70f4c3c3843a", "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -348,11 +348,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727231386, "lastModified": 1728613723,
"narHash": "sha256-XLloPtQHKk/Tdt8t8zIb+JhmunlH3YB9Jz8RTlQ3N/4=", "narHash": "sha256-zVVj0PKguM8ZMdLE43YW7dzer3tl9e6i5Qs1fr878+c=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "b5f76c3b09a8194889f5328a480fbea1a9115518", "rev": "ca93f28abd2147dd9997261dcaeacc5a30dba463",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -378,11 +378,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1727275485, "lastModified": 1728738154,
"narHash": "sha256-uoKC6huWVsGrv8YbepyeXgj5L80TEesa7s8S9+mDT4I=", "narHash": "sha256-BKniFdCCST/4gmDPjHgfVOOvCyVk5sp3PX+f4SKSFM0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3510b853efd22fd14062785300e171cd0867b7c8", "rev": "54cce652cb480258b12f15b2915e7a6c79ac51ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
+8 -1
View File
@@ -22,7 +22,7 @@ in
desktop = { desktop = {
enable = true; enable = true;
kde.enable = true; kde.enable = true;
cosmic.enable = false; cosmic.enable = true;
hyprland = { hyprland = {
enable = false; enable = false;
useNWG = false; useNWG = false;
@@ -30,6 +30,11 @@ in
crypto.enable = true; crypto.enable = true;
}; };
}; };
server.arrs = {
enable = false;
rootDataDir = "/mnt/terra1/Data/apps/arrs";
prowlarr.enable = true;
};
}; };
services.displayManager.defaultSession = "plasmax11"; services.displayManager.defaultSession = "plasmax11";
# Firmware updater # Firmware updater
@@ -76,6 +81,8 @@ in
# Photo Editing # Photo Editing
krita krita
gimp-with-plugins gimp-with-plugins
# Util
libusb1
# Web # Web
chromium chromium
]) ++ (with unstable; [ ]) ++ (with unstable; [
+4
View File
@@ -11,3 +11,7 @@ function restart-wifi {
function start-windows() { function start-windows() {
quickemu --vm /mnt/Data/vms/windows-11.conf --display spice --viewer remote-viewer quickemu --vm /mnt/Data/vms/windows-11.conf --display spice --viewer remote-viewer
} }
# function clean-file() {
# ${@} | grep -v '^\s*#' | grep -v '^$'
# }
+4 -16
View File
@@ -32,22 +32,10 @@ in
nwg-bar # logout window nwg-bar # logout window
]); ]);
system.userActivationScripts.hyprlandMineConfig.text = '' system.userActivationScripts.hyprlandMineConfig.text = ''
rm -f "$HOME/.config/hypr" ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/hypr" "$HOME/.config/hypr"
if [[ ! -h "$HOME/.config/hypr" ]]; then ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/waybar" "$HOME/.config/waybar"
ln -s "/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/nwg-bar" "$HOME/.config/nwg-bar"
fi ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/dunst" "$HOME/.config/dunst"
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
''; '';
}; };
} }
+1 -4
View File
@@ -17,10 +17,7 @@ in
xdotool xdotool
]; ];
system.userActivationScripts.hyprlandMineConfig.text = '' system.userActivationScripts.hyprlandMineConfig.text = ''
rm -f "$HOME/.config/libinput-gestures.conf" ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/libinput-gestures.conf" "$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
''; '';
}; };
} }
+13 -7
View File
@@ -2,22 +2,28 @@
let let
cfg = config.skyg.server.arrs; cfg = config.skyg.server.arrs;
ifAdd = cond: add: if cond then [ add ] else [ ]; ifAdd = cond: add: if cond then [ add ] else [ ];
mkEnsureUser = name: {
inherit name;
ensureDBOwnership = true;
ensureClauses.login = true;
ensureClauses.createdb = true;
};
in in
{ {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services.postgresql = { services.postgresql = {
enable = true; enable = true;
settings.port = cfg.database.port; settings.port = cfg.database.port;
dataDir = cfg.database.dataDir; dataDir = "${cfg.rootDataDir}/db";
ensureDatabases = ensureDatabases =
(ifAdd cfg.prowlarr cfg.prowlarr.user) ++ (ifAdd cfg.prowlarr.enable cfg.prowlarr.user) ++
(ifAdd cfg.radarr cfg.radarr.user) ++ (ifAdd cfg.radarr.enable cfg.radarr.user) ++
(ifAdd cfg.sonarr cfg.sonarr.user) (ifAdd cfg.sonarr.enable cfg.sonarr.user)
; ;
ensureUsers = ensureUsers =
(ifAdd cfg.prowlarr cfg.prowlarr.user) ++ (ifAdd cfg.prowlarr.enable (mkEnsureUser cfg.prowlarr.user)) ++
(ifAdd cfg.radarr cfg.radarr.user) ++ (ifAdd cfg.radarr.enable (mkEnsureUser cfg.radarr.user)) ++
(ifAdd cfg.sonarr cfg.sonarr.user) (ifAdd cfg.sonarr.enable (mkEnsureUser cfg.sonarr.user))
; ;
}; };
}; };
+8 -12
View File
@@ -2,16 +2,13 @@
let let
cfg = config.skyg.server.arrs; cfg = config.skyg.server.arrs;
dbPort = 5432; dbPort = 5432;
rootDataDir = "/var/lib/arrs";
makeConfig = { port, name, uid, gid }: { makeConfig = { port, name, uid, gid }: {
enable = lib.mkEnableOption "Enable ${name}"; enable = lib.mkEnableOption "Enable ${name}";
package = lib.mkPackageOption pkgs 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 { user = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = name; default = name;
@@ -21,11 +18,11 @@ let
default = name; default = name;
}; };
uid = lib.mkOption { uid = lib.mkOption {
type = lib.types.str; type = lib.types.number;
default = uid; default = uid;
}; };
gid = lib.mkOption { gid = lib.mkOption {
type = lib.types.str; type = lib.types.number;
default = gid; default = gid;
}; };
port = lib.mkOption { port = lib.mkOption {
@@ -46,17 +43,16 @@ in
"Enable Arr Stack Store"; "Enable Arr Stack Store";
openFirewall = lib.mkEnableOption openFirewall = lib.mkEnableOption
"Open Firewall ports for services"; "Open Firewall ports for services";
rootDataDir = lib.mkOption {
type = lib.types.str;
default = rootDataDir;
};
}; };
skyg.server.arrs.database = { skyg.server.arrs.database = {
port = lib.mkOption { port = lib.mkOption {
type = lib.types.int; type = lib.types.int;
default = dbPort; default = dbPort;
}; };
dataDir = lib.mkOption {
description = "Data folder for db";
type = lib.types.str;
default = "/var/lib/postgresql/arrs";
};
}; };
skyg.server.arrs.prowlarr = makeConfig { skyg.server.arrs.prowlarr = makeConfig {
name = "prowlarr"; name = "prowlarr";
+45 -4
View File
@@ -1,23 +1,64 @@
{ config, lib, ... }: { config, lib, pkgs, ... }:
let let
cfg = config.skyg.server.arrs.prowlarr; 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 in
{ {
config = lib.mkIf cfg.enable { 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 = { systemd.services.prowlarr = {
description = "Prowlarr"; description = "Prowlarr";
after = [ "network.target" ]; after = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
preStart = ''
ln -sfn "${dataDir}/config.xml" "${configXMLFile}"
'';
serviceConfig = { serviceConfig = {
User = cfg.user; User = cfg.user;
Group = cfg.group; Group = cfg.group;
WorkingDirectory = cfg.dataDir; WorkingDirectory = dataDir;
Type = "simple"; Type = "simple";
DynamicUser = true; DynamicUser = true;
StateDirectory = "prowlarr"; StateDirectory = "prowlarr";
ExecStart = "${lib.getExe cfg.package} -nobrowser -data=${cfg.dataDir}"; ExecStart = "${lib.getExe cfg.package} -nobrowser -data=${dataDir}";
Restart = "on-failure"; Restart = "on-failure";
}; };
environment.HOME = "/var/empty"; environment.HOME = "/var/empty";