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

Use and format with nixfmt-rfc-style

Browse source
This commit is contained in:
Oliver Davies 2024-05-15 19:53:51 +01:00
parent b4809f12a2
commit e7bcf62062
2 changed files with 38 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
flake.nix
View file

@ -4,7 +4,8 @@
nixpkgs-2305.url = "github:NixOS/nixpkgs/nixos-23.05"; nixpkgs-2305.url = "github:NixOS/nixpkgs/nixos-23.05";
}; };
outputs = { nixpkgs, self, ... }@inputs: outputs =
{ nixpkgs, self, ... }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
@ -16,14 +17,16 @@
default = mkVimPlugin { inherit system; }; default = mkVimPlugin { inherit system; };
neovim = mkNeovim { inherit system; }; neovim = mkNeovim { inherit system; };
in { in
{
inherit lib; inherit lib;
devShells.${system}.default = devShells.${system}.default = mkShell { buildInputs = with pkgs; [ just ]; };
mkShell { buildInputs = with pkgs; [ just ]; };
formatter.${system} = pkgs.nixfmt; formatter.${system} = pkgs.nixfmt-rfc-style;
packages.${system} = { inherit default neovim; }; packages.${system} = {
inherit default neovim;
};
}; };
} }

45
lib/default.nix
View file

@ -1,14 +1,18 @@
{ inputs, self }: { inputs, self }:
let inherit (inputs.nixpkgs) legacyPackages; let
in rec { inherit (inputs.nixpkgs) legacyPackages;
mkVimPlugin = { system }: in
rec {
mkVimPlugin =
{ system }:
let let
inherit (pkgs) vimUtils; inherit (pkgs) vimUtils;
inherit (vimUtils) buildVimPlugin; inherit (vimUtils) buildVimPlugin;
pkgs = legacyPackages.${system}; pkgs = legacyPackages.${system};
in buildVimPlugin { in
buildVimPlugin {
name = "opdavies"; name = "opdavies";
postInstall = '' postInstall = ''
rm -rf $out/.envrc rm -rf $out/.envrc
@ -26,7 +30,8 @@ in rec {
src = ../.; src = ../.;
}; };
mkNeovimPlugins = { system }: mkNeovimPlugins =
{ system }:
let let
inherit (pkgs) vimPlugins; inherit (pkgs) vimPlugins;
inherit (pkgs.vimUtils) buildVimPlugin; inherit (pkgs.vimUtils) buildVimPlugin;
@ -42,7 +47,8 @@ in rec {
pkgs2305 = inputs.nixpkgs-2305.legacyPackages.${system}; pkgs2305 = inputs.nixpkgs-2305.legacyPackages.${system};
opdavies-nvim = mkVimPlugin { inherit system; }; opdavies-nvim = mkVimPlugin { inherit system; };
in [ in
[
vimPlugins.nvim-tmux-navigation vimPlugins.nvim-tmux-navigation
vimPlugins.tabline-vim vimPlugins.tabline-vim
vimPlugins.vim-caser vimPlugins.vim-caser
@ -184,7 +190,8 @@ in rec {
opdavies-nvim opdavies-nvim
]; ];
mkExtraPackages = { system }: mkExtraPackages =
{ system }:
let let
inherit (pkgs) nodePackages lua54Packages php82Packages; inherit (pkgs) nodePackages lua54Packages php82Packages;
@ -195,7 +202,8 @@ in rec {
}; };
inherit (pkgs) hadolint; inherit (pkgs) hadolint;
in [ in
[
# Languages # Languages
nodePackages.typescript nodePackages.typescript
pkgs.nodejs-slim pkgs.nodejs-slim
@ -224,7 +232,7 @@ in rec {
pkgs.alejandra pkgs.alejandra
pkgs.black pkgs.black
pkgs.eslint_d pkgs.eslint_d
pkgs.nixfmt pkgs.nixfmt-rfc-style
pkgs.nodePackages.prettier pkgs.nodePackages.prettier
pkgs.stylua pkgs.stylua
pkgs.yamlfmt pkgs.yamlfmt
@ -247,28 +255,33 @@ in rec {
EOF EOF
''; '';
mkNeovim = { system }: mkNeovim =
{ system }:
let let
inherit (pkgs) lib neovim; inherit (pkgs) lib neovim;
extraPackages = mkExtraPackages { inherit system; }; extraPackages = mkExtraPackages { inherit system; };
pkgs = legacyPackages.${system}; pkgs = legacyPackages.${system};
start = mkNeovimPlugins { inherit system; }; start = mkNeovimPlugins { inherit system; };
in neovim.override { in
neovim.override {
configure = { configure = {
customRC = mkExtraConfig; customRC = mkExtraConfig;
packages.main = { inherit start; }; packages.main = {
inherit start;
};
}; };
extraMakeWrapperArgs = extraMakeWrapperArgs = ''--suffix PATH : "${lib.makeBinPath extraPackages}"'';
''--suffix PATH : "${lib.makeBinPath extraPackages}"'';
}; };
mkHomeManager = { system }: mkHomeManager =
{ system }:
let let
extraConfig = mkExtraConfig; extraConfig = mkExtraConfig;
extraPackages = mkExtraPackages { inherit system; }; extraPackages = mkExtraPackages { inherit system; };
plugins = mkNeovimPlugins { inherit system; }; plugins = mkNeovimPlugins { inherit system; };
in { in
{
inherit extraConfig extraPackages plugins; inherit extraConfig extraPackages plugins;
enable = true; enable = true;