reidlab/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update cross-module package references, nuke execOnStart

Browse source
This commit is contained in:
Reid 2024-12-14 16:40:14 -08:00
parent 6d61976106
commit ff647de9ce
Signed by: reidlab
GPG key ID: DAF5EAF6665839FD
13 changed files with 135 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

48
modules/desktop/hyprland.nix
View file

@ -88,10 +88,10 @@ in {
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
]));
bindr = [ # "bind released"
"SUPER, Super_L, exec, ${lib.getExe pkgs.nwg-drawer}"
"SUPER, Super_L, exec, ${lib.getExe config.modules.desktop.nwg-drawer.package}"
];
bind = let
screenshotScript = pkgs.writeScript "screenshot" ''
screenshotScript = pkgs.writeShellScript "screenshot" ''
temp_file=$(mktemp)
trap 'rm -f "$temp_file"' EXIT
@ -149,9 +149,10 @@ in {
"$mod, bracketleft, workspace, e-1"
"$mod, bracketright, workspace, e+1"
"$mod, R, exec, ${lib.getExe pkgs.rofi-wayland} -show run"
"$mod, T, exec, ${lib.getExe pkgs.wezterm}"
"$mod, R, exec, ${lib.getExe config.modules.desktop.rofi.package} -show run"
"$mod, T, exec, ${lib.getExe config.modules.software.system.wezterm.package}"
"$mod, L, exec, ${lib.getExe config.modules.desktop.hyprlock.package}"
"$mod, V, exec, ${lib.getExe config.modules.software.system.wezterm.package} start --class 'clipse' -e '${lib.getExe config.modules.desktop.clipse.package}'"
# screenshot
# area
@ -164,10 +165,6 @@ in {
", XF86LaunchA, exec, ${screenshotScript} area"
", XF86LaunchB, exec, ${lib.getExe pkgs.rofi-rbw-wayland} -a copy -t password --clear-after 20"
", XF86ScreenSaver, exec, ${lib.getExe config.modules.desktop.hyprlock.package}"
# alt-tab emulation
# doesnt activate when we let go of alt sadly
"ALT, Tab, exec, ${lib.getExe pkgs.rofi-wayland} -show window"
] ++ (
# workspaces
# binds $mod + [shift +] {1..10} to [move to] workspace {1..10}
@ -205,7 +202,7 @@ in {
"${lib.getExe pkgs.networkmanagerapplet}" # network applet
"${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" # polkit agent
"${lib.getExe pkgs.wl-clip-persist} --clipboard regular" # to fix wl clipboards disappearing
] ++ config.modules.desktop.execOnStart;
];
env = [
"XCURSOR_THEME,${config.modules.desktop.themes.cursorTheme.name}"
@ -226,15 +223,15 @@ in {
windowrulev2 = [
# TODO: dedupe
# commons
"float, class:org.gnome.FileRoller"
"size 1100 650, class:org.gnome.FileRoller"
"center, class:org.gnome.FileRoller"
"float, class:org.gnome.Loupe"
"size 1100 650, class:org.gnome.Loupe"
"center class:org.gnome.Loupe"
"float, class:com.gabm.satty"
"size 1100 650, class:com.gabm.satty"
"center 1100 650, class:com.gabm.satty"
"float, class:^org.gnome.FileRoller$"
"size 1100 650, class:^org.gnome.FileRoller$"
"center, class:^org.gnome.FileRoller$"
"float, class:^org.gnome.Loupe$"
"size 1100 650, class:^org.gnome.Loupe$"
"center class:^org.gnome.Loupe$"
"float, class:^com.gabm.satty$"
"size 1100 650, class:^com.gabm.satty$"
"center 1100 650, class:^com.gabm.satty$"
"float, initialTitle:^Open Folder$"
"size 1100 650, initialTitle:^Open Folder$"
"center, initialTitle:^Open Folder$"
@ -253,9 +250,14 @@ in {
"float, initialTitle:^File Upload$"
"size 1100 650, initialTitle:^File Upload$"
"center, initialTitle:^File Upload$"
"float, class:^clipse$"
"size 1100 650, class:^clipse$"
"center, class:^clipse$"
# privacy popups
"stayfocused, class:^gcr-prompter"
"dimaround, class:^gcr-prompter"
"stayfocused, class:^clipse$"
"dimaround, class:^clipse$"
"stayfocused, class:^gcr-prompter$"
"dimaround, class:^gcr-prompter$"
"stayfocused, class:^pinentry-"
"dimaround, class:^pinentry-"
"stayfocused, class:^polkit-"
@ -282,9 +284,9 @@ in {
"noborder, initialTitle:^Discord Popout$"
# workspace moving
"workspace 1 silent, class:^firefox"
"workspace 2 silent, class:code"
"workspace 4 silent, class:vesktop"
"workspace 1 silent, class:^firefox$"
"workspace 2 silent, class:^code$"
"workspace 4 silent, class:^vesktop$"
];
layerrule = [