From 127438c16317a45c4a222562a7f7261ff208038d Mon Sep 17 00:00:00 2001
From: Henry Sipp <hesipp@gmail.com>
Date: Mon, 30 Jun 2025 09:38:02 -0500
Subject: [PATCH] package organization

---
 config.nix                |  6 +++++-
 modules/nixos/default.nix |  2 +-
 modules/nixos/system.nix  | 23 +++++++++++------------
 modules/packages.nix      |  5 +++++
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/config.nix b/config.nix
index a5f07d0..6a7a32a 100644
--- a/config.nix
+++ b/config.nix
@@ -1,5 +1,10 @@
 lib: {
   omarchyOptions = {
+    hostname = lib.mkOption {
+      type = lib.types.str;
+      default = "omarchy";
+      description = "Hostname for the system";
+    };
     full_name = lib.mkOption {
       type = lib.types.str;
       description = "Main user's full name";
@@ -21,7 +26,6 @@ lib: {
       type = lib.types.attrs;
       default = {};
     };
-
     quick_app_bindings = lib.mkOption {
       type = lib.types.listOf lib.types.str;
       description = "A list of single keystroke key bindings to launch common apps.";
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 602b247..177ee21 100644
--- a/modules/nixos/default.nix
+++ b/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;
 }
diff --git a/modules/nixos/system.nix b/modules/nixos/system.nix
index ee3dcbb..8ba51b9 100644
--- a/modules/nixos/system.nix
+++ b/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;
 }
diff --git a/modules/packages.nix b/modules/packages.nix
index 1994150..11ff5bc 100644
--- a/modules/packages.nix
+++ b/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