diff --git a/dotfiles/dot_config/kanata/main.kbd b/dotfiles/dot_config/kanata/main.kbd deleted file mode 100644 index 488be88..0000000 --- a/dotfiles/dot_config/kanata/main.kbd +++ /dev/null @@ -1,36 +0,0 @@ -(defcfg - linux-use-trackpoint-property yes - ;;linux-output-device-bus-type USB - process-unmapped-keys yes - linux-continue-if-no-devs-found yes -) - -;; Only one defsrc is allowed. -;; -;; defsrc defines the keys that will be intercepted by kanata. The order of the -;; keys matches with deflayer declarations and all deflayer declarations must -;; have the same number of keys as defsrc. Any keys not listed in defsrc will -;; be passed straight to the operating system. -(defsrc - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab q w e r t y u i o p [ ] \ - caps a s d f g h j k l ; ' ret - lsft z x c v b n m , . / rsft - lctl lmet lalt spc ralt rmet -) - -;; The first layer defined is the layer that will be active by default when -;; kanata starts up. This layer is the standard QWERTY layout except for the -;; backtick/grave key (@grl) which is an alias for a tap-hold key. -(deflayer qwerty - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab q w e r t y u i o p [ ] \ - @ctrlesc a s d f g h j k l ; ' ret - lsft z x c v b n m , . / rsft - lctl lalt lmet spc rmet ralt -) - -(defalias - ;; tap for escape, hold for lctl - ctrlesc (tap-hold 200 200 esc lctl) -) diff --git a/dotfiles/dot_config/kmonad/quefrency.kbd b/dotfiles/dot_config/kmonad/quefrency.kbd index 56dd42d..46e1742 100644 --- a/dotfiles/dot_config/kmonad/quefrency.kbd +++ b/dotfiles/dot_config/kmonad/quefrency.kbd @@ -9,19 +9,16 @@ tab q w e r t y u i o p [ ] bspc caps a s d f g h j k l ; ' ret lsft z x c v b n m , . / rsft - lctl nlck lmet lalt spc ralt rmet -) + lctl nlck lmet lalt spc ralt rmet) (defalias ctrlesc (tap-hold-next-release 200 esc lctrl) sp-lsft (tap-hold-next-release 200 \( lsft) - sp-rsft (tap-hold-next-release 200 \) lsft) - hypr C-A-M-S) + sp-rsft (tap-hold-next-release 200 \) lsft)) (deflayer qwerty grv 1 2 3 4 5 6 7 8 9 0 - = \ del tab q w e r t y u i o p [ ] bspc @ctrlesc a s d f g h j k l ; ' ret @sp-lsft z x c v b n m , . / @sp-rsft - lctl lctl lalt lmet spc rmet ralt -) + lctl lctl lalt lmet spc rmet ralt) diff --git a/dotfiles/dot_config/kmonad/quefrency.kbd.save b/dotfiles/dot_config/kmonad/quefrency.kbd.save deleted file mode 100644 index 87218dd..0000000 --- a/dotfiles/dot_config/kmonad/quefrency.kbd.save +++ /dev/null @@ -1,28 +0,0 @@ -(defcfg - input (device-file "/dev/input/by-id/usb-Keebio_Quefrency_Rev._5-event-kbd") - output (uinput-sink "kmonad-quefrency") - fallthrough true -) - -(defsrc - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab q w e r t y u i o p [ ] \ - caps a s d f g h j k l ; ' ret - lsft z x c v b n m , . / rsft - lctl nlck lmet lalt spc ralt rmet slck -) - -(defalias - ctrlesc (tap-hold-next-release 200 esc lctrl) - sp-lsft (tap-hold-next-release 200 \( lsft) - sp-rsft (tap-hold-next-release 200 \) lsft) - hypr C-A-M-S) - -(deflayer qwerty - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab q w e r t y u i o p [ ] \ - @ctrlesc a s d f g h j k l ; ' ret - @sp-lsft z x c v b n m , . / @sp-rsft - @hypr lctl lalt lmet spc rmet ralt @hypr -) - diff --git a/dotfiles/dot_config/kmonad/razer.kbd b/dotfiles/dot_config/kmonad/razer.kbd index 0f6c407..a4922d3 100644 --- a/dotfiles/dot_config/kmonad/razer.kbd +++ b/dotfiles/dot_config/kmonad/razer.kbd @@ -1,16 +1,14 @@ (defcfg input (device-file "/dev/input/by-id/usb-Razer_Razer_Blade-if01-event-kbd") output (uinput-sink "kmonad-razer") - fallthrough true -) + fallthrough true) (defsrc grv 1 2 3 4 5 6 7 8 9 0 - = bspc tab q w e r t y u i o p [ ] \ caps a s d f g h j k l ; ' ret lsft z x c v b n m , . / rsft - lctl lmet lalt spc ralt rmet -) + lctl lmet lalt spc ralt rmet) (defalias ctrlesc (tap-hold-next-release 200 esc lctrl) @@ -20,7 +18,6 @@ (deflayer qwerty grv 1 2 3 4 5 6 7 8 9 0 - = bspc tab q w e r t y u i o p [ ] \ - @ctrlesc a s d f g h j k l ; ' ret + @supesc a s d f g h j k l ; ' ret @sp-lsft z x c v b n m , . / @sp-rsft - lmet lalt lctrl spc rctrl ralt -) + lmet lalt lctrl spc rctrl ralt) diff --git a/dotfiles/dot_config/kmonad/snap.kbd b/dotfiles/dot_config/kmonad/snap.kbd index f4b4df6..64248ba 100644 --- a/dotfiles/dot_config/kmonad/snap.kbd +++ b/dotfiles/dot_config/kmonad/snap.kbd @@ -5,21 +5,22 @@ (defsrc esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 ins del - f13 grv 1 2 3 4 5 6 7 8 9 0 - = bspc KeyHome - f14 tab q w e r t y u i o p [ ] \ KeyEnd + f13 grv 1 2 3 4 5 6 7 8 9 0 - = bspc home + f14 tab q w e r t y u i o p [ ] \ end f15 caps a s d f g h j k l ; ' ret pgup f16 lsft z x c v b n m , . / rsft pgdn f17 lctl slck lmet lalt spc ralt rmet rctrl) (defalias +<<<<<<< HEAD:dotfiles/dot_config/kmonad/snap.kbd 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 ins del - f13 grv 1 2 3 4 5 6 7 8 9 0 - = bspc KeyHome - f14 tab q w e r t y u i o p [ ] \ KeyEnd + f13 grv 1 2 3 4 5 6 7 8 9 0 - = bspc home + f14 tab q w e r t y u i o p [ ] \ end f15 @supesc a s d f g h j k l ; ' ret pgup f16 @sp-lsft z x c v b n m , . / @sp-rsft pgdn f17 lctrl lmet lalt lctrl spc rctrl ralt rmet) diff --git a/flake.lock b/flake.lock index 39f4c56..d2a8c17 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ }, "locked": { "dir": "nix", - "lastModified": 1727508868, - "narHash": "sha256-fxvkjUK661MWM9ClLWM+YmOIfL9omqGibdf4gONgMW0=", + "lastModified": 1728567251, + "narHash": "sha256-ymM01ZxzDDY0RTgSOlzVLTRx3mais7dcfb1bYStVcRU=", "ref": "refs/heads/master", - "rev": "b3eb93c86abc66c7e7420585c3fe7e410208b2e8", - "revCount": 859, + "rev": "751bad81ce48557b3e2c56de36e3c6db906b752a", + "revCount": 864, "submodules": true, "type": "git", "url": "https://github.com/kmonad/kmonad?dir=nix" @@ -147,11 +147,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1727953523, - "narHash": "sha256-cT8fN56OHCqTajmj2JwDL5uhTIEFvVSnBRvypXfZ9f4=", + "lastModified": 1728593025, + "narHash": "sha256-j/p2ftkP8MXYEK7Vx65jH/Knr2QkEcRSVoDnVOUDe6Q=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "7ae693d28c5922533ce86f348ddb6709a2beffbf", + "rev": "a3307ac4b38b6dae769f771c877a6f2c236ee238", "type": "github" }, "original": { @@ -162,11 +162,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1721549352, - "narHash": "sha256-nlXJa8RSOX0kykrIYW33ukoHYq+FOSNztHLLgqKwOp8=", + "lastModified": 1728416205, + "narHash": "sha256-t30gsrwiBc2oBsd89DwdsVZuEbMT5ed81PYY57CIOJE=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "dbce39ea8664820ba9037caaf1e2fad365ed6b4b", + "rev": "d65dbf59900de4beaaaba8b42a15994f8433c1bc", "type": "github" }, "original": { @@ -199,11 +199,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728269138, - "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", + "lastModified": 1728729581, + "narHash": "sha256-oazkQ/z7r43YkDLLQdMg8oIB3CwWNb+2ZrYOxtLEWTQ=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", + "rev": "a8dd1b21995964b115b1e3ec639dd6ce24ab9806", "type": "github" }, "original": { @@ -215,11 +215,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728241625, - "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -246,11 +246,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1728193676, - "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=", + "lastModified": 1728627514, + "narHash": "sha256-r+SF9AnHrTg+bk6YszoKfV9lgyw+yaFUQe0dOjI0Z2o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6", + "rev": "c505ebf777526041d792a49d5f6dd4095ea391a7", "type": "github" }, "original": { @@ -270,11 +270,11 @@ ] }, "locked": { - "lastModified": 1728373025, - "narHash": "sha256-5iEV1QH5A74HbTvSR+yrPttqwf6gzlL76JQiXB+P/Q4=", + "lastModified": 1728757472, + "narHash": "sha256-AM37viNRyjiPo8l+MgjtuBbLQbZ14UdqUsQZQYC7v8Q=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "0a5e8f7bd281e879e9a5fe614d27162261c544d9", + "rev": "f31d5880ded44894e6c14e04d3a2dc624c542756", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index a551231..e87c97e 100644 --- a/home/home.nix +++ b/home/home.nix @@ -10,7 +10,7 @@ erdtree age figlet - ffmpeg + ffmpeg-full rlwrap pinentry gcr @@ -183,7 +183,7 @@ alsa-tools clapper amberol - + ardour parinfer-rust-emacs ardour # Audio plugins (LV2, VST2, VST3, LADSPA) diff --git a/home/home.nix.save b/home/home.nix.save deleted file mode 100644 index c2adadd..0000000 --- a/home/home.nix.save +++ /dev/null @@ -1,3 +0,0 @@ -{ nix-flatpak, lib, pkgs, ... }: -{ -T diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index 74e85fd..1d4a964 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -229,7 +229,7 @@ services.accounts-daemon.enable = true; services.gnome.gnome-online-accounts.enable = true; - services.kmonad = { + services.kanata = { enable = true; keyboards = { # quefrency = { @@ -237,12 +237,12 @@ # 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; + devices = ["/dev/input/by-id/usb-nullbits_SNAP-event-kbd"]; + configFile = ../../dotfiles/dot_config/kanata/snap.kbd; }; razer = { - device = "/dev/input/by-id/usb-Razer_Razer_Blade-if01-event-kbd"; - config = builtins.readFile ../../dotfiles/dot_config/kmonad/razer.kbd; + devices = ["/dev/input/by-id/usb-Razer_Razer_Blade-if01-event-kbd"]; + configFile = ../../dotfiles/dot_config/kanata/razer.kbd; }; }; };