From 47b39d47b6ef3a5d26fee65099925b6207b7d95f Mon Sep 17 00:00:00 2001
From: Alexander Szczepanski <alexander@szczepan.ski>
Date: Thu, 21 Nov 2024 16:16:17 +0100
Subject: [PATCH] framework-2024-11-21-16-16-17

---
 configs/common.nix                  | 11 +++++++++--
 machine/desktop/configuration.nix   | 17 -----------------
 machine/framework/configuration.nix |  1 -
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/configs/common.nix b/configs/common.nix
index 055f251..b8e5b95 100755
--- a/configs/common.nix
+++ b/configs/common.nix
@@ -10,10 +10,8 @@
       useTmpfs = lib.mkDefault true;
       cleanOnBoot = true;
     };
-    # kernelParams = [ "quiet" ];
     consoleLogLevel = 0;
     kernel.sysctl = {"vm.max_map_count" = 262144;};
-    # initrd.systemd.enable = (!config.boot.swraid.enable && !config.boot.isContainer);
   };
 
   # Work around for https://github.com/NixOS/nixpkgs/issues/124215
@@ -195,6 +193,7 @@
     vnstat.enable = true;
     tuptime.enable = true;
     locate.enable = true;
+    tailscale.enable = true;
 
     openssh = {
       enable = true;
@@ -279,4 +278,12 @@
       fi
     '';
   };
+
+  # Turn off sudo lecture
+  security = {
+    sudo.extraConfig = ''
+      # rollback results in sudo lectures after each reboot
+      Defaults lecture = never
+    '';
+  };
 }
diff --git a/machine/desktop/configuration.nix b/machine/desktop/configuration.nix
index f630cce..3ea301a 100755
--- a/machine/desktop/configuration.nix
+++ b/machine/desktop/configuration.nix
@@ -282,8 +282,6 @@ in {
     #   group = "users";
     # };
 
-    tailscale.enable = true;
-
     borgbackup.jobs = {
       home = rec {
         compression = "auto,zstd";
@@ -307,21 +305,6 @@ in {
     };
   };
 
-  security = {
-    # rtkit.enable = true;
-    # apparmor.enable = true;
-
-    # auditd.enable = true;
-    # audit.enable = true;
-    # audit.rules = [
-    #   "-a exit,always -F arch=b64 -S execve"
-    # ];
-
-    sudo.extraConfig = ''
-      # rollback results in sudo lectures after each reboot
-      Defaults lecture = never
-    '';
-  };
 
   system.stateVersion = "24.11";
 }
diff --git a/machine/framework/configuration.nix b/machine/framework/configuration.nix
index a450ce2..1f8f1e6 100755
--- a/machine/framework/configuration.nix
+++ b/machine/framework/configuration.nix
@@ -209,7 +209,6 @@ in {
     power-profiles-daemon.enable = true;
     colord.enable = true;
     fprintd.enable = false;
-    tailscale.enable = true;
 
     btrfs.autoScrub = {
       enable = true;