chore: merge remote-tracking branch 'refs/remotes/origin/master'

modules/core/default.nix

@@ -4,7 +4,6 @@
     [ (import ./docker.nix) ]
     ++ [ (import ../security/default.nix) ]
     ++ [ (import ./hardware.nix) ]
-    ++ [ (import ./displaylink.nix) ]
     # ++ [(import ./printing.nix)]
     ++ [ (import ./xserver.nix) ]
     ++ [ (import ./network.nix) ]

modules/core/hardware.nix

@@ -1,7 +1,11 @@
 { pkgs, ... }:
-{  
+{
   services.smartd = {
     enable = true;
     autodetect = true;
   };
+  hardware.logitech.wireless = {
+    enable = true;
+    enableGraphical = true;
+  };
 }

modules/core/network.nix

@@ -12,5 +12,29 @@
   };
   services = {
     avahi.enable = lib.mkDefault false;
+    tailscale = {
+      enable = true;
+      useRoutingFeatures = "client";
+      extraUpFlags = [
+        # "--accept-dns=false"
+        "--accept-routes"
+      ];
+    };
   };
+
+  programs = {
+    wireshark.enable = true;
+  };
+
+  environment.systemPackages = with pkgs; [
+    dig
+    iftop
+    inetutils
+    ipcalc
+    iperf
+    nmap
+    tcpdump
+    traceroute
+    tshark
+  ];
 }

modules/core/program.nix

@@ -8,11 +8,4 @@
       # pinentryFlavor = "";
     };
   };
-
-  environment.systemPackages = with pkgs; [
-    wget
-    git
-    dig
-    traceroute
-  ];
 }

modules/core/system.nix

@@ -30,6 +30,8 @@
     libraries = with pkgs; [ ];
   };
 
+  services.envfs.enable = true;
+
   nixpkgs = {
     overlays = [
       self.overlays.default