chore: nixfmt *
This commit is contained in:
parent
dc761a5271
commit
d039179898
161 changed files with 2688 additions and 3024 deletions
|
@ -1,6 +1,6 @@
|
|||
import /home/steveej/src/github/NixOS/nixpkgs/default.nix {
|
||||
crossSystem = rec {
|
||||
config = "armv7l-unknown-linux-gnueabi";
|
||||
config = "armv7l-unknown-linux-gnueabi";
|
||||
bigEndian = false;
|
||||
arch = "arm";
|
||||
float = "hard";
|
||||
|
@ -21,12 +21,12 @@ import /home/steveej/src/github/NixOS/nixpkgs/default.nix {
|
|||
kernelDTB = true;
|
||||
kernelAutoModules = false;
|
||||
kernelExtraConfig = ''
|
||||
NAMESPACES y
|
||||
BTRFS_FS y
|
||||
BTRFS_FS_POSIX_ACL y
|
||||
OVERLAY_FS y
|
||||
FUSE_FS y
|
||||
'';
|
||||
NAMESPACES y
|
||||
BTRFS_FS y
|
||||
BTRFS_FS_POSIX_ACL y
|
||||
OVERLAY_FS y
|
||||
FUSE_FS y
|
||||
'';
|
||||
kernelTarget = "zImage";
|
||||
uboot = null;
|
||||
};
|
||||
|
|
|
@ -1,10 +1,5 @@
|
|||
{ gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs {}
|
||||
, pkgs ? gitpkgs
|
||||
, name ? "generic"
|
||||
, version
|
||||
, extraBuildInputs ? []
|
||||
, extraShellHook ? ""
|
||||
}:
|
||||
{ gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs { }, pkgs ? gitpkgs
|
||||
, name ? "generic", version, extraBuildInputs ? [ ], extraShellHook ? "" }:
|
||||
let
|
||||
go = builtins.getAttr "go_${version}" pkgs;
|
||||
commonVimRC = ''
|
||||
|
@ -55,21 +50,21 @@ let
|
|||
" }
|
||||
'';
|
||||
buildInputs = with pkgs; [
|
||||
glibc.out
|
||||
glibc.static
|
||||
glibc.out
|
||||
glibc.static
|
||||
|
||||
go
|
||||
gotools
|
||||
#gotools.bin
|
||||
#gocode.bin
|
||||
#godef godef.bin
|
||||
godep
|
||||
#godep.bin
|
||||
gox.bin
|
||||
#ginkgo ginkgo.bin
|
||||
#gomega
|
||||
# ( import ./vim-go.nix { pkgs=gitpkgs; commonRC=commonVimRC; } )
|
||||
# ( import ./neovim-go.nix { pkgs=gitpkgs; commonRC=commonVimRC; } )
|
||||
go
|
||||
gotools
|
||||
#gotools.bin
|
||||
#gocode.bin
|
||||
#godef godef.bin
|
||||
godep
|
||||
#godep.bin
|
||||
gox.bin
|
||||
#ginkgo ginkgo.bin
|
||||
#gomega
|
||||
# ( import ./vim-go.nix { pkgs=gitpkgs; commonRC=commonVimRC; } )
|
||||
# ( import ./neovim-go.nix { pkgs=gitpkgs; commonRC=commonVimRC; } )
|
||||
];
|
||||
|
||||
in pkgs.stdenv.mkDerivation {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{ commonRC, ... } @ args :
|
||||
{ commonRC, ... }@args:
|
||||
|
||||
(import ../../pkg-configuration/vim-derivates/neovim.nix args // {
|
||||
additionalRC = commonRC + ''
|
||||
|
@ -7,9 +7,5 @@
|
|||
let g:deoplete#enable_smart_case = 1
|
||||
" }
|
||||
'';
|
||||
additionalPlugins = [
|
||||
"deoplete-go"
|
||||
"deoplete-nvim"
|
||||
"vim-go"
|
||||
];
|
||||
additionalPlugins = [ "deoplete-go" "deoplete-nvim" "vim-go" ];
|
||||
})
|
||||
|
|
|
@ -1,23 +1,21 @@
|
|||
{ gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs {}
|
||||
, pkgs ? gitpkgs
|
||||
, name ? "generic"
|
||||
, version ? "Stable"
|
||||
, extraBuildInputs ? []
|
||||
}:
|
||||
let
|
||||
commonVimRC = ''
|
||||
'';
|
||||
{ gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs { }, pkgs ? gitpkgs
|
||||
, name ? "generic", version ? "Stable", extraBuildInputs ? [ ] }:
|
||||
let commonVimRC = "";
|
||||
in pkgs.stdenv.mkDerivation {
|
||||
inherit name;
|
||||
buildInputs = with pkgs; [
|
||||
( import ./vim-pandoc.nix { pkgs=gitpkgs; commonRC=commonVimRC; })
|
||||
pandoc
|
||||
texlive.combined.scheme-medium
|
||||
python27Packages.pandocfilters
|
||||
python27Packages.htmltreediff
|
||||
python27Packages.html5lib
|
||||
python27Packages.dbus-python
|
||||
] ++ extraBuildInputs;
|
||||
buildInputs = with pkgs;
|
||||
[
|
||||
(import ./vim-pandoc.nix {
|
||||
pkgs = gitpkgs;
|
||||
commonRC = commonVimRC;
|
||||
})
|
||||
pandoc
|
||||
texlive.combined.scheme-medium
|
||||
python27Packages.pandocfilters
|
||||
python27Packages.htmltreediff
|
||||
python27Packages.html5lib
|
||||
python27Packages.dbus-python
|
||||
] ++ extraBuildInputs;
|
||||
shellHook = ''
|
||||
pandocname=pandoc_${pkgs.pandoc.version}
|
||||
setPS1 $pandocname
|
||||
|
|
|
@ -1,9 +1,6 @@
|
|||
{
|
||||
pkgs ? import /home/steveej/src/github/NixOS/nixpkgs {},
|
||||
mkGoEnv ? import ./go.nix,
|
||||
rktPath,
|
||||
}:
|
||||
let
|
||||
{ pkgs ? import /home/steveej/src/github/NixOS/nixpkgs { }
|
||||
, mkGoEnv ? import ./go.nix, rktPath, }:
|
||||
let
|
||||
rktBasebuildInputs = with pkgs; [
|
||||
glibc.out
|
||||
glibc.static
|
||||
|
|
|
@ -1,10 +1,6 @@
|
|||
{ gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs {}
|
||||
, pkgs ? gitpkgs
|
||||
, name ? "generic"
|
||||
, version ? "Stable"
|
||||
, extraBuildInputs ? []
|
||||
}:
|
||||
let
|
||||
{ gitpkgs ? import /home/steveej/src/github/NixOS/nixpkgs { }, pkgs ? gitpkgs
|
||||
, name ? "generic", version ? "Stable", extraBuildInputs ? [ ] }:
|
||||
let
|
||||
rustPackages = builtins.getAttr "rust${version}" pkgs;
|
||||
rustc = rustPackages.rustc;
|
||||
rustShellHook = { rustc, name }: ''
|
||||
|
@ -12,20 +8,21 @@ let
|
|||
setPS1 $rustname
|
||||
unset name
|
||||
'';
|
||||
commonVimRC = ''
|
||||
'';
|
||||
commonVimRC = "";
|
||||
in pkgs.stdenv.mkDerivation {
|
||||
inherit name;
|
||||
buildInputs = with rustPackages;[
|
||||
( import ./vim-rust.nix { pkgs=gitpkgs; commonRC=commonVimRC;
|
||||
buildInputs = with rustPackages;
|
||||
[
|
||||
(import ./vim-rust.nix {
|
||||
pkgs = gitpkgs;
|
||||
commonRC = commonVimRC;
|
||||
inherit rustc;
|
||||
racerd=pkgs.rustracerd;
|
||||
})
|
||||
rustc cargo
|
||||
] ++ [
|
||||
pkgs.rustfmt
|
||||
] ++ extraBuildInputs;
|
||||
shellHook = (rustShellHook){
|
||||
racerd = pkgs.rustracerd;
|
||||
})
|
||||
rustc
|
||||
cargo
|
||||
] ++ [ pkgs.rustfmt ] ++ extraBuildInputs;
|
||||
shellHook = (rustShellHook) {
|
||||
inherit name;
|
||||
inherit rustc;
|
||||
};
|
||||
|
|
|
@ -1,20 +1,17 @@
|
|||
{ commonRC, ... } @ args :
|
||||
{ commonRC, ... }@args:
|
||||
|
||||
import ../../pkg-configuration/vim-derivates/vim.nix (args // {
|
||||
name = "vim-for-go";
|
||||
additionalRC = commonRC + ''
|
||||
" Disable AutoComplPop.
|
||||
let g:acp_enableAtStartup = 0
|
||||
" Use neocomplete.
|
||||
let g:neocomplete#enable_at_startup = 1
|
||||
" Use smartcase.
|
||||
let g:neocomplete#enable_smart_case = 1
|
||||
if !exists('g:neocomplete#sources#omni#input_patterns')
|
||||
let g:neocomplete#sources#omni#input_patterns = {}
|
||||
endif
|
||||
'';
|
||||
additionalPlugins = [
|
||||
"neocomplete"
|
||||
"vim-go"
|
||||
];
|
||||
" Disable AutoComplPop.
|
||||
let g:acp_enableAtStartup = 0
|
||||
" Use neocomplete.
|
||||
let g:neocomplete#enable_at_startup = 1
|
||||
" Use smartcase.
|
||||
let g:neocomplete#enable_smart_case = 1
|
||||
if !exists('g:neocomplete#sources#omni#input_patterns')
|
||||
let g:neocomplete#sources#omni#input_patterns = {}
|
||||
endif
|
||||
'';
|
||||
additionalPlugins = [ "neocomplete" "vim-go" ];
|
||||
})
|
||||
|
|
|
@ -1,6 +1,4 @@
|
|||
{ commonRC
|
||||
,
|
||||
... } @ args :
|
||||
{ commonRC, ... }@args:
|
||||
|
||||
import ../../pkg-configuration/vim-derivates/vim.nix (args // {
|
||||
name = "vim-for-pandoc";
|
||||
|
@ -13,10 +11,6 @@ import ../../pkg-configuration/vim-derivates/vim.nix (args // {
|
|||
let g:syntastic_auto_loc_list = 1
|
||||
let g:syntastic_check_on_open = 1
|
||||
let g:syntastic_check_on_wq = 0
|
||||
'';
|
||||
additionalPlugins = [
|
||||
"vim-pandoc"
|
||||
"vim-pandoc-syntax"
|
||||
"vimpreviewpandoc"
|
||||
];
|
||||
'';
|
||||
additionalPlugins = [ "vim-pandoc" "vim-pandoc-syntax" "vimpreviewpandoc" ];
|
||||
})
|
||||
|
|
|
@ -1,7 +1,4 @@
|
|||
{ commonRC
|
||||
, rustc
|
||||
, racerd,
|
||||
... } @ args :
|
||||
{ commonRC, rustc, racerd, ... }@args:
|
||||
|
||||
import ../../pkg-configuration/vim-derivates/vim.nix (args // {
|
||||
name = "vim-for-rust";
|
||||
|
@ -39,8 +36,6 @@ import ../../pkg-configuration/vim-derivates/vim.nix (args // {
|
|||
let g:ycm_rust_src_path = '${rustc.src}/src'
|
||||
let g:ycm_racerd_binary_path = '${racerd.out}/bin/racerd'
|
||||
|
||||
'';
|
||||
additionalPlugins = [
|
||||
"rust-vim"
|
||||
];
|
||||
'';
|
||||
additionalPlugins = [ "rust-vim" ];
|
||||
})
|
||||
|
|
|
@ -1,40 +1,41 @@
|
|||
{ pkgs ? import <nixpkgs> {} }:
|
||||
{ pkgs ? import <nixpkgs> { } }:
|
||||
|
||||
(pkgs.buildFHSUserEnv {
|
||||
name = "devfhs";
|
||||
multiPkgs = pkgs: (with pkgs; [
|
||||
android-udev-rules
|
||||
sudo
|
||||
gawk
|
||||
bzip2
|
||||
file
|
||||
gcc
|
||||
getopt
|
||||
git
|
||||
gnumake
|
||||
ncurses
|
||||
openssl
|
||||
patch
|
||||
perl
|
||||
pkgconfig
|
||||
python
|
||||
openssh
|
||||
subversion
|
||||
unzip
|
||||
wget
|
||||
which
|
||||
vim
|
||||
zlib
|
||||
libusb
|
||||
libusb1
|
||||
systemd
|
||||
strace
|
||||
swt
|
||||
xorg.libXtst
|
||||
glib
|
||||
gtk2
|
||||
gnome.gtk
|
||||
]);
|
||||
multiPkgs = pkgs:
|
||||
(with pkgs; [
|
||||
android-udev-rules
|
||||
sudo
|
||||
gawk
|
||||
bzip2
|
||||
file
|
||||
gcc
|
||||
getopt
|
||||
git
|
||||
gnumake
|
||||
ncurses
|
||||
openssl
|
||||
patch
|
||||
perl
|
||||
pkgconfig
|
||||
python
|
||||
openssh
|
||||
subversion
|
||||
unzip
|
||||
wget
|
||||
which
|
||||
vim
|
||||
zlib
|
||||
libusb
|
||||
libusb1
|
||||
systemd
|
||||
strace
|
||||
swt
|
||||
xorg.libXtst
|
||||
glib
|
||||
gtk2
|
||||
gnome.gtk
|
||||
]);
|
||||
profile = ''
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/lib:/lib64:/lib32:/usr/lib32:/usr/lib64:${pkgs.xorg.libXtst}/lib:${pkgs.glib}/lib:${pkgs.gtk2}/lib
|
||||
'';
|
||||
|
|
|
@ -1,9 +1,10 @@
|
|||
{ pkgs ? import <nixpkgs> {} }:
|
||||
{ pkgs ? import <nixpkgs> { } }:
|
||||
|
||||
(pkgs.buildFHSUserEnv {
|
||||
name = "everydayFHS";
|
||||
targetPkgs = pkgs: (with pkgs;
|
||||
[ which
|
||||
targetPkgs = pkgs:
|
||||
(with pkgs; [
|
||||
which
|
||||
gitFull
|
||||
zsh
|
||||
file
|
||||
|
@ -28,9 +29,7 @@
|
|||
zlib
|
||||
libsecret
|
||||
]);
|
||||
multiPkgs = pkgs: (with pkgs;
|
||||
[
|
||||
]);
|
||||
multiPkgs = pkgs: (with pkgs; [ ]);
|
||||
profile = ''
|
||||
export SHELL=/bin/zsh
|
||||
'';
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue