refector

hosts/machine/ena/configuration.nix

@@ -9,21 +9,21 @@
     ./hardware-configuration.nix
 
     "${inputs.self}/modules/nixos/base"
-    "${inputs.self}/modules/nixos/features/boot.nix"
+    "${inputs.self}/modules/nixos/features/system/boot.nix"
     "${inputs.self}/modules/nixos/features/fonts.nix"
     "${inputs.self}/modules/nixos/features/plasma.nix"
-    "${inputs.self}/modules/nixos/features/sound.nix"
+    "${inputs.self}/modules/nixos/features/system/sound.nix"
     "${inputs.self}/modules/nixos/features/packages.nix"
     "${inputs.self}/modules/nixos/features/catppuccin.nix"
     "${inputs.self}/modules/nixos/features/figma-agent.nix"
-    "${inputs.self}/modules/nixos/features/sbctl.nix"
-    "${inputs.self}/modules/nixos/features/grub-standalone.nix"
-    "${inputs.self}/modules/nixos/features/virtualisation.nix"
-    "${inputs.self}/modules/nixos/features/cockpit.nix"
-    "${inputs.self}/modules/nixos/features/bluetooth.nix"
-    "${inputs.self}/modules/nixos/features/graphics.nix"
+    "${inputs.self}/modules/nixos/features/system/sbctl.nix"
+    "${inputs.self}/modules/nixos/features/system/grub-standalone.nix"
+    "${inputs.self}/modules/nixos/features/system/virtualisation.nix"
+    "${inputs.self}/modules/nixos/features/management/cockpit.nix"
+    "${inputs.self}/modules/nixos/features/system/bluetooth.nix"
+    "${inputs.self}/modules/nixos/features/system/graphics.nix"
     "${inputs.self}/modules/nixos/features/steam.nix"
-    "${inputs.self}/modules/nixos/features/ssh.nix"
+    "${inputs.self}/modules/nixos/features/remote/ssh.nix"
   ];
 
   networking = {

hosts/machine/ena/home/default.nix

@@ -32,14 +32,14 @@
   };
 
   imports = [
-    "${inputs.self}/modules/home/git.nix"
-    # "${inputs.self}/modules/home/firefox.nix
-    "${inputs.self}/modules/home/neovim.nix"
+    "${inputs.self}/modules/home/devtool/git.nix"
+    "${inputs.self}/modules/home/devtool/neovim.nix"
     "${inputs.self}/modules/home/spicetify.nix"
-    "${inputs.self}/modules/home/ghostty.nix"
-    "${inputs.self}/modules/home/zed.nix"
+    "${inputs.self}/modules/home/devtool/ghostty.nix"
+    "${inputs.self}/modules/home/devtool/zed.nix"
     "${inputs.self}/modules/home/discord/linux.nix"
-    "${inputs.self}/modules/home/vscode.nix"
+    "${inputs.self}/modules/home/devtool/vscode.nix"
+    "${inputs.self}/modules/home/devtool/ciscopackettracer.nix"
     ./config/shell.nix
     ./config/plasma.nix
   ];

hosts/machine/ena/home/packages.nix

@@ -1,16 +1,4 @@
 { pkgs, inputs }:
-let
-  system = pkgs.stdenv.hostPlatform.system;
-  pkgsPacketTracer8 = import inputs.nixpkgs-2511 {
-    inherit system;
-    config = {
-      allowUnfree = true;
-      permittedInsecurePackages = [
-        "ciscoPacketTracer8-8.2.2"
-      ];
-    };
-  };
-in
 with pkgs;
 (import ../../../../modules/home/packages.nix { inherit pkgs inputs; })
 ++ [
@@ -21,7 +9,5 @@ with pkgs;
   # inputs.waterfox.packages.${pkgs.system}.waterfox
   gnome-network-displays
   element-desktop
-  cisco-packet-tracer_9
-  pkgsPacketTracer8.ciscoPacketTracer8
   # hoffice
 ]