From 14d2cbfdfb15e9e761f6b0771cf44644643f3136 Mon Sep 17 00:00:00 2001 From: Noah Masur <7386960+nmasur@users.noreply.github.com> Date: Sat, 7 Oct 2023 07:52:47 -0400 Subject: [PATCH] attempt to upgrade to keyd 2.4.3 pr --- flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ overlays/keyd.nix | 6 ++++++ 3 files changed, 28 insertions(+) create mode 100644 overlays/keyd.nix diff --git a/flake.lock b/flake.lock index bc99849..d4b93d6 100644 --- a/flake.lock +++ b/flake.lock @@ -383,6 +383,22 @@ "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": 1695825837, @@ -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", diff --git a/flake.nix b/flake.nix index bb10c70..1318d92 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,10 @@ # 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"; @@ -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. diff --git a/overlays/keyd.nix b/overlays/keyd.nix new file mode 100644 index 0000000..6b3bf5f --- /dev/null +++ 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; +}