From 10f11ec042ab468821274636d438f84781cb2408 Mon Sep 17 00:00:00 2001 From: Caroline Larimore Date: Tue, 4 Feb 2025 18:50:11 -0800 Subject: migration: desktop role --- snowfall/modules/nixos/hardware/audio/default.nix | 25 +++++++++++++ .../modules/nixos/hardware/keyboard/default.nix | 43 ++++++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 snowfall/modules/nixos/hardware/audio/default.nix create mode 100644 snowfall/modules/nixos/hardware/keyboard/default.nix (limited to 'snowfall/modules/nixos/hardware') diff --git a/snowfall/modules/nixos/hardware/audio/default.nix b/snowfall/modules/nixos/hardware/audio/default.nix new file mode 100644 index 0000000..d2bfa96 --- /dev/null +++ b/snowfall/modules/nixos/hardware/audio/default.nix @@ -0,0 +1,25 @@ +{ options, config, lib, pkgs, namespace, ... }: + +with lib; with lib.${namespace}; let + cfg = config.${namespace}.hardware.audio; +in { + options.${namespace}.hardware.audio = with types; { + enable = mkEnableOption "audio support"; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + pulseaudio + ]; + + security.rtkit.enable = true; + services.pipewire = { + enable = true; + + pulse.enable = true; + alsa.enable = true; + alsa.support32Bit = true; + #jack.enable = true; + }; + }; +} diff --git a/snowfall/modules/nixos/hardware/keyboard/default.nix b/snowfall/modules/nixos/hardware/keyboard/default.nix new file mode 100644 index 0000000..a8c478d --- /dev/null +++ b/snowfall/modules/nixos/hardware/keyboard/default.nix @@ -0,0 +1,43 @@ +{ options, config, lib, pkgs, namespace, ... }: + +with lib; with lib.${namespace}; let + cfg = config.${namespace}.hardware.keyboard; +in { + options.${namespace}.hardware.keyboard = with types; { + enable = mkEnableOption "keyboard hardware tweaks"; + jp = mkEnableOption "japanese ime support"; + }; + + config = mkIf cfg.enable { + services.keyd = { + enable = true; + + keyboards."*".settings = { + main = { + # Swap alt and meta keys. + # I prefer (physical) alt as my WM modifier key because it + # is easier to reach. This can collide with some programs + # shortcuts if they inlcude alt. Swapping alt and meta fixes + # this by making my WM mod key (software) meta, freeing up alt. + + leftalt = "leftmeta"; + leftmeta = "leftalt"; + + rightalt = "rightmeta"; + rightmeta = "rightalt"; + }; + }; + }; + + i18n.inputMethod = mkIf cfg.jp { + enable = true; + type = "fcitx5"; + fcitx5.addons = with pkgs; [ fcitx5-mozc ]; + }; + + environment.variables = mkIf cfg.jp { + # Required for fcitx5 support in kitty + GLFW_IM_MODULE = "ibus"; + }; + }; +} -- cgit v1.2.3