From 14d79d3134664089413f061f98c1a9bcae130a6e Mon Sep 17 00:00:00 2001 From: xenia Date: Sun, 12 Nov 2023 12:43:00 +0100 Subject: [PATCH] kak-tree --- flake.lock | 249 ++++++++++++++++++++++++++++++++++++++++++------ flake.nix | 7 +- home/common.nix | 4 +- home/kak.nix | 5 +- 4 files changed, 231 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index e0d80426..09b98065 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,7 @@ "nodes": { "agda": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_6", "nixpkgs": [ "rachel", "nixpkgs" @@ -68,8 +68,8 @@ ], "agda-stdlib-source": "agda-stdlib-source", "flake-compat": "flake-compat", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1694540816, @@ -138,12 +138,15 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -154,14 +157,14 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -172,7 +175,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1694529238, @@ -189,8 +192,59 @@ } }, "flake-utils_6": { + "locked": { + "lastModified": 1678901627, + "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_7": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" + }, + "locked": { + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_8": { + "inputs": { + "systems": "systems_7" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_9": { + "inputs": { + "systems": "systems_8" }, "locked": { "lastModified": 1694529238, @@ -213,11 +267,11 @@ ] }, "locked": { - "lastModified": 1698392685, - "narHash": "sha256-yx/sbRneR2AfSAeAMqUu0hoVJdjh+qhl/7dkirp8yo8=", + "lastModified": 1699783872, + "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", "owner": "nix-community", "repo": "home-manager", - "rev": "1369d2cefb6f128c30e42fabcdebbacc07e18b3f", + "rev": "280721186ab75a76537713ec310306f0eba3e407", "type": "github" }, "original": { @@ -269,6 +323,29 @@ "url": "https://githug.xyz/xenia/kakoune.git" } }, + "kak-tree": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay", + "tree-sitters": "tree-sitters" + }, + "locked": { + "lastModified": 1699785742, + "narHash": "sha256-FIM8vTHA73oPcsTw296ZzCZwFFW07A7iD0lfwHkqt2I=", + "ref": "refs/heads/main", + "rev": "d62b1657c3b50b8d33a1064518f05884325440a6", + "revCount": 3, + "type": "git", + "url": "https://githug.xyz/xenia/kak-tree.git" + }, + "original": { + "type": "git", + "url": "https://githug.xyz/xenia/kak-tree.git" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -276,11 +353,11 @@ ] }, "locked": { - "lastModified": 1698429334, - "narHash": "sha256-Gq3+QabboczSu7RMpcy79RSLMSqnySO3wsnHQk4DfbE=", + "lastModified": 1699704228, + "narHash": "sha256-NApWG385goidsXmsakWgFRjvbH+aw/n1CGGHn/UuXsc=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "afe83cbc2e673b1f08d32dd0f70df599678ff1e7", + "rev": "0f1ad801387445fdda01d080db8ecf169be8e793", "type": "github" }, "original": { @@ -291,11 +368,41 @@ }, "nixpkgs": { "locked": { - "lastModified": 1698318101, - "narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=", + "lastModified": 1681358109, + "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1697009197, + "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1699099776, + "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "63678e9f3d3afecfeafa0acead6239cdb447574c", + "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", "type": "github" }, "original": { @@ -305,7 +412,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_4": { "locked": { "lastModified": 1694062546, "narHash": "sha256-PiGI4f2BGnZcedP6slLjCLGLRLXPa9+ogGGgVPfGxys=", @@ -331,11 +438,11 @@ ] }, "locked": { - "lastModified": 1698442363, - "narHash": "sha256-MoAnALR+r/+tuWNm2DqHUHhQMTrq5jNSgwPgQ4/vIKs=", + "lastModified": 1699738267, + "narHash": "sha256-spGi9SpcDQ4Vf9ulojj7wdVz83erFMvpwmtXGNkKalk=", "ref": "refs/heads/master", - "rev": "78a50f078d7efda240c2ef17f51a50f821dbe238", - "revCount": 62, + "rev": "f536566a01ef215386131a5baef1a25e744cf069", + "revCount": 78, "type": "git", "url": "https://git@githug.xyz/rachel/nixos-config" }, @@ -349,13 +456,33 @@ "ansi-utils": "ansi-utils", "home-manager": "home-manager", "kak": "kak", + "kak-tree": "kak-tree", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_3", "rachel": "rachel", "unambig-path": "unambig-path", "unispect": "unispect" } }, + "rust-overlay": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1699669856, + "narHash": "sha256-OIb0WAoEMUA1EH70AwpWabdEpvYt/kJChBnb7XiXAJs=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "efd15e11c8954051a47679e7718b4c2a9b68ce27", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -431,9 +558,73 @@ "type": "github" } }, - "unambig-path": { + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_8": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tree-sitters": { "inputs": { "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1699742193, + "narHash": "sha256-1pc59vyEpFwtHYKsEGAwxL7/4wiTmLmzKO6j61wqOeo=", + "ref": "refs/heads/main", + "rev": "bb561d2e33d4d9f9d8171df2484ba6ae8e810b74", + "revCount": 3, + "type": "git", + "url": "https://githug.xyz/xenia/tree-sitters" + }, + "original": { + "type": "git", + "url": "https://githug.xyz/xenia/tree-sitters" + } + }, + "unambig-path": { + "inputs": { + "flake-utils": "flake-utils_8", "nixpkgs": [ "nixpkgs" ] @@ -454,7 +645,7 @@ }, "unispect": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_9", "nixpkgs": [ "nixpkgs" ] diff --git a/flake.nix b/flake.nix index a62b6bfb..3cd25a04 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,10 @@ url = "git+https://githug.xyz/xenia/kakoune.git"; inputs.nixpkgs.follows = "nixpkgs"; }; + kak-tree = { + url = "git+https://githug.xyz/xenia/kak-tree.git"; + inputs.nixpkgs.follows = "nixpkgs"; + }; unispect = { url = "git+https://git@githug.xyz/xenia/unispect"; inputs.nixpkgs.follows = "nixpkgs"; @@ -35,7 +39,7 @@ }; }; - outputs = { self, nixpkgs, home-manager, nix-darwin, kak, unispect, ansi-utils, unambig-path, rachel }: + outputs = { self, nixpkgs, home-manager, nix-darwin, kak, kak-tree, unispect, ansi-utils, unambig-path, rachel }: let xdg-runtime-dir = "/tmp/xdg-rt"; @@ -47,6 +51,7 @@ unispect = unispect.packages.${system}.unispect; ansi-utils = ansi-utils.packages.${system}; unambig-path = unambig-path.packages.${system}.unambig-path; + kak-tree = kak-tree.packages.${system}.kak-tree; }; mkPC = {system, pkgs} : import ./home/graphical.nix { inherit pkgs xdg-runtime-dir; diff --git a/home/common.nix b/home/common.nix index 55a0d3c3..fc312af8 100644 --- a/home/common.nix +++ b/home/common.nix @@ -1,7 +1,7 @@ -{ pkgs, username, home-dir, prompt-color, xdg-runtime-dir, kak-pkg, unispect, ansi-utils, unambig-path }: +{ pkgs, username, home-dir, prompt-color, xdg-runtime-dir, kak-pkg, kak-tree, unispect, ansi-utils, unambig-path }: let - kak = import ./kak.nix { kak = kak-pkg; inherit pkgs; }; + kak = import ./kak.nix { kak = kak-pkg; inherit pkgs kak-tree; }; extras = import ./extras.nix pkgs; diff --git a/home/kak.nix b/home/kak.nix index d0d303cd..2722c20d 100644 --- a/home/kak.nix +++ b/home/kak.nix @@ -1,4 +1,4 @@ -{ pkgs, kak }: +{ pkgs, kak, kak-lsp ? pkgs.kak-lsp, kak-tree }: with pkgs; let kakoune-mirror = kakouneUtils.buildKakounePluginFrom2Nix { pname = "kakoune-mirror"; @@ -63,7 +63,7 @@ with pkgs; let command = "clangd" ''; - kak-lsp-config-line = "set global lsp_cmd \"kak-lsp -s %val{session} --config ${kak-lsp-config-file} --log /tmp/kak-lsp.log\""; + kak-lsp-config-line = "set global lsp_cmd \"${kak-lsp}/bin/kak-lsp -s %val{session} --config ${kak-lsp-config-file} --log /tmp/kak-lsp.log\""; in { enable = true; @@ -77,6 +77,7 @@ in ad-hoc-org-mode kakoune-lsp + kak-tree ]; config = {