diff --git a/.gitignore b/.gitignore index 126bc38..763f675 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ devenv.local.nix # tmp tmp +result.diff # direnv .direnv diff --git a/flake.lock b/flake.lock index 307a00d..5c56328 100644 --- a/flake.lock +++ b/flake.lock @@ -266,11 +266,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727393223, - "narHash": "sha256-1jKdnW3CvFbz6m/neIr48XGqMY7eQYDHei9WNvQ+JLA=", + "lastModified": 1728696962, + "narHash": "sha256-zhLDfVImuWQgwczQ+pxdwteWPiULTwYLzJNGluwcO4A=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "89657e8162b3f453a6e1c7c0ce598cc77ab61e96", + "rev": "b744a190a610460e51fd2dbd10cf2bfc42711fe8", "type": "github" }, "original": { @@ -313,11 +313,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1727129439, - "narHash": "sha256-nPyrcFm6FSk7CxzVW4x2hu62aLDghNcv9dX6DF3dXw8=", + "lastModified": 1728627514, + "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "babc25a577c3310cce57c72d5bed70f4c3c3843a", + "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7", "type": "github" }, "original": { @@ -348,11 +348,11 @@ ] }, "locked": { - "lastModified": 1727231386, - "narHash": "sha256-XLloPtQHKk/Tdt8t8zIb+JhmunlH3YB9Jz8RTlQ3N/4=", + "lastModified": 1728613723, + "narHash": "sha256-zVVj0PKguM8ZMdLE43YW7dzer3tl9e6i5Qs1fr878+c=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "b5f76c3b09a8194889f5328a480fbea1a9115518", + "rev": "ca93f28abd2147dd9997261dcaeacc5a30dba463", "type": "github" }, "original": { @@ -378,11 +378,11 @@ }, "unstable": { "locked": { - "lastModified": 1727275485, - "narHash": "sha256-uoKC6huWVsGrv8YbepyeXgj5L80TEesa7s8S9+mDT4I=", + "lastModified": 1728738154, + "narHash": "sha256-BKniFdCCST/4gmDPjHgfVOOvCyVk5sp3PX+f4SKSFM0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3510b853efd22fd14062785300e171cd0867b7c8", + "rev": "54cce652cb480258b12f15b2915e7a6c79ac51ae", "type": "github" }, "original": { diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 8c77254..18038d3 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -22,7 +22,7 @@ in desktop = { enable = true; kde.enable = true; - cosmic.enable = false; + cosmic.enable = true; hyprland = { enable = false; useNWG = false; @@ -30,6 +30,11 @@ in crypto.enable = true; }; }; + server.arrs = { + enable = false; + rootDataDir = "/mnt/terra1/Data/apps/arrs"; + prowlarr.enable = true; + }; }; services.displayManager.defaultSession = "plasmax11"; # Firmware updater @@ -76,6 +81,8 @@ in # Photo Editing krita gimp-with-plugins + # Util + libusb1 # Web chromium ]) ++ (with unstable; [ diff --git a/hosts/scripts/fwbook/functions.sh b/hosts/scripts/fwbook/functions.sh index 807123f..b92845b 100755 --- a/hosts/scripts/fwbook/functions.sh +++ b/hosts/scripts/fwbook/functions.sh @@ -10,4 +10,8 @@ function restart-wifi { function start-windows() { quickemu --vm /mnt/Data/vms/windows-11.conf --display spice --viewer remote-viewer -} \ No newline at end of file +} + +# function clean-file() { +# ${@} | grep -v '^\s*#' | grep -v '^$' +# } \ No newline at end of file diff --git a/modules/nixos/desktop/hyprland/mine.nix b/modules/nixos/desktop/hyprland/mine.nix index 14d65ea..c307f02 100644 --- a/modules/nixos/desktop/hyprland/mine.nix +++ b/modules/nixos/desktop/hyprland/mine.nix @@ -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" ''; }; } diff --git a/modules/nixos/desktop/x11.nix b/modules/nixos/desktop/x11.nix index d92e51b..731d797 100644 --- a/modules/nixos/desktop/x11.nix +++ b/modules/nixos/desktop/x11.nix @@ -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" ''; }; } diff --git a/modules/nixos/server/arrs/db.nix b/modules/nixos/server/arrs/db.nix index ae334e1..b87c6f0 100644 --- a/modules/nixos/server/arrs/db.nix +++ b/modules/nixos/server/arrs/db.nix @@ -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)) ; }; }; diff --git a/modules/nixos/server/arrs/default.nix b/modules/nixos/server/arrs/default.nix index 5aa13ae..2098788 100644 --- a/modules/nixos/server/arrs/default.nix +++ b/modules/nixos/server/arrs/default.nix @@ -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"; diff --git a/modules/nixos/server/arrs/prowlarr.nix b/modules/nixos/server/arrs/prowlarr.nix index fcac8b2..f92706a 100644 --- a/modules/nixos/server/arrs/prowlarr.nix +++ b/modules/nixos/server/arrs/prowlarr.nix @@ -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 = '' + + info + False + ${toString(cfg.port)} + + * + BuiltIn + False + main + prowlarr + ${toString(config.skyg.server.arrs.database.port)} + 0.0.0.0 + prowlarr + prowlarr-log + SkyG Prowlarr + External + Enabled + + ''; + }; 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";