diff --git a/home/extra/browsers/default.nix b/home/core/gui/browsers/default.nix
similarity index 100%
rename from home/extra/browsers/default.nix
rename to home/core/gui/browsers/default.nix
diff --git a/home/extra/discord/default.nix b/home/core/gui/discord/default.nix
similarity index 100%
rename from home/extra/discord/default.nix
rename to home/core/gui/discord/default.nix
diff --git a/home/extra/lutris/default.nix b/home/core/gui/lutris/default.nix
similarity index 100%
rename from home/extra/lutris/default.nix
rename to home/core/gui/lutris/default.nix
diff --git a/home/extra/mangohud/default.nix b/home/core/gui/mangohud/default.nix
similarity index 100%
rename from home/extra/mangohud/default.nix
rename to home/core/gui/mangohud/default.nix
diff --git a/home/core/services/hypr/idle/default.nix b/home/core/services/hypr/idle/default.nix
new file mode 100644
index 00000000..dd2e2d7e
--- /dev/null
+++ b/home/core/services/hypr/idle/default.nix
@@ -0,0 +1,27 @@
+{
+  services.hypridle = {
+    enable = true;
+    importantPrefixes = [
+      "$lock_cmd = pidof hyprlock || hyprlock"
+      "$suspend_cmd = pidof steam || systemctl suspend || loginctl suspend"
+    ];
+    settings = {
+      general = {
+        lock_cmd = "$lock_cmd";
+        before_sleep_cmd = "$lock_cmd";
+      };
+
+      listener = [
+        {
+          timeout = 900; # 15mins
+          on-timeout = "$lock_cmd";
+        }
+        {
+          timeout = 1200; # 20mins
+          on-timeout = "hyprctl dispatch dpms off";
+          on-resume = "hyprctl dispatch dpms on";
+        }
+      ];
+    };
+  };
+}
diff --git a/home/core/services/hypr/lock/default.nix b/home/core/services/hypr/lock/default.nix
new file mode 100644
index 00000000..bf27aa3e
--- /dev/null
+++ b/home/core/services/hypr/lock/default.nix
@@ -0,0 +1,69 @@
+{
+  programs.hyprlock = {
+    enable = true;
+    settings = {
+      general = {
+        disable_loading_bar = true;
+        hide_cursor = false;
+        no_fade_in = true;
+      };
+      background = [
+        {
+          path = "/src/wallpaper.png";
+          blur_size = 3;
+          blur_passes = 2;
+        }
+      ];
+      input-field = [
+        {
+          monitor = "";
+          size = "200, 50";
+          outline_thickness = 2;
+          dots_size = 0.33;
+          dots_spacing = 0.15;
+          dots_center = true;
+          dots_rounding = -1;
+          outer_color = "rgba(3B3B3B55)";
+          inner_color = "rgba(33333311)";
+          font_color = "rgba(FFFFFFFF)";
+          fade_on_empty = true;
+          fade_timeout = 5000;
+          placeholder_text = "";
+          hide_input = false;
+          rounding = -1;
+          check_color = "rgb(204, 136, 34)";
+          failed_color = "rgb(204, 34, 34)";
+        }
+      ];
+      label = [
+        {
+          # Clock
+          monitor = "";
+          text = "cmd[update:1000] echo '$TIME'";
+          shadow_passes = 1;
+          shadow_boost = 0.5;
+          color = "rgba(FFFFFFFF)";
+          font_size = 85;
+          font_family = "Input Mono";
+          position = "0, 300";
+          halign = "center";
+          valign = "center";
+        }
+        {
+          # Date
+          monitor = "";
+          text = "cmd[update:1000] echo '$(date -I)'";
+          shadow_passes = 1;
+          shadow_boost = 0.5;
+          color = "rgba(FFFFFFFF)";
+          font_size = 25;
+          font_family = "Input Mono Compressed";
+
+          position = "0, 280";
+          halign = "center";
+          valign = "center";
+        }
+      ];
+    };
+  };
+}
diff --git a/home/core/services/hypr/paper/default.nix b/home/core/services/hypr/paper/default.nix
new file mode 100644
index 00000000..4e5a77d4
--- /dev/null
+++ b/home/core/services/hypr/paper/default.nix
@@ -0,0 +1,17 @@
+{
+  services.hyprpaper = {
+    enable = true;
+    settings = {
+      ipc = "on";
+      splash = false;
+      splash_offset = 2.0;
+
+      preload = ["./src/nix.png" "./src/wallpaper.png"];
+
+      wallpaper = [
+        "DP-3,./src/wallpaper.png"
+        # "DP-1,/share/wallpapers/cat_pacman.png"
+      ];
+    };
+  };
+}
diff --git a/home/core/services/hypr/paper/src/nix.png b/home/core/services/hypr/paper/src/nix.png
new file mode 100644
index 00000000..5384eca3
Binary files /dev/null and b/home/core/services/hypr/paper/src/nix.png differ
diff --git a/home/core/services/hypr/paper/src/wallpaper.png b/home/core/services/hypr/paper/src/wallpaper.png
new file mode 100644
index 00000000..8828174d
Binary files /dev/null and b/home/core/services/hypr/paper/src/wallpaper.png differ
diff --git a/home/core/gui/mako/default.nix b/home/core/services/mako/default.nix
similarity index 100%
rename from home/core/gui/mako/default.nix
rename to home/core/services/mako/default.nix
diff --git a/home/core/system/polkit.nix b/home/core/services/polkit/default.nix
similarity index 100%
rename from home/core/system/polkit.nix
rename to home/core/services/polkit/default.nix
diff --git a/home/core/system/udiskie.nix b/home/core/services/udiskie/default.nix
similarity index 100%
rename from home/core/system/udiskie.nix
rename to home/core/services/udiskie/default.nix
diff --git a/home/extra/foot/default.nix b/home/core/tui/foot/default.nix
similarity index 100%
rename from home/extra/foot/default.nix
rename to home/core/tui/foot/default.nix
diff --git a/home/extra/kitty/default.nix b/home/core/tui/kitty/default.nix
similarity index 100%
rename from home/extra/kitty/default.nix
rename to home/core/tui/kitty/default.nix
diff --git a/home/extra/neovim/autocommands.nix b/home/core/tui/neovim/autocommands.nix
similarity index 100%
rename from home/extra/neovim/autocommands.nix
rename to home/core/tui/neovim/autocommands.nix
diff --git a/home/extra/neovim/completion.nix b/home/core/tui/neovim/completion.nix
similarity index 100%
rename from home/extra/neovim/completion.nix
rename to home/core/tui/neovim/completion.nix
diff --git a/home/extra/neovim/default.nix b/home/core/tui/neovim/default.nix
similarity index 100%
rename from home/extra/neovim/default.nix
rename to home/core/tui/neovim/default.nix
diff --git a/home/extra/neovim/keymappings.nix b/home/core/tui/neovim/keymappings.nix
similarity index 100%
rename from home/extra/neovim/keymappings.nix
rename to home/core/tui/neovim/keymappings.nix
diff --git a/home/extra/neovim/options.nix b/home/core/tui/neovim/options.nix
similarity index 100%
rename from home/extra/neovim/options.nix
rename to home/core/tui/neovim/options.nix
diff --git a/home/extra/neovim/plugins/barbar.nix b/home/core/tui/neovim/plugins/barbar.nix
similarity index 100%
rename from home/extra/neovim/plugins/barbar.nix
rename to home/core/tui/neovim/plugins/barbar.nix
diff --git a/home/extra/neovim/plugins/comment.nix b/home/core/tui/neovim/plugins/comment.nix
similarity index 100%
rename from home/extra/neovim/plugins/comment.nix
rename to home/core/tui/neovim/plugins/comment.nix
diff --git a/home/extra/neovim/plugins/conform.nix b/home/core/tui/neovim/plugins/conform.nix
similarity index 100%
rename from home/extra/neovim/plugins/conform.nix
rename to home/core/tui/neovim/plugins/conform.nix
diff --git a/home/extra/neovim/plugins/default.nix b/home/core/tui/neovim/plugins/default.nix
similarity index 100%
rename from home/extra/neovim/plugins/default.nix
rename to home/core/tui/neovim/plugins/default.nix
diff --git a/home/extra/neovim/plugins/efm.nix b/home/core/tui/neovim/plugins/efm.nix
similarity index 100%
rename from home/extra/neovim/plugins/efm.nix
rename to home/core/tui/neovim/plugins/efm.nix
diff --git a/home/extra/neovim/plugins/floaterm.nix b/home/core/tui/neovim/plugins/floaterm.nix
similarity index 100%
rename from home/extra/neovim/plugins/floaterm.nix
rename to home/core/tui/neovim/plugins/floaterm.nix
diff --git a/home/extra/neovim/plugins/harpoon.nix b/home/core/tui/neovim/plugins/harpoon.nix
similarity index 100%
rename from home/extra/neovim/plugins/harpoon.nix
rename to home/core/tui/neovim/plugins/harpoon.nix
diff --git a/home/extra/neovim/plugins/lsp.nix b/home/core/tui/neovim/plugins/lsp.nix
similarity index 100%
rename from home/extra/neovim/plugins/lsp.nix
rename to home/core/tui/neovim/plugins/lsp.nix
diff --git a/home/extra/neovim/plugins/lualine.nix b/home/core/tui/neovim/plugins/lualine.nix
similarity index 100%
rename from home/extra/neovim/plugins/lualine.nix
rename to home/core/tui/neovim/plugins/lualine.nix
diff --git a/home/extra/neovim/plugins/markdown-preview.nix b/home/core/tui/neovim/plugins/markdown-preview.nix
similarity index 100%
rename from home/extra/neovim/plugins/markdown-preview.nix
rename to home/core/tui/neovim/plugins/markdown-preview.nix
diff --git a/home/extra/neovim/plugins/neo-tree.nix b/home/core/tui/neovim/plugins/neo-tree.nix
similarity index 100%
rename from home/extra/neovim/plugins/neo-tree.nix
rename to home/core/tui/neovim/plugins/neo-tree.nix
diff --git a/home/extra/neovim/plugins/nonels.nix b/home/core/tui/neovim/plugins/nonels.nix
similarity index 100%
rename from home/extra/neovim/plugins/nonels.nix
rename to home/core/tui/neovim/plugins/nonels.nix
diff --git a/home/extra/neovim/plugins/startify.nix b/home/core/tui/neovim/plugins/startify.nix
similarity index 100%
rename from home/extra/neovim/plugins/startify.nix
rename to home/core/tui/neovim/plugins/startify.nix
diff --git a/home/extra/neovim/plugins/tagbar.nix b/home/core/tui/neovim/plugins/tagbar.nix
similarity index 100%
rename from home/extra/neovim/plugins/tagbar.nix
rename to home/core/tui/neovim/plugins/tagbar.nix
diff --git a/home/extra/neovim/plugins/telescope.nix b/home/core/tui/neovim/plugins/telescope.nix
similarity index 100%
rename from home/extra/neovim/plugins/telescope.nix
rename to home/core/tui/neovim/plugins/telescope.nix
diff --git a/home/extra/neovim/plugins/treesitter.nix b/home/core/tui/neovim/plugins/treesitter.nix
similarity index 100%
rename from home/extra/neovim/plugins/treesitter.nix
rename to home/core/tui/neovim/plugins/treesitter.nix
diff --git a/home/extra/neovim/plugins/vimtex.nix b/home/core/tui/neovim/plugins/vimtex.nix
similarity index 100%
rename from home/extra/neovim/plugins/vimtex.nix
rename to home/core/tui/neovim/plugins/vimtex.nix
diff --git a/home/extra/neovim/plugins/yanky.nix b/home/core/tui/neovim/plugins/yanky.nix
similarity index 100%
rename from home/extra/neovim/plugins/yanky.nix
rename to home/core/tui/neovim/plugins/yanky.nix
diff --git a/home/extra/neovim/todo.nix b/home/core/tui/neovim/todo.nix
similarity index 100%
rename from home/extra/neovim/todo.nix
rename to home/core/tui/neovim/todo.nix
diff --git a/home/extra/wezterm/default.nix b/home/core/tui/wezterm/default.nix
similarity index 100%
rename from home/extra/wezterm/default.nix
rename to home/core/tui/wezterm/default.nix
diff --git a/home/extra/zellij/default.nix b/home/core/tui/zellij/default.nix
similarity index 100%
rename from home/extra/zellij/default.nix
rename to home/core/tui/zellij/default.nix
diff --git a/home/users/cnst/imports.nix b/home/users/cnst/imports.nix
index 15bb9d75..6d2db804 100644
--- a/home/users/cnst/imports.nix
+++ b/home/users/cnst/imports.nix
@@ -48,7 +48,6 @@
       qt5.qtwayland
       qt6.qtwayland
       slurp
-      swaybg
       #  thefuck
       wireguard-tools
       wl-clipboard
diff --git a/nixos/hosts/cnix/system.nix b/nixos/hosts/cnix/system.nix
index 249e24ff..61bf104c 100644
--- a/nixos/hosts/cnix/system.nix
+++ b/nixos/hosts/cnix/system.nix
@@ -11,7 +11,11 @@
       flake = "/home/cnst/.nix-config";
     };
   };
-  security.rtkit.enable = true;
+
+  security = {
+    rtkit.enable = true;
+    pam.services.hyprlock = {};
+  };
 
   environment.localBinInPath = true;