diff --git a/config/nix/common/home.nix b/config/nix/common/home.nix index da24fc02..576f92c3 100644 --- a/config/nix/common/home.nix +++ b/config/nix/common/home.nix @@ -15,9 +15,9 @@ in home.packages = with pkgs; [ gnupg - gpg-tui + # gpg-tui comma - neovide + # neovide sqls vcpkg file @@ -29,7 +29,7 @@ in just jq tldr - spotify-player + # spotify-player bottom qmk nodejs diff --git a/config/nix/common/nvim/default.nix b/config/nix/common/nvim/default.nix index eee0d50b..548b5d1d 100644 --- a/config/nix/common/nvim/default.nix +++ b/config/nix/common/nvim/default.nix @@ -3,8 +3,6 @@ programs.nixneovim = { enable = true; options = { - foldexpr = "nvim_treesitter#foldexpr()"; - foldmethod = "expr"; number = true; relativenumber = true; tabstop = 4; @@ -48,7 +46,7 @@ lua-language-server.enable = true; jsonls.enable = true; html.enable = true; - pylyzer.enable = true; + # pylyzer.enable = true; sqls = { enable = true; onAttachExtra = @@ -60,7 +58,7 @@ # rust-analyzer.enable = true; }; extraLua.pre = - # lua + /* lua */ '' local lsp_zero = require'lsp-zero' local lspconfig = require 'lspconfig' @@ -88,6 +86,7 @@ enable = true; autoStart = true; }; + treesitter-context.enable = true; ts-context-commentstring.enable = true; treesitter = { @@ -97,9 +96,10 @@ refactor = { smartRename = { enable = true; - keymaps = { smartRename = "rn"; }; }; }; + grammars = [ pkgs.tree-sitter-grammars.tree-sitter-just ]; + installAllGrammars = true; }; mini = { @@ -177,18 +177,6 @@ trouble-nvim crates-nvim sqls-nvim - # (nvim-treesitter.withPlugins (_: nvim-treesitter.allGrammars ++ [ - # (pkgs.tree-sitter.buildGrammar { - # language = "just"; - # version = "8af0aab"; - # src = pkgs.fetchFromGitHub { - # owner = "IndianBoy42"; - # repo = "tree-sitter-just"; - # rev = "8af0aab79854aaf25b620a52c39485849922f766"; - # sha256 = "sha256-hYKFidN3LHJg2NLM1EiJFki+0nqi1URnoLLPknUbFJY="; - # }; - # }) - # ])) # No more postman rest-nvim diff --git a/config/nix/flake.lock b/config/nix/flake.lock index 384ccad2..162d768c 100644 --- a/config/nix/flake.lock +++ b/config/nix/flake.lock @@ -123,11 +123,11 @@ ] }, "locked": { - "lastModified": 1709485267, - "narHash": "sha256-bunOdYTK9YNiy+u0D6YN8q40oAeHoQ+9EgoatF3InJ8=", + "lastModified": 1710003968, + "narHash": "sha256-g8+K+mLiNG5uch35Oy9oDQBAmGSkCcqrd0Jjme7xiG0=", "owner": "ipetkov", "repo": "crane", - "rev": "e4a71521a8eafc07524c55326ecc4ea942b06e25", + "rev": "10484f86201bb94bd61ecc5335b1496794fedb78", "type": "github" }, "original": { @@ -236,11 +236,11 @@ ] }, "locked": { - "lastModified": 1706830856, - "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -311,11 +311,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -445,11 +445,11 @@ ] }, "locked": { - "lastModified": 1704029560, - "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=", + "lastModified": 1708547820, + "narHash": "sha256-xU/KC1PWqq5zL9dQ9wYhcdgxAwdeF/dJCLPH3PNZEBg=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16", + "rev": "0ca27bd58e4d5be3135a4bef66b582e57abe8f4a", "type": "github" }, "original": { @@ -465,11 +465,11 @@ ] }, "locked": { - "lastModified": 1709988192, - "narHash": "sha256-qxwIkl85P0I1/EyTT+NJwzbXdOv86vgZxcv4UKicjK8=", + "lastModified": 1710273215, + "narHash": "sha256-AfVYEQIhOK6vaYVndgqFV4Vb5REXG9R0ylv83QInsT0=", "owner": "nix-community", "repo": "home-manager", - "rev": "b0b0c3d94345050a7f86d1ebc6c56eea4389d030", + "rev": "a500de54b2e3067201a40cefa5f210f719423ddf", "type": "github" }, "original": { @@ -509,11 +509,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1709596966, - "narHash": "sha256-0aLjtDt6UzJNsY/Xl8F46LmXLTq6RHtAoZtAskv55JU=", + "lastModified": 1710170683, + "narHash": "sha256-ya+kRZ/37f0fdR+9BegJlx7TL6PxXzc4Vd52jf5xvSs=", "owner": "JakeStanger", "repo": "ironbar", - "rev": "59307f3aef37d39bd61304ab665af90d5048259e", + "rev": "18ee921fab20578f08b229d0fdbe72db02d45927", "type": "github" }, "original": { @@ -535,11 +535,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1709641033, - "narHash": "sha256-Eegyvq56NiXgrDrZ6FgE1lNCD2Mi6aLY/HFOeVG8ZtI=", + "lastModified": 1710171982, + "narHash": "sha256-WFMB+Yohcvego1/vOtaq+MJ8Wvp5meOANfNifg26Ie4=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "3881267e84cc966ded48601390e88fc13d960319", + "rev": "19ad7fd5724f30868748b8156ff25be838cd2bc5", "type": "github" }, "original": { @@ -576,11 +576,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1708040042, - "narHash": "sha256-8iloeE/jALIKcOcYKgTlI9i7iDW7n52Epqps27jGklU=", + "lastModified": 1710199222, + "narHash": "sha256-iZ8v1gkzUVVI9t5BKHAxRHgMpUjJq/yJgB7VyCUMTag=", "owner": "neovim", "repo": "neovim", - "rev": "04dfa2eea914086a9f42a5a00a33e9524f9fded4", + "rev": "b02a4d8ac39bafdbfd490bfbab35e3202e6f709c", "type": "github" }, "original": { @@ -601,11 +601,11 @@ ] }, "locked": { - "lastModified": 1709942621, - "narHash": "sha256-8VHrHzAOR1N8VxJm4i4D1EoNHhN1gfVOUOUidxMGZZI=", + "lastModified": 1710201806, + "narHash": "sha256-ySFpQv1cVsm1uGr/cbtfvWht6Kszfy/aP3TjiLQ8h0w=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "055a08233a86e7fe538db9d42fe5a92340e8de92", + "rev": "a6185e08ac09b6528b7120cd2886610eaffd68de", "type": "github" }, "original": { @@ -621,11 +621,11 @@ ] }, "locked": { - "lastModified": 1709771483, - "narHash": "sha256-Hjzu9nCknHLQvhdaRFfCEprH0o15KcaNu1QDr3J88DI=", + "lastModified": 1710255615, + "narHash": "sha256-DFooGP2D6cNfOj35qkptUgG0r+VxuI38QgNAoYxmVE0=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "550340062c16d7ef8c2cc20a3d2b97bcd3c6b6f6", + "rev": "c7ae5dc969b93f3221f5c228f0ec3de3e2b8084e", "type": "github" }, "original": { @@ -856,11 +856,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1709703039, - "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=", + "lastModified": 1709961763, + "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d", + "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "type": "github" }, "original": { @@ -905,11 +905,11 @@ }, "nur": { "locked": { - "lastModified": 1709999056, - "narHash": "sha256-YZBLyvYRIsT9jSo9rxhFLq4XvE9woduFdxyzTaOwZys=", + "lastModified": 1710276687, + "narHash": "sha256-S53VF0PA1pTz87oi3NKID7BnOqUFrKOflLXA/9DL46M=", "owner": "nix-community", "repo": "nur", - "rev": "b9fdd3dace5a629c585a2e137563c2a04fe59e40", + "rev": "b221a8e8493458bf33a754d86970bc656fdc43cc", "type": "github" }, "original": { @@ -1067,11 +1067,11 @@ ] }, "locked": { - "lastModified": 1709431943, - "narHash": "sha256-CqTcEJGITB3rfSuAcWC1QZnbVnIipXmIDbZHfxsAy80=", + "lastModified": 1710036830, + "narHash": "sha256-pnV4gO3N/7/GzyRSKTRlSfS/19KJiPSvYcL4apnSkoQ=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "362184acf4a991f27fc222864e94a2e81b3c3c9f", + "rev": "d09dac6a63a2ac4b74ac2ecdc19acd8c46c2da2c", "type": "github" }, "original": { diff --git a/config/nix/overlays.nix b/config/nix/overlays.nix index dbd52be6..d2634725 100644 --- a/config/nix/overlays.nix +++ b/config/nix/overlays.nix @@ -9,7 +9,21 @@ let }; vimPlugins = final: prev: { vimPlugins = prev.vimPlugins // { - # nvim-treesitter + # nvim-treesitter = prev.vimPlugins.nvim-treesitter.override(.allGrammars ++ [ + # (prev.vimPlugins.nvim-treesitter.allGrammars ++ [ + # (prev.vimPluginspkgs.tree-sitter.buildGrammar { + # language = "just"; + # version = "8af0aab"; + # src = final.pkgs.fetchFromGitHub { + # owner = "IndianBoy42"; + # repo = "tree-sitter-just"; + # rev = "613b3fd39183bec94bc741addc5beb6e6f17969f"; + # sha256 = final.pkgs.lib.fakeSha256; + # # sha256 = "sha256-hYKFidN3LHJg2NLM1EiJFki+0nqi1URnoLLPknUbFJY="; + # }; + # }) + # ]); + comfortable-motion = final.pkgs.vimUtils.buildVimPlugin { name = "comfortable-motion"; src = final.pkgs.fetchFromGitHub { @@ -43,7 +57,7 @@ let owner = "rest-nvim"; repo = "rest.nvim"; rev = "main"; - sha256 = "sha256-EclCwr0Oi6+5zF47niO0nt8wjNmb6cAADxd7S71DAiI"; + sha256 = "sha256-3EC0j/hEbdQ8nJU0I+LGmE/zNnglO/FrP/6POer0338="; }; }; }; @@ -74,6 +88,18 @@ let ln -s ${inputs.nix-index-database.legacyPackages.${prev.system}.database} $out/files ''; }); + treesitterGrammars = (final: prev: { + treesitter-just = prev.pkgs.tree-sitter.buildGrammar { + language = "just"; + version = "8af0aab"; + src = final.pkgs.fetchFromGitHub { + owner = "IndianBoy42"; + repo = "tree-sitter-just"; + rev = "613b3fd39183bec94bc741addc5beb6e6f17969f"; + sha256 = "sha256-OBlXwWriE6cdGn0dhpfSMnJ6Rx1Z7KcXehaamdi/TxQ"; + }; + }; + }); in [ catppuccinThemes @@ -85,4 +111,5 @@ in # inputs.nixneovimplugins.overlays.default inputs.nur.overlay nix-index-db + treesitterGrammars ] diff --git a/config/nix/themes/catppuccin.nix b/config/nix/themes/catppuccin.nix index 9b909b72..b284931c 100644 --- a/config/nix/themes/catppuccin.nix +++ b/config/nix/themes/catppuccin.nix @@ -25,7 +25,7 @@ in bat = mkCatppuccin { item = "bat"; - sha256 = "sha256-PLbTLj0qhsDj+xm+OML/AQsfRQVPXLYQNEPllgKcEx4"; + sha256 = "sha256-yHt3oIjUnljARaihalcWSNldtaJfVDfmfiecYfbzGs0"; }; hyprland = mkCatppuccin {