kanshi: init

5 files changed, 51 insertions, 2 deletions

diff --git a/README.md b/README.md
index f4792df..4509b49 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,7 @@ This overlay is built and (somewhat) tested against `nixos-unstable`.
 | slurp | [2018-10-24 12:37](https://github.com/emersion/slurp/commits/0dbd03991462397eb92bb40af712c837c898ebf1) |
 | grim | [2018-10-24 12:39](https://github.com/emersion/grim/commits/61df6f0a9531520c898718874c460826bc7e2b42) |
 | mako | [2018-11-03 07:23](https://github.com/emersion/mako/commits/d1e6585eb5c06f1e05c3ec77230a263d73cc103c) |
+| kanshi | [2018-11-03 07:08](https://github.com/emersion/kanshi/commits/b70796587861cc4b860853f68ab8669d5fb5a083) |
 | wlstream | [2018-07-15 14:10](https://github.com/atomnuker/wlstream/commits/182076a94562b128c3a97ecc53cc68905ea86838) |
 | waybar | [2018-11-03 05:36](https://github.com/Alexays/waybar/commits/26182c222b6994666640ea0a89cfa97fbcf7229f) |
 | wayfire | [2018-11-01 03:05](https://github.com/WayfireWM/wayfire/commits/f634aff42ae8a29794d3977675a09e72832f2414) |
@@ -23,7 +24,7 @@ This overlay is built and (somewhat) tested against `nixos-unstable`.
 | redshift-wayland | [2018-09-01 12:25](https://github.com/minus7/redshift/commits/a2177ed9942477868ccc514372f32a0fbcbe189e) |
 <!--pkgs-->
 
-Auto-update script last run: <!--update-->2018-11-03 18:00<!--update-->.
+Auto-update script last run: <!--update-->2018-11-03 20:52<!--update-->.
 
 Please open an issue if something is out of date.
 
diff --git a/default.nix b/default.nix
index 6348b06..875ecfb 100644
--- a/default.nix
+++ b/default.nix
@@ -10,6 +10,7 @@ swaypkgs = {
   grim             = self.callPackage ./grim {};
   slurp            = self.callPackage ./slurp {};
   mako             = self.callPackage ./mako {};
+  #kanshi           = self.callPackage ./kanshi {};
   wlstream         = self.callPackage ./wlstream {};
   waybar           = self.callPackage ./waybar {};
   wf-config        = self.callPackage ./wf-config {};
diff --git a/kanshi/default.nix b/kanshi/default.nix
new file mode 100644
index 0000000..6b8e91f
--- /dev/null
+++ b/kanshi/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, rustPlatform,
+  xorg, python3, pkgconfig, cairo, libxkbcommon }:
+let
+  metadata = import ./metadata.nix;
+  pname = "kanshi";
+  version = metadata.rev;
+in
+rustPlatform.buildRustPackage {
+  inherit pname version;
+  name = "${pname}-${version}";
+
+  nativeBuildInputs = [ python3 pkgconfig ];
+  buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ];
+
+  # For now, this is the only available featureset. This is also why the file is
+  # in the i3 folder, even though it might be useful for more than just i3
+  # users.
+  cargoBuildFlags = ["--features i3"];
+
+  src = fetchFromGitHub {
+    owner = "emersion";
+    repo = pname;
+    rev = version;
+    sha256 = metadata.sha256;
+  };
+
+  cargoSha256 = "0lwzw8gf970ybblaxxkwn3pxrncxp0hhvykffbzirs7fic4fnvsg";
+
+  meta = with stdenv.lib; {
+    description = ''
+      Tool that allows you to rapidly choose a specific window directly
+      without having to use the mouse or directional keyboard navigation.
+    '';
+    maintainers = with maintainers; [ synthetica ];
+    platforms = platforms.linux;
+    license = licenses.mit;
+    homepage = https://github.com/svenstaro/wmfocus;
+  };
+}
diff --git a/kanshi/metadata.nix b/kanshi/metadata.nix
new file mode 100644
index 0000000..a83ed43
--- /dev/null
+++ b/kanshi/metadata.nix
@@ -0,0 +1,5 @@
+{
+  rev = "b70796587861cc4b860853f68ab8669d5fb5a083";
+  sha256 = "1bs9s6ji0kmmpb2danvvg8w96rlis8ixyw23mandlg07y9iqam9f";
+  revdate = "2018-11-03T14:08:40Z";
+}
diff --git a/update.sh b/update.sh
index 4ce3e9d..54a24bb 100755
--- a/update.sh
+++ b/update.sh
@@ -46,6 +46,7 @@ update "sway-beta"        "swaywm"     "sway"             "master"
 update "slurp"            "emersion"   "slurp"            "master"
 update "grim"             "emersion"   "grim"             "master"
 update "mako"             "emersion"   "mako"             "master"
+update "kanshi"           "emersion"   "kanshi"           "master"
 update "wlstream"         "atomnuker"  "wlstream"         "master"
 update "waybar"           "Alexays"    "waybar"           "master"
 update "wayfire"          "WayfireWM"  "wayfire"          "master"
@@ -61,6 +62,7 @@ update "redshift-wayland" "minus7"     "redshift"         "wayland"
 #update "waymonad"   "waymonad"   "waymonad"         "master"
 
 # update README.md
+set +x
 replace="$(printf "<!--pkgs-->")"
 replace="$(printf "%s\n| Attribute Name | Last Upstream Commit Time |" "${replace}")"
 replace="$(printf "%s\n| -------------- | ------------------------- |" "${replace}")"
@@ -68,6 +70,7 @@ for p in "${pkgentries[@]}"; do
   replace="$(printf "%s\n%s\n" "${replace}" "${p}")"
 done
 replace="$(printf "%s\n<!--pkgs-->" "${replace}")"
+set -x
 
 rg --multiline '(?s)(.*)<!--pkgs-->(.*)<!--pkgs-->(.*)' "README.md" \
   --replace "\$1${replace}\$3" \
@@ -78,5 +81,5 @@ rg --multiline '(?s)(.*)<!--update-->(.*)<!--update-->(.*)' "README.md" \
     > README2.md; mv README2.md README.md
 
 # build all and push to cachix
-nix-build --no-out-link build.nix | cachix push "${cachixremote}"
+nix-build --no-out-link --keep-going build.nix | cachix push "${cachixremote}"