diff --git a/flake.lock b/flake.lock index 8aaf62a..c9b9f39 100644 --- a/flake.lock +++ b/flake.lock @@ -1,30 +1,5 @@ { "nodes": { - "blueprint": { - "inputs": { - "nixpkgs": [ - "llm-agents", - "nixpkgs" - ], - "systems": [ - "llm-agents", - "systems" - ] - }, - "locked": { - "lastModified": 1776249299, - "narHash": "sha256-Dt9t1TGRmJFc0xVYhttNBD6QsAgHOHCArqGa0AyjrJY=", - "owner": "numtide", - "repo": "blueprint", - "rev": "56131e8628f173d24a27f6d27c0215eff57e40dd", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "blueprint", - "type": "github" - } - }, "bun2nix": { "inputs": { "flake-parts": "flake-parts", @@ -181,11 +156,11 @@ ] }, "locked": { - "lastModified": 1783221248, - "narHash": "sha256-ESQnuNHEDChsB4IxoLRhscVahqkDWkTb+qdIz8euYt4=", + "lastModified": 1783740085, + "narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=", "owner": "nix-community", "repo": "home-manager", - "rev": "af2beae5f0fae0a4310cc0e6aef2572f56090353", + "rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb", "type": "github" }, "original": { @@ -202,11 +177,11 @@ ] }, "locked": { - "lastModified": 1783221248, - "narHash": "sha256-ESQnuNHEDChsB4IxoLRhscVahqkDWkTb+qdIz8euYt4=", + "lastModified": 1783740085, + "narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=", "owner": "nix-community", "repo": "home-manager", - "rev": "af2beae5f0fae0a4310cc0e6aef2572f56090353", + "rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb", "type": "github" }, "original": { @@ -224,11 +199,11 @@ ] }, "locked": { - "lastModified": 1783426737, - "narHash": "sha256-yQFZXU2rFrwR+OJMktg9Zvrn3jnfVcQAuT8fWVNsnCs=", + "lastModified": 1783931038, + "narHash": "sha256-gKf9U1sjnmR2Ok7lGAO5qqYsJ7ZWcP41jGqhcMzFQLk=", "owner": "modem-dev", "repo": "hunk", - "rev": "059dd13c8bd27fe503ef59652077edf0041034c8", + "rev": "4fdf4bc1e26f6fdceeced81bf7bae8f9bcb8588a", "type": "github" }, "original": { @@ -254,7 +229,6 @@ }, "llm-agents": { "inputs": { - "blueprint": "blueprint", "bun2nix": "bun2nix_2", "flake-parts": "flake-parts_2", "nixpkgs": "nixpkgs", @@ -262,11 +236,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1783567605, - "narHash": "sha256-LyF84yqWppXAAEOAkL325Lt+DrVmkbbeXGzDgX9zMzI=", + "lastModified": 1784011337, + "narHash": "sha256-5+VL25vjGT8wxdKz8ebFr7eL3Ot4Bmy+QW/Y1ayFjHQ=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "a4c847460f0e773d02d0655ce28dc6b532dd65d6", + "rev": "8e68da4b08d1f5d0365dc1dcb066d998f0c69b31", "type": "github" }, "original": { @@ -324,11 +298,11 @@ ] }, "locked": { - "lastModified": 1780705040, - "narHash": "sha256-pVadZqLm8RJcwLuDzJm7d2KO6e+RHPpIa/2qdqtn+B4=", + "lastModified": 1783897462, + "narHash": "sha256-SggqDrhk0+7YtsUgDArP42vnolNITo602XY9mn5amF0=", "owner": "nix-community", "repo": "nixos-wsl", - "rev": "add6b01c7ca72240046b5d541a74845423f1ee35", + "rev": "ff26608a372676b74799da5a9a4d06ce1a4fca2a", "type": "github" }, "original": { @@ -340,11 +314,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1783279667, - "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", + "lastModified": 1783816212, + "narHash": "sha256-2aZisVTVGSFEk3MYcOiWQp3zvwyzbqpktB69Rcfp150=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", + "rev": "3b32825de172d0bc85664f495edb096b10862524", "type": "github" }, "original": { @@ -386,11 +360,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1783389287, - "narHash": "sha256-0xIy4dVLqq47rA+mRy0hXDfjhQd4E5PoIns/RmB7nR4=", + "lastModified": 1783856661, + "narHash": "sha256-ZGP04e+Q6WyQJGA9ZvI5CL6+heGQldbAG9U1T9NGvmU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ad6f47ea4fe188f4bc8f0380f93ae8523337c6c", + "rev": "569d578509928497eddc3fdbf94a799027050be4", "type": "github" }, "original": { @@ -402,11 +376,11 @@ }, "nixpkgs-wsl-stable": { "locked": { - "lastModified": 1783389287, - "narHash": "sha256-0xIy4dVLqq47rA+mRy0hXDfjhQd4E5PoIns/RmB7nR4=", + "lastModified": 1783856661, + "narHash": "sha256-ZGP04e+Q6WyQJGA9ZvI5CL6+heGQldbAG9U1T9NGvmU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ad6f47ea4fe188f4bc8f0380f93ae8523337c6c", + "rev": "569d578509928497eddc3fdbf94a799027050be4", "type": "github" }, "original": { @@ -418,11 +392,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1783224372, - "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=", + "lastModified": 1783776592, + "narHash": "sha256-UgCQzxeWI75XM8G+hPrPh+MKzEPjG3SpAj7dtqSbksA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d407951447dcd00442e97087bf374aad70c04cea", + "rev": "e7a3ca8092b61ff85b6a45bf863ea2b2d6a661b3", "type": "github" }, "original": { diff --git a/modules/home/nvim.nix b/modules/home/nvim.nix index a604e94..689523c 100644 --- a/modules/home/nvim.nix +++ b/modules/home/nvim.nix @@ -75,7 +75,9 @@ in image-nvim img-clip-nvim vim-nix + indent-blankline-nvim (nvim-treesitter.withPlugins (p: [ p.awk p.bash p.c p.c_sharp p.cpp p.css p.diff p.dockerfile p.doxygen p.git_config p.gitcommit p.go p.gomod p.gosum p.gotmpl p.helm p.haskell p.html p.http p.java p.javascript p.json p.latex p.lua p.markdown p.markdown_inline p.matlab p.nix p.printf p.python p.regex p.rust p.sql p.strace p.supercollider p.svelte p.swift p.terraform p.tmux p.toml p.typescript p.vim p.xml p.yaml p.zig ])) + nvim-treesitter-context ]; initLua = '' diff --git a/modules/home/tmux.nix b/modules/home/tmux.nix index 8c12965..8fb407c 100644 --- a/modules/home/tmux.nix +++ b/modules/home/tmux.nix @@ -154,9 +154,9 @@ in bind C-q display-popup -E -xC -yC -w 95% -h 95% " \ SESSION_NAME=\$(tmux display-message -p '#S'); \ if [ \"\$SESSION_NAME\" = 'misc' ]; then \ - cd '/mnt/c/Users/marti/Documents/notes/Work/' && vim task_notes.md; \ + cd '/mnt/c/Users/marti/Documents/notes/Work/' && vim -c 'nnoremap q :wqa' task_notes.md; \ else \ - cd \"\$HOME/pro/\$SESSION_NAME\" && vim task_notes.md; \ + cd \"\$HOME/pro/\$SESSION_NAME\" && vim -c 'nnoremap q :wqa' task_notes.md; \ fi" bind C-p display-popup -E -xC -yC -w 95% -h 95% -d "/mnt/c/Users/marti/Documents/notes/Work/development/" "vim mbpr.md" ''} diff --git a/modules/nvim/lua/plugins.lua b/modules/nvim/lua/plugins.lua index bc23bcb..54146b7 100644 --- a/modules/nvim/lua/plugins.lua +++ b/modules/nvim/lua/plugins.lua @@ -523,3 +523,10 @@ require('render-markdown').setup({ }, }) +require('treesitter-context').setup{ + multiwindow = true, +} +vim.api.nvim_set_hl(0, "TreesitterContextBottom", { + underline = true, + sp = "Grey" +})