GarandPLG/nix-zaneyos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Poprawa integracji z portalem XDG i wsparcie dla Ulaunchera

Browse Source 
- 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.
This commit is contained in:
installer
2025-05-07 20:11:04 +02:00
parent e832b7fd33
commit 9a01abb83b
8 changed files with 81 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/hyprland.nix
View File

@@ -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

1
hosts/garand-laptop/config/boot.nix
View File

@@ -18,6 +18,7 @@
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
initrd.systemd.dbus.enable = true;
# Make /tmp a tmpfs
tmp = {
useTmpfs = false;

16
hosts/garand-laptop/config/nixpkgs.nix
View File

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

2
hosts/garand-laptop/config/nixpkgs/tools.nix
View File

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

5
hosts/garand-laptop/config/programs.nix
View File

@@ -69,6 +69,11 @@
};
};
};
hyprland = {
enable = true;
withUWSM = true;
portalPackage = pkgs.xdg-desktop-portal-hyprland;
};
dconf.enable = true;
seahorse.enable = true;
fuse.userAllowOther = true;

23
hosts/garand-laptop/home/misc.nix
View File

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

1
scripts/list-hypr-bindings.nix
View File

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

66
scripts/web-search.nix
View File

@@ -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
''