diff --git a/profiles/applications/sunshine.nix b/profiles/applications/sunshine.nix index 2dd0ffb..f9ce7a1 100644 --- a/profiles/applications/sunshine.nix +++ b/profiles/applications/sunshine.nix @@ -23,8 +23,12 @@ }; networking.firewall = { - allowedTCPPorts = [ 47984 47989 48010 47990 ]; - allowedUDPPorts = [ 47998 47999 48000 48002 48010 ]; + allowedTCPPorts = [ + 47984 47989 47990 48010 + ]; + allowedUDPPorts = [ + 47998 47999 48000 48002 48010 + ]; }; persist.state.homeDirectories = [ ".config/sunshine" ]; diff --git a/profiles/servers/homepage.nix b/profiles/servers/homepage.nix index 11e4609..c8b68b6 100644 --- a/profiles/servers/homepage.nix +++ b/profiles/servers/homepage.nix @@ -4,15 +4,16 @@ let in { virtualisation.oci-containers.containers.homepage = { autoStart = true; - image = "ghcr.io/benphelps/homepage:latest"; + image = "ghcr.io/benphelps/homepage:v0.6.29"; environment = { PUID = "1000"; PGID = "100"; }; - extraOptions = [ "--pull=newer" ]; ports = [ "127.0.0.1:3000:3000/tcp" ]; volumes = [ - "${nas-path}/homepage:/app/config" + "${nas-path}/homepage/config:/app/config" + "${nas-path}/homepage/icons:/app/public/icons" + "/var/run/docker.sock:/var/run/docker.sock" ]; }; } \ No newline at end of file diff --git a/profiles/servers/minecraft.nix b/profiles/servers/minecraft.nix index 739a4ca..507826c 100644 --- a/profiles/servers/minecraft.nix +++ b/profiles/servers/minecraft.nix @@ -41,7 +41,7 @@ in { enable = true; inherit rsyncSSHKeys jvmOpts; jvmMaxAllocation = "6144m"; - jvmInitialAllocation = "2048m"; + jvmInitialAllocation = "6144m"; jvmPackage = jre17; serverConfig = defaults // { server-port = 25565; diff --git a/profiles/servers/nginx.nix b/profiles/servers/nginx.nix index d2e5b3c..f365ae1 100644 --- a/profiles/servers/nginx.nix +++ b/profiles/servers/nginx.nix @@ -288,9 +288,15 @@ in { extraConfig = proxySettings; }; } // default; - "tools.ataraxiadev.com" = default // authentik { - root = { proxyPass = "http://127.0.0.1:8070"; }; - }; + # "tools.ataraxiadev.com" = default // authentik { + # root = { proxyPass = "http://127.0.0.1:8070"; }; + # }; + "tools.ataraxiadev.com" = { + locations."/" = { + proxyPass = "http://127.0.0.1:8070"; + extraConfig = proxySettings; + }; + } // default; "medusa.ataraxiadev.com" = { locations."/" = { proxyPass = "http://127.0.0.1:8180"; diff --git a/profiles/workspace/waybar/default.nix b/profiles/workspace/waybar/default.nix index f52bca8..d7bb740 100644 --- a/profiles/workspace/waybar/default.nix +++ b/profiles/workspace/waybar/default.nix @@ -2,7 +2,6 @@ with config.deviceSpecific; { home-manager.users.${config.mainuser}.programs.waybar = { enable = true; - package = pkgs.waybar-hyprland; settings = { mainBar = { layer = "top"; diff --git a/profiles/workspace/zsh/default.nix b/profiles/workspace/zsh/default.nix index d32d7fa..4289b40 100644 --- a/profiles/workspace/zsh/default.nix +++ b/profiles/workspace/zsh/default.nix @@ -5,7 +5,7 @@ home-manager.users.${config.mainuser} = { home.sessionVariables.SHELL = "${pkgs.zsh}/bin/zsh"; home.file.".profile".text = '' - . "${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh" + . "${config.home-manager.users.${config.mainuser}.home.profileDirectory}/etc/profile.d/hm-session-vars.sh" ''; programs = { zsh = {