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.

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

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744578060,
+        "lastModified": 1746268454,
-        "narHash": "sha256-ApX5u3aXtmthemPSnZls/oxvqpNR7C9t4Ut57MTvces=",
+        "narHash": "sha256-cUrVjYzFn1zzR6m2hc02CdjlSPIADtAVo+7BE7qq0ZA=",
         "owner": "AdnanHodzic",
         "repo": "auto-cpufreq",
-        "rev": "b6493edc7033beac216b8836af4994e56c6682f4",
+        "rev": "3ffbee11df46921c9a60f118d3450a7e460f7b13",
         "type": "github"
       },
       "original": {
@@ -25,11 +25,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1732200724,
+        "lastModified": 1745523430,
-        "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
+        "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
         "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "153d52373b0fb2d343592871009a286ec8837aec",
+        "rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
         "type": "github"
       },
       "original": {
@@ -95,11 +95,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1744914542,
+        "lastModified": 1746417810,
-        "narHash": "sha256-Q6EKVSHbtWqndGWHw5E+dAN4ds5p+SD5Gyiy3KGN8DM=",
+        "narHash": "sha256-VhghpfFdvGiDeh6HqFhQncnLx4IrtFy4VWdCQvOwccI=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "30303c2b08c30085a784abf5c1823bd62dd8d9d7",
+        "rev": "14c779b4ff24742307127970549ac9a51de3f98a",
         "type": "gitlab"
       },
       "original": {
@@ -112,11 +112,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1743774811,
+        "lastModified": 1744642301,
-        "narHash": "sha256-oiHLDHXq7ymsMVYSg92dD1OLnKLQoU/Gf2F1GoONLCE=",
+        "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "df53a7a31872faf5ca53dd0730038a62ec63ca9e",
+        "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
         "type": "github"
       },
       "original": {
@@ -271,11 +271,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744919155,
+        "lastModified": 1746413188,
-        "narHash": "sha256-IJksPW32V9gid9vDxoloJMRk+YGjxq5drFHBFeBkKU8=",
+        "narHash": "sha256-i6BoiQP0PasExESQHszC0reQHfO6D4aI2GzOwZMOI20=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "72526a5f7cde2ef9075637802a1e2a8d2d658f70",
+        "rev": "8a318641ac13d3bc0a53651feaee9560f9b2d89a",
         "type": "github"
       },
       "original": {
@@ -287,11 +287,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744463964,
+        "lastModified": 1746328495,
-        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
+        "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
+        "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
         "type": "github"
       },
       "original": {
@@ -311,11 +311,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1743884191,
+        "lastModified": 1746056780,
-        "narHash": "sha256-foVcginhVvjg8ZnTzY5wwMeZ4wjJ8yX66PW5kgyivPE=",
+        "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "fde90f5f52e13eed110a0e53a2818a2b09e4d37c",
+        "rev": "d476cd0972dd6242d76374fcc277e6735715c167",
         "type": "github"
       },
       "original": {
@@ -359,11 +359,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1744910471,
+        "lastModified": 1746469524,
-        "narHash": "sha256-HItOUMA2whFnPMJuyN2XHq9TZttgrgOAZcoUXsaD4Js=",
+        "narHash": "sha256-uwFQebWXtMsRBmzKOYa6jjs7PDnfSuwyrqPK6yzqamU=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "8d5cd725ad591890c0cd804bf68cc842b8afca51",
+        "rev": "45aa0e849282dba5979e7bb3d0f6676bbd9dc130",
         "type": "github"
       },
       "original": {
@@ -424,11 +424,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1742851696,
+        "lastModified": 1744974599,
-        "narHash": "sha256-sR4K+OVFKeUOvNIqcCr5Br7NLxOBEwoAgsIyjsZmb8s=",
+        "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "c37771c4ae8ff1667e27ddcf24991ebeb94a4e77",
+        "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
         "type": "github"
       },
       "original": {
@@ -440,11 +440,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1743296873,
+        "lastModified": 1745111349,
-        "narHash": "sha256-8IQulrb1OBSxMwdKijO9fB70ON//V32dpK9Uioy7FzY=",
+        "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "af5152c8d7546dfb4ff6df94080bf5ff54f64e3a",
+        "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
         "type": "github"
       },
       "original": {

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;

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
     ];
   };
 

hosts/garand-laptop/config/nixpkgs/codium.nix

@@ -23,10 +23,6 @@
             jnoortheen.nix-ide
             mechatroner.rainbow-csv
             ms-azuretools.vscode-docker
-            ms-python.debugpy
-            ms-python.flake8
-            ms-python.python
-            ms-python.vscode-pylance
             njpwerner.autodocstring
             octref.vetur
             oderwat.indent-rainbow
@@ -74,12 +70,6 @@
               version = "0.1.0";
               hash = "sha256-Aj87mxOGer24O24/4/bGQqgLpgoBvfwOCKQyJ8NLplU=";
             }
-            {
-              name = "vscode-python-envs";
-              publisher = "ms-python";
-              version = "0.3.11081010";
-              hash = "sha256-Vs9Rkz/DAhNcC9e8fI8mlD8TljsFdU8+z7ztNkZozz0=";
-            }
             {
               name = "one-dark-pro-monokai-darker";
               publisher = "eserozvataf";
@@ -236,6 +226,12 @@
               version = "0.0.2";
               hash = "sha256-OXHUwynWm4RqJYjcv5qXt5DyjFDxtNjZFNpnd22gUgg=";
             }
+            {
+              name = "kylin-python";
+              publisher = "kylinideteam";
+              version = "0.4.2";
+              hash = "sha256-LhOsIvECrxLCnRjUVffS4G4fFsdP70iP/twoNoto354=";
+            }
           ];
       })
     ];

hosts/garand-laptop/config/nixpkgs/tools.nix

@@ -13,5 +13,7 @@
     # lazygit
     docker-slim
     dex
+    ulauncher
+    wmctrl
   ];
 }

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;

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 = {

hosts/garand-laptop/home/programs.nix

@@ -89,7 +89,7 @@ in {
         fc = "fortune | cowsay";
         terminal = "cat /home/garand_plg/Documents/terminal.txt";
         e-terminal = "nano /home/garand_plg/Documents/terminal.txt";
-        mkgidf = "git diff > git-diff.txt";
+        mkgidf = "git add --intent-to-add . && git diff > git-diff.txt";
         ".." = "cd ..";
         kys = "shutdown now";
         pasjans = "ttysolitaire -p 10 --no-background-color";

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" \

scripts/web-search.nix

@@ -1,43 +1,43 @@
 {pkgs}:
 pkgs.writeShellScriptBin "web-search" ''
-   declare -A URLS
+  declare -A URLS
 
-   URLS=(
+  URLS=(
-     ["🌎 Search"]="https://search.garandplg.com/search?q="
+    ["🌎 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="
+    ["❄️  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="
+    ["🎞️ YouTube"]="https://www.youtube.com/results?search_query="
-     ["❄️ NixOS Wiki"]="https://nixos.wiki/index.php?search="
+    ["❄️ NixOS Wiki"]="https://nixos.wiki/index.php?search="
-     ["🔎 Wikipedia"]="https://pl.wikipedia.org/w/index.php?ns0=1&search="
+    ["🔎 Wikipedia"]="https://pl.wikipedia.org/w/index.php?ns0=1&search="
-     ["👨‍💻 StackOverflow"]="https://stackoverflow.com/search?q="
+    ["👨‍💻 StackOverflow"]="https://stackoverflow.com/search?q="
-   )
+  )
 
-   # List for rofi
+  # List for rofi
-   gen_list() {
+  gen_list() {
-     for i in "''${!URLS[@]}"
+    for i in "''${!URLS[@]}"
-     do
+    do
-       echo "$i"
+      echo "$i"
-     done
+    done
-   }
+  }
 
-   main() {
+  main() {
-     # Pass the list to rofi
+    # Pass the list to rofi
-     platform=$( (gen_list) | ${pkgs.wofi}/bin/wofi -dmenu )
+    platform=$( (gen_list) | ${pkgs.wofi}/bin/wofi -dmenu )
 
-     if [[ -n "$platform" ]]; then
+    if [[ -n "$platform" ]]; then
-       query=$( (echo ) | ${pkgs.wofi}/bin/wofi -dmenu )
+      query=$( (echo ) | ${pkgs.wofi}/bin/wofi -dmenu )
 
-       if [[ -n "$query" ]]; then
+      if [[ -n "$query" ]]; then
-  url=''${URLS[$platform]}$query
+        url=''${URLS[$platform]}$query
-  xdg-open "$url"
+        xdg-open "$url"
-       else
+      else
-  exit
+        exit
-       fi
+      fi
-     else
+    else
-       exit
+      exit
-     fi
+    fi
-   }
+  }
 
-   main
+  main
 
-   exit 0
+  exit 0
 ''