migration: finalize

2 files changed, 68 insertions, 0 deletions

diff --git a/modules/nixos/hardware/audio/default.nix b/modules/nixos/hardware/audio/default.nix
new file mode 100644
index 0000000..d2bfa96
--- /dev/null
+++ b/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/modules/nixos/hardware/keyboard/default.nix b/modules/nixos/hardware/keyboard/default.nix
new file mode 100644
index 0000000..0ea2aa6
--- /dev/null
+++ b/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.enable = 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 {
+      enable = true;
+      type = "fcitx5";
+      fcitx5.addons = with pkgs; [ fcitx5-mozc ];
+    };
+
+    environment.variables = mkIf cfg.jp.enable {
+      # Required for fcitx5 support in kitty
+      GLFW_IM_MODULE = "ibus";
+    };
+  };
+}