chore: format with alejandra
This commit is contained in:
parent
05f0cbdfb4
commit
89f5f65f2d
181 changed files with 2720 additions and 2560 deletions
|
@ -1,6 +1,11 @@
|
|||
{ gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs { }, pkgs ? gitpkgs
|
||||
, name ? "generic", version, extraBuildInputs ? [ ], extraShellHook ? "" }:
|
||||
let
|
||||
{
|
||||
gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs {},
|
||||
pkgs ? gitpkgs,
|
||||
name ? "generic",
|
||||
version,
|
||||
extraBuildInputs ? [],
|
||||
extraShellHook ? "",
|
||||
}: let
|
||||
go = builtins.getAttr "go_${version}" pkgs;
|
||||
commonVimRC = ''
|
||||
let g:tagbar_type_go = {
|
||||
|
@ -66,19 +71,19 @@ let
|
|||
# ( import ./vim-go.nix { pkgs=gitpkgs; commonRC=commonVimRC; } )
|
||||
# ( import ./neovim-go.nix { pkgs=gitpkgs; commonRC=commonVimRC; } )
|
||||
];
|
||||
in
|
||||
pkgs.stdenv.mkDerivation {
|
||||
inherit name;
|
||||
buildInputs = extraBuildInputs ++ buildInputs;
|
||||
shellHook = ''
|
||||
goname=${go.version}_$name
|
||||
# FIXME: setPS1 $goname
|
||||
export GOROOT=${go}/share/go
|
||||
export GOPATH="$HOME/.gopath_$goname"
|
||||
export PATH="$HOME/.gopath_$goname/bin:$PATH"
|
||||
unset name
|
||||
unset SSL_CERT_FILE
|
||||
|
||||
in pkgs.stdenv.mkDerivation {
|
||||
inherit name;
|
||||
buildInputs = extraBuildInputs ++ buildInputs;
|
||||
shellHook = ''
|
||||
goname=${go.version}_$name
|
||||
# FIXME: setPS1 $goname
|
||||
export GOROOT=${go}/share/go
|
||||
export GOPATH="$HOME/.gopath_$goname"
|
||||
export PATH="$HOME/.gopath_$goname/bin:$PATH"
|
||||
unset name
|
||||
unset SSL_CERT_FILE
|
||||
|
||||
${extraShellHook}
|
||||
'';
|
||||
}
|
||||
${extraShellHook}
|
||||
'';
|
||||
}
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
{ commonRC, ... }@args:
|
||||
|
||||
(import ../../pkg-configuration/vim-derivates/neovim.nix args // {
|
||||
additionalRC = commonRC + ''
|
||||
" deoplete {
|
||||
let g:deoplete#enable_at_startup = 1
|
||||
let g:deoplete#enable_smart_case = 1
|
||||
" }
|
||||
'';
|
||||
additionalPlugins = [ "deoplete-go" "deoplete-nvim" "vim-go" ];
|
||||
})
|
||||
{commonRC, ...} @ args: (import ../../pkg-configuration/vim-derivates/neovim.nix args
|
||||
// {
|
||||
additionalRC =
|
||||
commonRC
|
||||
+ ''
|
||||
" deoplete {
|
||||
let g:deoplete#enable_at_startup = 1
|
||||
let g:deoplete#enable_smart_case = 1
|
||||
" }
|
||||
'';
|
||||
additionalPlugins = ["deoplete-go" "deoplete-nvim" "vim-go"];
|
||||
})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue