jasmine/nvim.nix
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fmt: alejandra

Browse source
This commit is contained in:
♥ Minnie ♥ 2024-08-08 09:58:48 +08:00
parent a6a7676c4e
commit 537828c2e9
Signed by: jasmine
GPG key ID: 8563E358D4E8040E
22 changed files with 124 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/default.nix
View file

@ -1,6 +1,4 @@
{ ... }: {...}: {
{
imports = [ imports = [
# General configuration. # General configuration.
./keymaps.nix ./keymaps.nix
@ -39,4 +37,3 @@
./plugins/utils/whichkey.nix ./plugins/utils/whichkey.nix
]; ];
} }

5
config/keymaps.nix
View file

@ -1,6 +1,3 @@
{ ... }: {...}: {
{
globals.mapleader = " "; globals.mapleader = " ";
} }

21
config/options.nix
View file

@ -1,18 +1,15 @@
{ ... }: {...}: {
{
config.opts = { config.opts = {
# General # General
number = true; # Display line numbers. number = true; # Display line numbers.
showmode = false; # Do not show the mode we're editing in. showmode = false; # Do not show the mode we're editing in.
swapfile = false; # Disable vim swapfile. swapfile = false; # Disable vim swapfile.
clipboard = "unnamedplus"; # Use the clipboard for all operations. clipboard = "unnamedplus"; # Use the clipboard for all operations.
# Tabs & Spaces # Tabs & Spaces
tabstop = 2; # Set the width of a tab character. tabstop = 2; # Set the width of a tab character.
softtabstop = 2; # Set the number of columns for a tab. softtabstop = 2; # Set the number of columns for a tab.
shiftwidth = 2; # Set the number of spaces for each step of (auto)indent. shiftwidth = 2; # Set the number of spaces for each step of (auto)indent.
expandtab = true; # Convert tabs to spaces. expandtab = true; # Convert tabs to spaces.
}; };
} }

9
config/plugins/cmp/cmp.nix
View file

@ -1,6 +1,4 @@
{ ... }: {...}: {
{
# Autocompletion plugin # Autocompletion plugin
plugins.cmp = { plugins.cmp = {
enable = true; enable = true;
@ -8,8 +6,8 @@
settings = { settings = {
# The sources to use # The sources to use
sources = [ sources = [
{ name = "nvim_lsp"; } # LSP source for cmp {name = "nvim_lsp";} # LSP source for cmp
{ name = "luasnip"; } # Snippets source for cmp {name = "luasnip";} # Snippets source for cmp
]; ];
# The snippet expansion function. # The snippet expansion function.
snippet.expand = '' snippet.expand = ''
@ -35,4 +33,3 @@
autoEnableSources = true; autoEnableSources = true;
}; };
} }

5
config/plugins/editor/bufdelete.nix
View file

@ -1,6 +1,4 @@
{ ... }: {...}: {
{
plugins.bufdelete = { plugins.bufdelete = {
enable = true; enable = true;
}; };
@ -20,4 +18,3 @@
} }
]; ];
} }

5
config/plugins/editor/comment.nix
View file

@ -1,6 +1,4 @@
{ ... }: {...}: {
{
plugins.comment = { plugins.comment = {
enable = true; enable = true;
settings = { settings = {
@ -30,4 +28,3 @@
}; };
}; };
} }

5
config/plugins/editor/neo-tree.nix
View file

@ -1,6 +1,4 @@
{ ... }: {...}: {
{
plugins.neo-tree = { plugins.neo-tree = {
enable = true; enable = true;
}; };
@ -14,4 +12,3 @@
} }
]; ];
} }

7
config/plugins/editor/treesitter.nix
View file

@ -1,13 +1,11 @@
{ pkgs, ... }: {pkgs, ...}: {
{
# Tree-sitter is a parser generator tool and an incremental parsing library. # Tree-sitter is a parser generator tool and an incremental parsing library.
plugins.treesitter = { plugins.treesitter = {
enable = true; enable = true;
# Options provided to the require('nvim-treesitter.configs').setup function. # Options provided to the require('nvim-treesitter.configs').setup function.
settings = { settings = {
highlight = { highlight = {
enable = true; # Enable syntax highlighing. enable = true; # Enable syntax highlighing.
}; };
indent = { indent = {
@ -21,4 +19,3 @@
grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars; grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars;
}; };
} }

5
config/plugins/git/fugitive.nix
View file

@ -1,8 +1,5 @@
{ ... }: {...}: {
{
plugins.fugitive = { plugins.fugitive = {
enable = true; enable = true;
}; };
} }

9
config/plugins/git/gitsigns.nix
View file

@ -1,13 +1,11 @@
{ ... }: {...}: {
{
plugins.gitsigns = { plugins.gitsigns = {
enable = true; enable = true;
}; };
keymaps = [ keymaps = [
{ {
mode = [ "n" "v" ]; mode = ["n" "v"];
key = "<leader>hs"; key = "<leader>hs";
action = "<cmd>Gitsigns stage_hunk<cr>"; action = "<cmd>Gitsigns stage_hunk<cr>";
options = { options = {
@ -17,7 +15,7 @@
} }
{ {
mode = [ "n" "v" ]; mode = ["n" "v"];
key = "<leader>hr"; key = "<leader>hr";
action = "<cmd>Gitsigns reset_hunk<cr>"; action = "<cmd>Gitsigns reset_hunk<cr>";
options = { options = {
@ -107,4 +105,3 @@
} }
]; ];
} }

5
config/plugins/git/lazygit.nix
View file

@ -1,6 +1,4 @@
{ ... }: {...}: {
{
plugins.lazygit = { plugins.lazygit = {
enable = true; enable = true;
}; };
@ -29,4 +27,3 @@
require("telescope").load_extension("lazygit") require("telescope").load_extension("lazygit")
''; '';
} }

6
config/plugins/lsp/conform.nix
View file

@ -1,6 +1,4 @@
{pkgs, ...}: {pkgs, ...}: {
{
plugins.conform-nvim = { plugins.conform-nvim = {
enable = true; enable = true;
@ -18,7 +16,7 @@
nix = ["alejandra"]; nix = ["alejandra"];
}; };
}; };
# Install our formatters. # Install our formatters.
extraPackages = with pkgs; [ extraPackages = with pkgs; [
alejandra alejandra

21
config/plugins/lsp/lsp.nix
View file

@ -1,6 +1,4 @@
{ ... }: {...}: {
{
plugins.lsp = { plugins.lsp = {
enable = true; # Enable neovim's built-in LSP. enable = true; # Enable neovim's built-in LSP.
@ -35,23 +33,22 @@
keymaps = { keymaps = {
# nvim-lsp keymaps should be silent # nvim-lsp keymaps should be silent
silent = true; silent = true;
# Configure keymaps for our diagnostics. # Configure keymaps for our diagnostics.
diagnostic = { diagnostic = {
"<leader>n" = "open_float"; # Show diagnostics in floating window. "<leader>n" = "open_float"; # Show diagnostics in floating window.
"<leader>o" = "goto_prev"; # Jump to previous diagnostic. "<leader>o" = "goto_prev"; # Jump to previous diagnostic.
"<leader>e" = "goto_next"; # Jump to next diagnostic. "<leader>e" = "goto_next"; # Jump to next diagnostic.
}; };
# Configure keymaps for our lspbuf. # Configure keymaps for our lspbuf.
lspBuf = { lspBuf = {
K = "hover"; # Displays hover information¹ K = "hover"; # Displays hover information¹
gr = "references"; # Lists all the references¹ gr = "references"; # Lists all the references¹
gd = "definition"; # Jumps to the definition¹ gd = "definition"; # Jumps to the definition¹
gD = "declaration"; # Jumps to the declaration¹ gD = "declaration"; # Jumps to the declaration¹
gi = "implementation"; # Lists all the implementations¹ gi = "implementation"; # Lists all the implementations¹
gt = "type_definition"; # Jumps to the definition of the type¹ gt = "type_definition"; # Jumps to the definition of the type¹
# ¹ for the symbol under the cursor # ¹ for the symbol under the cursor
}; };
}; };
}; };
} }

7
config/plugins/snippets/luasnip.nix
View file

@ -1,12 +1,9 @@
{ ... }: {...}: {
{
plugins.luasnip = { plugins.luasnip = {
enable = true; enable = true;
extraConfig = { extraConfig = {
enable_autosnippets = true; enable_autosnippets = true;
store_selection_keys = "<Tab>"; store_selection_keys = "<Tab>";
}; };
}; };
} }

7
config/plugins/themes/default.nix
View file

@ -1,10 +1,8 @@
{ pkgs, ... }: {pkgs, ...}: {
{
extraPlugins = with pkgs.vimPlugins; [ extraPlugins = with pkgs.vimPlugins; [
gruvbox-material gruvbox-material
]; ];
extraConfigLua = '' extraConfigLua = ''
vim.o.termguicolors = true vim.o.termguicolors = true
vim.g.gruvbox_material_background = 'hard' vim.g.gruvbox_material_background = 'hard'
@ -12,4 +10,3 @@
vim.cmd.colorscheme('gruvbox-material') vim.cmd.colorscheme('gruvbox-material')
''; '';
} }

42
config/plugins/ui/lualine.nix
View file

@ -1,6 +1,4 @@
{ ... }: {...}: {
{
plugins.lualine = { plugins.lualine = {
enable = true; enable = true;
globalstatus = true; globalstatus = true;
@ -12,14 +10,20 @@
]; ];
# Icons for our separators # Icons for our separators
componentSeparators = { left = ""; right = ""; }; componentSeparators = {
sectionSeparators = { left = ""; right = ""; }; left = "";
right = "";
};
sectionSeparators = {
left = "";
right = "";
};
# Display components in tabline # Display components in tabline
tabline = { tabline = {
lualine_a = [ { name = "buffers"; } ]; lualine_a = [{name = "buffers";}];
lualine_x = [ { name = "hostname"; } ]; lualine_x = [{name = "hostname";}];
lualine_z = [ { name = "encoding"; } ]; lualine_z = [{name = "encoding";}];
}; };
# Lualine has sections as shown below # Lualine has sections as shown below
@ -28,15 +32,19 @@
# +-------------------------------------------------+ # +-------------------------------------------------+
sections = { sections = {
# Section A # Section A
lualine_a = [ { name = "mode"; } ]; lualine_a = [{name = "mode";}];
# Section B # Section B
lualine_b = [ lualine_b = [
# Git branch # Git branch
{ name = "branch"; icon = ""; } {
name = "branch";
icon = "";
}
# Git diff status # Git diff status
{ name = "diff"; {
name = "diff";
extraConfig.symbols = { extraConfig.symbols = {
added = "+"; added = "+";
modified = "~"; modified = "~";
@ -46,14 +54,15 @@
]; ];
# Section C # Section C
lualine_c = [ { name = "filename"; } ]; lualine_c = [{name = "filename";}];
# Section X # Section X
lualine_x = [ lualine_x = [
# Diagnostic count from nvim_lsp # Diagnostic count from nvim_lsp
{ name = "diagnostics"; {
name = "diagnostics";
extraConfig = { extraConfig = {
sources = [ "nvim_lsp" ]; sources = ["nvim_lsp"];
symbols = { symbols = {
error = "error:"; error = "error:";
warn = "warning:"; warn = "warning:";
@ -65,11 +74,10 @@
]; ];
# Section Y # Section Y
lualine_y = [ { name = "progress"; } ]; lualine_y = [{name = "progress";}];
# Section Z # Section Z
lualine_z = [ { name = "location"; } ]; lualine_z = [{name = "location";}];
}; };
}; };
} }

5
config/plugins/utils/markdown-preview.nix
View file

@ -1,8 +1,5 @@
{ ... }: {...}: {
{
plugins.markdown-preview = { plugins.markdown-preview = {
enable = true; enable = true;
}; };
} }

25
config/plugins/utils/neoclip.nix
View file

@ -1,18 +1,17 @@
{ pkgs, ... }: {pkgs, ...}: {
extraPlugins = [
{ (pkgs.vimUtils.buildVimPlugin {
extraPlugins = [(pkgs.vimUtils.buildVimPlugin { name = "neoclip";
name = "neoclip"; src = pkgs.fetchFromGitHub {
src = pkgs.fetchFromGitHub { owner = "AckslD";
owner = "AckslD"; repo = "nvim-neoclip.lua";
repo = "nvim-neoclip.lua"; rev = "709c97f";
rev = "709c97f"; hash = "sha256-8ZPmxVM4dzjJxAYUHRMCiAQBxZEGHtsgSCNlCZBRBWo=";
hash = "sha256-8ZPmxVM4dzjJxAYUHRMCiAQBxZEGHtsgSCNlCZBRBWo="; };
}; })
})]; ];
extraConfigLua = "require('neoclip').setup({ extraConfigLua = "require('neoclip').setup({
default_register = {'\"', '+'} default_register = {'\"', '+'}
})"; })";
} }

25
config/plugins/utils/software-licenses.nix
View file

@ -1,14 +1,13 @@
{ pkgs, ... }: {pkgs, ...}: {
extraPlugins = [
{ (pkgs.vimUtils.buildVimPlugin {
extraPlugins = [(pkgs.vimUtils.buildVimPlugin { name = "software-licenses";
name = "software-licenses"; src = pkgs.fetchFromGitHub {
src = pkgs.fetchFromGitHub { owner = "chip";
owner = "chip"; repo = "telescope-software-licenses.nvim";
repo = "telescope-software-licenses.nvim"; rev = "fb5fc33";
rev = "fb5fc33"; hash = "sha256-luyCjkZSm1F6qoRpP5hHRAx4632u6JFuX2s7m2s8y60=";
hash = "sha256-luyCjkZSm1F6qoRpP5hHRAx4632u6JFuX2s7m2s8y60="; };
}; })
})]; ];
} }

7
config/plugins/utils/telescope.nix
View file

@ -1,8 +1,6 @@
{ ... }: {...}: {
{
imports = [ imports = [
./neoclip.nix # Persistent clipboard. ./neoclip.nix # Persistent clipboard.
./software-licenses.nix # View common software licenses. ./software-licenses.nix # View common software licenses.
]; ];
@ -99,4 +97,3 @@
}; };
}; };
} }

7
config/plugins/utils/whichkey.nix
View file

@ -1,6 +1,4 @@
{ ... }: {...}: {
{
plugins.which-key = { plugins.which-key = {
enable = true; enable = true;
}; };
@ -53,7 +51,7 @@
} }
{ {
mode = [ "n" "v" ]; mode = ["n" "v"];
key = "<leader>c"; key = "<leader>c";
action = "<Nop>"; action = "<Nop>";
options = { options = {
@ -80,4 +78,3 @@
} }
]; ];
} }

59
flake.nix
View file

@ -7,9 +7,12 @@
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
}; };
outputs = outputs = {
{ nixvim, flake-parts, ... }@inputs: nixvim,
flake-parts.lib.mkFlake { inherit inputs; } { flake-parts,
...
} @ inputs:
flake-parts.lib.mkFlake {inherit inputs;} {
systems = [ systems = [
"x86_64-linux" "x86_64-linux"
"aarch64-linux" "aarch64-linux"
@ -17,32 +20,32 @@
"aarch64-darwin" "aarch64-darwin"
]; ];
perSystem = perSystem = {
{ pkgs, system, ... }: pkgs,
let system,
nixvimLib = nixvim.lib.${system}; ...
nixvim' = nixvim.legacyPackages.${system}; }: let
nixvimModule = { nixvimLib = nixvim.lib.${system};
inherit pkgs; nixvim' = nixvim.legacyPackages.${system};
module = import ./config; # import the module directly nixvimModule = {
# You can use `extraSpecialArgs` to pass additional arguments to your module files inherit pkgs;
extraSpecialArgs = { module = import ./config; # import the module directly
# inherit (inputs) foo; # You can use `extraSpecialArgs` to pass additional arguments to your module files
}; extraSpecialArgs = {
}; # inherit (inputs) foo;
nvim = nixvim'.makeNixvimWithModule nixvimModule;
in
{
checks = {
# Run `nix flake check .` to verify that your config is not broken
default = nixvimLib.check.mkTestDerivationFromNixvimModule nixvimModule;
};
packages = {
# Lets you run `nix run .` to start nixvim
default = nvim;
}; };
}; };
nvim = nixvim'.makeNixvimWithModule nixvimModule;
in {
checks = {
# Run `nix flake check .` to verify that your config is not broken
default = nixvimLib.check.mkTestDerivationFromNixvimModule nixvimModule;
};
packages = {
# Lets you run `nix run .` to start nixvim
default = nvim;
};
};
}; };
} }