Skip to content

Commit

Permalink
fix new neovim lua parser issue
Browse files Browse the repository at this point in the history
  • Loading branch information
Sathvik Birudavolu committed Dec 22, 2023
1 parent 62608a5 commit adcdfc9
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
4 changes: 1 addition & 3 deletions configs/nvim/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,6 @@ require("lazy").setup({
-- tree-sitter for parsing, syntax highlighting and much more
{
"nvim-treesitter/nvim-treesitter",
event = "BufReadPost",
dependencies = {
"nvim-treesitter/nvim-treesitter-textobjects",
"nvim-treesitter/nvim-treesitter-refactor",
Expand Down Expand Up @@ -350,6 +349,7 @@ require("lazy").setup({
dependencies = { "williamboman/mason.nvim" },
config = function()
require("mason-lspconfig").setup({
-- TODO: Make sure to install tree-sitter-cli, stylua
ensure_installed = required_servers,
-- Don't automagically install server configured by lspconfig, add to required_servers
automatic_installation = false,
Expand Down Expand Up @@ -599,8 +599,6 @@ vim.api.nvim_create_autocmd("TextYankPost", {
pattern = "*",
})

vim.api.nvim_create_user_command("MasonAll", [[Mason install stylua]], {})

local function urlencode(url)
if url == nil then
return
Expand Down
11 changes: 11 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
# NOTE: Never mess with hostName on a company managed machine!
hostName = null;
computerName = "Sathvik’s Work MBP";
email = "[email protected]";
};
in
{
Expand Down Expand Up @@ -101,6 +102,16 @@
'';
};
};

# neovim-unwrapped installs tree-sitter parsers that are added to the path that
# conflict with nvim-treesitter parser install starting v9.4
neovim-unwrapped = final: prev: {
neovim-unwrapped = prev.neovim-unwrapped.overrideAttrs {
postInstall = ''
rm -rf $out/lib/nvim/parser/*
'';
};
};
};
# }}}

Expand Down
7 changes: 5 additions & 2 deletions home/packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
extraConfig = ''
set -sg escape-time 10
set-option -g status-bg "#e82424"
set-option -g status-bg "#FB607F"
set-option -g status-fg "#19191F"
# pane border
set-option -g pane-active-border-style fg="#e82424" #base01
set-option -g pane-active-border-style fg="#FB607F" #base01
set -g window-status-format '#I:#(pwd="#{pane_current_path}"; echo ''${pwd####*/})#F'
set -g window-status-current-format '#I:#(pwd="#{pane_current_path}"; echo ''${pwd####*/})#F'
Expand Down Expand Up @@ -48,6 +48,8 @@
bind c new-window -c "#{pane_current_path}"
bind '"' split-window -c "#{pane_current_path}"
bind % split-window -h -c "#{pane_current_path}"
set-option -g renumber-windows on
'';
plugins = with pkgs; [
tmuxPlugins.cpu
Expand Down Expand Up @@ -137,6 +139,7 @@
rustc
rustfmt
nixpkgs-fmt
shellcheck
;

# Useful nix related tools
Expand Down

0 comments on commit adcdfc9

Please sign in to comment.