set keyd overload tap timeout

helps prevent escape key from being sent if not tapped
attempt to upgrade to keyd 2.4.3 pr
2025-07-07 19:30:14 +00:00 · 2023-10-07 08:58:34 -04:00 · 2023-10-07 07:52:47 -04:00
20 changed files with 151 additions and 184 deletions
--- a/flake.lock
+++ b/flake.lock
@ -90,11 +90,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1696360011,
-        "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=",
+        "lastModified": 1696043447,
+        "narHash": "sha256-VbJ1dY5pVH2fX1bS+cT2+4+BYEk4lMHRP0+udu9G6tk=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a",
+        "rev": "792c2e01347cb1b2e7ec84a1ef73453ca86537d8",
        "type": "github"
      },
      "original": {
@ -111,11 +111,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1697419184,
-        "narHash": "sha256-eRPjCyjdcqaME/baecZHyTQTn3k0AYFzN/S+u351FcE=",
+        "lastModified": 1695864092,
+        "narHash": "sha256-Hu1SkFPqO7ND95AOzBkZE2jGXSYhfZ965C03O72Kbu8=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "325e1f7f2e0eea44c27e5e8a3946c2461ec095f2",
+        "rev": "19b62324663b6b9859caf7f335d232cf4f1f6a32",
        "type": "github"
      },
      "original": {
@ -131,11 +131,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1697243978,
-        "narHash": "sha256-ZhtaqhEFcYxxPNNm246uqVGJ/CiM6j8mK0xGIZ8Dk0c=",
+        "lastModified": 1696034364,
+        "narHash": "sha256-7giewUYqKhhfhKRxe2EPHCpSM0oMLuByW4RTRZl6Jfc=",
        "owner": "bandithedoge",
        "repo": "nixpkgs-firefox-darwin",
-        "rev": "972388ef1f081def3398135dea9edbbede8a6435",
+        "rev": "b1e4d451a15c34d45bfefb05137a20469399a2df",
        "type": "github"
      },
      "original": {
@ -147,11 +147,11 @@
    "flake-compat": {
      "flake": false,
      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
        "owner": "edolstra",
        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
        "type": "github"
      },
      "original": {
@ -237,11 +237,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1697688028,
-        "narHash": "sha256-d9CAOd9W2iTrgB31a8Dvyp6Vgn/gxASCNrD4Z9yzUOY=",
+        "lastModified": 1696063111,
+        "narHash": "sha256-F2IJEbyH3xG0eqyAYn9JoV+niqNz+xb4HICYNkkviNI=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19",
+        "rev": "ae896c810f501bf0c3a2fd7fc2de094dd0addf01",
        "type": "github"
      },
      "original": {
@ -369,11 +369,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1697456312,
-        "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
+        "lastModified": 1695830400,
+        "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
+        "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2",
        "type": "github"
      },
      "original": {
@ -383,13 +383,29 @@
        "type": "github"
      }
    },
+    "nixpkgs-keyd": {
+      "locked": {
+        "lastModified": 1690363189,
+        "narHash": "sha256-Zs0VkngOtQz7nIEO7Wi8AwGB4TBSex2KZAw784aOm2M=",
+        "owner": "JohnAZoidberg",
+        "repo": "nixpkgs",
+        "rev": "6591d332f93422e388ef6337f6b362b4ff8d0724",
+        "type": "github"
+      },
+      "original": {
+        "owner": "JohnAZoidberg",
+        "ref": "keyd-2.4.3",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1697226376,
-        "narHash": "sha256-cumLLb1QOUtWieUnLGqo+ylNt3+fU8Lcv5Zl+tYbRUE=",
+        "lastModified": 1695825837,
+        "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "898cb2064b6e98b8c5499f37e81adbdf2925f7c5",
+        "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e",
        "type": "github"
      },
      "original": {
@ -417,11 +433,11 @@
    },
    "nur": {
      "locked": {
-        "lastModified": 1697716025,
-        "narHash": "sha256-5gT33Zs2uGsiU43FNWN4GrRqNy/n+eOeGRapU9yy1Bs=",
+        "lastModified": 1696080597,
+        "narHash": "sha256-fhf7+NT/xMwPZ/sRT30lnI04AHgf7tLPU4ClMux1nWA=",
        "owner": "nix-community",
        "repo": "nur",
-        "rev": "9e80a4be10bd21688163db9b3d2c710e185a654e",
+        "rev": "8783c360abc69f58d46a2929534ddd91eb41f3c6",
        "type": "github"
      },
      "original": {
@ -450,11 +466,11 @@
    "nvim-tree-lua-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1697497256,
-        "narHash": "sha256-Eu92ktyMEf7Oy96fEmWXeKxk2v08RFX8YQrSXRK3DgU=",
+        "lastModified": 1695716495,
+        "narHash": "sha256-Fkchn7UuIHPmVFFrx1kzsE2lviJrAFAe9tHu73HnS/w=",
        "owner": "kyazdani42",
        "repo": "nvim-tree.lua",
-        "rev": "40b9b887d090d5da89a84689b4ca0304a9649f62",
+        "rev": "934469b9b6df369e198fb3016969e56393b0dc07",
        "type": "github"
      },
      "original": {
@ -466,11 +482,11 @@
    "nvim-treesitter-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1697700673,
-        "narHash": "sha256-wbK9krVQ0YbB3qbuyWf/f776KP3nITlwI8KLsJKjiXg=",
+        "lastModified": 1696061053,
+        "narHash": "sha256-KR+VMYTVM2qsLPx412gySAKiGObhs+awbDJhWX72/wY=",
        "owner": "nvim-treesitter",
        "repo": "nvim-treesitter",
-        "rev": "eb3faef3a44641e5875581e901b0a8df8da2bde4",
+        "rev": "dd4e2dbc002dfce109d621e8bdcd9d89438b0a32",
        "type": "github"
      },
      "original": {
@ -511,6 +527,7 @@
        "nix2vim": "nix2vim",
        "nixos-generators": "nixos-generators",
        "nixpkgs": "nixpkgs",
+        "nixpkgs-keyd": "nixpkgs-keyd",
        "null-ls-nvim-src": "null-ls-nvim-src",
        "nur": "nur",
        "nvim-lspconfig-src": "nvim-lspconfig-src",
@ -655,11 +672,11 @@
    "tree-sitter-bash": {
      "flake": false,
      "locked": {
-        "lastModified": 1696959291,
-        "narHash": "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM=",
+        "lastModified": 1695263734,
+        "narHash": "sha256-dJUJGrpBWBLjcqiqxCnJ/MENwa2+uxAmQD71aYloxsw=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-bash",
-        "rev": "7331995b19b8f8aba2d5e26deb51d2195c18bc94",
+        "rev": "fd4e40dab883d6456da4d847de8321aee9c80805",
        "type": "github"
      },
      "original": {
@ -721,11 +738,11 @@
    "tree-sitter-python": {
      "flake": false,
      "locked": {
-        "lastModified": 1696990675,
-        "narHash": "sha256-nQ4HU5ysQjht9USFGRmW/+PLFTzPgi+6G68/uupMMRk=",
+        "lastModified": 1695282953,
+        "narHash": "sha256-gRhD3M1DkmwYQDDnyRq6QMTWUJUY0vbetGnN+pBTd84=",
        "owner": "tree-sitter",
        "repo": "tree-sitter-python",
-        "rev": "82f5c9937fe4300b4bec3ee0e788d642c77aab2c",
+        "rev": "a901729099257aac932d79c60adb5e8a53fa7e6c",
        "type": "github"
      },
      "original": {
@ -790,11 +807,11 @@
        "nixpkgs": "nixpkgs_2"
      },
      "locked": {
-        "lastModified": 1697459493,
-        "narHash": "sha256-HH8ePJIVAsiDHIdS4qnKQ9o4X0KTVGA9cfHBplKqpfs=",
+        "lastModified": 1696053802,
+        "narHash": "sha256-8TTbJbtGDz1MstExrVQe56eXZpovvZv6G6L6q/4NOKg=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "b63b328577f1cb5839f8ecc4fd05040335d4a55a",
+        "rev": "cadde47d123d1a534c272b04a7582f1d11474c48",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -7,9 +7,13 @@
    # Used for system packages
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";

+    # Update to keyd 2.4.3 not yet in nixpkgs-unstable
+    # https://github.com/NixOS/nixpkgs/pull/245327
+    nixpkgs-keyd.url = "github:JohnAZoidberg/nixpkgs/keyd-2.4.3";
+
    # Used for MacOS system config
    darwin = {
-      url = "github:lnl7/nix-darwin/master";
+      url = "github:/lnl7/nix-darwin/master";
      inputs.nixpkgs.follows = "nixpkgs";
    };

@ -228,6 +232,7 @@
        (import ./overlays/betterlockscreen.nix)
        (import ./overlays/age.nix inputs)
        (import ./overlays/proton-ge.nix inputs)
+        (import ./overlays/keyd.nix inputs)
      ];

      # System types to support.
--- a/hosts/tempest/default.nix
+++ b/hosts/tempest/default.nix
@ -99,7 +99,6 @@ inputs.nixpkgs.lib.nixosSystem {
      keybase.enable = true;
      mullvad.enable = false;
      nixlang.enable = true;
-      rust.enable = true;
      yt-dlp.enable = true;
      gaming = {
        dwarf-fortress.enable = true;
--- a/modules/common/applications/firefox.nix
+++ b/modules/common/applications/firefox.nix
@ -74,8 +74,6 @@
            "media.ffmpeg.vaapi.enabled" =
              true; # Enable hardware video acceleration
            "cookiebanners.ui.desktop.enabled" = true; # Reject cookie popups
-            "devtools.command-button-screenshot.enabled" =
-              true; # Scrolling screenshot of entire page
            "svg.context-properties.content.enabled" = true; # Sidebery styling
          };
          userChrome = ''
--- a/modules/common/neovim/config/lsp.nix
+++ b/modules/common/neovim/config/lsp.nix
@ -1,21 +1,5 @@
-{ pkgs, lib, config, dsl, ... }: {
+{ pkgs, dsl, ... }: {

-  # Terraform optional because non-free
-  options.useTerraform = lib.mkEnableOption "Whether to enable Terraform LSP";
-
-  config =
-
-    let
-
-      terraformFormat = if config.useTerraform then ''
-        require("null-ls").builtins.formatting.terraform_fmt.with({
-            command = "${pkgs.terraform}/bin/terraform",
-            extra_filetypes = { "hcl" },
-        }),
-      '' else
-        "";
-
-    in {
  plugins = [
    pkgs.vimPlugins.nvim-lspconfig
    pkgs.vimPlugins.lsp-colors-nvim
@ -24,27 +8,21 @@

  use.lspconfig.lua_ls.setup = dsl.callWith {
    settings = { Lua = { diagnostics = { globals = [ "vim" "hs" ]; }; }; };
-        capabilities =
-          dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
    cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
  };

  use.lspconfig.nil_ls.setup = dsl.callWith {
    cmd = [ "${pkgs.nil}/bin/nil" ];
-        capabilities =
-          dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
+    capabilities = dsl.rawLua "require('cmp_nvim_lsp').default_capabilities()";
  };

  use.lspconfig.pyright.setup = dsl.callWith {
    cmd = [ "${pkgs.pyright}/bin/pyright-langserver" "--stdio" ];
  };

-      use.lspconfig.terraformls.setup = dsl.callWith {
-        cmd = [ "${pkgs.terraform-ls}/bin/terraform-ls" "serve" ];
-      };
-
-      use.lspconfig.rust_analyzer.setup =
-        dsl.callWith { cmd = [ "${pkgs.rust-analyzer}/bin/rust-analyzer" ]; };
+  use.lspconfig.terraformls.setup =
+    dsl.callWith { cmd = [ "${pkgs.terraform-ls}/bin/terraform-ls" "serve" ]; };

  vim.api.nvim_create_augroup = dsl.callWith [ "LspFormatting" { } ];

@ -67,7 +45,10 @@
                command = "${pkgs.shfmt}/bin/shfmt",
                extra_args = { "-i", "4", "-ci" },
            }),
-                ${terraformFormat}
+            require("null-ls").builtins.formatting.terraform_fmt.with({
+                command = "${pkgs.terraform}/bin/terraform",
+                extra_filetypes = { "hcl" },
+            }),
        },

        on_attach = function(client, bufnr)
@ -92,6 +73,4 @@
    })
  '';

-    };
-
 }
--- a/modules/common/neovim/config/syntax.nix
+++ b/modules/common/neovim/config/syntax.nix
@ -24,7 +24,7 @@
    pkgs.vimPlugins.vim-helm
    pkgs.baleia-nvim # Clean ANSI from kitty scrollback
    # pkgs.hmts-nvim # Tree-sitter injections for home-manager
-    (pkgs.vimUtils.buildVimPlugin {
+    (pkgs.vimUtils.buildVimPluginFrom2Nix {
      pname = "nmasur";
      version = "0.1";
      src = ../plugin;
--- a/modules/common/neovim/config/tree.nix
+++ b/modules/common/neovim/config/tree.nix
@ -63,6 +63,7 @@
    '';
    view = { # Set look and feel
      width = 30;
+      hide_root_folder = false;
      side = "left";
      number = false;
      relativenumber = false;
--- a/modules/common/neovim/default.nix
+++ b/modules/common/neovim/default.nix
@ -5,7 +5,6 @@ let
  neovim = import ./package {
    inherit pkgs;
    colors = config.theme.colors;
-    useTerraform = config.terraform.enable;
  };

 in {
--- a/modules/common/neovim/package/default.nix
+++ b/modules/common/neovim/package/default.nix
@ -26,13 +26,13 @@
 #   ] ++ extraConfig;
 # }

-{ pkgs, colors, useTerraform ? false, ... }:
+{ pkgs, colors, ... }:

 # Comes from nix2vim overlay:
 # https://github.com/gytis-ivaskevicius/nix2vim/blob/master/lib/neovim-builder.nix
 pkgs.neovimBuilder {
  package = pkgs.neovim-unwrapped;
-  inherit colors useTerraform;
+  inherit colors;
  imports = [
    ../config/align.nix
    ../config/bufferline.nix
--- a/modules/common/programming/default.nix
+++ b/modules/common/programming/default.nix
@ -6,7 +6,6 @@
    ./lua.nix
    ./nix.nix
    ./python.nix
-    ./rust.nix
    ./terraform.nix
  ];

--- a/modules/common/programming/rust.nix
+++ b/modules/common/programming/rust.nix
@ -1,17 +0,0 @@
-{ config, pkgs, lib, ... }: {
-
-  options.rust.enable = lib.mkEnableOption "Rust programming language.";
-
-  config = lib.mkIf config.rust.enable {
-
-    home-manager.users.${config.user} = {
-
-      home.packages = with pkgs; [ cargo rustc gcc ];
-
-      programs.fish.shellAbbrs = { };
-
-    };
-
-  };
-
-}
--- a/modules/common/programming/terraform.nix
+++ b/modules/common/programming/terraform.nix
@ -3,7 +3,6 @@
  options.terraform.enable = lib.mkEnableOption "Terraform tools.";

  config = lib.mkIf config.terraform.enable {
-    unfreePackages = [ "terraform" ];

    home-manager.users.${config.user} = {
      programs.fish.shellAbbrs = {
--- a/modules/nixos/hardware/keyboard.nix
+++ b/modules/nixos/hardware/keyboard.nix
@ -18,7 +18,14 @@
      keyboards = {
        default = {
          ids = [ "*" ];
-          settings = { main = { capslock = "overload(control, esc)"; }; };
+          settings = {
+            main = { capslock = "overload(control, esc)"; };
+
+            # Fix: ctrl-click sends escape afterwards
+            # Suppresses escape if held for more than 500ms
+            # https://github.com/rvaiya/keyd/issues/424
+            global = { overload_tap_timeout = 500; };
+          };
        };
      };
    };
--- a/modules/nixos/system/doas.nix
+++ b/modules/nixos/system/doas.nix
@ -26,14 +26,9 @@
      };
    };

-    home-manager.users.${config.user}.programs = {
-
    # Alias sudo to doas for convenience
-      fish.shellAliases = { sudo = "doas"; };
-
-      # Disable overriding our sudo alias with a TERMINFO alias
-      kitty.settings.shell_integration = "no-sudo";
-
+    home-manager.users.${config.user}.programs.fish.shellAliases = {
+      sudo = "doas";
    };

  };
--- a/overlays/caddy.nix
+++ b/overlays/caddy.nix
@ -31,7 +31,7 @@ in {

    src = prev.caddy.src;

-    vendorSha256 = "sha256:0KfMzTt4lNzVfoCfDHhC2ue3OWICkFCHuhREiM2JPMY=";
+    vendorSha256 = "sha256:mwIsWJYKuEZpOU38qZOG1LEh4QpK4EO0/8l4UGsroU8=";

    overrideModAttrs = (_: {
      preBuild = ''
--- a/overlays/keyd.nix
+++ b/overlays/keyd.nix
@ -0,0 +1,6 @@
+# Use latest PR of keyd to update to 2.4.3
+# https://github.com/NixOS/nixpkgs/pull/245327
+
+inputs: _final: prev: {
+  inherit (inputs.nixpkgs-keyd.legacyPackages.${prev.system}) keyd;
+}
--- a/overlays/neovim-plugins.nix
+++ b/overlays/neovim-plugins.nix
@ -9,7 +9,7 @@ let

  # Package plugin - for plugins not found in nixpkgs at all
  plugin = pname: src:
-    prev.vimUtils.buildVimPlugin {
+    prev.vimUtils.buildVimPluginFrom2Nix {
      inherit pname src;
      version = "master";
    };
--- a/templates/poetry/flake.nix
+++ b/templates/poetry/flake.nix
@ -5,7 +5,7 @@
  inputs.nixpkgs.url = "github:NixOS/nixpkgs";
  inputs.poetry2nix.url = "github:nix-community/poetry2nix";

-  outputs = { self, nixpkgs, flake-utils, poetry2nix }:
+  outputs = { nixpkgs, flake-utils, poetry2nix }:
    flake-utils.lib.eachDefaultSystem (system:
      let
        pkgs = import nixpkgs {
--- a/templates/python/flake.nix
+++ b/templates/python/flake.nix
@ -11,7 +11,7 @@
    inputs.pypi-deps-db.follows = "pypi-deps-db";
  };

-  outputs = { self, nixpkgs, mach-nix }:
+  outputs = { nixpkgs, mach-nix }:
    let
      supportedSystems = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
      forAllSystems = f:
--- a/templates/rust/flake.nix
+++ b/templates/rust/flake.nix
@ -1,20 +0,0 @@
-{
-  description = "Basic Rust project";
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-  outputs = { self, nixpkgs }:
-    let
-      forAllSystems = nixpkgs.lib.genAttrs [
-        "x86_64-linux"
-        "x86_64-darwin"
-        "aarch64-linux"
-        "aarch64-darwin"
-      ];
-    in {
-      devShells = forAllSystems (system:
-        let pkgs = import nixpkgs { inherit system; };
-        in {
-          default =
-            pkgs.mkShell { buildInputs = with pkgs; [ gcc rustc cargo ]; };
-        });
-    };
-}
Author	SHA1	Message	Date
Noah Masur	1c9bd21ced	set keyd overload tap timeout helps prevent escape key from being sent if not tapped	2023-10-07 08:58:34 -04:00
Noah Masur	14d2cbfdfb	attempt to upgrade to keyd 2.4.3 pr	2023-10-07 07:52:47 -04:00