From bbc18de5afc7e3d91b55b70ab9e278a8ce3409a0 Mon Sep 17 00:00:00 2001 From: Andre Date: Thu, 22 Aug 2024 16:26:30 -0400 Subject: [PATCH] Dimaga: install Gnome Services: Fix Forgejo runner communication --- flake.lock | 12 ++++++------ hosts/Dimaga/default.nix | 3 +++ hosts/Dimaga/start-services.sh | 3 +-- modules/services/forgejo.nix | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 502c056..0b10caf 100644 --- a/flake.lock +++ b/flake.lock @@ -297,11 +297,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1723991338, - "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", + "lastModified": 1724224976, + "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a3354191c0d7144db9756a74755672387b702ba", + "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", "type": "github" }, "original": { @@ -313,11 +313,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1724098845, - "narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=", + "lastModified": 1724242322, + "narHash": "sha256-HMpK7hNjhEk4z5SFg5UtxEio9OWFocHdaQzCfW1pE7w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f1bad50880bae73ff2d82fafc22010b4fc097a9c", + "rev": "224042e9a3039291f22f4f2ded12af95a616cca0", "type": "github" }, "original": { diff --git a/hosts/Dimaga/default.nix b/hosts/Dimaga/default.nix index 529dccf..10fff7f 100644 --- a/hosts/Dimaga/default.nix +++ b/hosts/Dimaga/default.nix @@ -222,6 +222,9 @@ in }; }; + # Install Gnome + ui.desktops.gnome.enable = true; + users.aires = { enable = true; services = { diff --git a/hosts/Dimaga/start-services.sh b/hosts/Dimaga/start-services.sh index 992b139..e75b1d2 100644 --- a/hosts/Dimaga/start-services.sh +++ b/hosts/Dimaga/start-services.sh @@ -18,8 +18,7 @@ else fi echo "Starting services..." -systemctl restart duplicacy-web.service -systemctl restart airsonic.service forgejo.service jellyfin.service +systemctl restart duplicacy-web.service forgejo.service jellyfin.service systemctl --machine aires@.host --user start syncthing.service systemctl restart nginx.service echo "Services started. $(hostname) is ready to go!" diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index 28299df..9175a3d 100644 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -87,7 +87,7 @@ in instances.default = { enable = true; name = config.networking.hostName; - url = cfg.url; + url = "https://${cfg.url}"; token = cfg.actions.token; labels = [ "nix:docker://nixos/nix" # Shoutout to Icewind 1991 for this syntax: https://icewind.nl/entry/gitea-actions-nix/