From caf111557c76e0ab4490969cdab11eeb7fdcfa43 Mon Sep 17 00:00:00 2001
From: The_miro <amir@abdelbaki.eu>
Date: Fri, 18 Oct 2024 15:58:00 +0200
Subject: [PATCH] added import hierarchy

---
 Modules/pkgs/AssortedTools.nix | 17 --------
 Modules/pkgs/NetworkTools.nix  | 78 ++++++++++++++++------------------
 Modules/pkgs/Packages.nix      | 26 ++++++------
 3 files changed, 50 insertions(+), 71 deletions(-)
 delete mode 100644 Modules/pkgs/AssortedTools.nix

diff --git a/Modules/pkgs/AssortedTools.nix b/Modules/pkgs/AssortedTools.nix
deleted file mode 100644
index 7626a99..0000000
--- a/Modules/pkgs/AssortedTools.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, pkgs, ... }:
-{
-        environment.systemPackages = [
-                pkgs.flameshot
-				pkgs.libreoffice
-				pkgs.gimp-with-plugins
-				pkgs.inkscape
-				pkgs.nyxt
-				pkgs.spotify
-				pkgs.vlc
-				pkgs.audacity
-				pkgs.obs-studio
-				pkgs.hollywood
-				pkgs.flameshot
-				pkgs.krita
-        ];
-}
diff --git a/Modules/pkgs/NetworkTools.nix b/Modules/pkgs/NetworkTools.nix
index 8f54582..fa0f8af 100644
--- a/Modules/pkgs/NetworkTools.nix
+++ b/Modules/pkgs/NetworkTools.nix
@@ -1,49 +1,43 @@
 { config, pkgs, ... }:
 {
-	nixpkgs.config.permittedInsecurePackages = [
-                "pulsar-1.117.0"
-		"tightvnc-1.3.10"
-        ];
+				nixpkgs.config.permittedInsecurePackages = [
+        	"pulsar-1.117.0"
+					"tightvnc-1.3.10"
+  			];
         environment.systemPackages = [
-                pkgs.wireshark
-				pkgs.angryipscanner
-				pkgs.drawio
-				pkgs.vscode
-				pkgs.mono
-				pkgs.fastfetch
-				pkgs.netrw
-				pkgs.netop
-				pkgs.netdata
-				#pkgs.pulsar
-				pkgs.wireguard-tools
-				pkgs.nmap
-				pkgs.wireshark-cli
-				#pkgs.pyqt5
-				pkgs.python312Packages.manuf
-				pkgs.dig
-				pkgs.inetutils
-				#pkgs.wireguard
-				#pkgs.wireguard-tools
-				pkgs.dotnet-sdk_8
-				pkgs.imagemagick
-				pkgs.exif
-				pkgs.netcat-gnu
-				pkgs.distrobox
-				pkgs.powershell
-				pkgs.pulsar
-				pkgs.tor
-				pkgs.torsocks
+        	pkgs.wireshark
+					pkgs.angryipscanner
+					pkgs.drawio
+					pkgs.vscode
+					pkgs.mono
+					pkgs.fastfetch
+					pkgs.netrw
+					pkgs.netop
+					pkgs.netdata
+					pkgs.wireguard-tools
+					pkgs.nmap
+					pkgs.wireshark-cli
+					pkgs.python312Packages.manuf
+					pkgs.dig
+					pkgs.inetutils
+					pkgs.dotnet-sdk_8
+					pkgs.imagemagick
+					pkgs.exif
+					pkgs.netcat-gnu
+					pkgs.distrobox
+					pkgs.powershell
+					pkgs.pulsar
+					pkgs.tor
+					pkgs.torsocks
         ];
 	services.tor.enable = true;
-	#boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ];
-	#environment.systemPackages = [ pkgs.wireguard pkgs.wireguard-tools ];
-
-#	programs.wireshark.enable = true;
-#	security.sudo.extraConfig = ''
-#		Defaults env_keep += "WAYLAND_DISPLAY wayland-1"
-#	'';
-
-
 	programs.wireshark.enable = true;
-
+	services.resolved = {
+    enable = true;
+    extraConfig = ''
+      LLMNR=no
+      ReadEtcHosts=no
+      DNSSEC=no
+    '';
+  };
 }
diff --git a/Modules/pkgs/Packages.nix b/Modules/pkgs/Packages.nix
index aa18539..4284418 100644
--- a/Modules/pkgs/Packages.nix
+++ b/Modules/pkgs/Packages.nix
@@ -1,17 +1,23 @@
 { config, pkgs, ... }:
 {
 	environment.systemPackages = [
-  		pkgs.fastfetch
-  		pkgs.wget
-		pkgs.curl
-		pkgs.lynx
+		pkgs.libreoffice
 		pkgs.gimp-with-plugins
 		pkgs.inkscape
+		pkgs.nyxt
+		pkgs.spotify
+		pkgs.vlc
+		pkgs.audacity
+		pkgs.obs-studio
+		pkgs.krita
+  	pkgs.fastfetch
+  	pkgs.wget
+		pkgs.curl
+		pkgs.lynx
 		pkgs.firefox-unwrapped
 		pkgs.rustdesk
 		pkgs.yazi
 		pkgs.git
-		pkgs.spotify
 		pkgs.python312Packages.gpustat
 		pkgs.nextcloud-client
 		pkgs.zip
@@ -22,7 +28,6 @@
 		pkgs.onlyoffice-bin
 		pkgs.lsof
 		pkgs.konsole
-		#pkgs.openrgb
 		pkgs.gtop
 		pkgs.btop
 		pkgs.nvtopPackages.full
@@ -31,13 +36,10 @@
 		pkgs.aalib
 		pkgs.jp2a
 		pkgs.pipes
-		pkgs.tty-clock		
+		pkgs.tty-clock
 		pkgs.hackertyper
 		pkgs.hollywood
+		pkgs.webcord
   	];
-	#services.hardware.openrgb.enable = true;
-        
+
 }
-
-
-