hosts/tempest/default.nix

@@ -118,7 +118,6 @@ inputs.nixpkgs.lib.nixosSystem {
         dwarf-fortress.enable = true;
         enable = true;
         steam.enable = true;
-        moonlight.enable = true;
         legendary.enable = true;
         lutris.enable = true;
         ryujinx.enable = true;

modules/nixos/gaming/default.nix

@@ -12,7 +12,6 @@
     ./legendary.nix
     ./lutris.nix
     ./minecraft-server.nix
-    ./moonlight.nix
     ./ryujinx.nix
     ./steam.nix
   ];

modules/nixos/gaming/moonlight.nix

@@ -1,14 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-
-  options.gaming.moonlight.enable = lib.mkEnableOption "Enable Moonlight game streaming client.";
-
-  config = lib.mkIf config.gaming.moonlight.enable {
-    environment.systemPackages = with pkgs; [ moonlight-qt ];
-  };
-}

modules/nixos/graphical/polybar.nix

@@ -209,6 +209,12 @@
             label-foreground = config.theme.colors.base06;
             # format-background = colors.background;
           };
+          "module/keyboard" = {
+            type = "custom/text";
+            content = "󰌌";
+            click-left = "doas systemctl restart keyd";
+            content-foreground = config.theme.colors.base04;
+          };
           "module/power" = {
             type = "custom/text";
             content = "  ";

modules/nixos/hardware/keyboard.nix

@@ -1,4 +1,9 @@
-{ config, lib, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 {
 
   config = lib.mkIf config.physical {
@@ -12,29 +17,23 @@
       autoRepeatInterval = 40;
     };
 
-    # Swap Caps-Lock with Escape when pressed or LCtrl when held/combined with others
-    # Inspired by: https://www.youtube.com/watch?v=XuQVbZ0wENE
-    services.kanata = {
+    # Use capslock as escape and/or control
+    services.keyd = {
       enable = true;
-      keyboards.default = {
-        devices = [
-          "/dev/input/by-id/usb-Logitech_Logitech_G710_Keyboard-event-kbd"
-          "/dev/input/by-id/usb-Logitech_Logitech_G710_Keyboard-if01-event-kbd"
-        ];
-        extraDefCfg = "process-unmapped-keys yes";
-        config = ''
-          (defsrc
-              caps
-          )
-          (defalias
-              escctrl (tap-hold-press 1000 1000 esc lctrl)
-          )
-          (deflayer base
-              @escctrl
-          )
-        '';
+      keyboards = {
+        default = {
+          ids = [ "*" ];
+          settings = {
+            main = {
+              capslock = "overload(control, esc)";
             };
           };
+        };
+      };
+    };
+
+    # For some reason, keyd doesn't restart properly when updating
+    system.activationScripts.keyd.text = "${pkgs.systemd}/bin/systemctl restart keyd.service";
 
     # Enable num lock on login
     home-manager.users.${config.user}.xsession.numlock.enable = true;

modules/nixos/services/cloudflare.nix

@@ -116,9 +116,6 @@ in
       [ "127.0.0.1" ] ++ cloudflareIpRanges
     );
 
-    # Using dyn-dns instead of ddclient because I can't find a way to choose
-    # between proxied and non-proxied records for Cloudflare using just
-    # ddclient.
     services.cloudflare-dyndns =
       lib.mkIf ((builtins.length config.services.cloudflare-dyndns.domains) > 0)
         {