all: merge system/* to configs directory

configs/default.nix

@@ -12,5 +12,7 @@
     ./tmux.nix
     ./net-overlay.nix
     ./zsh.nix
+    ./nix.nix
+    ./update.nix
   ];
 }

configs/nix.nix

@@ -1,17 +1,21 @@
 { pkgs, ... }:
-let
+{
-  nixOptions = {
+  nix = {
+    package = pkgs.nixVersions.nix_2_17;
     gc = {
       automatic = true;
       dates = "daily";
       options = "--delete-older-than 10d";
     };
 
-    # Enable flakes
-    package = pkgs.nixVersions.nix_2_17;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
+    settings.auto-optimise-store = true;
+    settings = {
+      sandbox = true;
+      trusted-users = [ "@wheel" ];
+      allowed-users = [ "root" "qbit" ];
+    };
   };
-in
+}
-{ nix = { settings.auto-optimise-store = true; } // nixOptions; }

default.nix

@@ -28,9 +28,6 @@ in
     ./overlays
     ./pkgs
     ./services
-    ./system/nix-config.nix
-    ./system/nix-lockdown.nix
-    ./system/update.nix
     ./users
 
     ./monitoring

system/nix-lockdown.nix

@@ -1,25 +0,0 @@
-{ config
-, lib
-, ...
-}:
-with lib; {
-  options = {
-    nixLockdown = {
-      enable = mkOption {
-        description = "Lockdown Nix";
-        default = true;
-        example = true;
-        type = lib.types.bool;
-      };
-    };
-  };
-  config = mkIf config.nixLockdown.enable {
-    nix = {
-      settings = {
-        sandbox = true;
-        trusted-users = [ "@wheel" ];
-        allowed-users = [ "root" "qbit" ];
-      };
-    };
-  };
-}