fmt: alejandra

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
# Tree-sitter is a parser generator tool and an incremental parsing library.
plugins.treesitter = {
enable = true;
@ -21,4 +19,3 @@
grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars;
};
}

View file

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

View file

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

View file

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

View file

@ -1,6 +1,4 @@
{pkgs, ...}:
{
{pkgs, ...}: {
plugins.conform-nvim = {
enable = true;

View file

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

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
plugins.luasnip = {
enable = true;
extraConfig = {
@ -9,4 +7,3 @@
};
};
}

View file

@ -1,6 +1,4 @@
{ pkgs, ... }:
{
{pkgs, ...}: {
extraPlugins = with pkgs.vimPlugins; [
gruvbox-material
];
@ -12,4 +10,3 @@
vim.cmd.colorscheme('gruvbox-material')
'';
}

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -7,9 +7,12 @@
flake-parts.url = "github:hercules-ci/flake-parts";
};
outputs =
{ nixvim, flake-parts, ... }@inputs:
flake-parts.lib.mkFlake { inherit inputs; } {
outputs = {
nixvim,
flake-parts,
...
} @ inputs:
flake-parts.lib.mkFlake {inherit inputs;} {
systems = [
"x86_64-linux"
"aarch64-linux"
@ -17,32 +20,32 @@
"aarch64-darwin"
];
perSystem =
{ pkgs, system, ... }:
let
nixvimLib = nixvim.lib.${system};
nixvim' = nixvim.legacyPackages.${system};
nixvimModule = {
inherit pkgs;
module = import ./config; # import the module directly
# 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;
perSystem = {
pkgs,
system,
...
}: let
nixvimLib = nixvim.lib.${system};
nixvim' = nixvim.legacyPackages.${system};
nixvimModule = {
inherit pkgs;
module = import ./config; # import the module directly
# 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;
};
};
};
}