From 86219fee55e1bd6e502740442ebc4585bce1b084 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Mon, 18 Nov 2024 10:54:45 -0500 Subject: [PATCH] adding sinc keyboard and more --- dotfiles/dot_config/kmonad/sinc.kbd | 29 ++++++++++++++++++++ dotfiles/dot_vst3/yabridge.toml | 0 flake.lock | 42 ++++++++++++++--------------- home/home.nix | 3 ++- system/eddie/configuration.nix | 16 +++++++---- 5 files changed, 63 insertions(+), 27 deletions(-) create mode 100644 dotfiles/dot_config/kmonad/sinc.kbd create mode 100644 dotfiles/dot_vst3/yabridge.toml diff --git a/dotfiles/dot_config/kmonad/sinc.kbd b/dotfiles/dot_config/kmonad/sinc.kbd new file mode 100644 index 0000000..8f37910 --- /dev/null +++ b/dotfiles/dot_config/kmonad/sinc.kbd @@ -0,0 +1,29 @@ +(defcfg + input (device-file "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-event-kbd") + output (uinput-sink "kmonad-sinc") + fallthrough true) + + +(defsrc + esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 KeyPrint KeyInsert + grv 1 2 3 4 5 6 7 8 9 0 - = \ del home + tab q w e r t y u i o p [ ] bspc end + caps a s d f g h j k l ; ' ret pgup + lsft z x c v b n m , . / rsft pgdn + lctl slck lmet lalt spc ralt rmet rctrl) + +(defalias + supesc (tap-hold-next-release 200 esc lmet) + sp-lsft (tap-hold-next-release 200 \( lsft) + sp-rsft (tap-hold-next-release 200 \) lsft)) + +(deflayer qwerty + esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 KeyPrint KeyInsert + grv 1 2 3 4 5 6 7 8 9 0 - = \ del home + tab q w e r t y u i o p [ ] bspc end + @supesc a s d f g h j k l ; ' ret pgup + @sp-lsft z x c v b n m , . / @sp-rsft pgdn + lmet lmet lalt lctrl spc rctrl ralt rmet) + +;; (defalias +;; toggle-scratch ()) diff --git a/dotfiles/dot_vst3/yabridge.toml b/dotfiles/dot_vst3/yabridge.toml new file mode 100644 index 0000000..e69de29 diff --git a/flake.lock b/flake.lock index 4ea5ddf..1c76aab 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1731586450, - "narHash": "sha256-upNRIVk5PmBPJ307djkiowhHOx8Dqwb5bpM4XNJH4Ek=", + "lastModified": 1731845570, + "narHash": "sha256-5reOtlm18XLnh3ezruPOg2wQO+MB7ztsFaIzSUAzeh8=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "902e1bb3c2ae0f051ff98e4e3eac247f7e6ca392", + "rev": "7a1d37b2b16f32536628df9cea6a2003d79a49f9", "type": "github" }, "original": { @@ -162,11 +162,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1730108712, - "narHash": "sha256-vIvmXmjAQIY39hACGFe/cdBK2r3ZprpHLwX2HIy7Mj8=", + "lastModified": 1731698554, + "narHash": "sha256-5kTDLWpsMaKSEnekip2rUBfzuHNS9Fafp5Y7n4Y7hr8=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "1cba177bb0a948c919af7596e40bef307543d40a", + "rev": "8db1648a95446d41e97ace7caf54e172669810ff", "type": "github" }, "original": { @@ -219,11 +219,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731403644, - "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", + "lastModified": 1731797098, + "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f6581f1c3b137086e42a08a906bdada63045f991", + "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", "type": "github" }, "original": { @@ -235,11 +235,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731319897, - "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc460ec76cbff0e66e269457d7b728432263166c", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -251,11 +251,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1731200463, - "narHash": "sha256-qDaAweJjdFbVExqs8aG27urUgcgKufkIngHW3Rzustg=", + "lastModified": 1731805462, + "narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "e04234d263750db01c78a412690363dc2226e68a", + "rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734", "type": "github" }, "original": { @@ -266,11 +266,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1731386116, - "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "689fed12a013f56d4c4d3f612489634267d86529", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "type": "github" }, "original": { @@ -290,11 +290,11 @@ ] }, "locked": { - "lastModified": 1731684610, - "narHash": "sha256-rfb93JFID/fYO7h0Yhsot6TjbUgtEJMl6Qk212cVdOY=", + "lastModified": 1731878857, + "narHash": "sha256-5Bg6+R6PdBSakjnuqEHrTVIPZ4PjMjHmcSBBieF2kPA=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "a3fc86160dba0a9160716cf6f1d4ff4da7a53085", + "rev": "82cf2241ee012ff5157d72ac055db9cdc67c410b", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index eb76e6e..92ed259 100644 --- a/home/home.nix +++ b/home/home.nix @@ -521,12 +521,13 @@ }; home.file.".npmrc".source = ../dotfiles/dot_npmrc; - xdg.configFile."kmonad".source = ../dotfiles/dot_config/kmonad; + # xdg.configFile."kmonad".source = ../dotfiles/dot_config/kmonad; xdg.configFile."just/justfile".source = ../dotfiles/dot_config/just/justfile; xdg.configFile."starship.toml".source = ../dotfiles/dot_config/starship.toml; xdg.configFile."wezterm".source = ../dotfiles/dot_config/wezterm; xdg.configFile."git".source = ../dotfiles/dot_config/git; xdg.configFile."rbw".source = ../dotfiles/dot_config/rbw; + home.file.".vst3/yabridge/yabridge.toml".source = ../dotfiles/dot_vst3/yabridge.toml; home.file.".sbclrc".source = ../dotfiles/dot_sbclrc; home.file.".signature".source = ../dotfiles/dot_signature; home.file.".config/fish/functions" = { diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index 190a87a..a1bdf0e 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -17,6 +17,7 @@ # List packages installed in system profile. To search, run: environment.systemPackages = with pkgs; [ wget + libGL home-manager curl git-lfs @@ -34,6 +35,8 @@ fontconfig freetype nix-ld + egl-wayland + glfw-wayland ]; # Bootloader. @@ -44,7 +47,7 @@ boot = { initrd.kernelModules = [ "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" ]; - kernelParams = [ "nvidia-drm.fbdev=1" "nvidia_drm.modeset=1" "amd_pstate=guided"]; + kernelParams = [ "nvidia-drm.fbdev=1" "nvidia_drm.modeset=1"]; # "amd_pstate=guided" }; systemd.services.tailscaled.after = ["NetworkManager-wait-online.service"]; @@ -88,7 +91,7 @@ forceFullCompositionPipeline = true; prime = { - amdgpuBusId = "PCI:41:0:0"; + amdgpuBusId = "PCI:101:0:0"; nvidiaBusId = "PCI:1:0:0"; offload = { enable = true; @@ -268,9 +271,9 @@ # device = "/dev/input/by-id/usb-Keebio_Quefrency_Rev._5-event-kbd"; # config = builtins.readFile ../../dotfiles/dot_config/kmonad/quefrency.kbd; # }; - snap = { - device = "/dev/input/by-id/usb-nullbits_SNAP-event-kbd"; - config = builtins.readFile ../../dotfiles/dot_config/kmonad/snap.kbd; + sinc = { + device = "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-event-kbd"; + config = builtins.readFile ../../dotfiles/dot_config/kmonad/sinc.kbd; }; razer = { extraGroups = [ "openrazer" ]; @@ -323,6 +326,9 @@ freetype gnutls util-linux + libGL + egl-wayland + glfw-wayland ]; services.udev.packages = with pkgs; [