jalil/configuration.nix
1
1
Fork 0
Code Issues 2 Pull requests 3 Projects Activity Actions

fix: Format according to nixfmt-rfc-style

Browse source
This commit is contained in:
Jalil David Salamé Messina 2024-04-05 11:55:35 +02:00
parent e3e96bbf40
commit ce37942672
Signed by: jalil
GPG key ID: F016B9E770737A0B
24 changed files with 606 additions and 302 deletions
Download patch file Download diff file Expand all files Collapse all files

7
nvim/default.nix
View file

@ -1,7 +1,6 @@
{ pkgs, ... } @ opts: {
imports = [
./options.nix
];
{ pkgs, ... }@opts:
{
imports = [ ./options.nix ];
config.programs.nixvim = (import ./nixvim.nix opts).config;
}

15
nvim/nixvim.nix
View file

@ -1,4 +1,9 @@
{ pkgs, lib, config, ... } @ args:
{
pkgs,
lib,
config,
...
}@args:
let
cfg = config.jhome.nvim;
hmAvailable = args ? hmConfig;
@ -8,9 +13,7 @@ let
notStandalone = hmAvailable || nixosAvailable || darwinAvailable;
in
{
imports = [
./options.nix
];
imports = [ ./options.nix ];
config = lib.mkMerge [
(lib.optionalAttrs canSetAsDefault { defaultEditor = lib.mkDefault true; })
@ -49,9 +52,7 @@ in
plugins = import ./plugins.nix { inherit lib; };
keymaps = import ./mappings.nix;
inherit (import ./augroups.nix) autoGroups autoCmd;
extraPlugins = with pkgs.vimPlugins; [
nvim-web-devicons
];
extraPlugins = with pkgs.vimPlugins; [ nvim-web-devicons ];
# Formatting
extraPackages = with pkgs; [
stylua

8
nvim/options.nix
View file

@ -1,3 +1,7 @@
{ lib, ... }: {
options.jhome.nvim.enable = lib.mkEnableOption "jalil's neovim configuration" // { default = true; example = false; };
{ lib, ... }:
{
options.jhome.nvim.enable = lib.mkEnableOption "jalil's neovim configuration" // {
default = true;
example = false;
};
}

82
nvim/plugins.nix
View file

@ -1,4 +1,5 @@
{ lib }: {
{ lib }:
{
bacon = {
enable = true;
settings.quickfix.enabled = true;
@ -8,11 +9,17 @@
cmdline = {
"/" = {
mapping.__raw = "cmp.mapping.preset.cmdline()";
sources = [{ name = "rg"; } { name = "buffer"; }];
sources = [
{ name = "rg"; }
{ name = "buffer"; }
];
};
":" = {
mapping.__raw = "cmp.mapping.preset.cmdline()";
sources = [{ name = "path"; } { name = "cmdline"; }];
sources = [
{ name = "path"; }
{ name = "cmdline"; }
];
};
};
settings = {
@ -20,18 +27,54 @@
snippet.expand = "function(args) require('luasnip').lsp_expand(args.body) end";
# Completion Sources
sources = [
{ name = "buffer"; groupIndex = 3; }
{ name = "calc"; groupIndex = 2; }
{ name = "conventionalcommits"; groupIndex = 1; }
{ name = "crates"; groupIndex = 1; }
{ name = "luasnip"; groupIndex = 1; }
{ name = "nvim_lsp"; groupIndex = 1; }
{ name = "nvim_lsp_document_symbol"; groupIndex = 1; }
{ name = "nvim_lsp_signature_help"; groupIndex = 1; }
{ name = "path"; groupIndex = 2; }
{ name = "spell"; groupIndex = 2; }
{ name = "treesitter"; groupIndex = 2; }
{ name = "zsh"; groupIndex = 1; }
{
name = "buffer";
groupIndex = 3;
}
{
name = "calc";
groupIndex = 2;
}
{
name = "conventionalcommits";
groupIndex = 1;
}
{
name = "crates";
groupIndex = 1;
}
{
name = "luasnip";
groupIndex = 1;
}
{
name = "nvim_lsp";
groupIndex = 1;
}
{
name = "nvim_lsp_document_symbol";
groupIndex = 1;
}
{
name = "nvim_lsp_signature_help";
groupIndex = 1;
}
{
name = "path";
groupIndex = 2;
}
{
name = "spell";
groupIndex = 2;
}
{
name = "treesitter";
groupIndex = 2;
}
{
name = "zsh";
groupIndex = 1;
}
];
mapping.__raw = ''
cmp.mapping.preset.insert({
@ -116,7 +159,9 @@
};
luasnip = {
enable = true;
extraConfig = { update_events = "TextChanged,TextChangedI"; };
extraConfig = {
update_events = "TextChanged,TextChangedI";
};
};
noice = {
enable = true;
@ -162,7 +207,10 @@
enable = true;
lintersByFt = {
rust = [ "typos" ];
latex = [ "chktex" "typos" ];
latex = [
"chktex"
"typos"
];
markdown = [ "typos" ];
};
};