opdavies/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Refactor vim plugins overlay

Browse source 
Add overlays for additions, modifications and unstable packages, and
move each additional plugin into its own additional package.
This commit is contained in:
Oliver Davies 2024-11-05 12:00:00 +00:00
parent cd25bf96e9
commit 4f9073757c
18 changed files with 188 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
flake.nix
View file

@ -19,6 +19,8 @@
...
}@inputs:
let
inherit (self) outputs;
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
@ -27,13 +29,21 @@
mkNixos = import ./lib/nixos {
inherit
inputs
outputs
nixos-hardware
pkgs
self
username
;
};
mkWsl = import ./lib/wsl2 { inherit inputs self username; };
mkWsl = import ./lib/wsl2 {
inherit
inputs
outputs
self
username
;
};
inherit (pkgs) mkShell;
inherit (pkgs.vimUtils) buildVimPlugin;
@ -50,6 +60,8 @@
formatter.${system} = pkgs.nixfmt-rfc-style;
overlays = import ./overlays { inherit inputs; };
nixosConfigurations = {
lemp11 = mkNixos {
desktop = true;

7
lib/nixos/configuration.nix
View file

@ -1,5 +1,6 @@
{
inputs,
outputs,
desktop ? false,
hostname,
self,
@ -18,7 +19,11 @@ in
permittedInsecurePackages = [ "electron-27.3.11" ];
};
overlays = [ (import "${self}/overlays/vim-plugins-overlay.nix") ];
overlays = [
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.unstable-packages
];
};
nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];

2
lib/nixos/default.nix
View file

@ -1,5 +1,6 @@
{
inputs,
outputs,
nixos-hardware,
pkgs,
self,
@ -12,6 +13,7 @@
let
configuration = import ./configuration.nix {
inherit
outputs
desktop
hostname
inputs

7
lib/wsl2/default.nix
View file

@ -1,5 +1,6 @@
{
inputs,
outputs,
self,
username,
}:
@ -9,7 +10,11 @@ let
inherit (pkgs) lib;
pkgs = import inputs.nixpkgs {
overlays = [ (import "${self}/overlays/vim-plugins-overlay.nix") ];
overlays = [
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.unstable-packages
];
};
shared-config = import "${self}/lib/shared/home-manager.nix" {

20
overlays/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ inputs, ... }:
{
additions =
final: prev:
import ../pkgs {
inherit prev;
pkgs = final;
};
modifications = final: prev: { };
unstable-packages = final: _prev: {
unstable = import inputs.nixpkgs-unstable {
config.allowUnfree = true;
system = final.system;
};
};
}

130
overlays/vim-plugins-overlay.nix
View file

@ -1,130 +0,0 @@
final: prev:
let
inherit (final) fetchFromGitHub;
inherit (final.vimUtils) buildVimPlugin;
in
{
vimPlugins = prev.vimPlugins // {
conf-vim = buildVimPlugin {
name = "conf-vim";
src = fetchFromGitHub {
owner = "tjdevries";
repo = "conf.vim";
rev = "master";
sha256 = "AjiTJsoim0BAnyfqk1IQzNsa6jhFM2+A66E7q9sJqz0=";
};
};
edit-alternate-vim = buildVimPlugin {
name = "edit-alternate-vim";
src = fetchFromGitHub {
owner = "tjdevries";
repo = "edit_alternate.vim";
rev = "master";
sha256 = "mEKnqYAhgrdxPRoKf4S4yYecdFIHGg8bDxpqPuC1+S4=";
};
};
nvim-tmux-navigation = buildVimPlugin {
name = "nvim-tmux-navigation";
src = fetchFromGitHub {
owner = "alexghergh";
repo = "nvim-tmux-navigation";
rev = "4898c98702954439233fdaf764c39636681e2861";
sha256 = "sha256-CxAgQSbOrg/SsQXupwCv8cyZXIB7tkWO+Y6FDtoR8xk=";
};
};
standard-vim = buildVimPlugin {
name = "standard-vim";
src = fetchFromGitHub {
owner = "tjdevries";
repo = "standard.vim";
rev = "master";
sha256 = "9VwkvV1Dv6cE4uDkPp36DozjWJOclDR883yDMYw000E=";
};
};
vim-autoread = buildVimPlugin {
name = "vim-autoread";
src = fetchFromGitHub {
owner = "djoshea";
repo = "vim-autoread";
rev = "24061f84652d768bfb85d222c88580b3af138dab";
sha256 = "fSADjNt1V9jgAPjxggbh7Nogcxyisi18KaVve8j+c3w=";
};
};
vim-textobj-indent = buildVimPlugin {
name = "vim-textobj-indent";
src = fetchFromGitHub {
owner = "kana";
repo = "vim-textobj-indent";
rev = "deb76867c302f933c8f21753806cbf2d8461b548";
sha256 = "oFzUPG+IOkbKZ2gU/kduQ3G/LsLDlEjFhRP0BHBE+1Q=";
};
};
toggle-checkbox-nvim = buildVimPlugin {
name = "toggle-checkbox-nvim";
src = fetchFromGitHub {
owner = "opdavies";
repo = "toggle-checkbox.nvim";
rev = "main";
sha256 = "4YSEagQnLK5MBl2z53e6sOBlCDm220GYVlc6A+HNywg=";
};
};
vim-heritage = buildVimPlugin {
name = "vim-heritage";
src = fetchFromGitHub {
owner = "jessarcher";
repo = "vim-heritage";
rev = "cffa05c78c0991c998adc4504d761b3068547db6";
sha256 = "Lebe5V1XFxn4kSZ+ImZ69Vst9Nbc0N7eA9IzOCijFS0=";
};
};
vim-textobj-xmlattr = buildVimPlugin {
name = "vim-textobj-xmlattr";
src = fetchFromGitHub {
owner = "whatyouhide";
repo = "vim-textobj-xmlattr";
rev = "694a297f1d75fd527e87da9769f3c6519a87ebb1";
sha256 = "+91FVP95oh00flINdltqx6qJuijYo56tHIh3J098G2Q=";
};
};
tabline-vim = buildVimPlugin {
name = "tabline-vim";
src = fetchFromGitHub {
owner = "mkitt";
repo = "tabline.vim";
rev = "69c9698a3240860adaba93615f44778a9ab724b4";
sha256 = "51b8PxyKqBdeIvmmZyF2hpMBjkyrlZDdTB1opr5JZ7Y=";
};
};
vim-caser = buildVimPlugin {
name = "vim-caser";
src = fetchFromGitHub {
owner = "arthurxavierx";
repo = "vim-caser";
rev = "6bc9f41d170711c58e0157d882a5fe8c30f34bf6";
sha256 = "PXAY01O/cHvAdWx3V/pyWFeiV5qJGvLcAKhl5DQc0Ps=";
};
};
vim-zoom = buildVimPlugin {
name = "vim-zoom";
src = fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-zoom";
rev = "01c737005312c09e0449d6518decf8cedfee32c7";
sha256 = "/ADzScsG0u6RJbEtfO23Gup2NYdhPkExqqOPVcQa7aQ=";
};
};
};
}

20
pkgs/default.nix Normal file
View file

@ -0,0 +1,20 @@
{ pkgs, prev, ... }:
let
inherit (pkgs) callPackage;
in
{
vimPlugins = prev.vimPlugins // {
conf-vim = callPackage ./vim-plugins/conf-vim.nix { };
edit-alternate-vim = callPackage ./vim-plugins/edit-alternate-vim.nix { };
nvim-tmux-navigation = callPackage ./vim-plugins/nvim-tmux-navigation.nix { };
standard-vim = callPackage ./vim-plugins/standard-vim.nix { };
tabline-vim = callPackage ./vim-plugins/tabline-vim.nix { };
vim-autoread = callPackage ./vim-plugins/vim-autoread.nix { };
vim-caser = callPackage ./vim-plugins/vim-caser.nix { };
vim-heritage = callPackage ./vim-plugins/vim-heritage.nix { };
vim-textobj-indent = callPackage ./vim-plugins/vim-textobj-indent.nix { };
vim-textobj-xmlattr = callPackage ./vim-plugins/vim-textobj-xmlattr.nix { };
vim-zoom = callPackage ./vim-plugins/vim-zoom.nix { };
};
}

11
pkgs/vim-plugins/conf-vim.nix Normal file
View file

@ -0,0 +1,11 @@
{ pkgs, ... }:
pkgs.vimUtils.buildVimPlugin {
name = "conf-vim";
src = pkgs.fetchFromGitHub {
owner = "tjdevries";
repo = "conf.vim";
rev = "master";
sha256 = "AjiTJsoim0BAnyfqk1IQzNsa6jhFM2+A66E7q9sJqz0=";
};
}

11
pkgs/vim-plugins/edit-alternate-vim.nix Normal file
View file

@ -0,0 +1,11 @@
{ pkgs, ... }:
pkgs.vimUtils.buildVimPlugin {
name = "edit-alternate-vim";
src = pkgs.fetchFromGitHub {
owner = "tjdevries";
repo = "edit_alternate.vim";
rev = "master";
sha256 = "mEKnqYAhgrdxPRoKf4S4yYecdFIHGg8bDxpqPuC1+S4=";
};
}

11
pkgs/vim-plugins/nvim-tmux-navigation.nix Normal file
View file

@ -0,0 +1,11 @@
{ pkgs, ... }:
pkgs.vimUtils.buildVimPlugin {
name = "nvim-tmux-navigation";
src = pkgs.fetchFromGitHub {
owner = "alexghergh";
repo = "nvim-tmux-navigation";
rev = "4898c98702954439233fdaf764c39636681e2861";
sha256 = "sha256-CxAgQSbOrg/SsQXupwCv8cyZXIB7tkWO+Y6FDtoR8xk=";
};
}

11
pkgs/vim-plugins/standard-vim.nix Normal file
View file

@ -0,0 +1,11 @@
{ pkgs, ... }:
pkgs.vimUtils.buildVimPlugin {
name = "standard-vim";
src = pkgs.fetchFromGitHub {
owner = "tjdevries";
repo = "standard.vim";
rev = "master";
sha256 = "9VwkvV1Dv6cE4uDkPp36DozjWJOclDR883yDMYw000E=";
};
}

11
pkgs/vim-plugins/tabline-vim.nix Normal file
View file

@ -0,0 +1,11 @@
{ pkgs, ... }:
pkgs.vimUtils.buildVimPlugin {
name = "tabline-vim";
src = pkgs.fetchFromGitHub {
owner = "mkitt";
repo = "tabline.vim";
rev = "69c9698a3240860adaba93615f44778a9ab724b4";
sha256 = "51b8PxyKqBdeIvmmZyF2hpMBjkyrlZDdTB1opr5JZ7Y=";
};
}

11
pkgs/vim-plugins/vim-autoread.nix Normal file
View file

@ -0,0 +1,11 @@
{ pkgs, ... }:
pkgs.vimUtils.buildVimPlugin {
name = "vim-autoread";
src = pkgs.fetchFromGitHub {
owner = "djoshea";
repo = "vim-autoread";
rev = "24061f84652d768bfb85d222c88580b3af138dab";
sha256 = "fSADjNt1V9jgAPjxggbh7Nogcxyisi18KaVve8j+c3w=";
};
}

11
pkgs/vim-plugins/vim-caser.nix Normal file
View file

@ -0,0 +1,11 @@
{ pkgs, ... }:
pkgs.vimUtils.buildVimPlugin {
name = "vim-caser";
src = pkgs.fetchFromGitHub {
owner = "arthurxavierx";
repo = "vim-caser";
rev = "6bc9f41d170711c58e0157d882a5fe8c30f34bf6";
sha256 = "PXAY01O/cHvAdWx3V/pyWFeiV5qJGvLcAKhl5DQc0Ps=";
};
}

11
pkgs/vim-plugins/vim-heritage.nix Normal file
View file

@ -0,0 +1,11 @@
{ pkgs, ... }:
pkgs.vimUtils.buildVimPlugin {
name = "vim-heritage";
src = pkgs.fetchFromGitHub {
owner = "jessarcher";
repo = "vim-heritage";
rev = "cffa05c78c0991c998adc4504d761b3068547db6";
sha256 = "Lebe5V1XFxn4kSZ+ImZ69Vst9Nbc0N7eA9IzOCijFS0=";
};
}

11
pkgs/vim-plugins/vim-textobj-indent.nix Normal file
View file

@ -0,0 +1,11 @@
{ pkgs, ... }:
pkgs.vimUtils.buildVimPlugin {
name = "vim-textobj-indent";
src = pkgs.fetchFromGitHub {
owner = "kana";
repo = "vim-textobj-indent";
rev = "deb76867c302f933c8f21753806cbf2d8461b548";
sha256 = "oFzUPG+IOkbKZ2gU/kduQ3G/LsLDlEjFhRP0BHBE+1Q=";
};
}

11
pkgs/vim-plugins/vim-textobj-xmlattr.nix Normal file
View file

@ -0,0 +1,11 @@
{ pkgs, ... }:
pkgs.vimUtils.buildVimPlugin {
name = "vim-textobj-xmlattr";
src = pkgs.fetchFromGitHub {
owner = "whatyouhide";
repo = "vim-textobj-xmlattr";
rev = "694a297f1d75fd527e87da9769f3c6519a87ebb1";
sha256 = "+91FVP95oh00flINdltqx6qJuijYo56tHIh3J098G2Q=";
};
}

11
pkgs/vim-plugins/vim-zoom.nix Normal file
View file

@ -0,0 +1,11 @@
{ pkgs, ... }:
pkgs.vimUtils.buildVimPlugin {
name = "vim-zoom";
src = pkgs.fetchFromGitHub {
owner = "dhruvasagar";
repo = "vim-zoom";
rev = "01c737005312c09e0449d6518decf8cedfee32c7";
sha256 = "/ADzScsG0u6RJbEtfO23Gup2NYdhPkExqqOPVcQa7aQ=";
};
}