diff --git a/hosts/boreal/default.nix b/hosts/boreal/default.nix index d721404..5930747 100644 --- a/hosts/boreal/default.nix +++ b/hosts/boreal/default.nix @@ -111,14 +111,6 @@ in }; my.displayManager.sddm.enable = true; - environment.systemPackages = with pkgs; [ - chrysalis - ]; - - services.udev.packages = with pkgs; [ - packages.kaleidoscope-udev-rules - ]; - hardware.bluetooth = { enable = true; powerOnBoot = true; diff --git a/pkgs/default.nix b/pkgs/default.nix index e7e4804..4b0dc52 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,5 +1,4 @@ { pkgs }: { sddm-sugar-candy = pkgs.callPackage ./sddm-sugar-candy {}; - kaleidoscope-udev-rules = pkgs.callPackage ./kaleidoscope-udev-rules {}; } diff --git a/pkgs/kaleidoscope-udev-rules/60-kaleidoscope.rules b/pkgs/kaleidoscope-udev-rules/60-kaleidoscope.rules deleted file mode 100644 index 6462d5a..0000000 --- a/pkgs/kaleidoscope-udev-rules/60-kaleidoscope.rules +++ /dev/null @@ -1,16 +0,0 @@ -## This file sets up a few things for selected Kaleidoscope-powered keyboards: -## - We first symlink the device to a more friendly name, based on the product -## name. -## - We then ask ModemManager to ignore the serial ports on the device, and not -## consider them a candidate. -## - We also tell systemd to grant access to the device (via ACLs) to the user -## at-seat. -## -## For more information about the access part, see the following resources: -## - https://github.com/systemd/systemd/issues/4288 -## - https://www.freedesktop.org/software/systemd/man/sd-login.html - -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2300", SYMLINK+="model01", ENV{ID_MM_DEVICE_IGNORE}:="1", ENV{ID_MM_CANDIDATE}:="0", TAG+="uaccess", TAG+="seat" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2301", SYMLINK+="model01", ENV{ID_MM_DEVICE_IGNORE}:="1", ENV{ID_MM_CANDIDATE}:="0", TAG+="uaccess", TAG+="seat" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2302", SYMLINK+="Atreus2", ENV{ID_MM_DEVICE_IGNORE}:="1", ENV{ID_MM_CANDIDATE}:="0", TAG+="uaccess", TAG+="seat" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="2303", SYMLINK+="Atreus2", ENV{ID_MM_DEVICE_IGNORE}:="1", ENV{ID_MM_CANDIDATE}:="0", TAG+="uaccess", TAG+="seat" diff --git a/pkgs/kaleidoscope-udev-rules/default.nix b/pkgs/kaleidoscope-udev-rules/default.nix deleted file mode 100644 index 211b96f..0000000 --- a/pkgs/kaleidoscope-udev-rules/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, lib }: - -let - pname = "kaleidoscope-udev-rules"; - version = "0.8.4"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - - dontBuild = true; - - src = ./.; - - # FIXME: fetch from GitHub properly - installPhase = '' - mkdir -p $out/lib/udev/rules.d - cp ./60-kaleidoscope.rules $out/lib/udev/rules.d/ - ''; - - meta = with lib; { - description = "udev rules for kaleidoscope firmware keyboards"; - homepage = "https://github.com/keyboardio/Chrysalis"; - license = licenses.gpl3; - platforms = [ "x86_64-linux" ]; - }; -}