refactor: moving some desktop environment stuff around

This commit is contained in:
Jay Looney 2025-11-26 18:25:11 -06:00
parent f2d2b00fe7
commit 26f35df7ad
6 changed files with 20 additions and 17 deletions

View file

@ -10,21 +10,6 @@
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
#services.displayManager.sddm.enable = true;
services.displayManager.defaultSession = "xfce";
services.displayManager.sessionPackages = [ pkgs.niri ];
#services.sysc-greet.enable = true;
programs.niri.package = pkgs.niri;
services.xserver.desktopManager = {
xterm.enable = false;
xfce.enable = true;
};
# Desktop stuff specific to this device
services.xserver.enable = true;
#services.xserver.displayManager.lightdm.enable = true;
#services.xserver.desktopManager.pantheon.enable = true;
services.xserver.xkb = { services.xserver.xkb = {
layout = "us"; layout = "us";
variant = ""; variant = "";

View file

@ -11,7 +11,8 @@
./hardware-configuration.nix ./hardware-configuration.nix
./configuration.nix ./configuration.nix
../../modules/nixos/gaming.nix ../../modules/nixos/gaming.nix
../../modules/nixos/desktop/niri ../../modules/nixos/desktop/xfce
#../../modules/nixos/desktop/niri
]; ];
zw.gaming.enable = true; zw.gaming.enable = true;

View file

@ -14,7 +14,8 @@
calibre calibre
]; ];
services.udisks2.enable = true; services.udisks2.enable = true; # Required for eReader Support
}; };
# NOTE: Consider adding https://github.com/nydragon/calibre-plugins # NOTE: Consider adding https://github.com/nydragon/calibre-plugins
# especially for DeDRM
} }

View file

@ -5,6 +5,9 @@
./fonts.nix ./fonts.nix
]; ];
# TODO: Add options for enabling/switching between different Desktop Environments.
options = {};
zw.calibre.enable = true; zw.calibre.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View file

@ -17,6 +17,10 @@
fastfetch fastfetch
]; ];
services.displayManager.sessionPackages = [ pkgs.niri ];
programs.niri.package = pkgs.niri;
# Notification Daemon # Notification Daemon
#services.mako.enable = true; #services.mako.enable = true;
#services.mako.settings.default-timeout = 3000; #services.mako.settings.default-timeout = 3000;

View file

@ -0,0 +1,9 @@
{}:
{
services.displayManager.defaultSession = "xfce";
services.xserver.desktopManager = {
xterm.enable = false;
xfce.enable = true;
};
}