diff --git a/modules/user/general.nix b/modules/user/general.nix index 24cbf6f..c9896f5 100644 --- a/modules/user/general.nix +++ b/modules/user/general.nix @@ -20,7 +20,6 @@ dejavu_fonts noto-fonts noto-fonts-cjk-sans - nerd-fonts.jetbrains-mono ]) ++ (with pkgs; [ material-symbols font-awesome diff --git a/modules/user/modules/greetd/default.nix b/modules/user/modules/greetd/default.nix index e9ca9e7..1828133 100644 --- a/modules/user/modules/greetd/default.nix +++ b/modules/user/modules/greetd/default.nix @@ -2,7 +2,7 @@ hyprlandPackage = config.home-manager.users.${config.main-user}.wayland.windowManager.hyprland.package; hyprlandConfig = pkgs.writeText "greetd-hyprland-config" '' # for some reason pkill is way faster than dispatching exit, to the point greetd thinks the greeter died. - exec-once = quickshell -p ~/.config/quickshell/shell/greeter.qml >& qslog.txt && pkill Hyprland + exec-once = quickshell -c greeter >& qslog.txt && pkill Hyprland input { kb_layout = us @@ -49,7 +49,7 @@ in { home.stateVersion = config.system.stateVersion; imports = [ ../../../theme/home.nix # also fixes cursor - ../quickshell # set up quickshell conf and such + ../quickshell # set up quickshell manifest and such ]; }; } diff --git a/modules/user/modules/quickshell/default.nix b/modules/user/modules/quickshell/default.nix index 996b340..9dff89b 100644 --- a/modules/user/modules/quickshell/default.nix +++ b/modules/user/modules/quickshell/default.nix @@ -20,5 +20,8 @@ in { grim imagemagick # screenshot ]; - xdg.configFile."quickshell/shell".source = "${maybeLink ./.}/shell"; + xdg.configFile."quickshell/manifest.conf".text = lib.generators.toKeyValue {} { + shell = "${maybeLink ./.}/shell"; + greeter = "${maybeLink ./.}/shell/greeter.qml"; + }; }