package organization

modules/nixos/default.nix

@@ -3,6 +3,7 @@ inputs: {
   pkgs,
   ...
 }: let
+  cfg = config.omarchy;
   packages = import ../packages.nix {inherit pkgs;};
 in {
   imports = [
@@ -12,5 +13,4 @@ in {
     (import ./podman.nix)
   ];
 
-  environment.systemPackages = packages.systemPackages;
 }

modules/nixos/system.nix

@@ -3,17 +3,6 @@
   pkgs,
   ...
 }: {
-  environment.systemPackages = with pkgs; [
-    git
-    vim
-    curl
-    wget
-    pamixer
-    playerctl
-    bibata-cursors
-    gnome-themes-extra
-  ];
-
   security.rtkit.enable = true;
   services.pulseaudio.enable = false;
   services.pipewire = {
@@ -23,10 +12,20 @@
     jack.enable = true;
   };
 
+  # Initial login experience
   services.greetd = {
     enable = true;
     settings.default_session.command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland";
   };
 
-  networking.networkmanager.enable = true;
+  # Install packages
+  environment.systemPackages = packages.systemPackages;
+
+  # Networking 
+  services.resolved.enable = true;
+  networking = {
+    hostName = hostConfig.name;
+    networkmanager.enable = true;
+  };
+  # services.samba.enable = true;
 }

modules/packages.nix

@@ -2,6 +2,7 @@
   # Regular packages
   systemPackages = with pkgs; [
     # Base system tools
+
     git
     vim
     libnotify
@@ -13,6 +14,10 @@
     hyprshot
     hyprpicker
     alejandra
+    pamixer
+    playerctl
+    bibata-cursors
+    gnome-themes-extra
 
     # Shell tools
     fzf