mirror of
https://github.com/ryan4yin/nix-config.git
synced 2026-04-28 03:37:06 +02:00
chore: remove xorg server
This commit is contained in:
@@ -7,7 +7,6 @@
|
|||||||
}:
|
}:
|
||||||
with lib; let
|
with lib; let
|
||||||
cfgWayland = config.modules.desktop.wayland;
|
cfgWayland = config.modules.desktop.wayland;
|
||||||
cfgXorg = config.modules.desktop.xorg;
|
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
./base
|
./base
|
||||||
@@ -20,9 +19,6 @@ in {
|
|||||||
wayland = {
|
wayland = {
|
||||||
enable = mkEnableOption "Wayland Display Server";
|
enable = mkEnableOption "Wayland Display Server";
|
||||||
};
|
};
|
||||||
xorg = {
|
|
||||||
enable = mkEnableOption "Xorg Display Server";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkMerge [
|
config = mkMerge [
|
||||||
@@ -51,45 +47,5 @@ in {
|
|||||||
# fix https://github.com/ryan4yin/nix-config/issues/10
|
# fix https://github.com/ryan4yin/nix-config/issues/10
|
||||||
security.pam.services.swaylock = {};
|
security.pam.services.swaylock = {};
|
||||||
})
|
})
|
||||||
|
|
||||||
(mkIf cfgXorg.enable {
|
|
||||||
####################################################################
|
|
||||||
# NixOS's Configuration for Xorg Server
|
|
||||||
####################################################################
|
|
||||||
|
|
||||||
services = {
|
|
||||||
gvfs.enable = true; # Mount, trash, and other functionalities
|
|
||||||
tumbler.enable = true; # Thumbnail support for images
|
|
||||||
|
|
||||||
xserver = {
|
|
||||||
enable = true;
|
|
||||||
displayManager = {
|
|
||||||
lightdm.enable = true;
|
|
||||||
autoLogin = {
|
|
||||||
enable = true;
|
|
||||||
user = myvars.username;
|
|
||||||
};
|
|
||||||
# use a fake session to skip desktop manager
|
|
||||||
# and let Home Manager take care of the X session
|
|
||||||
defaultSession = "hm-session";
|
|
||||||
};
|
|
||||||
desktopManager = {
|
|
||||||
runXdgAutostartIfNone = true;
|
|
||||||
session = [
|
|
||||||
{
|
|
||||||
name = "hm-session";
|
|
||||||
manage = "window";
|
|
||||||
start = ''
|
|
||||||
${pkgs.runtimeShell} $HOME/.xsession &
|
|
||||||
waitPID=$!
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
# Configure keymap in X11
|
|
||||||
xkb.layout = "us";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user