Update configuration
This commit is contained in:
parent
06b07ac7dc
commit
1c096e0a70
@ -38,12 +38,12 @@
|
|||||||
sessions.hyprland.enable = false;
|
sessions.hyprland.enable = false;
|
||||||
sessions.plasma.enable = true;
|
sessions.plasma.enable = true;
|
||||||
};
|
};
|
||||||
services.xserver.displayManager.sddm.enable = lib.mkForce true;
|
services.displayManager.sddm.enable = lib.mkForce true;
|
||||||
services.xserver.displayManager.startx.enable = lib.mkForce false;
|
services.xserver.displayManager.startx.enable = lib.mkForce false;
|
||||||
};
|
};
|
||||||
|
|
||||||
# who needs a display manager?
|
# who needs a display manager?
|
||||||
services.xserver.displayManager.sddm.enable = false;
|
services.displayManager.sddm.enable = false;
|
||||||
|
|
||||||
nixfiles = {
|
nixfiles = {
|
||||||
profile.pc.enable = true;
|
profile.pc.enable = true;
|
||||||
|
@ -24,9 +24,6 @@ in
|
|||||||
|
|
||||||
# shell config
|
# shell config
|
||||||
programs.zsh.enable = true;
|
programs.zsh.enable = true;
|
||||||
programs.fzf = {
|
programs.fzf.enable = true;
|
||||||
keybindings = true;
|
|
||||||
fuzzyCompletion = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -6,7 +6,7 @@ let
|
|||||||
inherit (lib) optional optionals;
|
inherit (lib) optional optionals;
|
||||||
optionalsSet = val: optionals (!(isNull val));
|
optionalsSet = val: optionals (!(isNull val));
|
||||||
optionalSet = val: optional (!(isNull val));
|
optionalSet = val: optional (!(isNull val));
|
||||||
sessions = config.services.xserver.displayManager.sessionData.desktops;
|
sessions = config.services.displayManager.sessionData.desktops;
|
||||||
xsessions = "${sessions}/share/xsessions";
|
xsessions = "${sessions}/share/xsessions";
|
||||||
wayland-sessions = "${sessions}/share/wayland-sessions";
|
wayland-sessions = "${sessions}/share/wayland-sessions";
|
||||||
|
|
||||||
@ -27,7 +27,8 @@ in
|
|||||||
command = let
|
command = let
|
||||||
st = cfg.settings;
|
st = cfg.settings;
|
||||||
args = [ "${pkgs.greetd.tuigreet}/bin/tuigreet" "--asterisks" "--remember" "--remember-session"
|
args = [ "${pkgs.greetd.tuigreet}/bin/tuigreet" "--asterisks" "--remember" "--remember-session"
|
||||||
"--sessions" "${xsessions}:${wayland-sessions}" ]
|
"--sessions" "${xsessions}:${wayland-sessions}"
|
||||||
|
]
|
||||||
++ optionalsSet st.greeting [ "--greeting" st.greeting ]
|
++ optionalsSet st.greeting [ "--greeting" st.greeting ]
|
||||||
++ optional st.time "--time"
|
++ optional st.time "--time"
|
||||||
++ optionalsSet st.command [ "--cmd" st.finalCommand ]
|
++ optionalsSet st.command [ "--cmd" st.finalCommand ]
|
||||||
|
@ -17,9 +17,9 @@ in
|
|||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
nixfiles.common.desktop.enable = true;
|
nixfiles.common.desktop.enable = true;
|
||||||
|
|
||||||
services.xserver.displayManager.sddm.enable = mkDefault true;
|
services.displayManager.sddm.enable = mkDefault true;
|
||||||
services.xserver.desktopManager.plasma5.enable = true;
|
services.xserver.desktopManager.plasma5.enable = true;
|
||||||
services.xserver.displayManager.defaultSession = "plasmawayland";
|
services.displayManager.defaultSession = "plasmawayland";
|
||||||
programs.kdeconnect.enable = mkDefault true;
|
programs.kdeconnect.enable = mkDefault true;
|
||||||
nixfiles.meta.wayland = true;
|
nixfiles.meta.wayland = true;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user