up
This commit is contained in:
18
flake.lock
generated
18
flake.lock
generated
@@ -164,11 +164,11 @@
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754924470,
|
||||
"narHash": "sha256-asI/or9AcUMydwzodCgpHGytnMSNUlciw3uaycpXm4E=",
|
||||
"lastModified": 1754974548,
|
||||
"narHash": "sha256-XMjUjKD/QRPcqUnmSDczSYdw46SilnG0+wkho654DFM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "67393957c27b4e4c6c48a60108a201413ced7800",
|
||||
"rev": "27a26be51ff0162a8f67660239f9407dba68d7c5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -196,11 +196,11 @@
|
||||
"homebrew-cask": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1754931713,
|
||||
"narHash": "sha256-8ar1jlSF1PoaAbkaDH/YOKjkTmXiOj+yrojL3Ppf7LQ=",
|
||||
"lastModified": 1754979074,
|
||||
"narHash": "sha256-um6BpDFFuPfNku2yKkJLvx2JvrOWlRL/51RmXl/oY7I=",
|
||||
"owner": "homebrew",
|
||||
"repo": "homebrew-cask",
|
||||
"rev": "a3abcd193aff0596af28b6849eda437dd1baa84f",
|
||||
"rev": "6acdfa7207c75987bf19ea1fda5ada494a4f2290",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -212,11 +212,11 @@
|
||||
"homebrew-core": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1754929321,
|
||||
"narHash": "sha256-0NHsn08/bSSxt13o8zAYtaSuD2M4aziTS8t9o7DvCus=",
|
||||
"lastModified": 1754979109,
|
||||
"narHash": "sha256-4QOoUHg2QwLR4P7WjWlcTIPxapZxs83ZS3+yUc4Yrhc=",
|
||||
"owner": "homebrew",
|
||||
"repo": "homebrew-core",
|
||||
"rev": "d939090d6bdf40b8a5cbbbc8b49eb78ec6b8f445",
|
||||
"rev": "f991bc151c3e8b708514f01908ae6d431b8ce697",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -66,6 +66,7 @@
|
||||
local all all trust
|
||||
host all all 127.0.0.1/32 trust
|
||||
host all all ::1/128 trust
|
||||
host all all 100.64.0.0/10 trust
|
||||
'';
|
||||
settings = {
|
||||
shared_preload_libraries = ["timescaledb"];
|
||||
|
||||
@@ -3,5 +3,8 @@
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
enableZshIntegration = true;
|
||||
settings = {
|
||||
auto_install = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
./plugins/lazygit.nix
|
||||
./plugins/lsp.nix
|
||||
./plugins/mini.nix
|
||||
./plugins/oil.nix
|
||||
./plugins/treesitter.nix
|
||||
];
|
||||
|
||||
|
||||
@@ -1,10 +1,60 @@
|
||||
{
|
||||
programs.nixvim.keymaps = [
|
||||
# e - explore/edit
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>lf";
|
||||
action = ":lua require('conform').format({ lsp_fallback = true })<CR>";
|
||||
options.desc = "Format";
|
||||
key = "<leader>ed";
|
||||
action = ":lua require('mini.files').open()<CR>";
|
||||
options.desc = "Directory";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>ef";
|
||||
action = ":lua require('mini.files').open(vim.api.nvim_buf_get_name(0))<CR>";
|
||||
options.desc = "File directory";
|
||||
}
|
||||
# f - find
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>f/";
|
||||
action = ":Pick history scope='/'<CR>";
|
||||
options.desc = "'/' history";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>f:";
|
||||
action = ":Pick history scope=':'<CR>";
|
||||
options.desc = "':' history";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fa";
|
||||
action = ":Pick git_hunks scope='staged'<CR>";
|
||||
options.desc = "Added hunks (all)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fA";
|
||||
action = ":Pick git_hunks path='%' scope='staged'<CR>";
|
||||
options.desc = "Added hunks (buffer)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fb";
|
||||
action = ":Pick buffers<CR>";
|
||||
options.desc = "Buffers";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fd";
|
||||
action = ":Pick diagnostic scope='all'<CR>";
|
||||
options.desc = "Diagnostic (workspace)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fD";
|
||||
action = ":Pick diagnostic scope='current'<CR>";
|
||||
options.desc = "Diagnostic (buffer)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
@@ -14,21 +64,48 @@
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>/";
|
||||
action = ":Pick grep_live<CR>";
|
||||
options.desc = "Grep";
|
||||
key = "<leader>fr";
|
||||
action = ":Pick lsp scope='references'<CR>";
|
||||
options.desc = "References (LSP)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>ed";
|
||||
action = ":Oil<CR>";
|
||||
options.desc = "File browser";
|
||||
key = "<leader>fs";
|
||||
action = ":Pick lsp scope='workspace_symbol'<CR>";
|
||||
options.desc = "Symbols (LSP, workspace)";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>fS";
|
||||
action = ":Pick lsp scope='document_symbol'<CR>";
|
||||
options.desc = "Symbols (LSP, buffer)";
|
||||
}
|
||||
# g - git
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>gg";
|
||||
action = ":LazyGit<CR>";
|
||||
options.desc = "Lazygit";
|
||||
}
|
||||
# l - lsp/formatter
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>lf";
|
||||
action = ":lua require('conform').format({ lsp_fallback = true })<CR>";
|
||||
options.desc = "Format";
|
||||
}
|
||||
# next
|
||||
{
|
||||
mode = "n";
|
||||
key = "<leader>/";
|
||||
action = ":Pick grep_live<CR>";
|
||||
options.desc = "Grep";
|
||||
}
|
||||
{
|
||||
mode = "n";
|
||||
key = "sj";
|
||||
action = ":lua require('mini.jump2d').start(require('mini.jump2d').builtin_opts.query)<CR>";
|
||||
options.desc = "Jump to character";
|
||||
}
|
||||
];
|
||||
}
|
||||
|
||||
@@ -11,5 +11,9 @@
|
||||
globals = {
|
||||
clipboard = "osc52";
|
||||
};
|
||||
opts = {
|
||||
ignorecase = true;
|
||||
smartcase = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -2,6 +2,18 @@
|
||||
programs.nixvim.plugins.mini = {
|
||||
enable = true;
|
||||
modules = {
|
||||
jump = {};
|
||||
files = {};
|
||||
jump2d = {
|
||||
settings = {
|
||||
spotter.__raw = "require('mini.jump2d').gen_spotter.pattern('[^%s%p]+')";
|
||||
labels = "asdfghjkl";
|
||||
view = {
|
||||
dim = true;
|
||||
n_steps_ahead = 2;
|
||||
};
|
||||
};
|
||||
};
|
||||
basics = {
|
||||
options = {
|
||||
basic = true;
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
{
|
||||
programs.nixvim.plugins.oil = {
|
||||
enable = true;
|
||||
settings = {
|
||||
columns = [
|
||||
"icon"
|
||||
];
|
||||
keymaps = {
|
||||
"<C-r>" = "actions.refresh";
|
||||
"<leader>qq" = "actions.close";
|
||||
};
|
||||
skip_confirm_for_simple_edits = true;
|
||||
constrain_cursor = "editable";
|
||||
default_file_explorer = true;
|
||||
view_options = {
|
||||
show_hidden = true;
|
||||
};
|
||||
win_options = {
|
||||
concealcursor = "ncv";
|
||||
conceallevel = 3;
|
||||
cursorcolumn = false;
|
||||
foldcolumn = "0";
|
||||
list = false;
|
||||
signcolumn = "no";
|
||||
spell = false;
|
||||
wrap = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user