Skip to content

Commit dc17b18

Browse files
committed
Fork keyd (temporary friendly fork)
1 parent 31f307e commit dc17b18

File tree

2 files changed

+65
-17
lines changed

2 files changed

+65
-17
lines changed

README.md

Lines changed: 63 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,52 @@
11
[![Kofi](https://badgen.net/badge/icon/kofi?icon=kofi&label)](https://ko-fi.com/rvaiya)
22
[![Packaging status](https://repology.org/badge/tiny-repos/keyd.svg)](https://repology.org/project/keyd/versions)
33

4-
# keyd
4+
# keyd (temporary friendly fork)
55

66
A key remapping daemon for Linux.
77

8+
> [!NOTE]
9+
> https://github.com/keyd-project/keyd-fork is a temporary, friendly fork of the
10+
> [original keyd project](https://github.com/rvaiya/keyd) (upstream). This fork
11+
> was created on 2024-12-06 with the following goals:
12+
>
13+
> * Help reduce the backlog of pull requests in the original project by
14+
> merging them here and creating releases that users can test.
15+
> * Provide a well-maintained distribution tarball to make it easier for
16+
> downstream packagers to maintain keyd packages.
17+
> * Recruit potential maintainers. (If you are interested, please speak up at
18+
> [rvaiya/keyd#887](https://github.com/rvaiya/keyd/issues/887) or contact
19+
> [@rhansen](https://github.com/rhansen) directly.)
20+
>
21+
> Once the original project acquires a vibrant group of maintainers, this fork
22+
> will be archived. If the original project is abandoned, this fork will be
23+
> made permanent by dropping the `-fork` suffix.
24+
>
25+
> See [rvaiya/keyd#887](https://github.com/rvaiya/keyd/issues/887) for
26+
> discussion.
27+
>
28+
> This fork's branch plan: Commits intended to be reintegrated with the upstream
29+
> project will be put on a `reintegrate-vN` branch where `N` is a version
30+
> number. If new commits are pushed to the upstream project, and the new
31+
> commits cause the current `reintegrate-vN` branch to no longer be
32+
> fast-forwardable from the upstream's default branch:
33+
>
34+
> 1. A new `reintegrate-vM` branch (where `M = N+1`) is created pointing to
35+
> the same commit as `reintegrate-vN`, but not pushed yet.
36+
> 2. `reintegrate-vM` is rebased onto the upstream project's default branch,
37+
> preserving merges.
38+
> 3. `reintegrate-vM` is merged into `main`.
39+
> 4. `reintegrate-vN` is deleted.
40+
>
41+
> This is a bit painful, but the goal is to make it as easy as possible to
42+
> reintegrate with the upstream project without force-pushing this fork's `main`
43+
> branch.
44+
>
45+
> Feel free to open issues or pull requests in this fork. Pull requests
46+
> containing commits intended for reintegration into the upstream project should
47+
> be merged into the current `reintegrate-vN` branch, not `main`. After the
48+
> pull request is merged, `reintegrate-vN` is merged into `main`.
49+
850
## Impetus
951

1052
Linux lacks a good key remapping solution. In order to achieve satisfactory
@@ -25,8 +67,12 @@ See also: [changelog](docs/CHANGELOG.md).
2567

2668
- Speed (a hand tuned input loop written in C that takes <<1ms)
2769
- Simplicity (a [config format](#sample-config) that is intuitive)
28-
- Consistency (modifiers that [play nicely with layers](https://github.com/rvaiya/keyd/blob/6dc2d5c4ea76802fd192b143bdd53b1787fd6deb/docs/keyd.scdoc#L128) by default)
29-
- Modularity (a UNIXy core extensible through the use of an [IPC](https://github.com/rvaiya/keyd/blob/90973686723522c2e44d8e90bb3508a6da625a20/docs/keyd.scdoc#L391) mechanism)
70+
- Consistency (modifiers that [play nicely with
71+
layers](https://github.com/keyd-project/keyd-fork/blob/6dc2d5c4ea76802fd192b143bdd53b1787fd6deb/docs/keyd.scdoc#L128)
72+
by default)
73+
- Modularity (a UNIXy core extensible through the use of an
74+
[IPC](https://github.com/keyd-project/keyd-fork/blob/90973686723522c2e44d8e90bb3508a6da625a20/docs/keyd.scdoc#L391)
75+
mechanism)
3076

3177
## Features
3278

@@ -36,7 +82,8 @@ as well as some which are unique to keyd.
3682

3783
Some of the more interesting ones include:
3884

39-
- Layers (with support for [hybrid modifiers](https://github.com/rvaiya/keyd/blob/6dc2d5c4ea76802fd192b143bdd53b1787fd6deb/docs/keyd.scdoc#L128)).
85+
- Layers (with support for [hybrid
86+
modifiers](https://github.com/keyd-project/keyd-fork/blob/6dc2d5c4ea76802fd192b143bdd53b1787fd6deb/docs/keyd.scdoc#L128)).
4087
- Key overloading (different behaviour on tap/hold).
4188
- Keyboard specific configuration.
4289
- Instantaneous remapping (no more flashing :)).
@@ -139,20 +186,21 @@ If you wish to help maintain this PPA, please contact
139186
### From Source
140187

141188
> [!NOTE]
142-
> The default branch (`master`) is the development branch; it contains the
143-
> latest work-in-progress code. Things may occasionally break between releases.
144-
> Stable releases are [tagged](https://github.com/rvaiya/keyd/tags) and
145-
> announced on the [releases page](https://github.com/rvaiya/keyd/releases);
146-
> these versions are known to work.
189+
> The default branch (`main`) is the development branch; it contains the latest
190+
> work-in-progress code. Things may occasionally break between releases.
191+
> Stable releases are [tagged](https://github.com/keyd-project/keyd-fork/tags)
192+
> and announced on the [releases
193+
> page](https://github.com/keyd-project/keyd-fork/releases); these versions are
194+
> known to work.
147195
148196
#### From a Source Code Distribution Tarball
149197

150198
1. Download the desired tarball:
151199
* Releases can be found on the [releases
152-
page](https://github.com/rvaiya/keyd/releases).
153-
* The current revision of the `master` branch (work-in-progress
154-
development version) can be found at
155-
<https://nightly.link/rvaiya/keyd/workflows/ci/master/distribution-tarball>.
200+
page](https://github.com/keyd-project/keyd-fork/releases).
201+
* The current revision of the `main` branch (work-in-progress development
202+
version) can be found at
203+
<https://nightly.link/keyd-project/keyd-fork/workflows/ci/main/distribution-tarball>.
156204
Note that the distribution tarball is inside a zip file [due to an
157205
unfortunate GitHub
158206
limitation](https://github.com/actions/upload-artifact/issues/426).
@@ -184,8 +232,8 @@ If you wish to help maintain this PPA, please contact
184232
2. Get the source code:
185233

186234
```shell
187-
git clone https://github.com/rvaiya/keyd
188-
cd keyd
235+
git clone https://github.com/keyd-project/keyd-fork
236+
cd keyd-fork
189237
```
190238

191239
3. Optionally switch to a released revision, if desired:

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ AC_INIT([keyd],
55
dnl m4_esyscmd macro does not quote the command output itself, so the command output is subject to
66
dnl expansion).
77
m4_dquote(m4_esyscmd([printf "[%s]" "$(build-aux/git-version-gen .dist-version)"])),
8-
[https://github.com/rvaiya/keyd/issues],
8+
[https://github.com/keyd-project/keyd-fork/issues],
99
[],
10-
[https://github.com/rvaiya/keyd])
10+
[https://github.com/keyd-project/keyd-fork])
1111
AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/build-aux/git-version-gen'])
1212
AC_CONFIG_SRCDIR([src/keyd.c])
1313
AC_CONFIG_AUX_DIR([build-aux])

0 commit comments

Comments
 (0)