From 8e0ec537409365bdc045b4286c84d0338adeb799 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 20 Dec 2023 14:37:08 +0000 Subject: [PATCH] feat: bump nextcloud. Had to update packages which involved setting a interface for teh default gateway --- applications/nextcloud.nix | 4 ++-- flake.lock | 10 +++++----- flake.nix | 2 +- machines/_base.nix | 5 ++++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/applications/nextcloud.nix b/applications/nextcloud.nix index c15da62..c2662a2 100644 --- a/applications/nextcloud.nix +++ b/applications/nextcloud.nix @@ -76,7 +76,7 @@ in { services.nextcloud = { enable = true; - package = pkgs.nextcloud27; + package = pkgs.nextcloud28; hostName = domain; https = true; @@ -93,7 +93,7 @@ in { appstoreEnable = true; extraApps = with config.services.nextcloud.package.packages.apps; { - inherit files_markdown files_texteditor forms groupfolders mail maps news notes onlyoffice polls; + inherit forms groupfolders mail maps notes onlyoffice polls; }; extraOptions = { diff --git a/flake.lock b/flake.lock index 641696e..28d949b 100644 --- a/flake.lock +++ b/flake.lock @@ -110,14 +110,14 @@ "lastModified": 1698519699, "narHash": "sha256-GK8NGWeG2gf3z/ktT0rzDVfj1UsaXxDLcSWCz6tsYSY=", "owner": "compsoc1%2Fcompsoc", - "repo": "presentations", + "repo": "presentations%2Fpresentations", "rev": "7f451b04c5cffda1558e58f65a53dbc89a678446", "type": "gitlab" }, "original": { "host": "gitlab.skynet.ie", "owner": "compsoc1%2Fcompsoc", - "repo": "presentations", + "repo": "presentations%2Fpresentations", "type": "gitlab" } }, @@ -532,11 +532,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1696207572, - "narHash": "sha256-w24NTSMrc7bMIQP5Y8BFsKbpYjbRh/+ptf/9gCEFrKo=", + "lastModified": 1703081463, + "narHash": "sha256-Z7bWFPVZbX3Qdb7QMbaNpuhmQGx3eKKfj4d+12WnQno=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fe0b3b663e98c85db7f08ab3a4ac318c523c0684", + "rev": "1a499bdaea0401ec0512330c712b63a8c68a3704", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9fac61a..6a1e690 100644 --- a/flake.nix +++ b/flake.nix @@ -72,7 +72,7 @@ type = "gitlab"; host = "gitlab.skynet.ie"; owner = "compsoc1%2Fcompsoc"; - repo = "presentations"; + repo = "presentations%2Fpresentations"; }; }; diff --git a/machines/_base.nix b/machines/_base.nix index 01aaf76..e52cbec 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -100,7 +100,10 @@ in { firewall.allowedTCPPorts = [22]; # explisitly stating this is good - defaultGateway = "193.1.99.65"; + defaultGateway = { + address= "193.1.99.65"; + interface = "eno1"; + }; # cannot use our own it seems? nameservers = [