From b9aaa45d56dc2370ba1f2cdf0f91e080df28e0eb Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Mon, 18 Sep 2023 17:09:25 +0200 Subject: [PATCH] upgrade --- flake.lock | 90 +++++++++++++++---------------- nixos/machines/robi/nextcloud.nix | 6 +++ 2 files changed, 51 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index b6bfaf4..9bc1ed3 100644 --- a/flake.lock +++ b/flake.lock @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1694069327, - "narHash": "sha256-Si2otUNjCe8kY5nsV7tILi4PsI0odBFrdSu8cCjn/eQ=", + "lastModified": 1694763556, + "narHash": "sha256-csMoysn8NrVAaPuhAB64nRd4CeH+yXEdFcYf04vFfw0=", "owner": "nix-community", "repo": "disko", - "rev": "7bee8de8e6755506c70323b864a884f9624cc23a", + "rev": "8aa6ec5ff220f1d9749d636dbeb46ec929f112dc", "type": "github" }, "original": { @@ -129,11 +129,11 @@ "ws-butler": "ws-butler" }, "locked": { - "lastModified": 1689075996, - "narHash": "sha256-NwBzz2CHNtT0oDqAGewByQ5OFnAWf+ewHUrK0F44xZk=", + "lastModified": 1694741217, + "narHash": "sha256-PsyQbRMvc/+5QXS5eahj6aS9xkp+eyOWO3nQ0uzqR/Y=", "owner": "nix-community", "repo": "nix-doom-emacs", - "rev": "9a5b34d9ba30842eb8f0d7deb08bf03a75930471", + "rev": "e0c972b33eb6715d4a59b7de656008609f8d77bd", "type": "github" }, "original": { @@ -178,11 +178,11 @@ "emacs-overlay_2": { "flake": false, "locked": { - "lastModified": 1694145944, - "narHash": "sha256-TVotu2rG6ie63qc4FeZIYk4VNP0X/Q1WFRbHFA09b3w=", + "lastModified": 1694801846, + "narHash": "sha256-+mYOCAuqDR4+4lPLiwGSN8fYhvmNyfUBbWpDHnBWGtM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6c391a705bdcbbe43c4b17bf7732d7e4cbbe77b1", + "rev": "90182afcb4fdb564a653959a8a2d818714e115fb", "type": "github" }, "original": { @@ -361,11 +361,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -479,11 +479,11 @@ ] }, "locked": { - "lastModified": 1693208669, - "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=", + "lastModified": 1694465129, + "narHash": "sha256-8BQiuobMrCfCbGM7w6Snx+OBYdtTIm0+cGVaKwQ5BFg=", "owner": "nix-community", "repo": "home-manager", - "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c", + "rev": "9787dffff5d315c9593d3f9fb0f9bf2097e1b57b", "type": "github" }, "original": { @@ -579,11 +579,11 @@ "nix-straight": { "flake": false, "locked": { - "lastModified": 1666982610, - "narHash": "sha256-xjgIrmUsekVTE+MpZb5DMU8DQf9DJ/ZiR0o30L9/XCc=", + "lastModified": 1694361489, + "narHash": "sha256-kjDp+j6OtrmqbtjQB5uuOtjS08+kgJQuxFqhWE1Y9Rw=", "owner": "nix-community", "repo": "nix-straight.el", - "rev": "ad10364d64f472c904115fd38d194efe1c3f1226", + "rev": "748be99b84be0b130e946288099806a0f16d6e57", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1693718952, - "narHash": "sha256-+nGdJlgTk0MPN7NygopipmyylVuAVi7OItIwTlwtGnw=", + "lastModified": 1694710316, + "narHash": "sha256-uRh46iIC86D8BD1wCDA5gRrt+hslUXiD0kx/UjnjBcs=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "793de77d9f83418b428e8ba70d1e42c6507d0d35", + "rev": "570256327eb6ca6f7bebe8d93af49459092a0c43", "type": "github" }, "original": { @@ -649,11 +649,11 @@ ] }, "locked": { - "lastModified": 1687333264, - "narHash": "sha256-tSfLls1bg2oelCQky8QCgpniFDH2OTG/2NycpBkNJKE=", + "lastModified": 1694529264, + "narHash": "sha256-DEKAFsrXoxdmaFDmmQ5HseeWyfJHcfut0ZBkcHfWCTo=", "owner": "nix-community", "repo": "nixpkgs-fmt", - "rev": "6d2dee8954cc4e790dede82ddff2aeac4a32da46", + "rev": "45460f512b0a7ae85b4123f2f58fe311f5724397", "type": "github" }, "original": { @@ -728,11 +728,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1693985761, - "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", + "lastModified": 1694669921, + "narHash": "sha256-6ESpJ6FsftHV96JO/zn6je07tyV2dlLR7SdLsmkegTY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", + "rev": "f2ea252d23ebc9a5336bf6a61e0644921f64e67c", "type": "github" }, "original": { @@ -775,11 +775,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1694048570, - "narHash": "sha256-PEQptwFCVaJ+jLFJgrZll2shQ9VI/7xVhrCYkJo8iIw=", + "lastModified": 1694753796, + "narHash": "sha256-QPE7dqcicQH/nq9aywVXJWWtci4FvxHaM+BSIEbGBvA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4f77ea639305f1de0a14d9d41eef83313360638c", + "rev": "360a7d31c30abefdc490d203f80e3221b7a24af2", "type": "github" }, "original": { @@ -870,11 +870,11 @@ "org": { "flake": false, "locked": { - "lastModified": 1683136293, - "narHash": "sha256-PMHNr3Qo62uqO5IUDAfxUoqa4Zvb9y2J76pRYDB/6Y4=", + "lastModified": 1694696773, + "narHash": "sha256-lgrfqX5YCRXZSyLHyRpYIQf+DOpHswPm7Vcw3WUCRAk=", "owner": "emacs-straight", "repo": "org-mode", - "rev": "080710797ad25e76c4556d2b03cc0aa5313cd187", + "rev": "765a84ea252fd7f281340c40fdc97f696f8cac33", "type": "github" }, "original": { @@ -988,11 +988,11 @@ }, "retiolum": { "locked": { - "lastModified": 1693818010, - "narHash": "sha256-A6p33I4ByqXoSXJL87t+FDbm1TjeHMj+E0cLq6v6TnU=", + "lastModified": 1694786409, + "narHash": "sha256-aYpXy5XnTdF9PV6lEgyNnEsXI9s/ccADHxiV6EKrHH4=", "owner": "Mic92", "repo": "retiolum", - "rev": "4d9b888cb2683cb97a1bc3b8b4eb06ea8fbe3277", + "rev": "43d5a6ae57ae4a9051724767df133da4064d3461", "type": "github" }, "original": { @@ -1004,11 +1004,11 @@ "revealjs": { "flake": false, "locked": { - "lastModified": 1681386605, - "narHash": "sha256-9Q7aWgjAV37iJp6oYDz45e8J+RKwKY1Uvgg/BXwf5nQ=", + "lastModified": 1694600616, + "narHash": "sha256-R599Zdw9YzID7CRzWRcasz+ZZvZiagBFsuDWUvnNX4o=", "owner": "hakimel", "repo": "reveal.js", - "rev": "0301ce58ab185f7191696e16b1b6389f58df2892", + "rev": "a4b7f9dff7ef360afdb6d0cb53fd89063cbe0b66", "type": "github" }, "original": { @@ -1117,11 +1117,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1693898833, - "narHash": "sha256-OIrMAGNYNeLs6IvBynxcXub7aSW3GEUvWNsb7zx6zuU=", + "lastModified": 1694495315, + "narHash": "sha256-sZEYXs9T1NVHZSSbMqBEtEm2PGa7dEDcx0ttQkArORc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "faf21ac162173c2deb54e5fdeed002a9bd6e8623", + "rev": "ea208e55f8742fdcc0986b256bdfa8986f5e4415", "type": "github" }, "original": { @@ -1170,11 +1170,11 @@ "ts-fold": { "flake": false, "locked": { - "lastModified": 1681029086, - "narHash": "sha256-z3eVkAPFI6JYZZ+2XM496zBxwnujTp4Y4KNNfqgUC/E=", + "lastModified": 1694318094, + "narHash": "sha256-PQHn0HvcWGYhvrynYfTAFWF92TzNdFGV8cfjRG6nPeQ=", "owner": "jcs-elpa", "repo": "ts-fold", - "rev": "5fd2a5afe2112ac23b58ee1b12730fcf16068df3", + "rev": "3dd7c477fb08874d1bbbcb2588029e7ebd4b445f", "type": "github" }, "original": { diff --git a/nixos/machines/robi/nextcloud.nix b/nixos/machines/robi/nextcloud.nix index 3304880..622fb53 100644 --- a/nixos/machines/robi/nextcloud.nix +++ b/nixos/machines/robi/nextcloud.nix @@ -153,10 +153,16 @@ in hostAddress = hostAddress; localAddress = containerAddress; + autoStart = true; config = { config, pkgs, lib, ... }: { + # Configuring nameservers for containers is currently broken. + # Therefore in some cases internet connectivity can be broken inside the containers. + # A temporary workaround is to manually write the /etc/nixos/resolv.conf file like this: + environment.etc."resolv.conf".text = "nameserver 8.8.8.8"; + system.stateVersion = "21.05"; users.users.nextcloud.uid = nextcloudUid;