diff --git a/hm/desktop/i3.nix b/hm/desktop/i3.nix index d1092f9..3b3f0d2 100644 --- a/hm/desktop/i3.nix +++ b/hm/desktop/i3.nix @@ -108,7 +108,7 @@ in "${mod}+Shift+c" = "reload"; "${mod}+Shift+r" = "restart"; "${mod}+Shift+e" = "exit"; - } // lib.mapAttrs' (k: v: lib.nameValuePair v.enter "mode ${v.name}") modes + } // lib.mapAttrs' (k: v: lib.nameValuePair v.enter "mode ${v.name}") (lib.filterAttrs (k: v: v.enter != null) modes) // lib.attrsets.mergeAttrsList (forEachCardinal (c: { # change focus "${mod}+${c.vi}" = "focus ${c.container}; ${focus}"; @@ -202,7 +202,7 @@ in default = { }; }; enter = lib.mkOption { - type = lib.types.str; + type = lib.types.nullOr lib.types.str; default = "${mod}+${config.mod_enter}"; }; mod_enter = lib.mkOption { diff --git a/hm/desktop/presentation/default.nix b/hm/desktop/presentation/default.nix index fa4f37a..36bc811 100644 --- a/hm/desktop/presentation/default.nix +++ b/hm/desktop/presentation/default.nix @@ -20,7 +20,7 @@ in return_bindings = false; }; "${mode_pres_sec}" = { - mod_enter = "Shift+p+2"; # Bogus, just so I don't have to implement no binding + enter = null; bindings = { "b" = "workspace 1, workspace 2, mode ${mode_pres_main}"; "q" = "mode default";