feat: waybar modulization

This commit is contained in:
DACHXY 2025-04-12 13:09:16 +08:00
parent 6fddac69d2
commit 94c073c28a
15 changed files with 669 additions and 416 deletions

View file

@ -3,9 +3,7 @@ let
firefox = "firefox-nightly";
prefix = if nvidia-offload-enabled then "nvidia-offload" else "";
browser = "${prefix} ${firefox}";
noOffloadBrowser = "${firefox} -P noOffload";
terminal = "${prefix} ghostty";
# filemanager = "nemo";
terminal = "ghostty";
filemanager = "${terminal} -e yazi";
scripts = "~/.config/scripts";
@ -17,7 +15,6 @@ let
in
[
''${mainMod}, F, exec, ${browser}''
''CTRL ${mainMod}, F, exec, ${noOffloadBrowser} -no-remote''
''${mainMod}, RETURN, exec, ${terminal}''
''CTRL ALT, T, exec, ${terminal}''
''${mainMod}, Q, killactive, ''

View file

@ -5,28 +5,15 @@
...
}:
let
swayncScript = pkgs.pkgs.writeShellScriptBin "swaync-start" ''
#!/usr/bin/env bash
XDG_CONFIG_HOME="$HOME/.dummy" # Prevent swaync use default gtk theme
swaync -c "$HOME/.config/swaync/config.json" -s "$HOME/.config/swaync/style.css"
'';
startupScript = pkgs.pkgs.writeShellScriptBin "start" ''
# Fix nemo open in terminal
dconf write /org/cinnamon/desktop/applications/terminal/exec "''\'${terminal}''\'" &
dconf write /org/cinnamon/desktop/applications/terminal/exec-arg "''\'''\'" &
dconf write /org/gnome/desktop/interface/cursor-size ${builtins.toString xcursor-size} &
${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 &
${swayncScript}/bin/swaync-start &
dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
dbus-update-activation-environment --systemd --all &
systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP &
hyprpaper &
waybar -c ~/.config/waybar/config.jsonc -s ~/.config/waybar/style.css &
systemctl --user enable --now hypridle.service &
hyprsunset -t 3000k
'';
in
''${startupScript}/bin/start''

View file

@ -1,5 +1,5 @@
[
''desc:ASUSTek COMPUTER INC ASUS VG32VQ1B 0x00002271,2560x1440@165, 0x0, 1''
''desc:Acer Technologies XV272U V3 7422007E54222, 2560x1440@144, -1440x-540, 1, transform, 1''
''desc:Acer Technologies XV272U V3 1322131231233, 2560x1440@180, -1440x-540, 1, transform, 1''
''desc:LG Display 0x0665, preferred, 0x0, 1.25''
]