From f4abaea9895acd905b93a95b316b9e763e31d7cb Mon Sep 17 00:00:00 2001
From: xezo360hye <xezo360hye@gmail.com>
Date: Sun, 4 Aug 2024 23:47:49 +0300
Subject: [PATCH] Moved awesomerc and hyprland configs into ./home/components

---
 home/{ => components}/awesomerc.lua |  0
 home/components/hyprland.nix        | 75 +++++++++++++++++++++++++++++
 home/maidena.nix                    | 71 ++-------------------------
 3 files changed, 79 insertions(+), 67 deletions(-)
 rename home/{ => components}/awesomerc.lua (100%)
 create mode 100644 home/components/hyprland.nix

diff --git a/home/awesomerc.lua b/home/components/awesomerc.lua
similarity index 100%
rename from home/awesomerc.lua
rename to home/components/awesomerc.lua
diff --git a/home/components/hyprland.nix b/home/components/hyprland.nix
new file mode 100644
index 0000000..0f39e06
--- /dev/null
+++ b/home/components/hyprland.nix
@@ -0,0 +1,75 @@
+{
+  inputs,
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let genFlatList = f: n: builtins.concatLists (builtins.genList f n);
+in
+{
+  programs.kitty = {
+    enable = true;
+  };
+
+  wayland.windowManager.hyprland = {
+    enable = true;
+    settings = {
+      general = {
+        gaps_in = 5;
+        gaps_out = 20;
+
+        border_size = 2;
+
+        "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
+        "col.inactive_border" = "rgba(595959aa)";
+
+        resize_on_border = true;
+      };
+
+      input.kb_layout = "no";
+      input.touchpad.natural_scroll = true;
+
+      decoration = {
+        rounding = 0;
+
+        active_opacity = 1.0;
+        inactive_opacity = 1.0;
+
+        drop_shadow = true;
+        shadow_range = 4;
+        shadow_render_power = 3;
+
+        "col.shadow" = "rgba(1a1a1aee)";
+
+        blur = {
+          enabled = true;
+          size = 3;
+          passes = 1;
+          vibrancy = 0.1696;
+        };
+      };
+
+      bind = [
+        "SUPER, Return, exec, kitty"
+        "SUPER SHIFT, Q, exit"
+
+        "SUPER, V, togglefloating"
+        "SUPER, J, togglesplit"
+        "SUPER, P, pseudo"
+
+        "ALT CTRL, left,  workspace, -1"
+        "ALT CTRL, right, workspace, +1"
+      ] ++ (
+        genFlatList
+        ( x: let n = toString (x + 1);
+          in
+          [ "SUPER,       ${n},       workspace, ${n}"
+            "SUPER SHIFT, ${n}, movetoworkspace, ${n}"
+          ]
+        )
+        9
+      );
+    };
+  };
+}
diff --git a/home/maidena.nix b/home/maidena.nix
index dde26eb..6efd2f6 100644
--- a/home/maidena.nix
+++ b/home/maidena.nix
@@ -5,9 +5,11 @@
   lib,
   ...
 }:
-let genFlatList = f: n: builtins.concatLists (builtins.genList f n);
-in
 {
+  imports = [
+    ./components/hyprland.nix
+  ];
+
   programs = {
     home-manager.enable = true;
 
@@ -42,71 +44,6 @@ in
       enable = true;
       settings = {};
     };
-
-    kitty = {
-      enable = true;
-    };
-  };
-
-  wayland.windowManager.hyprland = {
-    enable = true;
-    settings = {
-      general = {
-        gaps_in = 5;
-        gaps_out = 20;
-
-        border_size = 2;
-
-        "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
-        "col.inactive_border" = "rgba(595959aa)";
-
-        resize_on_border = true;
-      };
-
-      input.kb_layout = "no";
-      input.touchpad.natural_scroll = true;
-
-      decoration = {
-        rounding = 0;
-
-        active_opacity = 1.0;
-        inactive_opacity = 1.0;
-
-        drop_shadow = true;
-        shadow_range = 4;
-        shadow_render_power = 3;
-
-        "col.shadow" = "rgba(1a1a1aee)";
-
-        blur = {
-          enabled = true;
-          size = 3;
-          passes = 1;
-          vibrancy = 0.1696;
-        };
-      };
-
-      bind = [
-        "SUPER, Return, exec, kitty"
-        "SUPER SHIFT, Q, exit"
-
-        "SUPER, V, togglefloating"
-        "SUPER, J, togglesplit"
-        "SUPER, P, pseudo"
-
-        "ALT CTRL, left,  workspace, -1"
-        "ALT CTRL, right, workspace, +1"
-      ] ++ (
-        genFlatList
-        ( x: let n = toString (x + 1);
-          in
-          [ "SUPER,       ${n},       workspace, ${n}"
-            "SUPER SHIFT, ${n}, movetoworkspace, ${n}"
-          ]
-        )
-        9
-      );
-    };
   };
 
   home.packages = with pkgs; [