diff --git a/config/kanata/kanata.kbd b/config/kanata/kanata.kbd index 19d6d3e..b0d157f 100644 --- a/config/kanata/kanata.kbd +++ b/config/kanata/kanata.kbd @@ -1,3 +1,12 @@ +(defcfg + linux-dev-names-exclude ( + "ZSA Technology Labs Voyager" + "ZSA Technology Labs Voyager Consumer Control" + "ZSA Technology Labs Voyager Keyboard" + ) +) + + (deflocalkeys-linux ImpPt 99 ยบ 41 diff --git a/hosts/reykjavik/default.nix b/hosts/reykjavik/default.nix index 88d82fb..10250ef 100644 --- a/hosts/reykjavik/default.nix +++ b/hosts/reykjavik/default.nix @@ -66,14 +66,7 @@ in server.vatnajokull.enable = true; # - Keyboards - - system.kanata = { - enable = true; - devices = [ - "/dev/input/by-path/platform-i8042-serio-0-event-kbd" - "/dev/input/by-path/pci-0000:00:14.0-usb-0:9:1.0-event-kbd" - "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:9:1.0-event-kbd" - ]; - }; + system.kanata.enable = true; system.devices.voyager.enable = true; # - Desktop ---------------------------------- diff --git a/modules/app/zen-browser.nix b/modules/app/zen-browser.nix new file mode 100644 index 0000000..a2061e6 --- /dev/null +++ b/modules/app/zen-browser.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, inputs, system, ... }: + +let + cfg = config.samfelag.modules.app.zen-browser; + i3Cfg = config.samfelag.modules.desktop.wm.i3; + hyprCfg = config.samfelag.modules.desktop.wm.hyprland; +in +{ + options.samfelag.modules.app.zen-browser = { + enable = lib.mkEnableOption "zen-browser"; + }; + config = lib.mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + inputs.zen-browser.packages."${system}".default + ]; + + samfelag.modules.desktop.wm.i3.extraKeybindings = lib.mkIf i3Cfg.enable { + "${i3Cfg.mod}+Shift+i" = "exec ${pkgs.zen-browser}/bin/zen"; + }; + + samfelag.modules.desktop.wm.hyprland.extraKeybindings = lib.mkIf hyprCfg.enable [ + "${hyprCfg.mod} SHIFT, i, exec, ${pkgs.zen-browser}/bin/zen" + ]; + }; +} diff --git a/modules/system/kanata.nix b/modules/system/kanata.nix index 5626ec2..8228d99 100644 --- a/modules/system/kanata.nix +++ b/modules/system/kanata.nix @@ -6,11 +6,6 @@ in { options.samfelag.modules.system.kanata = { enable = lib.mkEnableOption "kanata"; - devices = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = []; - description = "Devices to use for kanata"; - }; }; config = lib.mkIf cfg.enable { @@ -22,7 +17,6 @@ in enable = true; keyboards = { internalKeyboard = { - devices = cfg.devices; extraDefCfg = "process-unmapped-keys yes"; configFile = ../../config/kanata/kanata.kbd; };