Switch back to sddm for login manager

This commit is contained in:
Evie Litherland-Smith 2023-09-30 08:10:21 +01:00
parent 6bc0649fce
commit b38ffe853d
4 changed files with 17 additions and 16 deletions

View file

@ -260,8 +260,5 @@ in ''
exec-once = ${pkgs.protonmail-bridge}/bin/protonmail-bridge -n exec-once = ${pkgs.protonmail-bridge}/bin/protonmail-bridge -n
exec-once = ${pkgs.dex}/bin/dex --autostart exec-once = ${pkgs.dex}/bin/dex --autostart
exec-once = kidex exec-once = kidex
exec = pkill -HUP kanshi exec = pkill -HUP kanshi
exec-once = ${pkgs.gtklock}/bin/gtklock
'' ''

View file

@ -15,10 +15,11 @@
"${pkgs.gitFull}/bin/git-credential-libsecret"; "${pkgs.gitFull}/bin/git-credential-libsecret";
}; };
services = { services = {
gpg-agent = { gpg-agent = rec {
enable = true; enable = true;
defaultCacheTtl = 7200; maxCacheTtl = 86400;
defaultCacheTtlSsh = 7200; defaultCacheTtl = maxCacheTtl;
defaultCacheTtlSsh = maxCacheTtl;
pinentryFlavor = "gtk2"; pinentryFlavor = "gtk2";
extraConfig = '' extraConfig = ''
no-allow-external-cache no-allow-external-cache

View file

@ -3,7 +3,6 @@
{ {
environment.systemPackages = with pkgs; environment.systemPackages = with pkgs;
with libsForQt5.qt5; [ with libsForQt5.qt5; [
gtklock
dex dex
mesa mesa
libnotify libnotify
@ -12,13 +11,17 @@
qtgraphicaleffects qtgraphicaleffects
qtsvg qtsvg
qtquickcontrols2 qtquickcontrols2
catppuccin-sddm-corners
protonvpn-cli protonvpn-cli
protonvpn-gui protonvpn-gui
qbittorrent qbittorrent
]; ];
security = { security = {
rtkit.enable = true; rtkit.enable = true;
pam.services.gtklock.gnupg.enable = true; pam.services = {
sddm.gnupg.enable = true;
gtklock = { };
};
}; };
sound.enable = true; sound.enable = true;
hardware = { hardware = {
@ -26,7 +29,6 @@
bluetooth.enable = true; bluetooth.enable = true;
}; };
services = { services = {
greetd.enable = true;
pipewire = { pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
@ -34,8 +36,15 @@
pulse.enable = true; pulse.enable = true;
}; };
xserver = { xserver = {
enable = true;
layout = "gb"; layout = "gb";
xkbVariant = ""; xkbVariant = "";
displayManager.sddm = {
enable = true;
theme = "catppuccin-sddm-corners";
autoNumlock = true;
settings = { General = { InputMethod = ""; }; };
};
}; };
}; };
console.keyMap = "uk"; console.keyMap = "uk";

View file

@ -30,13 +30,7 @@
blueman.enable = true; blueman.enable = true;
gvfs.enable = true; gvfs.enable = true;
tumbler.enable = true; tumbler.enable = true;
greetd.settings = rec { xserver.displayManager.defaultSession = "hyprland";
default_session.command = "Hyprland";
initial_session = {
inherit user;
inherit (default_session) command;
};
};
}; };
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs; [