matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(desktop): fix breaking changes
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-11-06 23:02:18 -05:00
parent c4e8e56835
commit 52af004829
4 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
devices/wim/config/hypr/main.conf
View file

@ -15,8 +15,6 @@ decoration {
size = 3 size = 3
passes = 1 passes = 1
} }
drop_shadow = false
} }
animations { animations {

20
nixosModules/ags-v2/hyprland.nix
View file

@ -25,22 +25,22 @@
exec-once = ["ags"]; exec-once = ["ags"];
bind = [ bind = [
"$mainMod SHIFT, E , exec, ags -t win-powermenu" "$mainMod SHIFT, E , exec, ags toggle win-powermenu"
"$mainMod , D , exec, ags -t win-applauncher" "$mainMod , D , exec, ags toggle win-applauncher"
"$mainMod , V , exec, ags -t win-clipboard" "$mainMod , V , exec, ags toggle win-clipboard"
" , Print, exec, ags -t win-screenshot" " , Print, exec, ags toggle win-screenshot"
]; ];
binde = [ binde = [
## Brightness control ## Brightness control
", XF86MonBrightnessUp , exec, ags -m 'Brightness.screen += 0.05'" ", XF86MonBrightnessUp , exec, ags request 'Brightness.screen += 0.05'"
", XF86MonBrightnessDown, exec, ags -m 'Brightness.screen -= 0.05'" ", XF86MonBrightnessDown, exec, ags request 'Brightness.screen -= 0.05'"
## Volume control ## Volume control
", XF86AudioRaiseVolume , exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+ & ags -m 'popup_osd(\"speaker\")' &" ", XF86AudioRaiseVolume , exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+ & ags request 'popup_osd(\"speaker\")' &"
", XF86AudioLowerVolume , exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- & ags -m 'popup_osd(\"speaker\")' &" ", XF86AudioLowerVolume , exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- & ags request 'popup_osd(\"speaker\")' &"
]; ];
bindn = [" , Escape , exec, ags -m 'closeAll()'"]; bindn = [" , Escape , exec, ags request 'closeAll()'"];
bindr = ["CAPS, Caps_Lock, exec, ags -m 'Brightness.fetchCapsState()'"]; bindr = ["CAPS, Caps_Lock, exec, ags request 'Brightness.fetchCapsState()'"];
}; };
}; };
} }

19
nixosModules/ags-v2/packages.nix
View file

@ -34,9 +34,15 @@
in { in {
programs.ags-v2.lockPkg = pkgs.writeShellApplication { programs.ags-v2.lockPkg = pkgs.writeShellApplication {
name = "lock"; name = "lock";
runtimeInputs = [agsFull];
text = '' text = ''
export CONF="lock" export CONF="lock"
exec ${agsFull}/bin/ags --config ${fullConfPath} -i lock "$@"
if [ "$#" == 0 ]; then
exec ags run ${fullConfPath}
else
exec ags "$@" -i lock
fi
''; '';
}; };
@ -45,16 +51,23 @@
[ [
(pkgs.writeShellApplication { (pkgs.writeShellApplication {
name = "ags"; name = "ags";
runtimeInputs = [agsFull];
text = '' text = ''
export CONF="${hostName}" export CONF="${hostName}"
exec ${agsFull}/bin/ags --config ${fullConfPath} "$@"
if [ "$#" == 0 ]; then
exec ags run ${fullConfPath}
else
exec ags "$@"
fi
''; '';
}) })
(pkgs.writeShellApplication { (pkgs.writeShellApplication {
name = "agsConf"; name = "agsConf";
runtimeInputs = [agsFull];
text = '' text = ''
export CONF="$1" export CONF="$1"
exec ${agsFull}/bin/ags --config ${fullConfPath} exec ${agsFull}/bin/ags run ${fullConfPath}
''; '';
}) })
] ]

4
nixosModules/desktop/environment/modules/security.nix
View file

@ -62,11 +62,11 @@
case "$state" in case "$state" in
*open*) *open*)
${getExe runInDesktop} "${getExe lockPkg} -m 'authFinger()'" ${getExe runInDesktop} "${getExe lockPkg} request 'authFinger()'"
;; ;;
*close*) *close*)
${getExe runInDesktop} ${getExe lockPkg} ${getExe runInDesktop} "${getExe lockPkg}"
;; ;;
*) *)