From 750bcb5d97f510c9c35798f89640160838eddbbe Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 7 Apr 2025 09:57:11 +0200 Subject: [PATCH 1/2] helix/module.nix: Hide dotfiles --- packages/helix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/helix.nix b/packages/helix.nix index d13623c..50fed6f 100644 --- a/packages/helix.nix +++ b/packages/helix.nix @@ -48,7 +48,7 @@ snippets = true; }; file-picker = { - hidden = false; + hidden = true; }; line-number = "relative"; true-color = true; From 8a9d31be7de0682a68b5373391edb9f69d8d9f2a Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Mon, 7 Apr 2025 09:48:52 +0200 Subject: [PATCH 2/2] Kanata: add enable option, enable on temperance and hermit --- hosts/hermit/configuration.nix | 2 ++ hosts/temperance/configuration.nix | 1 + modules/services/kanata/module.nix | 31 ++++++++++++++++++++---------- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix index 4cd5c2d..3c30c09 100644 --- a/hosts/hermit/configuration.nix +++ b/hosts/hermit/configuration.nix @@ -61,6 +61,8 @@ }; services = { locate.enable = true; + kanata.enable = true; + media.mpd = { enable = true; diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix index 17abeb0..91f7a08 100644 --- a/hosts/temperance/configuration.nix +++ b/hosts/temperance/configuration.nix @@ -81,6 +81,7 @@ in { services = { locate.enable = true; usbguard.enable = true; + kanata.enable = true; media.mpd = { enable = true; diff --git a/modules/services/kanata/module.nix b/modules/services/kanata/module.nix index 7f6520f..430b360 100644 --- a/modules/services/kanata/module.nix +++ b/modules/services/kanata/module.nix @@ -1,15 +1,26 @@ -{...}: { - services.kanata = { - enable = true; +{ + config, + lib, + ... +}: let + cfg = config.modules.services.kanata; + inherit (lib.modules) mkIf; + inherit (lib.options) mkEnableOption; +in { + options.modules.services.kanata.enable = mkEnableOption "kanata"; + config = mkIf cfg.enable { + services.kanata = { + enable = true; - keyboards.daskeyboard = { - devices = ["/dev/input/by-id/usb-Metadot_-_Das_Keyboard_Das_Keyboard-event-kbd"]; - config = builtins.readFile (./. + "/main.kbd"); - }; + keyboards.daskeyboard = { + devices = ["/dev/input/by-id/usb-Metadot_-_Das_Keyboard_Das_Keyboard-event-kbd"]; + config = builtins.readFile (./. + "/main.kbd"); + }; - keyboards.laptop = { - devices = ["/dev/input/by-path/platform-i8042-serio-0-event-kbd"]; - config = builtins.readFile (./. + "/main.kbd"); + keyboards.laptop = { + devices = ["/dev/input/by-path/platform-i8042-serio-0-event-kbd"]; + config = builtins.readFile (./. + "/main.kbd"); + }; }; }; }