diff --git a/home/lukas/hyprland.nix b/home/lukas/hyprland.nix deleted file mode 100644 index a55dabd..0000000 --- a/home/lukas/hyprland.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, pkgs, ... }: - -{ - wayland.windowManager.hyprland = { - enable = true; - settings = { - monitor = ",preferred,auto,1"; - exec-once = "hyprpaper & waybar"; - input = { - kb_layout = "de"; - follow_mouse = 1; - }; - bind = [ - "SUPER,Return,exec,alacritty" - "SUPER,q,killactive" - "SUPER,space,togglefloating" - ]; - decoration.rounding = 8; - misc.vfr = true; - }; - }; -} diff --git a/hosts/segfault-machine/configuration.nix b/hosts/segfault-machine/configuration.nix index cc81ab8..2f234a8 100644 --- a/hosts/segfault-machine/configuration.nix +++ b/hosts/segfault-machine/configuration.nix @@ -2,7 +2,7 @@ imports = [ ./hardware.nix ../../users/lukas.nix - ../../modules/desktop/plasma.nix + ../../modules/desktop/gnome.nix ../../modules/input/katana.nix ../../modules/networking/networkmanager.nix ../../modules/system/locale.nix diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix new file mode 100644 index 0000000..d77cf31 --- /dev/null +++ b/modules/desktop/gnome.nix @@ -0,0 +1,21 @@ +{ config, pkgs, lib, ... }: + +{ + # --- GNOME on Wayland -------------------------------------------------- + services.xserver.enable = true; + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + + # Electron/Chromium apps → Wayland + environment.sessionVariables.NIXOS_OZONE_WL = "1"; + + # # --- dconf service & keyboard repeat ---------------------------------- + # programs.dconf.enable = true; # ← brings the `dconf` option into scope! + + # dconf.settings = { + # "org/gnome/desktop/peripherals/keyboard" = { + # delay = lib.gvariant.mkUint32 200; # ms before first repeat + # repeat-interval = lib.gvariant.mkUint32 25; # ms between repeats ≈40 cps + # }; + # }; +} diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix deleted file mode 100644 index ac271fa..0000000 --- a/modules/desktop/hyprland.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ pkgs, lib, ... }: - -{ - programs.hyprland = { - enable = true; - xwayland.enable = true; - }; - - services.greetd = { - enable = true; - settings.default_session = { - command = "Hyprland"; - user = "lukas"; - }; - }; - - environment.systemPackages = with pkgs; [ - hyprpicker hyprpaper hyprcursor - waybar swaylock grim slurp wl-clipboard kitty - ]; -} - diff --git a/modules/desktop/plasma.nix b/modules/desktop/plasma.nix deleted file mode 100644 index 5751502..0000000 --- a/modules/desktop/plasma.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config, pkgs, ... }: -{ - # gnome - services.xserver.enable = true; - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; - - # we use wayland -> hint electron apps to use wayland - environment.sessionVariables.NIXOS_OZONE_WL = "1"; -}