remove gnome and hyprland

This commit is contained in:
2026-04-25 10:37:31 +02:00
parent 2c70c8281e
commit 6ce78e164c
7 changed files with 3 additions and 382 deletions

View File

@@ -8,7 +8,7 @@
# ../../modules/desktop
# ];
#
# myDesktop.windowManager = "niri"; # niri (default) | hyprland | sway | kde | gnome
# myDesktop.windowManager = "niri"; # niri (default) | sway | kde
# myDesktop.cpu = "amd"; # amd | intel | none (default)
#
# myDesktop.virtualisation.enable = true;
@@ -43,7 +43,7 @@ in
options.myDesktop = with lib; {
windowManager = mkOption {
type = types.enum [ "niri" "hyprland" "sway" "kde" "gnome" ];
type = types.enum [ "niri" "sway" "kde" ];
default = "niri";
description = "Window manager / desktop environment for this host.";
};
@@ -355,42 +355,6 @@ in
};
})
# ── Hyprland ───────────────────────────────────────────────────────────
(lib.mkIf (cfg.windowManager == "hyprland") {
hardware.opengl.enable = true;
environment = {
loginShellInit = ''
if [ -z $DISPLAY ] && [ $UID != 0 ] && [ "$(tty)" = "/dev/tty1" ]; then
exec Hyprland
fi
'';
variables = {
MOZ_ENABLE_WAYLAND = "1";
MOZ_WEBRENDER = "1";
MOZ_USE_XINPUT2 = "2";
MOZ_DBUS_REMOTE = "1";
XDG_SESSION_TYPE = "wayland";
XDG_CURRENT_DESKTOP = "Unity";
GST_VAAPI_ALL_DRIVERS = "1";
GTK_THEME = "Arc";
_JAVA_AWT_WM_NONREPARENTING = "1";
};
systemPackages = with pkgs; [
xdg-desktop-portal-wlr
swaylock
swayidle
slurp
grim
];
};
programs.hyprland.enable = true;
xdg.portal.wlr.enable = true;
home-manager.users.${user}.imports = [ ../wm/hyprland/home.nix ];
})
# ── Sway ───────────────────────────────────────────────────────────────
(lib.mkIf (cfg.windowManager == "sway") {
environment = {
@@ -468,39 +432,6 @@ in
home-manager.users.${user}.imports = [ ../wm/kde/home.nix ];
})
# ── GNOME ──────────────────────────────────────────────────────────────
(lib.mkIf (cfg.windowManager == "gnome") {
hardware.pulseaudio.enable = lib.mkForce false;
environment.systemPackages = with pkgs; [
gnome.gnome-terminal
gnomeExtensions.dash-to-dock
gnomeExtensions.appindicator
rocmPackages.clr.icd
rocmPackages.clr
clinfo
];
services = {
xserver = {
enable = true;
desktopManager.gnome.enable = true;
displayManager = {
gdm.wayland = true;
gdm.enable = true;
gdm.autoLogin.delay = 5;
gdm.settings.security.DisallowTCP = true;
defaultSession = "gnome";
autoLogin.enable = true;
autoLogin.user = user;
};
};
udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
};
home-manager.users.${user}.imports = [ ../wm/gnome/home.nix ];
})
# ── Virtualisation (podman/docker-compat + qemu/libvirt) ───────────────
(lib.mkIf cfg.virtualisation.enable {
users.groups = {