diff --git a/home/default.nix b/home/default.nix index 19e86175..fcdee7d0 100644 --- a/home/default.nix +++ b/home/default.nix @@ -32,10 +32,7 @@ home = { username = device.user; - homeDirectory = - if device.isDarwin - then lib.mkForce "/Users/${device.user}" - else lib.mkForce "/home/${device.user}"; + homeDirectory = device.home; file = { ".config/fish/themes".source = pkgs.catppuccinThemes.fish + "/themes"; diff --git a/nixos/mirai/services/games/satisfactory.nix b/nixos/mirai/services/games/satisfactory.nix index bf109e81..de078117 100644 --- a/nixos/mirai/services/games/satisfactory.nix +++ b/nixos/mirai/services/games/satisfactory.nix @@ -3,7 +3,8 @@ ../../../../modules/nixos/satisfactory.nix ]; services.satisfactory = { - enable = true; + # enable = true; + enable = false; maxPlayers = 4; }; } diff --git a/nixos/mirai/services/gitea.nix b/nixos/mirai/services/gitea.nix index 7f340961..639a160d 100644 --- a/nixos/mirai/services/gitea.nix +++ b/nixos/mirai/services/gitea.nix @@ -143,33 +143,33 @@ }; }; - systemd.services.gitea-oauth-setup = let - name = "authelia"; - gitea_oauth_script = pkgs.writeShellApplication { - name = "gitea_oauth2_script"; - runtimeInputs = [config.services.gitea.package]; - text = '' - gitea admin auth delete --id "$(gitea admin auth list | grep "${name}" | cut -d "$(printf '\t')" -f1)" - gitea admin auth add-oauth --provider=openidConnect --name=${name} --key="$CLIENT_ID" --secret="$CLIENT_SECRET" --auto-discover-url=https://auth.darksailor.dev/.well-known/openid-configuration --scopes='openid email profile' - ''; - }; - in { - description = "Configure Gitea OAuth with Authelia"; - after = ["gitea.service"]; - wants = ["gitea.service"]; - wantedBy = ["multi-user.target"]; - serviceConfig = { - Type = "oneshot"; - User = config.services.gitea.user; - Group = config.services.gitea.group; - RemainAfterExit = true; - ExecStart = "${lib.getExe gitea_oauth_script}"; - WorkingDirectory = config.services.gitea.stateDir; - EnvironmentFile = config.sops.templates."GITEA_OAUTH_SETUP.env".path; - }; - environment = { - GITEA_WORK_DIR = config.services.gitea.stateDir; - GITEA_CUSTOM = config.services.gitea.customDir; - }; - }; + # systemd.services.gitea-oauth-setup = let + # name = "authelia"; + # gitea_oauth_script = pkgs.writeShellApplication { + # name = "gitea_oauth2_script"; + # runtimeInputs = [config.services.gitea.package]; + # text = '' + # gitea admin auth delete --id "$(gitea admin auth list | grep "${name}" | cut -d "$(printf '\t')" -f1)" + # gitea admin auth add-oauth --provider=openidConnect --name=${name} --key="$CLIENT_ID" --secret="$CLIENT_SECRET" --auto-discover-url=https://auth.darksailor.dev/.well-known/openid-configuration --scopes='openid email profile' + # ''; + # }; + # in { + # description = "Configure Gitea OAuth with Authelia"; + # after = ["gitea.service"]; + # wants = ["gitea.service"]; + # wantedBy = ["multi-user.target"]; + # serviceConfig = { + # Type = "oneshot"; + # User = config.services.gitea.user; + # Group = config.services.gitea.group; + # RemainAfterExit = true; + # ExecStart = "${lib.getExe gitea_oauth_script}"; + # WorkingDirectory = config.services.gitea.stateDir; + # EnvironmentFile = config.sops.templates."GITEA_OAUTH_SETUP.env".path; + # }; + # environment = { + # GITEA_WORK_DIR = config.services.gitea.stateDir; + # GITEA_CUSTOM = config.services.gitea.customDir; + # }; + # }; }