diff --git a/hosts/default.nix b/hosts/default.nix index 820c9b6..7a34711 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -27,17 +27,17 @@ inputs: let modules = concatLists [ # This is used to pre-emptively set the hostPlatform for nixpkgs. # Also, we set the system hostname here. + [ + # self.nixosModules.user + ] (singleton { networking.hostName = hostname; nixpkgs.hostPlatform = system; }) (flatten ( concatLists [ - # configuration for the host, passed as an argument. (singleton ./${hostname}/default.nix) - # common configuration, which all hosts share. (singleton ./common.nix) - # Import all files called module.nix from my modules directory. ( filter (hasSuffix "module.nix") ( map toString (listFilesRecursive ../modules) diff --git a/modules/services/greetd/module.nix b/modules/services/greetd/module.nix index 633e644..fad5c66 100644 --- a/modules/services/greetd/module.nix +++ b/modules/services/greetd/module.nix @@ -36,14 +36,14 @@ in { config = mkIf cfg.enable { services.greetd = let session = { - command = '' - ${pkgs.greetd.tuigreet}/bin/tuigreet \ - -c \"${cfg.session}\" \ - -r - -t --time-format "DD.MM.YYYY" - --asteriks''; - # command = "${getExe config.programs.uwsm.package} start hyprland-uwsm.desktop"; - # user = username; + # command = '' + # ${pkgs.greetd.tuigreet}/bin/tuigreet \ + # -c \"${cfg.session}\" \ + # -r + # -t --time-format "DD.MM.YYYY" + # --asteriks''; + command = "${getExe config.programs.uwsm.package} start hyprland-uwsm.desktop"; + user = username; }; in { enable = true; diff --git a/modules/wms/wayland/hyprland/exec.nix b/modules/wms/wayland/hyprland/exec.nix index 66d206c..c3b09cf 100644 --- a/modules/wms/wayland/hyprland/exec.nix +++ b/modules/wms/wayland/hyprland/exec.nix @@ -5,6 +5,7 @@ ... }: let # inherit (config.modules.style) cursor; + inherit (lib.meta) getExe; in { programs.hyprland.settings = { # Hyprland settings @@ -25,6 +26,7 @@ in { "${pkgs.lxqt.lxqt-policykit}/bin/lxqt-policykit-agent" "hyprctl dispatch split-workspace 1" + "${getExe pkgs.hyprlock}" ]; }; }