diff --git a/hosts/chmura/discord-autodelete.nix b/hosts/chmura/discord-autodelete.nix index f118d07..4348d59 100644 --- a/hosts/chmura/discord-autodelete.nix +++ b/hosts/chmura/discord-autodelete.nix @@ -34,8 +34,8 @@ in { environment.systemPackages = with pkgs; [ dbus ]; systemd.tmpfiles.rules = [ - "d /var/lib/${service-name} 0700 ${service-name} ${builtins.toString gid}" - "d /var/lib/${service-name}/data 0700 ${service-name} ${builtins.toString gid}" + "d /var/lib/${service-name} 0700 ${service-name} ${toString gid}" + "d /var/lib/${service-name}/data 0700 ${service-name} ${toString gid}" ]; systemd.services."${config.virtualisation.oci-containers.backend}-${service-name}".serviceConfig = { diff --git a/hosts/chmura/forgejo.nix b/hosts/chmura/forgejo.nix index a889824..8e3e7dd 100644 --- a/hosts/chmura/forgejo.nix +++ b/hosts/chmura/forgejo.nix @@ -15,12 +15,12 @@ APP_NAME = "fuck it we code"; }; - server = { + server = rec { DOMAIN = "git.jacekpoz.pl"; HTTP_PORT = 1849; PROTOCOL = "http"; SSH_PORT = 8236; - ROOT_URL = "${config.services.forgejo.settings.server.PROTOCOL}://${config.services.forgejo.settings.server.DOMAIN}/"; + ROOT_URL = "${PROTOCOL}://${DOMAIN}/"; }; }; }; @@ -28,7 +28,7 @@ services.caddy = { enable = true; virtualHosts."git.jacekpoz.pl".extraConfig = '' - reverse_proxy * localhost:1849 + reverse_proxy * localhost:${toString config.services.forgejo.settings.server.HTTP_PORT} ''; }; } diff --git a/hosts/chmura/owncast.nix b/hosts/chmura/owncast.nix index 1fb89b6..a2553cf 100644 --- a/hosts/chmura/owncast.nix +++ b/hosts/chmura/owncast.nix @@ -11,7 +11,7 @@ enable = true; virtualHosts."live.jacekpoz.pl".extraConfig = '' encode gzip - reverse_proxy 127.0.0.1:9842 + reverse_proxy ${config.services.owncast.listen}:${toString config.services.owncast.port} ''; }; diff --git a/modules/gui/hyprland.nix b/modules/gui/hyprland.nix index 3ddf704..9370abf 100644 --- a/modules/gui/hyprland.nix +++ b/modules/gui/hyprland.nix @@ -10,7 +10,7 @@ hmCfg = config.home-manager.users.${username}; osuCfg = config.myOptions.programs.osu; - isAmdGpuPresent = builtins.elem "amdgpu" config.boot.initrd.kernelModules; + isAmdGpuPresent = elem "amdgpu" config.boot.initrd.kernelModules; inherit (inputs.nixpkgs-wayland.packages.${pkgs.system}) foot wl-clipboard swww wlsunset swaylock; inherit (inputs.anyrun.packages.${pkgs.system}) anyrun;