From 64237058a201ac39d1ddc26dbac00e9f4ea4023a Mon Sep 17 00:00:00 2001
From: biscuit <biscuit@nixos.com>
Date: Thu, 15 May 2025 13:50:58 -0500
Subject: [PATCH] nix: cleaned up

---
 modules/system.nix                       |  2 +-
 modules/wayland.nix                      |  2 +-
 nixos/configuration.nix                  |  1 -
 packages/hyprland/default.nix            |  8 +--
 packages/hyprpanel/default.nix           | 72 ------------------------
 {packages => system}/firefox/default.nix |  0
 6 files changed, 3 insertions(+), 82 deletions(-)
 delete mode 100644 packages/hyprpanel/default.nix
 rename {packages => system}/firefox/default.nix (100%)

diff --git a/modules/system.nix b/modules/system.nix
index 43f7157..30ca7b2 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -1,5 +1,5 @@
 { ... }: {
   imports = [
-    ../packages/firefox/default.nix
+    ../system/firefox/default.nix
   ];
 }
diff --git a/modules/wayland.nix b/modules/wayland.nix
index 391e4dd..b83ab2b 100644
--- a/modules/wayland.nix
+++ b/modules/wayland.nix
@@ -3,7 +3,7 @@
   imports = [
     ../packages/hyprland/default.nix
     ../packages/waybar/default.nix
-    ../packages/hyprpanel/default.nix
     ../packages/ags/default.nix
+    ../packages/astal/default.nix
   ];
 }
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 9a489e9..d71961b 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -3,7 +3,6 @@
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
       ../modules/system.nix
-      ../packages/astal/default.nix
     ];
 
   # Bootloader.
diff --git a/packages/hyprland/default.nix b/packages/hyprland/default.nix
index 306bafe..e0ad4fe 100644
--- a/packages/hyprland/default.nix
+++ b/packages/hyprland/default.nix
@@ -1,11 +1,5 @@
 { pkgs, ... }: {
-  # home.packages = [
-  #   pkgs.hyprland
-  # ];
-
-  # programs.hyprland = {
-  #   enable = true;
-  # };
+  hyprland.enable = true;
 
   home.file.".config/hypr/hyprland.conf" = {
     source = builtins.toPath ./hyprland.conf;
diff --git a/packages/hyprpanel/default.nix b/packages/hyprpanel/default.nix
deleted file mode 100644
index 3f1df61..0000000
--- a/packages/hyprpanel/default.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{ inputs, ... }: {
-  imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ];
-
-  programs.hyprpanel = {
-
-    # Enable the module.
-    # Default: false
-    enable = true;
-
-    # Add '/nix/store/.../hyprpanel' to your
-    # Hyprland config 'exec-once'.
-    # Default: false
-    hyprland.enable = true;
-
-    # Fix the overwrite issue with HyprPanel.
-    # See below for more information.
-    # Default: false
-    overwrite.enable = false;
-
-    # Import a theme from './themes/*.json'.
-    # Default: ""
-    # theme = "gruvbox_split";
-
-    # Override the final config with an arbitrary set.
-    # Useful for overriding colors in your selected theme.
-    # Default: {}
-    override = {
-      theme.bar.menus.text = "#123ABC";
-    };
-
-    # Configure bar layouts for monitors.
-    # See 'https://hyprpanel.com/configuration/panel.html'.
-    # Default: null
-    # layout = {
-    #   "bar.layouts" = {
-    #     "0" = {
-    #       left = [ "dashboard" "workspaces" ];
-    #       middle = [ "media" ];
-    #       right = [ "volume" "systray" "notifications" ];
-    #     };
-    #   };
-    # };
-
-    # Configure and theme almost all options from the GUI.
-    # Options that require '{}' or '[]' are not yet implemented,
-    # except for the layout above.
-    # See 'https://hyprpanel.com/configuration/settings.html'.
-    # Default: <same as gui>
-    # settings = {
-    #   bar.launcher.autoDetectIcon = true;
-    #   bar.workspaces.show_icons = true;
-    #
-    #   menus.clock = {
-    #     time = {
-    #       military = true;
-    #       hideSeconds = true;
-    #     };
-    #     weather.unit = "metric";
-    #   };
-    #
-    #   menus.dashboard.directories.enabled = false;
-    #   menus.dashboard.stats.enable_gpu = true;
-    #
-    #   theme.bar.transparent = true;
-    #
-    #   theme.font = {
-    #     name = "CaskaydiaCove NF";
-    #     size = "16px";
-    #   };
-    # };
-  };
-}
diff --git a/packages/firefox/default.nix b/system/firefox/default.nix
similarity index 100%
rename from packages/firefox/default.nix
rename to system/firefox/default.nix