Theaninova/TheaninovOS
1
0
Fork 0
mirror of https://github.com/Theaninova/TheaninovOS.git synced 2025-12-12 11:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

update angular plugin

Browse Source
This commit is contained in:
Thea Schöbl
2023-11-26 12:56:26 +01:00
parent 0bb95b9501
commit 2aed6d599c
1 changed files with 41 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
programs/nixvim.nix
View File

@@ -6,8 +6,18 @@ let
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "dlvandenberg"; owner = "dlvandenberg";
repo = "nvim-treesitter-angular"; repo = "nvim-treesitter-angular";
rev = "1d1b468180c2b2d40bf87a834a28297456e24825"; rev = "7549872eb34934c5bc4f4df2ca71196755adfb1c";
hash = "sha256-z7jcJsrDdHE69VLO3V0nteZEvWxEN16vIOJDGJ01SJs="; hash = "sha256-fayRXogWBeV9jDmjXs/u6ULlbCziKIL26pKKh9QJzf8=";
};
});
tree-sitter-angular = (pkgs.tree-sitter.buildGrammar {
language = "angular";
version = "624ff10";
src = pkgs.fetchFromGitHub {
owner = "dlvandenberg";
repo = "tree-sitter-angular";
rev = "e0d7582e1ebbcf6136cfcfb22a37e20f4562acba";
hash = "sha256-ADOlhAUidmRKCpDxmo70ZYHgtUIwxrfy0ucACfjkhlQ=";
}; };
}); });
darkman = (pkgs.vimUtils.buildVimPlugin { darkman = (pkgs.vimUtils.buildVimPlugin {
@@ -23,7 +33,7 @@ let
sha256 = "sha256-ssEYdM460I1rufjgh63CEkLi4K+bEWbwku/6gQbytno="; sha256 = "sha256-ssEYdM460I1rufjgh63CEkLi4K+bEWbwku/6gQbytno=";
}; };
postInstall = '' postInstall = ''
cp -r lua $out cp -r lua $out
''; '';
}; };
}); });
@@ -89,33 +99,33 @@ in
}; };
extraConfigVim = /* vim */ '' extraConfigVim = /* vim */ ''
hi Normal guibg=NONE ctermbg=NONE hi Normal guibg=NONE ctermbg=NONE
''; '';
extraConfigLua = /* lua */ '' extraConfigLua = /* lua */ ''
require("darkman").setup() require("darkman").setup()
local Terminal = require('toggleterm.terminal').Terminal
local lazygit = Terminal:new({
cmd = "lazygit",
dir = "git_dir",
direction = "float",
on_open = function(term) local Terminal = require('toggleterm.terminal').Terminal
vim.cmd("startinsert!") local lazygit = Terminal:new({
vim.api.nvim_buf_set_keymap(term.bufnr, "n", "q", "<cmd>close<CR>", {noremap = true, silent = true}) cmd = "lazygit",
end, dir = "git_dir",
on_close = function(term) direction = "float",
vim.cmd("startinsert!")
end, on_open = function(term)
}) vim.cmd("startinsert!")
vim.api.nvim_buf_set_keymap(term.bufnr, "n", "q", "<cmd>close<CR>", {noremap = true, silent = true})
end,
on_close = function(term)
vim.cmd("startinsert!")
end,
})
function _lazygit_toggle() function _lazygit_toggle()
lazygit:toggle() lazygit:toggle()
end end
vim.api.nvim_set_keymap("n", "<leader>g", "<cmd>lua _lazygit_toggle()<CR>", {noremap = true, silent = true}) vim.api.nvim_set_keymap("n", "<leader>g", "<cmd>lua _lazygit_toggle()<CR>", {noremap = true, silent = true})
''; '';
colorschemes.catppuccin = { colorschemes.catppuccin = {
@@ -154,9 +164,9 @@ in
filesystem.filteredItems.visible = true; filesystem.filteredItems.visible = true;
eventHandlers = { eventHandlers = {
file_opened = /* lua */ '' file_opened = /* lua */ ''
function() function()
require('neo-tree').close_all() require('neo-tree').close_all()
end end
''; '';
}; };
}; };
@@ -182,18 +192,7 @@ in
treesitter = { treesitter = {
enable = true; enable = true;
indent = true; indent = true;
grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars ++ [ grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars ++ [tree-sitter-angular];
(pkgs.tree-sitter.buildGrammar {
language = "angular";
version = "624ff10";
src = pkgs.fetchFromGitHub {
owner = "dlvandenberg";
repo = "tree-sitter-angular";
rev = "e316388ca6dcc728a5c521b4d63acecdeedab942";
hash = "sha256-t/qLxBideSGP/x4dhDu8MvMnugIEhcBvYasUdUFisFI=";
};
})
];
}; };
none-ls.enable = true; none-ls.enable = true;
@@ -235,10 +234,10 @@ in
enable = true; enable = true;
mode = "symbol"; mode = "symbol";
cmp.after = /* lua */ '' cmp.after = /* lua */ ''
function(entry, vim_item, kind) function(entry, vim_item, kind)
kind.kind = kind.kind .. " "; kind.kind = kind.kind .. " ";
return kind return kind
end end
''; '';
}; };
nvim-cmp = { nvim-cmp = {