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

Format with nixfmt

Browse source
This commit is contained in:
Oliver Davies 2024-03-18 20:34:42 +00:00
parent 72dac789ef
commit 1b819937f7
2 changed files with 262 additions and 270 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
flake.nix
View file

@ -7,34 +7,23 @@
nixd-nightly.url = "github:nix-community/nixd"; nixd-nightly.url = "github:nix-community/nixd";
}; };
outputs = inputs @ { outputs = inputs@{ self, flake-parts, ... }:
self, flake-parts.lib.mkFlake { inherit inputs; } {
flake-parts, flake = { lib = import ./lib { inherit inputs; }; };
...
}:
flake-parts.lib.mkFlake {inherit inputs;} {
flake = {
lib = import ./lib {inherit inputs;};
};
systems = ["x86_64-linux"]; systems = [ "x86_64-linux" ];
perSystem = { perSystem = { pkgs, self', system, ... }:
pkgs, let
self', default = self.lib.mkVimPlugin { inherit system; };
system, neovim = self.lib.mkNeovim { inherit system; };
...
}: let
default = self.lib.mkVimPlugin {inherit system;};
neovim = self.lib.mkNeovim {inherit system;};
in { in {
devShells.default = pkgs.mkShell { devShells.default =
nativeBuildInputs = [pkgs.just]; pkgs.mkShell { nativeBuildInputs = [ pkgs.just pkgs.nixfmt ]; };
};
packages = {inherit default neovim;}; packages = { inherit default neovim; };
formatter = pkgs.alejandra; formatter = pkgs.nixfmt;
}; };
}; };
} }

43
lib/default.nix
View file

@ -1,13 +1,13 @@
{inputs}: let { inputs }:
inherit (inputs.nixpkgs) legacyPackages; let inherit (inputs.nixpkgs) legacyPackages;
in rec { in rec {
mkVimPlugin = {system}: let mkVimPlugin = { system }:
let
inherit (pkgs) vimUtils; inherit (pkgs) vimUtils;
inherit (vimUtils) buildVimPlugin; inherit (vimUtils) buildVimPlugin;
pkgs = legacyPackages.${system}; pkgs = legacyPackages.${system};
in in buildVimPlugin {
buildVimPlugin {
name = "opdavies"; name = "opdavies";
postInstall = '' postInstall = ''
rm -rf $out/.envrc rm -rf $out/.envrc
@ -24,7 +24,8 @@ in rec {
src = ../.; src = ../.;
}; };
mkNeovimPlugins = {system}: let mkNeovimPlugins = { system }:
let
inherit (pkgs) php82Packages vimPlugins; inherit (pkgs) php82Packages vimPlugins;
inherit (pkgs.vimUtils) buildVimPlugin; inherit (pkgs.vimUtils) buildVimPlugin;
@ -98,7 +99,7 @@ in rec {
}; };
}; };
opdavies-nvim = mkVimPlugin {inherit system;}; opdavies-nvim = mkVimPlugin { inherit system; };
in [ in [
customVim.nvim-tmux-navigation customVim.nvim-tmux-navigation
customVim.tabline-vim customVim.tabline-vim
@ -164,8 +165,7 @@ in rec {
vimPlugins.nvim-dap-virtual-text vimPlugins.nvim-dap-virtual-text
# Treesitter # Treesitter
(vimPlugins.nvim-treesitter.withPlugins (vimPlugins.nvim-treesitter.withPlugins (p: [
(p: [
p.bash p.bash
p.comment p.comment
p.css p.css
@ -256,7 +256,8 @@ in rec {
opdavies-nvim opdavies-nvim
]; ];
mkExtraPackages = {system}: let mkExtraPackages = { system }:
let
inherit (inputs) nixd-nightly; inherit (inputs) nixd-nightly;
inherit (pkgs) nodePackages lua54Packages php82Packages; inherit (pkgs) nodePackages lua54Packages php82Packages;
@ -311,25 +312,27 @@ in rec {
EOF EOF
''; '';
mkNeovim = {system}: let mkNeovim = { system }:
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 in neovim.override {
neovim.override {
configure = { configure = {
customRC = mkExtraConfig; customRC = mkExtraConfig;
packages.main = {inherit start;}; packages.main = { inherit start; };
}; };
extraMakeWrapperArgs = ''--suffix PATH : "${lib.makeBinPath extraPackages}"''; extraMakeWrapperArgs =
''--suffix PATH : "${lib.makeBinPath extraPackages}"'';
}; };
mkHomeManager = {system}: let mkHomeManager = { system }:
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;