darkkirb/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request #487 from DarkKirb/coexist-sway-kde

Browse source 
make kde and sway coexist
This commit is contained in:
Charlotte 🦝 Delenk 2024-07-23 09:29:15 +02:00 committed by GitHub
commit 72f1655c02
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
config/desktop.nix
View file

@ -20,7 +20,8 @@ in {
./services/cups.nix ./services/cups.nix
./services/docker.nix ./services/docker.nix
./services/cifs.nix ./services/cifs.nix
#./kde.nix ./kde.nix
./sway.nix
] ]
++ ( ++ (
if system == "x86_64-linux" if system == "x86_64-linux"

1
config/devterm.nix
View file

@ -93,4 +93,5 @@
} }
]; ];
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
services.xserver.displayManager.defaultSession = lib.mkForce "sway";
} }

8
config/kde.nix
View file

@ -3,9 +3,9 @@
services.xserver = { services.xserver = {
displayManager.sddm.enable = true; displayManager.sddm.enable = true;
displayManager.sddm.wayland.enable = true; displayManager.sddm.wayland.enable = true;
#desktopManager.plasma6.enable = true; desktopManager.plasma6.enable = true;
desktopManager.plasma5.enable = true; #desktopManager.plasma5.enable = true;
#displayManager.defaultSession = "plasma"; displayManager.defaultSession = "plasma";
displayManager.defaultSession = "plasmawayland"; #displayManager.defaultSession = "plasmawayland";
}; };
} }

15
config/sway.nix Normal file
View file

@ -0,0 +1,15 @@
{
system,
config,
pkgs,
lib,
...
}: {
programs.sway.enable = true;
programs.sway.package = config.home-manager.users.darkkirb.wayland.windowManager.sway.package;
security.pam.services.sddm.u2fAuth = true;
services.xserver = {
displayManager.sddm.enable = true;
displayManager.sddm.wayland.enable = true;
};
}