From d5571ca03cb5994da42e66ce57a47152b26142dd Mon Sep 17 00:00:00 2001 From: Alexander Heldt Date: Fri, 21 Jul 2023 21:01:21 +0200 Subject: [PATCH] bennu: Use `wayland` and `sway` --- hosts/bennu/configuration.nix | 11 ++--------- hosts/bennu/home.nix | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/hosts/bennu/configuration.nix b/hosts/bennu/configuration.nix index fccd06d..94bcb3f 100644 --- a/hosts/bennu/configuration.nix +++ b/hosts/bennu/configuration.nix @@ -49,15 +49,8 @@ LC_TIME = "sv_SE.UTF-8"; }; - # Configure keymap in X11 - services.xserver = { - enable = true; - layout = "se"; - xkbVariant = ""; - - displayManager.gdm.enable = true; - desktopManager.gnome.enable = true; - }; + security.polkit.enable = true; + hardware.opengl.enable = true; # Configure console keymap console.keyMap = "sv-latin1"; diff --git a/hosts/bennu/home.nix b/hosts/bennu/home.nix index 45afa4e..0a0adf8 100644 --- a/hosts/bennu/home.nix +++ b/hosts/bennu/home.nix @@ -89,5 +89,29 @@ ''; }; + wayland.windowManager.sway = { + enable = true; + + config = { + modifier = "Mod4"; # Super key + input = { + "type:keyboard"= { + xkb_layout = "se"; + }; + + "type:touchpad" = { + tap = "enabled"; + drag = "disabled"; + }; + }; + + output = { + "eDP-1" = { + mode = "1020x1200@60Hz"; + }; + }; + }; + }; + home.stateVersion = "23.05"; }