From 74d005e262709e7470a7edbfc52e08160914b0e5 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Sat, 3 Dec 2022 11:59:28 +0100
Subject: [PATCH] delete compression include/file

---
 nixos/modules/compression.nix    |  6 ------
 nixos/newton/configuration.nix   | 10 ----------
 nixos/serverle/configuration.nix | 16 ++++++----------
 nixos/thinkman/configuration.nix |  5 +----
 4 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 nixos/modules/compression.nix

diff --git a/nixos/modules/compression.nix b/nixos/modules/compression.nix
deleted file mode 100644
index 6b5d393..0000000
--- a/nixos/modules/compression.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ config, pkgs, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    brotli
-  ];
-}
diff --git a/nixos/newton/configuration.nix b/nixos/newton/configuration.nix
index 190e453..5f2b5b6 100644
--- a/nixos/newton/configuration.nix
+++ b/nixos/newton/configuration.nix
@@ -8,7 +8,6 @@
     ./syncthing.nix
     ./services.nix
     #../modules/backup.nix
-    ../modules/compression.nix
     ../modules/docker.nix
     ../modules/networkdecrypt.nix
     ../modules/nix.nix
@@ -28,15 +27,6 @@
   networking.firewall.allowedTCPPorts = [
   ];
 
-  services.openssh.permitRootLogin = "prohibit-password";
-  users.extraUsers.root.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOFx6OLwL9MbkD3mnMsv+xrzZHN/rwCTgVs758SCLG0h felix@thinkman" ];
-
-  # Nix
-  nix.gc = {
-    automatic = true;
-    options = "--delete-older-than 30d";
-  };
-
   system = {
     stateVersion = "22.05";
     autoUpgrade.enable = true;
diff --git a/nixos/serverle/configuration.nix b/nixos/serverle/configuration.nix
index fef28d0..6ed677e 100644
--- a/nixos/serverle/configuration.nix
+++ b/nixos/serverle/configuration.nix
@@ -5,19 +5,14 @@
     ./backup.nix
     ./disks.nix
     ./dyndns.nix
-    ../modules/3d-printer.nix
+    ./services.nix
+    ./syncthing.nix
+    ./wifi.nix
+    #../modules/3d-printer.nix
     ../modules/avahi.nix
-    ../modules/compression.nix
-    ../modules/development.nix
     ../modules/docker.nix
-    ../modules/networkdecrypt.nix
     ../modules/nix.nix
-    ../modules/ssh.nix
     ../modules/webapps/bazarr.nix
-    ../modules/webapps/config.nix
-    ../modules/webapps/homer.nix
-    ../modules/webapps/jellyfin.nix
-    ../modules/webapps/navidrome.nix
     ../modules/webapps/prowlarr.nix
     ../modules/webapps/radarr.nix
     ../modules/webapps/sonarr.nix
@@ -26,7 +21,8 @@
 
   sops = {
     defaultSopsFile = ./secrets.yaml;
-    gnupg.sshKeyPaths = [];
+    # disable gpg and thereby enable age
+    gnupg.sshKeyPaths = [ ];
   };
 
   #environment.noXlibs = true;
diff --git a/nixos/thinkman/configuration.nix b/nixos/thinkman/configuration.nix
index eb3a7f1..a346c24 100644
--- a/nixos/thinkman/configuration.nix
+++ b/nixos/thinkman/configuration.nix
@@ -9,7 +9,6 @@
     ../modules/backup.nix
     ../modules/bluetooth-audio.nix
     ../modules/clean.nix
-    ../modules/compression.nix
     ../modules/desktop-default.nix
     ../modules/desktop-development.nix
     ../modules/development.nix
@@ -28,13 +27,11 @@
     ../modules/presentation.nix
     ../modules/printer.nix
     ../modules/screen-sharing.nix
-    ../modules/sound.nix
     ../modules/sway.nix
     ../modules/sync.nix
     ../modules/systemd-user.nix
     ../modules/systemduefi.nix
     ../modules/tex.nix
-    ../modules/theme.nix
     ../modules/thunderbolt.nix
     ../modules/webcam.nix
   ];
@@ -43,7 +40,7 @@
 
   sops = {
     defaultSopsFile = ./secrets.yaml;
-    gnupg.sshKeyPaths = [];
+    gnupg.sshKeyPaths = [ ];
   };
 
   # Use latest kernel