Compare commits
No commits in common. "27b88eb931c98a447ec044bf3cc5fb8d92859d59" and "b3ea104e1ca3d8fb68f51be5f00034507d8b89be" have entirely different histories.
27b88eb931
...
b3ea104e1c
@ -51,10 +51,6 @@
|
||||
nixfiles = {
|
||||
profile.pc.enable = true;
|
||||
programs.adb.enable = true;
|
||||
programs.greetd = {
|
||||
enable = true;
|
||||
preset = "tuigreet";
|
||||
};
|
||||
programs.unbound.enable = true;
|
||||
common.remoteAccess.enable = true;
|
||||
sessions.plasma.enable = lib.mkDefault false;
|
||||
@ -65,6 +61,7 @@
|
||||
};
|
||||
|
||||
services.xserver.displayManager.sddm.enable = false;
|
||||
services.xserver.displayManager.startx.enable = true;
|
||||
|
||||
# bootloader setup
|
||||
boot.loader = {
|
||||
|
@ -44,6 +44,14 @@
|
||||
|
||||
# who needs a display manager?
|
||||
services.xserver.displayManager.sddm.enable = false;
|
||||
services.xserver.displayManager.startx.enable = true;
|
||||
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
default_session.command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland --asterisks";
|
||||
};
|
||||
};
|
||||
|
||||
nixfiles = {
|
||||
profile.pc.enable = true;
|
||||
@ -59,10 +67,6 @@
|
||||
programs = {
|
||||
adb.enable = true;
|
||||
unbound.enable = true;
|
||||
greetd = {
|
||||
enable = true;
|
||||
preset = "tuigreet";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -4,6 +4,5 @@
|
||||
./syncthing.nix
|
||||
./android.nix
|
||||
./unbound.nix
|
||||
./greetd.nix
|
||||
];
|
||||
}
|
||||
|
@ -1,78 +0,0 @@
|
||||
{ pkgs, config, lib, options, ... }:
|
||||
let
|
||||
cfg = config.nixfiles.programs.greetd;
|
||||
inherit (lib.types) bool enum nullOr str path;
|
||||
inherit (builtins) isNull;
|
||||
inherit (lib) optional optionals;
|
||||
optionalsSet = val: optionals (!(isNull val));
|
||||
sessions = config.services.xserver.displayManager.sessionData.desktops;
|
||||
xsessions = "${sessions}/share/xsessions";
|
||||
wayland-sessions = "${sessions}/share/wayland-sessions";
|
||||
in
|
||||
{
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
default_session = lib.mkMerge [
|
||||
|
||||
# tuigreet configuration
|
||||
(lib.mkIf cfg.presets.tuigreet.enable {
|
||||
command = let
|
||||
st = cfg.settings;
|
||||
args = [ "${pkgs.greetd.tuigreet}/bin/tuigreet" "--asterisks" "--remember" "--remember-session"
|
||||
"--sessions" "${xsessions}:${wayland-sessions}" ]
|
||||
++ optionalsSet st.greeting [ "--greeting" st.greeting ]
|
||||
++ optional st.time "--time"
|
||||
++ optionalsSet st.command [ "--cmd" (lib.escapeShellArg st.command) ];
|
||||
in lib.escapeShellArgs args;
|
||||
})
|
||||
|
||||
];
|
||||
};
|
||||
};
|
||||
nixfiles.programs.greetd.presets.${cfg.preset}.enable = true;
|
||||
};
|
||||
|
||||
options.nixfiles.programs.greetd = {
|
||||
enable = lib.mkEnableOption "greetd configuration";
|
||||
|
||||
preset = lib.mkOption {
|
||||
description = "greetd configuration to enable (shorthand for presets.<preset>.enable)";
|
||||
type = enum (lib.mapAttrsToList (name: value: name) options.nixfiles.programs.greetd.presets);
|
||||
default = "tuigreet";
|
||||
};
|
||||
|
||||
settings = {
|
||||
greeting = lib.mkOption {
|
||||
description = "Greeting to show on the chosen greeter (if configurable)";
|
||||
type = nullOr str;
|
||||
default = "log in pwease!! uwu";
|
||||
example = "something boring";
|
||||
};
|
||||
command = lib.mkOption {
|
||||
description = "Command to run following successful authentication";
|
||||
type = nullOr str;
|
||||
default = null;
|
||||
example = "Hyprland";
|
||||
};
|
||||
time = lib.mkOption {
|
||||
description = "Whether to show the current time (if configurable)";
|
||||
type = bool;
|
||||
default = true;
|
||||
example = false;
|
||||
};
|
||||
wallpaper = lib.mkOption {
|
||||
description = "Path to custom wallpaper (if configurable)";
|
||||
type = nullOr path;
|
||||
default = "${pkgs.nixfiles-assets}/share/wallpapers/nixfiles-static/Djayjesse-finding_life.png";
|
||||
example = "femboy-bee.png";
|
||||
};
|
||||
};
|
||||
presets.tuigreet.enable = lib.mkOption {
|
||||
description = "tuigreet greetd configuration";
|
||||
type = bool;
|
||||
default = false;
|
||||
};
|
||||
};
|
||||
}
|
@ -23,12 +23,9 @@ in
|
||||
};
|
||||
nixfiles.meta.wayland = true;
|
||||
|
||||
# greeter
|
||||
nixfiles.programs.greetd = {
|
||||
enable = true;
|
||||
settings = {
|
||||
command = "${pkgs.hyprland}/bin/Hyprland";
|
||||
};
|
||||
services.xserver.displayManager.sddm = {
|
||||
enable = lib.mkDefault true;
|
||||
wayland.enable = true;
|
||||
};
|
||||
|
||||
programs.hyprland = {
|
||||
|
Loading…
x
Reference in New Issue
Block a user