From 10340f1feb084216a2566637c3c26c9876b2d22d Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Sun, 1 Jun 2025 21:37:28 -0400 Subject: [PATCH] refactoring, lix, keys --- flake.lock | 119 ++++++++++++++++++++++++++++++++------ flake.nix | 10 +++- modules/system/kanata.nix | 2 +- 3 files changed, 110 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 4b64aee..1ea8a44 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1748800559, - "narHash": "sha256-aGirnvHHbYKn2Gk8KU1G2kXTKjM3YRmO2H0bLk3uVas=", + "lastModified": 1748827856, + "narHash": "sha256-GjHLfcgQbNIF4VbeLXNAm3Zjjf1arbu8zh/QtYb1l3E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9153c6719aff5ba4faf817e90d82e9c2f8b886a1", + "rev": "6bb8d143201db7c17d0fd8fcf32fa3f58e36856e", "type": "github" }, "original": { @@ -218,7 +218,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -270,6 +270,39 @@ "type": "github" } }, + "flake-utils_5": { + "inputs": { + "systems": "systems_9" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flakey-profile": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "freetype2": { "flake": false, "locked": { @@ -375,11 +408,11 @@ ] }, "locked": { - "lastModified": 1748737919, - "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", + "lastModified": 1748811839, + "narHash": "sha256-MDl6vpEK18ZfPHfoeOa9dGRdwVWNfmCCGazt72nHw+U=", "owner": "nix-community", "repo": "home-manager", - "rev": "5675a9686851d9626560052a032c4e14e533c1fa", + "rev": "6abf27943bbb09a0f9d443df45ec70b07a6cbe20", "type": "github" }, "original": { @@ -731,6 +764,41 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1746827285, + "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=", + "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils_2", + "flakey-profile": "flakey-profile", + "lix": "lix", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1746838955, + "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" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz" + } + }, "musnix": { "inputs": { "nixpkgs": [ @@ -758,17 +826,16 @@ ] }, "locked": { - "lastModified": 1746758336, - "narHash": "sha256-HN7R9p94Othop41GXf//vMxoi9HAx42fjySIRDljUVc=", + "lastModified": 1748096601, + "narHash": "sha256-ji/9z1pRbosyKVVAIGBazyz6PjWV8bc2Ux2RdQrVDWY=", "owner": "nix-community", "repo": "nh", - "rev": "28972b6fe193151cd52ed5bc4bb6b91cee21467b", + "rev": "1ea27e73a3dcbc9950258e9054377ee677d12b9e", "type": "github" }, "original": { "owner": "nix-community", "repo": "nh", - "rev": "28972b6fe193151cd52ed5bc4bb6b91cee21467b", "type": "github" } }, @@ -889,7 +956,7 @@ "nixpkgs" ], "nixpkgs-lib": "nixpkgs-lib_2", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1748538518, @@ -1212,6 +1279,7 @@ "hypridle": "hypridle", "hyprlock": "hyprlock", "isd": "isd", + "lix-module": "lix-module", "musnix": "musnix", "nh": "nh", "niri": "niri", @@ -1453,6 +1521,21 @@ "type": "github" } }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "uv2nix": { "inputs": { "nixpkgs": [ @@ -1536,7 +1619,7 @@ }, "wezterm": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "freetype2": "freetype2", "harfbuzz": "harfbuzz", "libpng": "libpng", @@ -1562,7 +1645,7 @@ }, "xwayland-satellite": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], @@ -1617,7 +1700,7 @@ }, "yazi": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ], @@ -1645,11 +1728,11 @@ ] }, "locked": { - "lastModified": 1748802344, - "narHash": "sha256-2AkocqhzYQzxAGNXYEkzmud2vWXMjvLNPMnLNpuHmRU=", + "lastModified": 1748809245, + "narHash": "sha256-2e6otgBmkNZdDsump0gIR7Q3efHdHlhi8mOR+J3OUQI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "062cbe2ec0e5c885098172b91d571599e7649c76", + "rev": "9bb61a99d7d7d4e4e1bd75b281f91873b38fb7d7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bdd211f..cdef4a5 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,11 @@ nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -54,7 +59,7 @@ }; nh = { - url = "github:nix-community/nh/28972b6fe193151cd52ed5bc4bb6b91cee21467b"; + url = "github:nix-community/nh"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -177,7 +182,8 @@ inherit system; specialArgs = configArgs; modules = [ - inputs.disko.nixosModules.disko + inputs.lix-module.nixosModules.default + inputs.disko.nixosModules.disko inputs.musnix.nixosModules.musnix inputs.niri.nixosModules.niri inputs.sops-nix.nixosModules.sops diff --git a/modules/system/kanata.nix b/modules/system/kanata.nix index b7c0f64..1c7180e 100644 --- a/modules/system/kanata.nix +++ b/modules/system/kanata.nix @@ -91,7 +91,7 @@ ${shared-alias} @supesc @a @s @d f g h j k l ; ' ret @sp-lsft z x @tap-copy v b n m , . / @sp-rsft @supesc @controls lalt lctrl @spcnav @spcnav rctrl ralt @controls @hyper @supesc - bspc ret ret del) + bspc mlft mrgt del) (deflayermap (navigation) 1 f1