From 9cabbde10399248d177d18e1ab4d2183998434c6 Mon Sep 17 00:00:00 2001 From: TheGeneralist <180094941+thegeneralist01@users.noreply.github.com> Date: Mon, 23 Jun 2025 09:10:39 +0200 Subject: [PATCH] xserver: use niri on the server --- modules/linux/xserver.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/linux/xserver.nix b/modules/linux/xserver.nix index ec1f0f1..c04ffb7 100644 --- a/modules/linux/xserver.nix +++ b/modules/linux/xserver.nix @@ -1,8 +1,19 @@ -{ pkgs, ... }: { +{ pkgs, lib, config, ... }: let + inherit (lib) optionalAttrs; +in { # TODO: write i3 and i3status here instead of stowing + virtualisation.vmware.guest.enable = true; + + environment.systemPackages = [ pkgs.fuzzel ]; + programs.niri.enable = config.isServer; + services.xserver = { enable = true; + # Configure keymap in X11 + # services.xserver.xkb.options = "eurosign:e,caps:escape"; + xkb.layout = "us,ru"; + displayManager = { lightdm = { enable = true; @@ -14,7 +25,7 @@ }; }; - windowManager.i3 = { + windowManager.i3 = optionalAttrs (!config.isServer) { enable = true; package = pkgs.i3; configFile = ../home/dotfiles/i3/config; @@ -35,10 +46,6 @@ }; }; - # Configure keymap in X11 - services.xserver.xkb.layout = "us,ru"; - # services.xserver.xkb.options = "eurosign:e,caps:escape"; - # home.file.".xprofile".text = '' # xrandr --output HDMI-0 --primary # '';