From a3774937b776dc10375df8f8e57129bf82e76639 Mon Sep 17 00:00:00 2001
From: Jade <jade@schrottkatze.de>
Date: Wed, 8 Feb 2023 12:48:31 +0100
Subject: [PATCH] fixed nextcloud and put server on nixpkgs stable

---
 common.nix                               | 2 --
 monosodium-glutamate-g/configuration.nix | 1 +
 potatobook-g/configuration.nix           | 1 +
 schrottserver/configuration.nix          | 2 ++
 schrottserver/nextcloud.nix              | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/common.nix b/common.nix
index d2ee7cf..b193f39 100644
--- a/common.nix
+++ b/common.nix
@@ -8,8 +8,6 @@
 with lib;
 with builtins;
 {
-  imports = [ ./modules ];
-
   nix = {
     package = pkgs.nixVersions.stable;
     extraOptions = ''
diff --git a/monosodium-glutamate-g/configuration.nix b/monosodium-glutamate-g/configuration.nix
index a042e5d..a2ccfdb 100644
--- a/monosodium-glutamate-g/configuration.nix
+++ b/monosodium-glutamate-g/configuration.nix
@@ -7,6 +7,7 @@
   imports = [
       ./hardware-configuration.nix
       ../common.nix
+      ../modules
   ];
 
   jade = {
diff --git a/potatobook-g/configuration.nix b/potatobook-g/configuration.nix
index 02216a9..5eacaed 100644
--- a/potatobook-g/configuration.nix
+++ b/potatobook-g/configuration.nix
@@ -13,6 +13,7 @@
       # "${builtins.fetchGit { url = "https://github.com/kekrby/nixos-hardware.git"; }}/apple/t2"
       ./hardware-configuration.nix
       ../common.nix
+      ../modules
       #inputs.mms.module
   ];
 
diff --git a/schrottserver/configuration.nix b/schrottserver/configuration.nix
index 537f18c..5c71158 100644
--- a/schrottserver/configuration.nix
+++ b/schrottserver/configuration.nix
@@ -13,6 +13,8 @@
       ./vaultwarden.nix
       ./nextcloud.nix
       ./mumble.nix
+      ../modules/neovim.nix
+      ../modules/zsh.nix
     ];
 
   #systemd.services.wordsofgod-bot.enable = true;
diff --git a/schrottserver/nextcloud.nix b/schrottserver/nextcloud.nix
index 5d25c60..7a65017 100644
--- a/schrottserver/nextcloud.nix
+++ b/schrottserver/nextcloud.nix
@@ -12,7 +12,7 @@
     };
     package = pkgs.nextcloud25;
     extraApps = with pkgs.nextcloud25Packages.apps; { 
-      inherit bookmarks calendar contacts deck keeweb mail news notes onlyoffice polls tasks twofactor_webauthn;
+      inherit bookmarks calendar contacts news tasks;
     };
     extraAppsEnable = true;
     hostName = "wolke.schrottkatze.de";