From e23eed01967f98c077f6a5c0ed9f45c448522670 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Sat, 1 Jun 2024 11:31:37 +0200 Subject: [PATCH] --wip-- [skip ci] --- flake.lock | 30 ++++++++++++++--------------- flake.nix | 5 +++-- modules/nixos/nextcloud.nix | 38 +++++++++++++++++++++---------------- modules/nixos/rclone.nix | 3 +++ 4 files changed, 43 insertions(+), 33 deletions(-) create mode 100644 modules/nixos/rclone.nix diff --git a/flake.lock b/flake.lock index 7524e0a..1ae4143 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1715290355, - "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", "owner": "ryantm", "repo": "agenix", - "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", "type": "github" }, "original": { @@ -342,11 +342,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1716173274, - "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", + "lastModified": 1716987116, + "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", + "rev": "8251761f93d6f5b91cee45ac09edb6e382641009", "type": "github" }, "original": { @@ -404,11 +404,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1716633019, - "narHash": "sha256-xim1b5/HZYbWaZKyI7cn9TJCM6ewNVZnesRr00mXeS4=", + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", "type": "github" }, "original": { @@ -420,11 +420,11 @@ }, "nixpkgs-u": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1716948383, + "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "type": "github" }, "original": { @@ -436,11 +436,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716978651, - "narHash": "sha256-/U3QuNaj1HxsxIQSqpk26FkLKWSmdfbZ7Ui+kMHgNsM=", + "lastModified": 1717225736, + "narHash": "sha256-IbJ9wR9xcNVo5LF/e9K3GnlEEGA84rUzTDl2LrY20kI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9600c69366c711335f13305fd9518b7dcd3cae18", + "rev": "3027b8b4cfe84f0dd6fad1c8a02a7a381af89c9c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b770640..f338072 100644 --- a/flake.nix +++ b/flake.nix @@ -220,7 +220,8 @@ ./modules/nixos/torrentbox.nix ./modules/nixos/minio.nix - ./modules/nixos/nextcloud.nix + ./modules/nixos/rclone.nix + # ./modules/nixos/nextcloud.nix # ./modules/nixos/ntfy.nix ] ++ homeManagerModules ++ [ { home-manager.users.bertof = import ./instances/heimdall/hm.nix; } @@ -247,7 +248,7 @@ ./modules/nixos/torrentbox.nix ./modules/nixos/minio.nix - ./modules/nixos/nextcloud.nix + # ./modules/nixos/nextcloud.nix ./modules/nixos/ntfy.nix ] ++ homeManagerModules ++ [ { home-manager.users.bertof = import ./instances/freya/hm.nix; } diff --git a/modules/nixos/nextcloud.nix b/modules/nixos/nextcloud.nix index 5ea0f0c..ee5254a 100644 --- a/modules/nixos/nextcloud.nix +++ b/modules/nixos/nextcloud.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, config, lib, ... }: let hosts = import ../../hosts.nix; in @@ -24,22 +24,28 @@ in database.createLocally = true; - autoUpdateApps.enable = true; - extraOptions.enabledPreviewProviders = [ - "OC\\Preview\\BMP" - "OC\\Preview\\GIF" - "OC\\Preview\\JPEG" - "OC\\Preview\\Krita" - "OC\\Preview\\MarkDown" - "OC\\Preview\\MP3" - "OC\\Preview\\OpenDocument" - "OC\\Preview\\PNG" - "OC\\Preview\\TXT" - "OC\\Preview\\XBitmap" - "OC\\Preview\\HEIC" # Enable preview of HEIC/HEIF images (others are default) - "OC\\Preview\\EMF" - ]; + # autoUpdateApps.enable = true; + appstoreEnable = lib.mkForce false; + extraApps = { }; + extraAppsEnable = false; + extraOptions = { + enabledPreviewProviders = [ + "OC\\Preview\\BMP" + "OC\\Preview\\GIF" + "OC\\Preview\\JPEG" + "OC\\Preview\\Krita" + "OC\\Preview\\MarkDown" + "OC\\Preview\\MP3" + "OC\\Preview\\OpenDocument" + "OC\\Preview\\PNG" + "OC\\Preview\\TXT" + "OC\\Preview\\XBitmap" + "OC\\Preview\\HEIC" # Enable preview of HEIC/HEIF images (others are default) + "OC\\Preview\\EMF" + ]; + + }; config = { trustedProxies = [ # hosts.zerotier.ipv4."baldur.zto" diff --git a/modules/nixos/rclone.nix b/modules/nixos/rclone.nix new file mode 100644 index 0000000..7fe8fce --- /dev/null +++ b/modules/nixos/rclone.nix @@ -0,0 +1,3 @@ +{ pkgs, ... }: { + # systemd.services.rclone-mounts = { }; +}