From dacbe3cb7dd31ab2956b0ddfc62261953615ca1c Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 12 Jun 2025 10:39:08 -0400 Subject: [PATCH] split out lib-gestures --- hosts/fwbook.nix | 1 + modules/nixos/desktop/default.nix | 2 +- modules/nixos/desktop/x11/default.nix | 16 ++++++++++++++++ .../desktop/{x11.nix => x11/lib-gesture.nix} | 13 +++++++------ 4 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 modules/nixos/desktop/x11/default.nix rename modules/nixos/desktop/{x11.nix => x11/lib-gesture.nix} (69%) diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index cb248d8..43b9aed 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -49,6 +49,7 @@ in services.xserver.displayManager.gdm.enable = true; services.xserver.displayManager.gdm.wayland = true; services.displayManager.defaultSession = "gnome"; + programs.niri.enable = true; # Firmware updater services.fwupd.enable = true; diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index ad68752..aab9cea 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -7,7 +7,7 @@ in ./cosmic.nix ./kde.nix ./wayland.nix - ./x11.nix + ./x11 ./packages.nix ./crypto.nix ./gnome.nix diff --git a/modules/nixos/desktop/x11/default.nix b/modules/nixos/desktop/x11/default.nix new file mode 100644 index 0000000..6b62251 --- /dev/null +++ b/modules/nixos/desktop/x11/default.nix @@ -0,0 +1,16 @@ +{ config, lib, ... }: +let + cfg = config.skyg.nixos.desktop; +in +{ + imports = [ + ./lib-gesture.nix + ]; + config = lib.mkIf cfg.enable { + services.xserver = { + enable = true; + xkb.layout = "us"; + xkb.variant = ""; + }; + }; +} diff --git a/modules/nixos/desktop/x11.nix b/modules/nixos/desktop/x11/lib-gesture.nix similarity index 69% rename from modules/nixos/desktop/x11.nix rename to modules/nixos/desktop/x11/lib-gesture.nix index 731d797..7f44fbe 100644 --- a/modules/nixos/desktop/x11.nix +++ b/modules/nixos/desktop/x11/lib-gesture.nix @@ -1,14 +1,15 @@ { config, lib, pkgs, ... }: let - cfg = config.skyg.nixos.desktop; + cfg = config.skyg.nixos.desktop.x11; in { - config = lib.mkIf cfg.enable { - services.xserver = { - enable = true; - xkb.layout = "us"; - xkb.variant = ""; + options = { + skyg.nixos.desktop.x11 = { + enableLibGestures = lib.mkEnableOption + "Enable Desktop"; }; + }; + config = lib.mkIf cfg.enableLibGestures { users.users.${config.skyg.user.name}.extraGroups = [ "input" ]; environment.systemPackages = with pkgs; [ # These are used to handle touchpad gestures