diff options
| -rw-r--r-- | build.nix | 5 | ||||
| -rw-r--r-- | default.nix | 2 | ||||
| -rw-r--r-- | kanshi/default.nix | 43 |
3 files changed, 23 insertions, 27 deletions
@@ -3,8 +3,5 @@ let pkgs-unstable= import (import ./pkgs-unstable) { inherit overlays; }; pkgs-release = import (import ./pkgs-18.09) { inherit overlays; }; in - [ - pkgs-unstable.swaypkgs - #pkgs-release.swaypkgs - ] + pkgs-unstable.swaypkgs diff --git a/default.nix b/default.nix index 875ecfb..ad57dce 100644 --- a/default.nix +++ b/default.nix @@ -10,7 +10,7 @@ swaypkgs = { grim = self.callPackage ./grim {}; slurp = self.callPackage ./slurp {}; mako = self.callPackage ./mako {}; - #kanshi = self.callPackage ./kanshi {}; + 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 index 6b8e91f..2831387 100644 --- a/kanshi/default.nix +++ b/kanshi/default.nix @@ -1,5 +1,8 @@ -{ stdenv, fetchFromGitHub, rustPlatform, - xorg, python3, pkgconfig, cairo, libxkbcommon }: +{ + stdenv, fetchFromGitHub, rustPlatform +, libudev, pkgconfig +}: + let metadata = import ./metadata.nix; pname = "kanshi"; @@ -9,31 +12,27 @@ rustPlatform.buildRustPackage { inherit pname version; name = "${pname}-${version}"; - nativeBuildInputs = [ python3 pkgconfig ]; - buildInputs = [ cairo libxkbcommon xorg.xcbutilkeysyms ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libudev ]; - # 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"]; + cargoBuildFlags = []; - src = fetchFromGitHub { - owner = "emersion"; - repo = pname; - rev = version; - sha256 = metadata.sha256; - }; + src = /home/cole/code/kanshi; + #src = fetchFromGitHub { + # owner = "emersion"; + # repo = pname; + # rev = version; + # sha256 = metadata.sha256; + #}; - cargoSha256 = "0lwzw8gf970ybblaxxkwn3pxrncxp0hhvykffbzirs7fic4fnvsg"; + cargoSha256Version = 2; + cargoSha256 = "098q1g04d5mpwlw1gshm78x28ki4gwhlkwqsd8vrfhp96v97n1sf"; 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 ]; + description = "Dynamic display configuration"; + homepage = "https://github.com/emersion/kanshi"; + maintainers = with maintainers; [ colemickens ]; platforms = platforms.linux; - license = licenses.mit; - homepage = https://github.com/svenstaro/wmfocus; + #license = licenses.unknown; # TODO: ??? }; } |