Poprawa integracji z portalem XDG i wsparcie dla Ulaunchera

- Dodano `xdg-desktop-portal-hyprland` do konfiguracji systemowej, Hyprlanda oraz środowiska użytkownika. - Włączono obsługę `dbus` w `initrd`, co może być wymagane przez `xdg-desktop-portal`. - Rozszerzono konfigurację portali XDG o jawne ustawienia priorytetów (`gtk`, `hyprland`). - Dodano `ulauncher` oraz `wmctrl` do listy narzędzi, a także nowe skróty klawiszowe do jego uruchamiania. - Pomimo zmian, integracja portalu XDG nie działa jeszcze zgodnie z oczekiwaniami.
aktualizacja zależności
2025-05-07 20:11:04 +02:00 · 2025-05-05 21:34:03 +02:00
9 changed files with 99 additions and 54 deletions
--- a/config/hyprland.nix
+++ b/config/hyprland.nix
@@ -1,5 +1,6 @@
 {
  lib,
+  pkgs,
  username,
  host,
  config,
@@ -18,6 +19,7 @@ in
      enable = true;
      xwayland.enable = true;
      systemd.enable = true;
+      portalPackage = pkgs.xdg-desktop-portal-hyprland;
      extraConfig = let
        modifier = "SUPER";
      in
@@ -192,6 +194,7 @@ in
            bind = ${modifier},SPACE,togglespecialworkspace
            bind = ${modifier},Return,exec,${terminal}
            bind = ${modifier}SHIFT,Return,exec,rofi-launcher
+            bind = ${modifier}ALT,SPACE,exec,ulauncher-toggle
            bind = ${modifier}ALT,W,exec,wallsetter
            bind = ${modifier}SHIFT,S,exec,screenshootin
            bind = ${modifier},E,exec,emopicker9000
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1745403023,
-        "narHash": "sha256-DEs6jbWYJFJgpaPtF5NT3DQs3erjzdm2brLNHpjrEPA=",
+        "lastModified": 1746268454,
+        "narHash": "sha256-cUrVjYzFn1zzR6m2hc02CdjlSPIADtAVo+7BE7qq0ZA=",
        "owner": "AdnanHodzic",
        "repo": "auto-cpufreq",
-        "rev": "ad6e313dabf7e4da2765be6b36688db85b29ff5f",
+        "rev": "3ffbee11df46921c9a60f118d3450a7e460f7b13",
        "type": "github"
      },
      "original": {
@@ -95,11 +95,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1745752599,
-        "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=",
+        "lastModified": 1746417810,
+        "narHash": "sha256-VhghpfFdvGiDeh6HqFhQncnLx4IrtFy4VWdCQvOwccI=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e",
+        "rev": "14c779b4ff24742307127970549ac9a51de3f98a",
        "type": "gitlab"
      },
      "original": {
@@ -271,11 +271,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1745894335,
-        "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=",
+        "lastModified": 1746413188,
+        "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa",
+        "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a",
        "type": "github"
      },
      "original": {
@@ -287,11 +287,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1745930157,
-        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
+        "lastModified": 1746328495,
+        "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
+        "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
        "type": "github"
      },
      "original": {
@@ -311,11 +311,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1745459908,
-        "narHash": "sha256-bWqgohVf/py9EW3bLS/dYbenD2p9N2/Qsw1+CJk1S04=",
+        "lastModified": 1746056780,
+        "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "dbc4ba3233b2bf951521177bf0ee0a7679959035",
+        "rev": "d476cd0972dd6242d76374fcc277e6735715c167",
        "type": "github"
      },
      "original": {
@@ -359,11 +359,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1745962538,
-        "narHash": "sha256-UmQxI4ocPZUVHuxtaQN3zNNBU8KLK9x2gXl2kWUhMKY=",
+        "lastModified": 1746469524,
+        "narHash": "sha256-uwFQebWXtMsRBmzKOYa6jjs7PDnfSuwyrqPK6yzqamU=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "764fd32955e79f2742a7975f0150175f93add2fb",
+        "rev": "45aa0e849282dba5979e7bb3d0f6676bbd9dc130",
        "type": "github"
      },
      "original": {
--- a/hosts/garand-laptop/config/boot.nix
+++ b/hosts/garand-laptop/config/boot.nix
@@ -18,6 +18,7 @@
      systemd-boot.enable = true;
      efi.canTouchEfiVariables = true;
    };
+    initrd.systemd.dbus.enable = true;
    # Make /tmp a tmpfs
    tmp = {
      useTmpfs = false;
--- a/hosts/garand-laptop/config/nixpkgs.nix
+++ b/hosts/garand-laptop/config/nixpkgs.nix
@@ -25,6 +25,11 @@
  nixpkgs.config = {
    allowUnfree = true;
    pulseaudio = true;
+    # packageOverrides = pkgs: {
+    #   ulauncher = pkgs.ulauncher.override {
+    #     autoStart = true;
+    #   };
+    # };
  };

  # Extra Portal Configuration
@@ -34,12 +39,19 @@
    wlr.enable = true;
    extraPortals = [
      pkgs.xdg-desktop-portal-gtk
-      pkgs.xdg-desktop-portal
+      pkgs.xdg-desktop-portal-hyprland
    ];
+    config = {
+      common = {
+        default = [
+          "gtk"
+          "hyprland"
+        ];
+      };
+    };
    configPackages = [
      pkgs.xdg-desktop-portal-gtk
      pkgs.xdg-desktop-portal-hyprland
-      pkgs.xdg-desktop-portal
    ];
  };

--- a/hosts/garand-laptop/config/nixpkgs/tools.nix
+++ b/hosts/garand-laptop/config/nixpkgs/tools.nix
@@ -13,5 +13,7 @@
    # lazygit
    docker-slim
    dex
+    ulauncher
+    wmctrl
  ];
 }
--- a/hosts/garand-laptop/config/programs.nix
+++ b/hosts/garand-laptop/config/programs.nix
@@ -69,6 +69,11 @@
        };
      };
    };
+    hyprland = {
+      enable = true;
+      withUWSM = true;
+      portalPackage = pkgs.xdg-desktop-portal-hyprland;
+    };
    dconf.enable = true;
    seahorse.enable = true;
    fuse.userAllowOther = true;
--- a/hosts/garand-laptop/home/misc.nix
+++ b/hosts/garand-laptop/home/misc.nix
@@ -1,10 +1,31 @@
-{...}: {
+{pkgs, ...}: {
  # Create XDG Dirs
  xdg = {
+    enable = true;
    userDirs = {
      enable = true;
      createDirectories = true;
    };
+    portal = {
+      enable = true;
+      xdgOpenUsePortal = true;
+      extraPortals = [
+        pkgs.xdg-desktop-portal-gtk
+        pkgs.xdg-desktop-portal-hyprland
+      ];
+      config = {
+        common = {
+          default = [
+            "gtk"
+            "hyprland"
+          ];
+        };
+      };
+      configPackages = [
+        pkgs.xdg-desktop-portal-gtk
+        pkgs.xdg-desktop-portal-hyprland
+      ];
+    };
  };

  dconf.settings = {
--- a/scripts/list-hypr-bindings.nix
+++ b/scripts/list-hypr-bindings.nix
@@ -49,6 +49,7 @@ in
    " + Prawy przycisk myszy" "Zmień rozmiar okna" "resizewindow" \
    " + ENTER" "Otwórz terminal" "${terminal}" \
    " + SHIFT + ENTER" "Uruchom launcher aplikacji" "rofi-launcher" \
+    " + ALT + SPACE" "Uruchom Ulauncher" "ulauncher-toggle" \
    " + ALT + W" "Zmień tapetę" "wallsetter" \
    " + SHIFT + S" "Zrób zrzut ekranu" "screenshootin" \
    " + E" "Uruchom selektor emotikon" "emopicker9000" \
--- a/scripts/web-search.nix
+++ b/scripts/web-search.nix
@@ -1,43 +1,43 @@
 {pkgs}:
 pkgs.writeShellScriptBin "web-search" ''
-   declare -A URLS
+  declare -A URLS

-   URLS=(
-     ["🌎 Search"]="https://search.garandplg.com/search?q="
-     ["❄️  Unstable Packages"]="https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query="
-     ["🎞️ YouTube"]="https://www.youtube.com/results?search_query="
-     ["❄️ NixOS Wiki"]="https://nixos.wiki/index.php?search="
-     ["🔎 Wikipedia"]="https://pl.wikipedia.org/w/index.php?ns0=1&search="
-     ["👨‍💻 StackOverflow"]="https://stackoverflow.com/search?q="
-   )
+  URLS=(
+    ["🌎 Search"]="https://search.garandplg.com/search?q="
+    ["❄️  Unstable Packages"]="https://search.nixos.org/packages?channel=unstable&from=0&size=50&sort=relevance&type=packages&query="
+    ["🎞️ YouTube"]="https://www.youtube.com/results?search_query="
+    ["❄️ NixOS Wiki"]="https://nixos.wiki/index.php?search="
+    ["🔎 Wikipedia"]="https://pl.wikipedia.org/w/index.php?ns0=1&search="
+    ["👨‍💻 StackOverflow"]="https://stackoverflow.com/search?q="
+  )

-   # List for rofi
-   gen_list() {
-     for i in "''${!URLS[@]}"
-     do
-       echo "$i"
-     done
-   }
+  # List for rofi
+  gen_list() {
+    for i in "''${!URLS[@]}"
+    do
+      echo "$i"
+    done
+  }

-   main() {
-     # Pass the list to rofi
-     platform=$( (gen_list) | ${pkgs.wofi}/bin/wofi -dmenu )
+  main() {
+    # Pass the list to rofi
+    platform=$( (gen_list) | ${pkgs.wofi}/bin/wofi -dmenu )

-     if [[ -n "$platform" ]]; then
-       query=$( (echo ) | ${pkgs.wofi}/bin/wofi -dmenu )
+    if [[ -n "$platform" ]]; then
+      query=$( (echo ) | ${pkgs.wofi}/bin/wofi -dmenu )

-       if [[ -n "$query" ]]; then
-  url=''${URLS[$platform]}$query
-  xdg-open "$url"
-       else
-  exit
-       fi
-     else
-       exit
-     fi
-   }
+      if [[ -n "$query" ]]; then
+        url=''${URLS[$platform]}$query
+        xdg-open "$url"
+      else
+        exit
+      fi
+    else
+      exit
+    fi
+  }

-   main
+  main

-   exit 0
+  exit 0
 ''