Compare commits

..

No commits in common. "37caaa036d3f0d5333490b5bfa4e76c085f3aaf4" and "bde2160dfad8dbfc825ed15bbd768ab83b1d82d3" have entirely different histories.

2 changed files with 6 additions and 73 deletions

View file

@ -14,7 +14,7 @@
byteCompileLua.enable = true; byteCompileLua.enable = true;
}; };
colorschemes.rose-pine.enable = true; colorschemes.cyberdream.enable = true;
opts = { opts = {
laststatus = 3; laststatus = 3;
@ -25,10 +25,6 @@
mapleader = " "; mapleader = " ";
}; };
extraConfigLua = ''
require("telescope").load_extension("yank_history")
'';
keymaps = [ keymaps = [
{ {
# Unmap space (leader) # Unmap space (leader)
@ -252,7 +248,7 @@
}; };
} }
{ {
action = ":split | wincmd j | resize 15 | term<CR>"; action = ":split | resize 50% | wincmd j | term<CR>";
key = "<Leader>tt"; key = "<Leader>tt";
options = { options = {
silent = true; silent = true;
@ -301,49 +297,6 @@
}; };
mode = "n"; mode = "n";
} }
{
action = "<Plug>(YankyPutAfter)";
key = "p";
mode = ["n" "x"];
}
{
action = "<Plug>(YankyPutBefore)";
key = "P";
mode = ["n" "x"];
}
{
action = "<Plug>(YankyGPutAfter)";
key = "gp";
mode = ["n" "x"];
}
{
action = "<Plug>(YankyGPutBefore)";
key = "gP";
mode = ["n" "x"];
}
{
action = ":Telescope yank_history<CR>";
key = "<Leader>p";
mode = "n";
}
{
action = '':lua require("yazi").yazi()<CR>'';
key = "<Leader>mm";
options = {
desc = "Open Yazi current nvim working directory";
noremap = true;
silent = true;
};
}
# {
# action = ":Yazi<CR>";
# key = "<Leader>mf";
# options = {
# desc = "Open Yazi at current file";
# noremap = true;
# silent = true;
# };
# }
# { # {
# action = "<cmd>lua require'conform'.format({ bufnr = args.bf })<CR>"; # action = "<cmd>lua require'conform'.format({ bufnr = args.bf })<CR>";
# key = "<Leader>cf"; # key = "<Leader>cf";
@ -362,6 +315,7 @@
servers = { servers = {
bashls.enable = true; bashls.enable = true;
clangd.enable = true; clangd.enable = true;
hls.enable = true;
pyright.enable = true; pyright.enable = true;
nixd.enable = true; nixd.enable = true;
nushell.enable = true; nushell.enable = true;
@ -508,6 +462,9 @@
cmp-path = { cmp-path = {
enable = true; # file system paths enable = true; # file system paths
}; };
cmp_luasnip = {
enable = true; # snippets
};
cmp-cmdline = { cmp-cmdline = {
enable = true; # autocomplete for cmdline enable = true; # autocomplete for cmdline
}; };
@ -528,12 +485,6 @@
"_" = ["trim_whitespace"]; "_" = ["trim_whitespace"];
}; };
}; };
yazi = {
enable = true;
settings = {
open_for_directories = true;
};
};
}; };
extraPlugins = [ extraPlugins = [
@ -555,20 +506,6 @@
hash = "sha256-lc++IrXzEA3M2iUFZACAZOcH2EwVqX4p0fhET+en37o="; hash = "sha256-lc++IrXzEA3M2iUFZACAZOcH2EwVqX4p0fhET+en37o=";
}; };
}) })
(pkgs.vimUtils.buildVimPlugin {
name = "haskell-tools-nvim";
src = pkgs.fetchFromGitHub {
owner = "mrcjkb";
repo = "haskell-tools.nvim";
rev = "959eac0fadbdd27442904a8cb363f39afb528027";
hash = "sha256-5CS5kvUSqQJe7iFFpicinBjCQXgFPL0ElGgnrZHTT+Y=";
};
})
]; ];
}; };
programs.yazi = {
enable = true;
enableBashIntegration = true;
enableFishIntegration = true;
};
} }

View file

@ -15,8 +15,4 @@
enable = true; enable = true;
flavor = "mocha"; flavor = "mocha";
}; };
programs.yazi.catppuccin = {
enable = true;
flavor = "macchiato";
};
} }