diff --git a/custom/cocktail-bar-cli/default.nix b/custom/cocktail-bar-cli/default.nix
deleted file mode 100644
index a47aef3..0000000
--- a/custom/cocktail-bar-cli/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ stdenv, autoPatchelfHook, ... }:
-stdenv.mkDerivation rec {
-  name = "cocktail-bar-cli";
-  version = "1.0";
-  src = /home/bertof/Documenti/Security/NPI/cli/cocktail-bar-cli;
-  dontUnpack = true;
-  nativeBuildInputs = [ autoPatchelfHook ];
-  installPhase = "install -m755 -D ${src} $out/bin/cocktail-bar-cli";
-}
diff --git a/flake.nix b/flake.nix
index 089d408..a8eaedf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -52,6 +52,11 @@
       _module.args.pkgs = import inputs.nixpkgs {
         inherit system;
         config.allowUnfree = true;
+        overlays = [
+          inputs.nix-rice.overlays.default
+          # inputs.self.overlays.rice.default
+          # inputs.self.overlays.packages
+        ];
       };
 
       pre-commit.settings.hooks = {
@@ -67,9 +72,61 @@
       };
 
       formatter = pkgs.nixpkgs-fmt;
+
+      packages = {
+        inherit
+          (pkgs)
+          clipedit
+          keyboard-switch
+          # lockscreen
+          #   ssdm-sugar-dark
+          #   ssdm-theme-clairvoyance
+          #   update-background
+          #   wl-clipedit
+          #   wl-lockscreen
+          # wl-update-background
+          ;
+      };
     };
 
-    flake = { };
+    flake = {
+      overlays = {
+        default = inputs.self.overlays.packages;
+
+        rice = import ./rice.nix;
+
+        packages = self: _super: {
+          clipedit = self.callPackage ./pkgs/clipedit { };
+          keyboard-switch = self.callPackage ./pkgs/keyboard-switch { };
+          lockscreen = self.callPackage ./pkgs/lockscreen { };
+          ssdm-sugar-dark = self.callPackage ./pkgs/ssdm-sugar-dark { };
+          ssdm-theme-clairvoyance = self.callPackage ./pkgs/ssdm-theme-clairvoyance { };
+          update-background = self.callPackage ./pkgs/update-background { };
+          wl-clipedit = self.callPackage ./pkgs/wl-clipedit { };
+          wl-lockscreen = self.callPackage ./pkgs/wl-lockscreen { };
+          wl-update-background = self.callPackage ./pkgs/wl-update-background { };
+        };
+
+        overrides = self: super: {
+          google-chrome = super.google-chrome.override { commandLineArgs = [ "--password-store=gnome" "--force-dark-mode" ]; };
+          sddm-theme-clairvoyance = self.callPackage ./custom/sddm-theme-clairvoyance { wallpaper = ./wallpapers/background.jpg; };
+          way-lockscreen = self.callPackage ./custom/way-lockscreen { palette = self.rice.colorPalette; font = self.rice.font.normal; };
+        };
+
+        # two-channels = (self: _: {
+        #   stable_pkgs = import inputs.nixpkgs {
+        #     inherit config overlays;
+        #     inherit (self) system;
+        #   };
+        #   unstable_pkgs = import inputs.nixpkgs-u {
+        #     inherit config overlays;
+        #     inherit (self) system;
+        #   };
+        # });
+
+
+      };
+    };
   };
 }
 
diff --git a/modules/hm/hyprland.nix b/modules/hm/hyprland.nix
index 8e2b149..89576ca 100644
--- a/modules/hm/hyprland.nix
+++ b/modules/hm/hyprland.nix
@@ -26,7 +26,7 @@
       swaylock
       swww
       # walker
-      way-lockscreen
+      wl-lockscreen
       waybar
       wl-clipboard
       wl-clipedit
@@ -211,7 +211,7 @@
         # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
         bind = SUPER, RETURN, exec, kitty
         bind = SUPER, W, killactive,
-        bind = SUPER, M, exec, way-lockscreen
+        bind = SUPER, M, exec, wl-lockscreen
         bind = SUPER_ALT_L, Q, exit,
         bind = SUPER, E, exec, nautilus
         bind = SUPER, L, exec, env -u WAYLAND_DISPLAY logseq
diff --git a/modules/hm/wl_update_background.nix b/modules/hm/wl_update_background.nix
index 3d59611..0ab50e5 100644
--- a/modules/hm/wl_update_background.nix
+++ b/modules/hm/wl_update_background.nix
@@ -1,20 +1,5 @@
-{ pkgs, ... }:
-let
-  update_time = "10m";
-  backgrounds_directory = "$HOME/Immagini/Sfondi/1080+/1440+";
-  update_script = pkgs.writeShellScriptBin "wl-update-background" ''
-    set -e
-    if [ $# -eq 0 ]; then
-      image=`${pkgs.findutils}/bin/find ${backgrounds_directory} -type f | ${pkgs.gnugrep}/bin/grep -v "/\." | ${pkgs.coreutils}/bin/shuf -n 1`
-    else
-      image="$1"
-    fi
-    echo "image: $image"
-    ${pkgs.swww}/bin/swww img "$image"
-  '';
-in
-{
-  home.packages = [ update_script ];
+{ pkgs, ... }: {
+  home.packages = [ pkgs.wl-update-background ];
 
   systemd.user.services."wl-update-background" = {
     Unit = {
@@ -29,7 +14,7 @@ in
     Service = {
       Type = "oneshot";
       IOSchedulingClass = "idle";
-      ExecStart = "${update_script}/bin/wl-update-background";
+      ExecStart = "${pkgs.wl-update-background}/bin/wl-update-background";
     };
   };
 
@@ -38,7 +23,7 @@ in
       Description = "Set random desktop background using swww";
     };
     Timer = {
-      OnUnitActiveSec = update_time;
+      OnUnitActiveSec = "10m";
     };
     Install = {
       WantedBy = [ "timers.target" ];
diff --git a/custom/clipedit/default.nix b/pkgs/clipedit/default.nix
similarity index 100%
rename from custom/clipedit/default.nix
rename to pkgs/clipedit/default.nix
diff --git a/custom/default.nix b/pkgs/default.nix
similarity index 100%
rename from custom/default.nix
rename to pkgs/default.nix
diff --git a/custom/keyboard-switch/default.nix b/pkgs/keyboard-switch/default.nix
similarity index 100%
rename from custom/keyboard-switch/default.nix
rename to pkgs/keyboard-switch/default.nix
diff --git a/custom/lockscreen/default.nix b/pkgs/lockscreen/default.nix
similarity index 100%
rename from custom/lockscreen/default.nix
rename to pkgs/lockscreen/default.nix
diff --git a/custom/sddm-sugar-dark/default.nix b/pkgs/sddm-sugar-dark/default.nix
similarity index 100%
rename from custom/sddm-sugar-dark/default.nix
rename to pkgs/sddm-sugar-dark/default.nix
diff --git a/custom/sddm-theme-clairvoyance/default.nix b/pkgs/sddm-theme-clairvoyance/default.nix
similarity index 100%
rename from custom/sddm-theme-clairvoyance/default.nix
rename to pkgs/sddm-theme-clairvoyance/default.nix
diff --git a/custom/update-background/default.nix b/pkgs/update-background/default.nix
similarity index 100%
rename from custom/update-background/default.nix
rename to pkgs/update-background/default.nix
diff --git a/custom/wl-clipedit/default.nix b/pkgs/wl-clipedit/default.nix
similarity index 100%
rename from custom/wl-clipedit/default.nix
rename to pkgs/wl-clipedit/default.nix
diff --git a/custom/way-lockscreen/default.nix b/pkgs/wl-lockscreen/default.nix
similarity index 96%
rename from custom/way-lockscreen/default.nix
rename to pkgs/wl-lockscreen/default.nix
index 8e19db0..9690d17 100644
--- a/custom/way-lockscreen/default.nix
+++ b/pkgs/wl-lockscreen/default.nix
@@ -14,7 +14,7 @@
 let
   strPalette = lib.nix-rice.palette.toRgbaShortHex palette;
 in
-writeScriptBin "way-lockscreen" ''
+writeScriptBin "wl-lockscreen" ''
   # Using font package ${font.package}
   ${swaylock}/bin/swaylock \
   --color "${strPalette.primary.background}" \
diff --git a/pkgs/wl-update-background/default.nix b/pkgs/wl-update-background/default.nix
new file mode 100644
index 0000000..54ae7f3
--- /dev/null
+++ b/pkgs/wl-update-background/default.nix
@@ -0,0 +1,16 @@
+{ findutils
+, gnugrep
+, coreutils
+, writeShellScriptBin
+, swww
+, backgrounds_directory ? "$HOME/Immagini/Sfondi/1080+/1440+"
+}: writeShellScriptBin "wl-update-background" ''
+  set -e
+  if [ $# -eq 0 ]; then
+    image=`${findutils}/bin/find ${backgrounds_directory} -type f | ${gnugrep}/bin/grep -v "/\." | ${coreutils}/bin/shuf -n 1`
+  else
+    image="$1"
+  fi
+  echo "image: $image"
+  ${swww}/bin/swww img "$image"
+''