From 171d7390d5c81675aed1164ff8b9a845df21ed01 Mon Sep 17 00:00:00 2001 From: Don Harper Date: Tue, 25 Jul 2023 21:28:08 -0500 Subject: [PATCH] attempt to add fix for kanshi and usb-c dock --- mypackages/kanshi-fix/99-kanshi-fix.rules | 2 ++ mypackages/kanshi-fix/default.nix | 2 ++ mypackages/kanshi-fix/derivation.nix | 20 ++++++++++++++++++++ mypackages/kanshi-fix/kanshi-fix | 4 ++++ workstation/default.nix | 6 ++++++ 5 files changed, 34 insertions(+) create mode 100644 mypackages/kanshi-fix/99-kanshi-fix.rules create mode 100644 mypackages/kanshi-fix/default.nix create mode 100644 mypackages/kanshi-fix/derivation.nix create mode 100755 mypackages/kanshi-fix/kanshi-fix diff --git a/mypackages/kanshi-fix/99-kanshi-fix.rules b/mypackages/kanshi-fix/99-kanshi-fix.rules new file mode 100644 index 0000000..8d17ad0 --- /dev/null +++ b/mypackages/kanshi-fix/99-kanshi-fix.rules @@ -0,0 +1,2 @@ +KERNEL=="card0", SUBSYSTEM=="drm", RUN+="$(pkgs.kanshi-fix}/bin/kanshi-fix" + diff --git a/mypackages/kanshi-fix/default.nix b/mypackages/kanshi-fix/default.nix new file mode 100644 index 0000000..469c3f9 --- /dev/null +++ b/mypackages/kanshi-fix/default.nix @@ -0,0 +1,2 @@ +{ pkgs ? import {} }: +pkgs.callPackage ./derivation.nix {} diff --git a/mypackages/kanshi-fix/derivation.nix b/mypackages/kanshi-fix/derivation.nix new file mode 100644 index 0000000..0fb779e --- /dev/null +++ b/mypackages/kanshi-fix/derivation.nix @@ -0,0 +1,20 @@ +{ stdenv }: +stdenv.mkDerivation rec { + name = "kanshi-fix-${version}"; + version = "1.4"; + + src = ./.; + + nativeBuildInputs = [ ]; + buildInputs = [ ]; + + dontConfigure = true; + buildPhase = '' + chmod 0755 kanshi-fix + ''; + + installPhase = '' + mkdir -p $out/bin + cp kanshi-fix $out/bin + ''; +} diff --git a/mypackages/kanshi-fix/kanshi-fix b/mypackages/kanshi-fix/kanshi-fix new file mode 100755 index 0000000..d321ca1 --- /dev/null +++ b/mypackages/kanshi-fix/kanshi-fix @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +export SWAYSOCK=/run/user/1000/sway-ipc.1000.$(pgrep -x sway).sock +export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/1000/bus" +swaymsg "output * dpms on" diff --git a/workstation/default.nix b/workstation/default.nix index d6bc204..a705551 100644 --- a/workstation/default.nix +++ b/workstation/default.nix @@ -60,6 +60,11 @@ in }; services = { + #udev = { + #extraRules = '' + #KERNEL=="card0", SUBSYSTEM=="drm", RUN+=""${pkgs.kanshi-fix}"/bin/kanshi-fix" + #''; + #}; avahi = { enable = true; nssmdns = true; @@ -134,6 +139,7 @@ in nixpkgs.config.permittedInsecurePackages = [ "electron-21.4.0" ]; environment.systemPackages = with pkgs; [ + #(callPackage ../mypackages/kanshi-fix/default.nix {}) python-with-my-packages acpi aspell