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

feat(agsV2): separate from agsV1

Browse source
This commit is contained in:
matt1432 2024-10-30 23:43:37 -04:00
parent 1fc5a48bf9
commit f522c984c4
64 changed files with 182 additions and 50 deletions
nixosModules/desktop
default.nix
environment
default.nix
modules
security.nix
manager/ags
default.nix

8
nixosModules/desktop/default.nix
View file

@ -44,6 +44,14 @@ in {
'';
};
ags-v2.enable = mkOption {
type = types.bool;
default = false;
description = ''
Whether we want to enable AGSv2 for the DE shell.
'';
};
mainMonitor = mkOption {
type = types.str;
description = ''

1
nixosModules/desktop/environment/default.nix
View file

@ -8,6 +8,7 @@ self: {
in {
imports = [
(import ../../ags self)
(import ../../ags-v2 self)
./modules/dconf.nix
./modules/printer.nix

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

@ -10,14 +10,26 @@
cfg = config.roles.desktop;
hmCfg = config.home-manager.users.${cfg.user};
agsPkg = hmCfg.programs.ags.finalPackage;
hyprPkg = hmCfg.wayland.windowManager.hyprland.finalPackage;
lockPkg =
if cfg.ags.enable
then
pkgs.writeShellApplication {
name = "lock";
runtimeInputs = [hmCfg.programs.ags.finalPackage];
text = ''
ags -r 'Tablet.setLaptopMode()'
ags -b lockscreen -c /home/${cfg.user}/.config/ags/lockscreen.js
'';
}
else hmCfg.programs.ags-v2.lockPkg;
runInDesktop = pkgs.writeShellApplication {
name = "runInDesktop";
runtimeInputs = [
pkgs.sudo
agsPkg
hyprPkg
];
@ -38,18 +50,6 @@
done
'';
};
lockPkg = pkgs.writeShellApplication {
name = "lock";
runtimeInputs = [
agsPkg
];
text = ''
ags -r 'Tablet.setLaptopMode()'
ags -b lockscreen -c /home/${cfg.user}/.config/ags/lockscreen.js
'';
};
in {
services.acpid = mkIf cfg.isLaptop {
enable = true;
@ -62,7 +62,7 @@
case "$state" in
*open*)
${getExe runInDesktop} "ags -b lockscreen -r 'authFinger()'"
${getExe runInDesktop} "${getExe lockPkg} -m 'authFinger()'"
;;
*close*)

4
nixosModules/desktop/manager/ags/default.nix
View file

@ -29,7 +29,9 @@ in {
home-manager.users.${cfg.user}.home.file = let
flakeDir = config.environment.variables.FLAKE;
modulesDir = "${lib.removePrefix "/home/${cfg.user}/" flakeDir}/nixosModules";
nodeModules = config.home-manager.users.${cfg.user}.home.file."${modulesDir}/ags/config/node_modules".source;
nodeModules =
config.home-manager.users.${cfg.user}.home.file."${modulesDir}/ags/config/node_modules".source
or config.home-manager.users.${cfg.user}.home.file."${modulesDir}/ags-v2/config/node_modules".source;
in {
"${modulesDir}/desktop/manager/ags/node_modules".source = nodeModules;
};