From e9f0fff210f1e6a4ed150d4c8a19a980bf148b57 Mon Sep 17 00:00:00 2001
From: cnst <cnst@cana.st>
Date: Mon, 15 Jul 2024 19:48:03 +0200
Subject: [PATCH] hypr eco systems and home directory restruct

---
 home/core/services/hypr/default.nix |  7 +++++++
 home/users/adam/imports.nix         | 18 ++++++++----------
 home/users/cnst/imports.nix         | 18 ++++++++----------
 3 files changed, 23 insertions(+), 20 deletions(-)
 create mode 100644 home/core/services/hypr/default.nix

diff --git a/home/core/services/hypr/default.nix b/home/core/services/hypr/default.nix
new file mode 100644
index 00000000..fe50ebf8
--- /dev/null
+++ b/home/core/services/hypr/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./idle
+    ./lock
+    ./paper
+  ];
+}
diff --git a/home/users/adam/imports.nix b/home/users/adam/imports.nix
index a6779699..07a15a5e 100644
--- a/home/users/adam/imports.nix
+++ b/home/users/adam/imports.nix
@@ -2,19 +2,19 @@
   imports = [
     # core.gui
     ../../core/gui/gtk
-    ../../core/gui/mako
     ../../core/gui/waybar
+    ../../core/gui/browsers
     ../../core/gui/xdg
+    ../../core/gui/discord
     # core.tui
     ../../core/tui/git/adam.nix
     ../../core/tui/shell/adam.nix
-    # core.system
-    ../../core/system/polkit.nix
-
-    # extra
-    ../../extra/foot
-    ../../extra/browsers
-    ../../extra/neovim
+    ../../core/tui/foot
+    ../../core/tui/neovim
+    # core.services
+    ../../core/services/mako
+    ../../core/services/polkit
+    ../../core/services/hypr
   ];
   home = {
     packages = with pkgs; [
@@ -27,7 +27,6 @@
       pavucontrol
       qbittorrent
       virt-manager
-      webcord
       xfce.thunar
 
       # misc.tui
@@ -47,7 +46,6 @@
       qt5.qtwayland
       qt6.qtwayland
       slurp
-      swaybg
       #  thefuck
       wireguard-tools
       wl-clipboard
diff --git a/home/users/cnst/imports.nix b/home/users/cnst/imports.nix
index 6d2db804..60ef5e6d 100644
--- a/home/users/cnst/imports.nix
+++ b/home/users/cnst/imports.nix
@@ -2,21 +2,19 @@
   imports = [
     # core.gui
     ../../core/gui/gtk
-    ../../core/gui/mako
     ../../core/gui/waybar
-    ../../core/gui/ags
+    ../../core/gui/browsers
     ../../core/gui/xdg
+    ../../core/gui/discord
     # core.tui
     ../../core/tui/git/cnst.nix
     ../../core/tui/shell/cnst.nix
-    # core.system
-    ../../core/system/polkit.nix
-
-    # extra
-    ../../extra/foot
-    ../../extra/browsers
-    ../../extra/neovim
-    ../../extra/discord
+    ../../core/tui/foot
+    ../../core/tui/neovim
+    # core.services
+    ../../core/services/mako
+    ../../core/services/polkit
+    ../../core/services/hypr
   ];
   home = {
     packages = with pkgs; [