From 555a6521c380f118db97699e9fa67d78d7f4443d Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Mon, 2 Jun 2025 09:07:36 -0400 Subject: [PATCH] yaxi paste some kanata keys --- flake.lock | 99 ++++++++++++++++++++++++++------------- flake.nix | 2 +- modules/home/yazi.nix | 9 ++-- modules/system/kanata.nix | 5 ++ 4 files changed, 78 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index 1ea8a44..59d3b0d 100644 --- a/flake.lock +++ b/flake.lock @@ -5,14 +5,15 @@ "elemental-wine-source": "elemental-wine-source", "flake-compat": "flake-compat", "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks" + "pre-commit-hooks": "pre-commit-hooks", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1740224586, - "narHash": "sha256-HFDE+kODQc3eYDaJGbinxyBwPr/02LJvd9Gyewbuxtc=", + "lastModified": 1748860001, + "narHash": "sha256-6DoZ9hRSndZnJ7pAolx2K2umDb9RPq99U+/QWUeL3K0=", "owner": "mrshmllow", "repo": "affinity-nix", - "rev": "554688f791e0263b0f9428734cadd71dd9ce0f9f", + "rev": "05a03d8c96e86e82cacaea1a8a369cea8d714a1d", "type": "github" }, "original": { @@ -28,11 +29,11 @@ ] }, "locked": { - "lastModified": 1748225455, - "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", + "lastModified": 1748832438, + "narHash": "sha256-/CtyLVfNaFP7PrOPrTEuGOJBIhcBKVQ91KiEbtXJi0A=", "owner": "nix-community", "repo": "disko", - "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", + "rev": "58d6e5a83fff9982d57e0a0a994d4e5c0af441e4", "type": "github" }, "original": { @@ -88,11 +89,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1748827856, - "narHash": "sha256-GjHLfcgQbNIF4VbeLXNAm3Zjjf1arbu8zh/QtYb1l3E=", + "lastModified": 1748856098, + "narHash": "sha256-LN2JdkDtpnGN99Q6zyJ0mg5xaw9+P4MU7av/Zqt1sSc=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "6bb8d143201db7c17d0fd8fcf32fa3f58e36856e", + "rev": "778e55eaced8cc64c5a364d565e46aab9958d464", "type": "github" }, "original": { @@ -324,7 +325,7 @@ "inputs": { "flake-compat": "flake-compat_4", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1747372754, @@ -408,11 +409,11 @@ ] }, "locked": { - "lastModified": 1748811839, - "narHash": "sha256-MDl6vpEK18ZfPHfoeOa9dGRdwVWNfmCCGazt72nHw+U=", + "lastModified": 1748830238, + "narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=", "owner": "nix-community", "repo": "home-manager", - "rev": "6abf27943bbb09a0f9d443df45ec70b07a6cbe20", + "rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a", "type": "github" }, "original": { @@ -792,7 +793,7 @@ "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz" }, "original": { "type": "tarball", @@ -851,11 +852,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1748797644, - "narHash": "sha256-zLkSMDE/4kEK+1q0Ep0fmSO7PJ/3ZxovvYNIA5TuN4I=", + "lastModified": 1748847346, + "narHash": "sha256-ohJbvwSyyGGmC29+Uxt9BEH0fSzFZVJmmped9px5ocU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "2036ef9e1bfac9d50d96c0771a412226b6998ba5", + "rev": "a36d9f210d5731382f205259425b41406aa78ff7", "type": "github" }, "original": { @@ -901,7 +902,7 @@ "inputs": { "flake-compat": "flake-compat_3", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1725758175, @@ -1073,11 +1074,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1748437600, - "narHash": "sha256-hYKMs3ilp09anGO7xzfGs3JqEgUqFMnZ8GMAqI6/k04=", + "lastModified": 1748708770, + "narHash": "sha256-q8jG2HJWgooWa9H0iatZqBPF3bp0504e05MevFmnFLY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7282cb574e0607e65224d33be8241eae7cfe0979", + "rev": "a59eb7800787c926045d51b70982ae285faa2346", "type": "github" }, "original": { @@ -1120,6 +1121,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1747958103, + "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "fe51d34885f7b5e3e7b59572796e1bcb427eccb1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1725103162, "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", @@ -1135,7 +1152,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1730768919, "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", @@ -1151,7 +1168,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1748693115, "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", @@ -1167,7 +1184,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1745391562, "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", @@ -1183,7 +1200,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1747426788, "narHash": "sha256-N4cp0asTsJCnRMFZ/k19V9akkxb7J/opG+K+jU57JGc=", @@ -1287,7 +1304,7 @@ "nix-rice": "nix-rice", "nixarr": "nixarr", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_3", "sops-nix": "sops-nix", "waybar": "waybar", @@ -1536,6 +1553,24 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1748243702, + "narHash": "sha256-9YzfeN8CB6SzNPyPm2XjRRqSixDopTapaRsnTpXUEY8=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "1f3f7b784643d488ba4bf315638b2b0a4c5fb007", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "uv2nix": { "inputs": { "nixpkgs": [ @@ -1579,7 +1614,7 @@ "waybar": { "inputs": { "flake-compat": "flake-compat_5", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1745487176, @@ -1623,7 +1658,7 @@ "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "rust-overlay": "rust-overlay", "zlib": "zlib" }, @@ -1728,11 +1763,11 @@ ] }, "locked": { - "lastModified": 1748809245, - "narHash": "sha256-2e6otgBmkNZdDsump0gIR7Q3efHdHlhi8mOR+J3OUQI=", + "lastModified": 1748834461, + "narHash": "sha256-1OfK7Ec2EIqwf/EhNikMp8DcdOcQG1CBS5CK4cAPMjs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9bb61a99d7d7d4e4e1bd75b281f91873b38fb7d7", + "rev": "2527ce862b0a80c3c4bd87e6717c7ac0fee1c456", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cdef4a5..ad2c36a 100644 --- a/flake.nix +++ b/flake.nix @@ -182,7 +182,7 @@ inherit system; specialArgs = configArgs; modules = [ - inputs.lix-module.nixosModules.default + # inputs.lix-module.nixosModules.default inputs.disko.nixosModules.disko inputs.musnix.nixosModules.musnix inputs.niri.nixosModules.niri diff --git a/modules/home/yazi.nix b/modules/home/yazi.nix index dd17dd4..e450a9a 100644 --- a/modules/home/yazi.nix +++ b/modules/home/yazi.nix @@ -44,11 +44,12 @@ { on = ["g" "r"]; run = "shell 'ya emit cd \"$(git rev-parse --show-toplevel)\"'\n"; desc = "Go to top of git repo"; } { on = ["g" "p"]; run = "cd ~/Projects"; desc = "Go to ~/Projects"; } - { on = "v"; run = "paste"; } - { on = "V"; run = "paste --force"; } - { on = "e"; run = "visual"; } - { on = "E"; run = "visual --unset"; } + { on = "p"; run = "plugin smart-paste"; } + { on = "P"; run = "plugin smart-paste --force"; } + + { on = "v"; run = "plugin smart-paste"; } + { on = "V"; run = "plugin smart-paste --force"; } { on = ""; run ="tab_create"; } { on = ""; run ="close"; } diff --git a/modules/system/kanata.nix b/modules/system/kanata.nix index 1c7180e..7d7f67a 100644 --- a/modules/system/kanata.nix +++ b/modules/system/kanata.nix @@ -123,6 +123,11 @@ ${shared-alias} 6 MediaPlayPause 7 MediaTrackNext + 8 brdown + 9 brup + 0 bldn + - blup + h MediaTrackPrevious j VolumeDown k VolumeUp