Skip to content

Commit

Permalink
Merge pull request #82 from RustLover2910/main
Browse files Browse the repository at this point in the history
Changed the old plugins naming structure to the new one
  • Loading branch information
redyf authored Apr 13, 2024
2 parents 7d692c8 + 4ccfd21 commit c506383
Show file tree
Hide file tree
Showing 9 changed files with 87 additions and 75 deletions.
4 changes: 2 additions & 2 deletions config/completion/cmp.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
cmp-cmdline = {enable = false;}; # autocomplete for cmdline
cmp = {
enable = true;
autoEnableSources = true;
extraOptions = {
autoEnableSources = false;
settings = {
experimental = {
ghost_text = true;
};
Expand Down
6 changes: 4 additions & 2 deletions config/git/gitsigns.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
plugins.gitsigns = {
enable = true;
trouble = true;
currentLineBlame = false;
settings = {
trouble = true;
currentLineBlame = false;
};
};
keymaps = [
{
Expand Down
2 changes: 1 addition & 1 deletion config/sets.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
...
}: {
config = {
options = {
opts = {
# Enable relative line numbers
number = true;
relativenumber = true;
Expand Down
22 changes: 11 additions & 11 deletions config/telescope/telescope.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
{
plugins.telescope = {
enable = true;

extensions = {
fzf-native = {
enable = true;
};
project-nvim = {
enable = true;
};
ui-select = {
settings = {
specific_opts = {
Expand All @@ -20,14 +18,16 @@
};
};
# If you'd prefer Telescope not to enter a normal-like mode when hitting escape (and instead exiting), you can map <Esc> to do so via:
defaults = {
mappings = {
i = {
"<esc>" = {
__raw = ''
function(...)
return require("telescope.actions").close(...)
end'';
settings = {
defaults = {
mappings = {
i = {
"<esc>" = {
__raw = ''
function(...)
return require("telescope.actions").close(...)
end'';
};
};
};
};
Expand Down
46 changes: 24 additions & 22 deletions config/ui/indent-blankline.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,30 @@
plugins = {
indent-blankline = {
enable = true;
indent = {
char = "│"; # "│" or "▎"
};
scope = {
enabled = true;
showStart = true;
};
exclude = {
buftypes = ["terminal" "nofile"];
filetypes = [
"help"
"alpha"
"dashboard"
"neo-tree"
"Trouble"
"trouble"
"lazy"
"mason"
"notify"
"toggleterm"
"lazyterm"
];
settings = {
indent = {
char = "│"; # "│" or "▎"
};
scope = {
enabled = true;
show_start = true;
};
exclude = {
buftypes = ["terminal" "nofile"];
filetypes = [
"help"
"alpha"
"dashboard"
"neo-tree"
"Trouble"
"trouble"
"lazy"
"mason"
"notify"
"toggleterm"
"lazyterm"
];
};
};
};
};
Expand Down
6 changes: 4 additions & 2 deletions config/utils/markdown-preview.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{
plugins.markdown-preview = {
enable = true;
browser = "floorp";
theme = "dark";
settings = {
browser = "floorp";
theme = "dark";
};
};
keymaps = [
{
Expand Down
69 changes: 36 additions & 33 deletions config/utils/oil.nix
Original file line number Diff line number Diff line change
@@ -1,40 +1,43 @@
{
plugins.oil = {
enable = true;
useDefaultKeymaps = true;
deleteToTrash = true;
viewOptions = {
showHidden = true;
};
float = {
padding = 2;
maxWidth = 0; # ''math.ceil(vim.o.lines * 0.8 - 4)'';
maxHeight = 0; # ''math.ceil(vim.o.columns * 0.8)'';
border = "rounded"; # 'single' | 'double' | 'shadow' | 'curved' | ... other options supported by win open
winOptions = {
winblend = 0;
settings = {
useDefaultKeymaps = true;
deleteToTrash = true;
viewOptions = {
showHidden = true;
};
preview = {
border = "rounded";
};

float = {
padding = 2;
maxWidth = 0; # ''math.ceil(vim.o.lines * 0.8 - 4)'';
maxHeight = 0; # ''math.ceil(vim.o.columns * 0.8)'';
border = "rounded"; # 'single' | 'double' | 'shadow' | 'curved' | ... other options supported by win open
winOptions = {
winblend = 0;
};
};
keymaps = {
"g?" = "actions.show_help";
"<CR>" = "actions.select";
"<C-\\>" = "actions.select_vsplit";
"<C-enter>" = "actions.select_split"; # this is used to navigate left
"<C-t>" = "actions.select_tab";
"<C-p>" = "actions.preview";
"<C-c>" = "actions.close";
"<C-r>" = "actions.refresh";
"-" = "actions.parent";
"_" = "actions.open_cwd";
"`" = "actions.cd";
"~" = "actions.tcd";
"gs" = "actions.change_sort";
"gx" = "actions.open_external";
"g." = "actions.toggle_hidden";
"q" = "actions.close";
};
};
preview = {
border = "rounded";
};
keymaps = {
"g?" = "actions.show_help";
"<CR>" = "actions.select";
"<C-\\>" = "actions.select_vsplit";
"<C-enter>" = "actions.select_split"; # this is used to navigate left
"<C-t>" = "actions.select_tab";
"<C-p>" = "actions.preview";
"<C-c>" = "actions.close";
"<C-r>" = "actions.refresh";
"-" = "actions.parent";
"_" = "actions.open_cwd";
"`" = "actions.cd";
"~" = "actions.tcd";
"gs" = "actions.change_sort";
"gx" = "actions.open_external";
"g." = "actions.toggle_hidden";
"q" = "actions.close";
};
};
keymaps = [
Expand Down
1 change: 1 addition & 0 deletions config/utils/project-nvim.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
plugins.project-nvim = {
enable = true;
enableTelescope = true;
};
}
6 changes: 4 additions & 2 deletions config/utils/undotree.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@
}: {
plugins.undotree = {
enable = true;
autoOpenDiff = true;
focusOnToggle = true;
settings = {
autoOpenDiff = true;
focusOnToggle = true;
};
};
keymaps = [
{
Expand Down

0 comments on commit c506383

Please sign in to comment.