various fixes
This commit is contained in:
parent
ba2292d472
commit
731c7fc9cf
@ -23,8 +23,12 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
allowedTCPPorts = [ 47984 47989 48010 47990 ];
|
allowedTCPPorts = [
|
||||||
allowedUDPPorts = [ 47998 47999 48000 48002 48010 ];
|
47984 47989 47990 48010
|
||||||
|
];
|
||||||
|
allowedUDPPorts = [
|
||||||
|
47998 47999 48000 48002 48010
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
persist.state.homeDirectories = [ ".config/sunshine" ];
|
persist.state.homeDirectories = [ ".config/sunshine" ];
|
||||||
|
@ -4,15 +4,16 @@ let
|
|||||||
in {
|
in {
|
||||||
virtualisation.oci-containers.containers.homepage = {
|
virtualisation.oci-containers.containers.homepage = {
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
image = "ghcr.io/benphelps/homepage:latest";
|
image = "ghcr.io/benphelps/homepage:v0.6.29";
|
||||||
environment = {
|
environment = {
|
||||||
PUID = "1000";
|
PUID = "1000";
|
||||||
PGID = "100";
|
PGID = "100";
|
||||||
};
|
};
|
||||||
extraOptions = [ "--pull=newer" ];
|
|
||||||
ports = [ "127.0.0.1:3000:3000/tcp" ];
|
ports = [ "127.0.0.1:3000:3000/tcp" ];
|
||||||
volumes = [
|
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"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
@ -41,7 +41,7 @@ in {
|
|||||||
enable = true;
|
enable = true;
|
||||||
inherit rsyncSSHKeys jvmOpts;
|
inherit rsyncSSHKeys jvmOpts;
|
||||||
jvmMaxAllocation = "6144m";
|
jvmMaxAllocation = "6144m";
|
||||||
jvmInitialAllocation = "2048m";
|
jvmInitialAllocation = "6144m";
|
||||||
jvmPackage = jre17;
|
jvmPackage = jre17;
|
||||||
serverConfig = defaults // {
|
serverConfig = defaults // {
|
||||||
server-port = 25565;
|
server-port = 25565;
|
||||||
|
@ -288,9 +288,15 @@ in {
|
|||||||
extraConfig = proxySettings;
|
extraConfig = proxySettings;
|
||||||
};
|
};
|
||||||
} // default;
|
} // default;
|
||||||
"tools.ataraxiadev.com" = default // authentik {
|
# "tools.ataraxiadev.com" = default // authentik {
|
||||||
root = { proxyPass = "http://127.0.0.1:8070"; };
|
# 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" = {
|
"medusa.ataraxiadev.com" = {
|
||||||
locations."/" = {
|
locations."/" = {
|
||||||
proxyPass = "http://127.0.0.1:8180";
|
proxyPass = "http://127.0.0.1:8180";
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
with config.deviceSpecific; {
|
with config.deviceSpecific; {
|
||||||
home-manager.users.${config.mainuser}.programs.waybar = {
|
home-manager.users.${config.mainuser}.programs.waybar = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.waybar-hyprland;
|
|
||||||
settings = {
|
settings = {
|
||||||
mainBar = {
|
mainBar = {
|
||||||
layer = "top";
|
layer = "top";
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
home-manager.users.${config.mainuser} = {
|
home-manager.users.${config.mainuser} = {
|
||||||
home.sessionVariables.SHELL = "${pkgs.zsh}/bin/zsh";
|
home.sessionVariables.SHELL = "${pkgs.zsh}/bin/zsh";
|
||||||
home.file.".profile".text = ''
|
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 = {
|
programs = {
|
||||||
zsh = {
|
zsh = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user