Compare commits

...
16 Commits
15 changed files with 159 additions and 88 deletions
+1
View File
@@ -0,0 +1 @@
test/
+10 -1
View File
@@ -6,7 +6,16 @@
./plugins ./plugins
]; ];
colorschemes.catppuccin.enable = true; colorscheme = "catppuccin";
colorschemes = {
onedark.enable = true;
nord.enable = true;
dracula.enable = true;
gruvbox.enable = true;
catppuccin.enable = true;
};
clipboard = { clipboard = {
register = "unnamedplus"; register = "unnamedplus";
providers.wl-copy.enable = true; providers.wl-copy.enable = true;
+2
View File
@@ -14,6 +14,7 @@ in
{ {
key = "<C-s>"; key = "<C-s>";
action = ":w<CR>"; action = ":w<CR>";
options = defaultOptions;
} }
{ {
key = "<S-q>"; key = "<S-q>";
@@ -38,6 +39,7 @@ in
{ {
action = ":ToggleTerm direction=float<CR>"; action = ":ToggleTerm direction=float<CR>";
key = "<Space>t"; key = "<Space>t";
options = defaultOptions;
} }
{ {
action = "<C-\\><C-n>"; action = "<C-\\><C-n>";
+1 -1
View File
@@ -12,7 +12,7 @@
smartcase = true; smartcase = true;
ignorecase = true; ignorecase = true;
termguicolors = true; termguicolors = true;
expandtab = false;
gdefault = true; gdefault = true;
cursorlineopt = "both";
}; };
} }
-10
View File
@@ -1,10 +0,0 @@
{ ... }:
{
plugins.guess-indent = {
enable = true;
settings = {
underline.enable = true;
static.enable = true;
};
};
}
-2
View File
@@ -12,8 +12,6 @@
{ name = "nvim_lsp_signature_help"; } { name = "nvim_lsp_signature_help"; }
{ name = "path"; } { name = "path"; }
{ name = "buffer"; } { name = "buffer"; }
{ name = "dap"; }
{ name = "blink-emoji"; }
{ name = "blink-ripgrep"; } { name = "blink-ripgrep"; }
]; ];
mapping = { mapping = {
-1
View File
@@ -4,7 +4,6 @@
enable = true; enable = true;
settings = { settings = {
sticky = true; sticky = true;
toggler = { toggler = {
block = "<C-x>"; block = "<C-x>";
line = "<C-c>"; line = "<C-c>";
+8 -4
View File
@@ -1,14 +1,14 @@
{ ... }: { ... }:
{ {
imports = [ imports = [
./blink-indent.nix ./guess-indent.nix
./cmp.nix ./cmp.nix
./comment.nix ./comment.nix
./cursorline.nix ./cursorline.nix
./fzf-lua.nix
./gitsigns.nix ./gitsigns.nix
./lsp.nix ./lsp.nix
./lualine.nix ./lualine.nix
./telescope.nix
./which-key.nix ./which-key.nix
]; ];
@@ -16,10 +16,14 @@
neo-tree.enable = true; neo-tree.enable = true;
web-devicons.enable = true; web-devicons.enable = true;
bufferline.enable = true; bufferline.enable = true;
nvim-autopairs.enable = true;
notify.enable = true; notify.enable = true;
toggleterm.enable = true; toggleterm.enable = true;
treesitter.enable = true; treesitter = {
enable = true;
highlight.enable = true;
indent.enable = true;
folding.enable = false;
};
todo-comments.enable = true; todo-comments.enable = true;
fidget.enable = true; fidget.enable = true;
blink-indent.enable = true; blink-indent.enable = true;
+67
View File
@@ -0,0 +1,67 @@
{
...
}:
let
mkMap =
action: desc:
{
inherit action;
options = {
silent = true;
inherit desc;
};
};
in
{
plugins.fzf-lua = {
enable = true;
settings = {
winopts = {
height = 0.85;
width = 0.9;
};
# fzf_opts = {
# "--layout" = "reverse";
# };
git_icons = true;
defaults.file_icons = true;
};
keymaps = {
# Files and search
"<Space>f" = mkMap "files" "Fzf-Lua Files";
"<Space>F" = mkMap "oldfiles" "Fzf-Lua Old Files";
"<Space>g" = mkMap "live_grep" "Fzf-Lua Live Grep";
# Buffers and windows
"<Space>b" = mkMap "buffers" "Fzf-Lua Buffers";
"<Space>w" = mkMap "tabs" "Fzf-Lua Tabs";
# Discoverability
"<Space>m" = mkMap "keymaps" "Fzf-Lua Keymaps";
"<Space>c" = mkMap "colorschemes" "Fzf-Lua Colorschemes";
# Git
"<Space>gs" = mkMap "git_status" "Fzf-Lua Git Status";
"<Space>gf" = mkMap "git_files" "Fzf-Lua Git Files";
"<Space>gl" = mkMap "git_log" "Fzf-Lua Git Log";
"<Space>gc" = mkMap "git_commits" "Fzf-Lua Git Commits";
"<Space>gb" = mkMap "git_bcommits" "Fzf-Lua Git Buffer Commits";
# LSP
"<Space>l" = mkMap "lsp_document_symbols" "Fzf-Lua Document Symbols";
"<Space>lr" = mkMap "lsp_references" "Fzf-Lua References";
"<Space>ld" = mkMap "lsp_definitions" "Fzf-Lua Definitions";
"<Space>la" = mkMap "lsp_code_actions" "Fzf-Lua Code Actions";
"<Space>lw" = mkMap "lsp_workspace_symbols" "Fzf-Lua Workspace Symbols";
# Diagnostics
"<Space>x" = mkMap "diagnostics_document" "Fzf-Lua Diagnostics";
"<Space>X" = mkMap "diagnostics_workspace" "Fzf-Lua Diagnostics Workspace";
# Resume
"<Space>z" = mkMap "resume" "Fzf-Lua Resume";
};
};
}
+10
View File
@@ -0,0 +1,10 @@
{ ... }:
{
plugins.guess-indent = {
enable = true;
settings = {
underline.enable = true;
static.enable = true;
};
};
}
+17 -2
View File
@@ -1,6 +1,7 @@
{ ... }: { ... }:
{ {
plugins.lsp = { plugins = {
lsp = {
enable = true; enable = true;
servers = { servers = {
clangd.enable = true; clangd.enable = true;
@@ -22,13 +23,27 @@
jsonls.enable = true; jsonls.enable = true;
phpactor.enable = true; phpactor.enable = true;
qmlls.enable = true; qmlls.enable = true;
pylsp.enable = true; ruff.enable = true;
slint_lsp.enable = true;
zuban.enable = true;
}; };
keymaps = { keymaps = {
lspBuf = { lspBuf = {
"<Space>k" = "hover"; "<Space>k" = "hover";
"<Space>r" = "rename"; "<Space>r" = "rename";
"<Space>a" = "code_action"; "<Space>a" = "code_action";
"<Space>R" = "references";
"<Space>d" = "definition";
"<Space>D" = "type_definition";
};
};
};
none-ls = {
enable = true;
sources = {
formatting = {
djlint.enable = true;
};
}; };
}; };
}; };
-10
View File
@@ -1,10 +0,0 @@
{ ... }:
{
plugins.telescope = {
enable = true;
keymaps = {
"<Space>f" = "find_files";
"<Space>g" = "live_grep";
};
};
}
Generated
+13 -23
View File
@@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1782949081, "lastModified": 1788450739,
"narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=", "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e", "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -41,24 +41,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1783816212, "lastModified": 1790149054,
"narHash": "sha256-M2X3JTJp7ktX73uVDEAm0Rws2A/xljf4Cu1ojd/o8pU=", "narHash": "sha256-FfjXg6mAzKQBCY+7V9keGWOXG4DV2Eym/qA987lFl8A=",
"rev": "3b32825de172d0bc85664f495edb096b10862524",
"type": "tarball",
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.11pre1033157.3b32825de172/nixexprs.tar.xz"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1783791668,
"narHash": "sha256-zbcZ1dmBTPfJ7Mlqh/yLEPGpgJnwuv4Xr1xucy2WqMA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "716c7a2664ca8325617b8a7fbb609273f2c4cae7", "rev": "8825bebf6324e0579d012936eff73379af284b6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -71,15 +58,17 @@
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_2", "nixpkgs": [
"nixpkgs"
],
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1783941741, "lastModified": 1789961561,
"narHash": "sha256-F+3M1IZrJa920cx2/k2AMKqedEodxLF7COJVkLJwUBo=", "narHash": "sha256-2lRgE8XsmXIVmiujmHVaCy5TrBUSblILNT5vYOj/Ed0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "e6715f01d9f56f07a27a01386b85ae22b06f0705", "rev": "bcb5f577a36565bda07d7b81346b73cad8618d16",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -111,6 +100,7 @@
} }
}, },
"systems_2": { "systems_2": {
"flake": false,
"locked": { "locked": {
"lastModified": 1774449309, "lastModified": 1774449309,
"narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=", "narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
+5 -1
View File
@@ -2,7 +2,11 @@
description = "My Neovim configuration"; description = "My Neovim configuration";
inputs = { inputs = {
nixvim.url = "github:nix-community/nixvim"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
}; };
-8
View File
@@ -1,8 +0,0 @@
{ pkgs }:
pkgs.mkShell {
buildInputs = with pkgs; [
ripgrep
git
];
}