From a20fc141524990730f21e5d8ca21fc988df0cca6 Mon Sep 17 00:00:00 2001
From: unexplrd <user@dunamis>
Date: Tue, 18 Feb 2025 16:40:03 +0200
Subject: [PATCH] upd

---
 hosts/dunamis/stylix.nix                  |  2 +-
 hosts/dunamis/users/user/programs.nix     |  1 +
 modules/home/desktop/hyprland/default.nix | 77 ++++++++++++-----------
 modules/home/programs/editor/nixvim.nix   |  2 +-
 modules/home/programs/editor/zed.nix      | 11 +++-
 5 files changed, 52 insertions(+), 41 deletions(-)

diff --git a/hosts/dunamis/stylix.nix b/hosts/dunamis/stylix.nix
index 4ba3d23..8b75cc2 100644
--- a/hosts/dunamis/stylix.nix
+++ b/hosts/dunamis/stylix.nix
@@ -19,7 +19,7 @@
       name = "GoogleDot-Blue";
       size = 24;
     };
-    image = ../../wallpapers/wallhaven-9djzww.jpg;
+    image = ../../wallpapers/wallhaven-wejkzx.jpg;
     opacity.terminal = 0.9;
     fonts = {
       sizes = {
diff --git a/hosts/dunamis/users/user/programs.nix b/hosts/dunamis/users/user/programs.nix
index fcc38f6..4f9e1b2 100644
--- a/hosts/dunamis/users/user/programs.nix
+++ b/hosts/dunamis/users/user/programs.nix
@@ -37,6 +37,7 @@
   editor = {
     helix.enable = true;
     neve.enable = true;
+    zed.enable = true;
   };
 
   home.packages = with pkgs; [
diff --git a/modules/home/desktop/hyprland/default.nix b/modules/home/desktop/hyprland/default.nix
index 3b407b1..8d6a600 100644
--- a/modules/home/desktop/hyprland/default.nix
+++ b/modules/home/desktop/hyprland/default.nix
@@ -361,13 +361,24 @@ in {
           # "10, defaultName:"
         ];
         windowrulev2 = [
-          # tray/misc utilities
-          "float, initialTitle:MainPicker" # why is it not floating by default
+          ## tray/misc utilities
+          # file picker
+          "float, class:xdg-desktop-portal-gtk"
+          "size <50% <90%, class:xdg-desktop-portal-gtk"
+          "center 1, class:xdg-desktop-portal-gtk"
+          # xdp-hyprland stream picker
+          "float, initialTitle:MainPicker"
+          # general apps
           "float, class:(com.saivert.pwvucontrol)"
           "float, class:(re.sonny.Junction)"
           "float, class:(com.github.hluk.copyq)"
           "float, class:(nm-connection-editor)"
           "float, class:(.blueman-manager-wrapped)"
+          # telegram
+          "maximize, initialTitle:Медіапереглядач"
+          "float, title:TelegramDesktop"
+          "noborder, title:TelegramDesktop"
+          "noblur, title:TelegramDesktop"
           # screenshot editor
           "noanim, class:com.gabm.satty"
           "float, class:com.gabm.satty"
@@ -378,8 +389,6 @@ in {
           ## games
           "float, class:(com.mojang.minecraft.java-edition)"
           "immediate, class:(com.mojang.minecraft.java-edition)"
-          # apex legends
-          # "immediate, class:(steam_app_1172470)"
           # cs2
           "immediate, class:(cs2)"
           # deadlock
@@ -416,41 +425,38 @@ in {
         submap = reset
       '';
     };
-    services.hyprpaper = {
-      enable = true;
-    };
-    services.hypridle = {
-      enable = true;
-      settings = {
-        general = {
-          before_sleep_cmd = "loginctl lock-session";
-          after_sleep_cmd = "hyprctl dispatch dpms on";
-          lock_cmd = "pidof hyprlock || hyprlock";
-          # unlock_cmd = "loginctl unlock-session";
-        };
-        listener = [
-          {
-            timeout = 600;
-            on-timeout = "pidof hyprlock || hyprlock";
-          }
-          {
-            timeout = 601;
-            on-timeout = "hyprctl dispatch dpms off";
-            on-resume = "hyprctl dispatch dpms on";
-          }
-        ];
-      };
-    };
-
-    services.gnome-keyring = {
-      enable = true;
-      components = ["secrets" "ssh"];
-    };
     services = {
+      hyprpaper.enable = true;
+      hypridle = {
+        enable = true;
+        settings = {
+          general = {
+            before_sleep_cmd = "loginctl lock-session";
+            after_sleep_cmd = "hyprctl dispatch dpms on";
+            lock_cmd = "pidof hyprlock || hyprlock";
+            # unlock_cmd = "loginctl unlock-session";
+          };
+          listener = [
+            {
+              timeout = 600;
+              on-timeout = "pidof hyprlock || hyprlock";
+            }
+            {
+              timeout = 601;
+              on-timeout = "hyprctl dispatch dpms off";
+              on-resume = "hyprctl dispatch dpms on";
+            }
+          ];
+        };
+      };
       network-manager-applet.enable = true;
       blueman-applet.enable = true;
       playerctld.enable = true;
       copyq.enable = true;
+      gnome-keyring = {
+        enable = true;
+        components = ["secrets" "ssh"];
+      };
     };
     gtk = {
       enable = true;
@@ -523,9 +529,6 @@ in {
               system = "󰢻";
               media = "󱜐";
               tray = "󱊖";
-              #focused = "󰗝";
-              #active = "󰻃";
-              #default = "󰄰";
             };
           };
           "hyprland/language" = {
diff --git a/modules/home/programs/editor/nixvim.nix b/modules/home/programs/editor/nixvim.nix
index 70511ce..4e7798b 100644
--- a/modules/home/programs/editor/nixvim.nix
+++ b/modules/home/programs/editor/nixvim.nix
@@ -1,6 +1,6 @@
 {
   pkgs,
-  pkgs-51b85c,
+  # pkgs-51b85c,
   lib,
   config,
   ...
diff --git a/modules/home/programs/editor/zed.nix b/modules/home/programs/editor/zed.nix
index 44609c8..105cc1b 100644
--- a/modules/home/programs/editor/zed.nix
+++ b/modules/home/programs/editor/zed.nix
@@ -28,8 +28,8 @@ in {
         languages = {
           "Nix" = {
             language-servers = [
-              "nil"
-              "!nixd"
+              "!nil"
+              "nixd"
             ];
             formatter = {
               external.command = lib.getExe pkgs.alejandra;
@@ -84,6 +84,13 @@ in {
               path = lib.getExe pkgs.ruff;
             };
           };
+          nixd = {
+            binary = {
+              arguments = [];
+              path = lib.getExe pkgs.nixd;
+            };
+            initialization_options.formatting.command = [(lib.getExe pkgs.alejandra)];
+          };
           nil = {
             binary = {
               arguments = [];