diff --git a/hadi/app.nix b/hadi/app.nix
deleted file mode 100644
index 1fa95a3..0000000
--- a/hadi/app.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    firefox
-    nextcloud-client
-    obsidian
-    chromium
-    swappy
-    hyprpicker
-    discord
-    imv
-    spotify
-  ];
-
-  programs.thunar.enable = true;
-  nixpkgs.overlays = [
-    (final: prev: { qutebrowser = prev.qutebrowser.override { enableWideVine = true; }; })
-  ];
-}
diff --git a/hadi/cli.nix b/hadi/cli.nix
deleted file mode 100644
index 0a3a2fa..0000000
--- a/hadi/cli.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    ranger
-    fd
-    lazygit
-    tree-sitter
-    btop
-    bitwarden-cli
-  ];
-}
diff --git a/hadi/default.nix b/hadi/default.nix
deleted file mode 100644
index 21591e6..0000000
--- a/hadi/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    imports = [
-      ./app.nix
-      ./cli.nix
-      ./dev.nix
-      ./utils.nix
-      ./font.nix
-    ];
-  }
diff --git a/hadi/dev.nix b/hadi/dev.nix
deleted file mode 100644
index f832c00..0000000
--- a/hadi/dev.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    go
-    cargo
-    nodejs
-    python3
-  ];
-
-  programs.nix-ld.enable = true;
-  programs.nix-ld.libraries = with pkgs; [
-    stylua
-    lua-language-server
-  ];
-}
diff --git a/hadi/font.nix b/hadi/font.nix
deleted file mode 100644
index ed6bcea..0000000
--- a/hadi/font.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }: {
-
-  fonts.packages = with pkgs; [
-    (nerdfonts.override { fonts = [ "FiraCode" ]; })
-    #inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd
-    #inputs.apple-fonts.packages.${pkgs.system}.sf-mono-nerd
-  ];
-
-}
diff --git a/hadi/utils.nix b/hadi/utils.nix
deleted file mode 100644
index 8a28942..0000000
--- a/hadi/utils.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ pkgs, ... }: {
-  environment.systemPackages = with pkgs; [
-    unzip
-    ripgrep
-    wget
-    libva
-    qt5ct
-    stow
-    blueman
-    gcc
-    peaclock
-    alejandra
-    libnotify
-    xdg_utils
-    tldr
-  ];
-}
diff --git a/home/dunst/default.nix b/home/dunst/default.nix
index 6264dc6..c3135be 100644
--- a/home/dunst/default.nix
+++ b/home/dunst/default.nix
@@ -1,6 +1,10 @@
 { config, lib, pkgs, ... }:
-
 {
+
+  home.packages = with pkgs; [
+   libnotify
+  ];
+
 services.dunst = {
     enable = true;
     iconTheme = {
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 9773436..90a5714 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -1,5 +1,7 @@
 { pkgs, config, ... }: {
 
+  imports = [ ./hyprlock.nix ./hypridle.nix ];
+
   home.packages = with pkgs; [
     xdg-desktop-portal-hyprland
     wlr-randr
@@ -32,6 +34,7 @@
       exec-once = [
         "swww init"
         "swww img /home/hadi/Nextcloud/wallpaper/Dim_12000x6000.png"
+        "hypridle"
       ];
 
       monitor = [
@@ -97,6 +100,39 @@
         "QT_STYLE_OVERRIDE,Adwaita-Dark"
       ];
 
+      general = {
+        resize_on_border = true;
+        gaps_in = 10;
+        gaps_out = 20;
+        border_size = 2;
+        "col.active_border" = "rgba(9978F8ff)";
+        "col.inactive_border" = "rgba(0b0b16ee)";
+        layout = "master";
+      };
+
+      decoration = {
+        rounding = 15;
+        drop_shadow = true;
+        shadow_range = 15;
+        shadow_render_power = 4;
+        "col.shadow" = "rgba(00010196)";
+        blur = { enabled = false; };
+      };
+
+      master = {
+        new_is_master = true;
+        new_on_top = true;
+      };
+
+      gestures = { workspace_swipe = true; };
+
+      misc = {
+        disable_hyprland_logo = true;
+        disable_splash_rendering = true;
+        focus_on_activate = true;
+        new_window_takes_over_fullscreen = 2;
+      };
+
       input = {
         kb_layout = "fr";
 
diff --git a/home/hyprland/hypridle.nix b/home/hyprland/hypridle.nix
new file mode 100644
index 0000000..bdc2e5a
--- /dev/null
+++ b/home/hyprland/hypridle.nix
@@ -0,0 +1,23 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [ hypridle ];
+
+  xdg.configFile."hypr/hypridle.conf".text = ''
+    general {
+        ignore_dbus_inhibit = false             # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
+    }
+
+    # Screenlock
+    listener {
+        timeout = 600                            # in seconds
+        on-timeout = hyprlock # command to run when timeout has passed
+        on-resume = notify-send "Welcome back hadi!"  # command to run when activity is detected after timeout has fired.
+    }
+
+    # Suspend
+    listener {
+        timeout = 660                            # in seconds
+        on-timeout = systemctl suspend # command to run when timeout has passed
+        # on-resume = notify-send "Welcome back to your desktop!"  # command to run when activity is detected after timeout has fired.
+    }
+  '';
+}
diff --git a/home/hyprland/hyprlock.nix b/home/hyprland/hyprlock.nix
new file mode 100644
index 0000000..983f2f3
--- /dev/null
+++ b/home/hyprland/hyprlock.nix
@@ -0,0 +1,50 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [ hyprlock ];
+
+  xdg.configFile."hypr/hyprlock.conf".text = ''
+    background {
+        monitor =
+        path = $HOME/Nextcloud/wallpaper/Dim_12000x6000.png
+        color = rgba(25, 20, 20, 1.0)
+
+        # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
+        blur_passes = 4 # 0 disables blurring
+        blur_size = 2
+        noise = 0.0117
+        contrast = 0.8916
+        brightness = 0.8172
+        vibrancy = 0.1696
+        vibrancy_darkness = 0.0
+    }
+
+    input-field {
+        monitor =
+        size = 200, 50
+        outline_thickness = 1
+        dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
+        dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
+        dots_center = true
+        outer_color = rgb(000000)
+        inner_color = rgb(200, 200, 200)
+        font_color = rgb(10, 10, 10)
+        fade_on_empty = true
+        placeholder_text = <i>Input Password...</i> # Text rendered in the input box when it's empty.
+        hide_input = false
+        position = 0, -20
+        halign = center
+        valign = center
+    }
+
+    label {
+        monitor =
+        text = Enter your password to unlock
+        color = rgba(200, 200, 200, 1.0)
+        font_size = 25
+        font_family = Noto Sans
+
+        position = 0, 200
+        halign = center
+        valign = center
+    }
+  '';
+}
diff --git a/home/nvim/default.nix b/home/nvim/default.nix
index e060d0e..827295b 100644
--- a/home/nvim/default.nix
+++ b/home/nvim/default.nix
@@ -23,6 +23,7 @@
     enable = true;
 
     colorschemes.catppuccin.enable = true;
+    colorschemes.catppuccin.transparentBackground = true;
 
     keymaps = [
       {
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 2a74a28..4c6a5b5 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -71,6 +71,7 @@
     nvidiaSettings = true;
   };
   hardware.bluetooth.enable = true;
+  services.blueman.enable = true;
 
   # Set environment variables
   environment.variables = {