add caelestia shell

home-manager/modules/hypr/hypr.nix

@@ -1,10 +1,11 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, inputs, ... }:
 
 # TODO:
 # - make hyprexpo work
 
 {
   imports = [
+    inputs.caelestia-shell.homeManagerModules.default
     # ./hyprland/env.nix
     # ./hyprland/execs.nix
     # ./hyprland/general.nix
@@ -12,10 +13,27 @@
     # ./hyprland/active.nix
     ./hyprland/rules.nix
     ./hyprland/keybinds.nix # done
-    ./hyprlock.nix # done
+    # ./hyprlock.nix # done
     ./hypridle.nix # done
-    ./qs/qs.nix
   ] ++ lib.optional (builtins.pathExists ./hyprland/my.nix) ./hyprland/my.nix;
+
+  programs.caelestia = {
+    enable = true;
+    systemd = {
+      enable = false; # if you prefer starting from your compositor
+      target = "graphical-session.target";
+      environment = [ ];
+    };
+    settings = {
+      # bar.status = { showBattery = false; };
+      # paths.wallpaperDir = "~/Images";
+    };
+    cli = {
+      enable = true; # Also add caelestia-cli to path
+      # settings = { theme.enableGtk = false; };
+    };
+  };
+
   home.packages = with pkgs; [
     (pkgs.writeScriptBin "wallpaper" (''
       #!${pkgs.python311}/bin/python3
@@ -27,14 +45,14 @@
     nemo
     pywal
     jq
-    quickshell
+    xdg-desktop-portal
+    xdg-desktop-portal-gtk
+    xdg-desktop-portal-hyprland
+    xdg-desktop-portal-shana
+    # wayvnc # configure in future for auto start
   ];
   programs.vicinae.enable = true;
   services.swww.enable = true;
-  programs.hyprpanel = {
-    enable = true;
-    settings = builtins.fromJSON (builtins.readFile ./hyprpanel.json);
-  };
 
   home.file.".config/hypr/scripts" = {
     source = ./scripts;
@@ -54,14 +72,12 @@
       layerrule = [ "noanim, vicinae" "blur,vicinae" "ignorealpha 0, vicinae" ];
       env = [ "XCURSOR_SIZE,24" "HYPRCURSOR_SIZE,24" ];
 
-      # кто-то возраждает swww
-      # надо узнать, кому он нужен
       exec-once = [
-        "hyprlock --immediate-render --no-fade-in &"
+        "caelestia shell &"
+        "caelestia shell lock lock; until [ $? -eq 0 ]; do sleep 1; caelestia shell lock lock; done"
+        # "hyprlock --immediate-render --no-fade-in &"
         "wal -R &"
-        "swww img ${config.home.homeDirectory}/Pictures/wallpaper.png &"
-        # "(swww-daemon &) && sleep 2 && swww img ${config.home.homeDirectory}/Pictures/wallpaper.png"
-        "hyprpanel &"
+        # "swww img ${config.home.homeDirectory}/Pictures/wallpaper.png &"
         "vicinae server &"
         "gsettings set org.gnome.desktop.interface cursor-theme '${config.home.pointerCursor.name}'"
         "gsettings set org.gnome.desktop.interface cursor-size ${
@@ -74,9 +90,11 @@
       debug = { disable_logs = false; };
 
       monitor = [
-        "eDP-1,preferred,auto,1.25"
+        "eDP-1,preferred,0x0,1.25"
         "HDMI-A-1,preferred,auto-left,auto"
         "HDMI-A-2,preferred,auto-left,auto"
+        "vcl-samsung,2340x1080@30,0x864,2"
+        "vcl-xiaomi,1440x900@30,-900x0,1"
       ];
 
       input = {
@@ -211,6 +229,8 @@
         disable_splash_rendering = true;
         focus_on_activate = false;
 
+        vrr = 0;
+
         # TODO: enable after rules.nix
 
         # vfr = 1;