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,6 +1,4 @@
{ ... }:
{
{...}: {
config.opts = {
# General
number = true; # Display line numbers.
@ -15,4 +13,3 @@
expandtab = true; # Convert tabs to spaces.
};
}

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
# Autocompletion plugin
plugins.cmp = {
enable = true;
@ -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,6 +1,4 @@
{ ... }:
{
{...}: {
plugins.gitsigns = {
enable = true;
};
@ -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.
@ -54,4 +52,3 @@
};
};
}

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,8 +10,14 @@
];
# Icons for our separators
componentSeparators = { left = ""; right = ""; };
sectionSeparators = { left = ""; right = ""; };
componentSeparators = {
left = "";
right = "";
};
sectionSeparators = {
left = "";
right = "";
};
# Display components in tabline
tabline = {
@ -33,10 +37,14 @@
# Section B
lualine_b = [
# Git branch
{ name = "branch"; icon = ""; }
{
name = "branch";
icon = "";
}
# Git diff status
{ name = "diff";
{
name = "diff";
extraConfig.symbols = {
added = "+";
modified = "~";
@ -51,7 +59,8 @@
# Section X
lualine_x = [
# Diagnostic count from nvim_lsp
{ name = "diagnostics";
{
name = "diagnostics";
extraConfig = {
sources = ["nvim_lsp"];
symbols = {
@ -72,4 +81,3 @@
};
};
}

View file

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

View file

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

View file

@ -1,7 +1,6 @@
{ pkgs, ... }:
{
extraPlugins = [(pkgs.vimUtils.buildVimPlugin {
{pkgs, ...}: {
extraPlugins = [
(pkgs.vimUtils.buildVimPlugin {
name = "software-licenses";
src = pkgs.fetchFromGitHub {
owner = "chip";
@ -9,6 +8,6 @@
rev = "fb5fc33";
hash = "sha256-luyCjkZSm1F6qoRpP5hHRAx4632u6JFuX2s7m2s8y60=";
};
})];
})
];
}

View file

@ -1,6 +1,4 @@
{ ... }:
{
{...}: {
imports = [
./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;
};
@ -80,4 +78,3 @@
}
];
}

View file

@ -7,8 +7,11 @@
flake-parts.url = "github:hercules-ci/flake-parts";
};
outputs =
{ nixvim, flake-parts, ... }@inputs:
outputs = {
nixvim,
flake-parts,
...
} @ inputs:
flake-parts.lib.mkFlake {inherit inputs;} {
systems = [
"x86_64-linux"
@ -17,9 +20,11 @@
"aarch64-darwin"
];
perSystem =
{ pkgs, system, ... }:
let
perSystem = {
pkgs,
system,
...
}: let
nixvimLib = nixvim.lib.${system};
nixvim' = nixvim.legacyPackages.${system};
nixvimModule = {
@ -31,8 +36,7 @@
};
};
nvim = nixvim'.makeNixvimWithModule nixvimModule;
in
{
in {
checks = {
# Run `nix flake check .` to verify that your config is not broken
default = nixvimLib.check.mkTestDerivationFromNixvimModule nixvimModule;
@ -45,4 +49,3 @@
};
};
}