From c04d9504fa2ae8f447ef05a1e7ddb3b21ed06af9 Mon Sep 17 00:00:00 2001 From: Katharina Fey Date: Sat, 5 Oct 2019 22:09:49 +0000 Subject: Adding workstation module --- modules/workstation/hardware/ckb/default.nix | 10 ++++++++++ modules/workstation/hardware/default.nix | 16 ++++++++++++++++ modules/workstation/hardware/xkblayout/default.nix | 16 ++++++++++++++++ modules/workstation/hardware/yubikey/default.nix | 14 ++++++++++++++ 4 files changed, 56 insertions(+) create mode 100644 modules/workstation/hardware/ckb/default.nix create mode 100644 modules/workstation/hardware/default.nix create mode 100644 modules/workstation/hardware/xkblayout/default.nix create mode 100644 modules/workstation/hardware/yubikey/default.nix (limited to 'modules/workstation/hardware') diff --git a/modules/workstation/hardware/ckb/default.nix b/modules/workstation/hardware/ckb/default.nix new file mode 100644 index 00000000000..88d8592d48a --- /dev/null +++ b/modules/workstation/hardware/ckb/default.nix @@ -0,0 +1,10 @@ +/* CORSAIR KEYBOARD SUPPORT + * + * Setup the K65 corsair keyboard daemon + * with themes properly + */ +{ config, ... }: + +{ + (builtins.abort "CKB module not implemented!") +} diff --git a/modules/workstation/hardware/default.nix b/modules/workstation/hardware/default.nix new file mode 100644 index 00000000000..28f684b5906 --- /dev/null +++ b/modules/workstation/hardware/default.nix @@ -0,0 +1,16 @@ +/* HARDWARE SUPPORT MODULE + * + * This module doesn't include ALL submodules because + * some are only relevant for specific platforms. Still + * the general support should be provided by the + * WORKSTATION module, not be bound to be device specific + */ + +{ ... }: + +{ + imports = [ + ./yubikey + ./xkblayout + ]; +} diff --git a/modules/workstation/hardware/xkblayout/default.nix b/modules/workstation/hardware/xkblayout/default.nix new file mode 100644 index 00000000000..1fa51cc0527 --- /dev/null +++ b/modules/workstation/hardware/xkblayout/default.nix @@ -0,0 +1,16 @@ +/* KEYBOARD LAYOUT MODULE + * + * (INCOMPLETE) Setup keyboard layout + * and overrides. Currently this is + * mostly handled by GRAPHICS/I3 but + * should maybe be moved here? + */ +{ pkgs, config, ... }: + +{ + i18n.consoleUseXkbConfig = true; + services.xserver.layout = "us"; + + # environment.variables.XKB_DEFAULT_LAYOUT = xcfg.layout; + # environment.variables.XKB_DEFAULT_OPTIONS = xcfg.xkbOptions; +} diff --git a/modules/workstation/hardware/yubikey/default.nix b/modules/workstation/hardware/yubikey/default.nix new file mode 100644 index 00000000000..851f9acea39 --- /dev/null +++ b/modules/workstation/hardware/yubikey/default.nix @@ -0,0 +1,14 @@ +{ pkgs, ... }: + +{ + services.udev.packages = with pkgs; [ yubikey-personalization ]; + + # FIXME: Can I remove these? + # Previously these rules were required to make + # Yubikey support work on `uwu`, but maybe this + # is redundant with special udev rules? + environment.systemPackages = with pkgs; [ + yubikey-manager + yubikey-personalization + ]; +} -- cgit v1.2.3