nixpkgs-fmt
This commit is contained in:
parent
0b08e521c8
commit
f63699c1cf
17 changed files with 1496 additions and 1258 deletions
|
@ -2,14 +2,15 @@ let
|
|||
pkgs = import <nixpkgs> {};
|
||||
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
|
||||
in
|
||||
pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
ffmpeg
|
||||
postgresql
|
||||
ruby_2_7
|
||||
taglib
|
||||
zlib
|
||||
(neovim.override {
|
||||
pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
ffmpeg
|
||||
postgresql
|
||||
ruby_2_7
|
||||
taglib
|
||||
zlib
|
||||
(
|
||||
neovim.override {
|
||||
configure = {
|
||||
customRC = baseVimConfig.customRC + ''
|
||||
" Required for operations modifying multiple buffers like rename
|
||||
|
@ -29,23 +30,24 @@ in
|
|||
}
|
||||
];
|
||||
};
|
||||
})
|
||||
];
|
||||
shellHook = ''
|
||||
export PGDATA=$PWD/tmp/postgres_data
|
||||
export PGHOST=$PWD/tmp/postgres
|
||||
export PGDATABASE=postgres
|
||||
export DATABASE_URL="postgresql:///postgres?host=$PGHOST"
|
||||
if [ ! -d $PGHOST ]; then
|
||||
mkdir -p $PGHOST
|
||||
fi
|
||||
if [ ! -d $PGDATA ]; then
|
||||
echo 'Initializing postgresql database...'
|
||||
initdb $PGDATA --auth=trust >/dev/null
|
||||
fi
|
||||
cat >"$PGDATA/postgresql.conf" <<HERE
|
||||
listen_addresses = '''
|
||||
unix_socket_directories = '$PGHOST'
|
||||
HERE
|
||||
'';
|
||||
}
|
||||
}
|
||||
)
|
||||
];
|
||||
shellHook = ''
|
||||
export PGDATA=$PWD/tmp/postgres_data
|
||||
export PGHOST=$PWD/tmp/postgres
|
||||
export PGDATABASE=postgres
|
||||
export DATABASE_URL="postgresql:///postgres?host=$PGHOST"
|
||||
if [ ! -d $PGHOST ]; then
|
||||
mkdir -p $PGHOST
|
||||
fi
|
||||
if [ ! -d $PGDATA ]; then
|
||||
echo 'Initializing postgresql database...'
|
||||
initdb $PGDATA --auth=trust >/dev/null
|
||||
fi
|
||||
cat >"$PGDATA/postgresql.conf" <<HERE
|
||||
listen_addresses = '''
|
||||
unix_socket_directories = '$PGHOST'
|
||||
HERE
|
||||
'';
|
||||
}
|
||||
|
|
|
@ -7,8 +7,9 @@ pkgs.mkShell {
|
|||
buildInputs = with pkgs; [
|
||||
nodejs-12_x
|
||||
yarn
|
||||
(neovim.override {
|
||||
configure = {
|
||||
(
|
||||
neovim.override {
|
||||
configure = {
|
||||
customRC = baseVimConfig.customRC + ''
|
||||
" Required for operations modifying multiple buffers like rename
|
||||
set hidden
|
||||
|
@ -26,7 +27,8 @@ pkgs.mkShell {
|
|||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
})
|
||||
};
|
||||
}
|
||||
)
|
||||
];
|
||||
}
|
||||
|
|
|
@ -3,14 +3,15 @@ let
|
|||
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
|
||||
nodePackages = import ../packages/node/default.nix { inherit pkgs; };
|
||||
in
|
||||
pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
ruby
|
||||
yarn
|
||||
nodejs-12_x
|
||||
libmysqlclient
|
||||
zlib
|
||||
(pkgs.writeScriptBin "start-db" ''
|
||||
pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
ruby
|
||||
yarn
|
||||
nodejs-12_x
|
||||
libmysqlclient
|
||||
zlib
|
||||
(
|
||||
pkgs.writeScriptBin "start-db" ''
|
||||
#!${pkgs.zsh}/bin/zsh
|
||||
|
||||
trap "docker stop dodona-db" 0
|
||||
|
@ -18,8 +19,10 @@ in
|
|||
|
||||
child=$!
|
||||
wait $child
|
||||
'')
|
||||
(neovim.override {
|
||||
''
|
||||
)
|
||||
(
|
||||
neovim.override {
|
||||
configure = {
|
||||
customRC = baseVimConfig.customRC + ''
|
||||
" Required for operations modifying multiple buffers like rename
|
||||
|
@ -42,9 +45,10 @@ in
|
|||
}
|
||||
];
|
||||
};
|
||||
})
|
||||
];
|
||||
shellHook = ''
|
||||
export DATABASE_URL="mysql2://root:dodona@127.0.0.1:3306/dodona"
|
||||
'';
|
||||
}
|
||||
}
|
||||
)
|
||||
];
|
||||
shellHook = ''
|
||||
export DATABASE_URL="mysql2://root:dodona@127.0.0.1:3306/dodona"
|
||||
'';
|
||||
}
|
||||
|
|
|
@ -1,9 +1,33 @@
|
|||
let
|
||||
pkgs = import <nixpkgs> {};
|
||||
jdtls = import ../packages/jdtls/default.nix { inherit pkgs; stdenv = pkgs.stdenv; };
|
||||
in
|
||||
pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
jdk11
|
||||
openjfx11
|
||||
];
|
||||
}
|
||||
pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
jdk11
|
||||
openjfx11
|
||||
jdtls
|
||||
(
|
||||
neovim.override {
|
||||
configure = {
|
||||
customRC = baseVimConfig.customRC + ''
|
||||
" Required for operations modifying multiple buffers like rename
|
||||
set hidden
|
||||
|
||||
let g:LanguageClient_serverCommands = {
|
||||
\ 'java': ['${jdtls}/bin/jdtls'],
|
||||
\ }
|
||||
'';
|
||||
vam.knownPlugins = baseVimConfig.vam.knownPlugins;
|
||||
vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [
|
||||
{
|
||||
names = [
|
||||
"LanguageClient-neovim"
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
)
|
||||
];
|
||||
}
|
||||
|
|
|
@ -2,14 +2,16 @@ let
|
|||
pkgs = import <nixpkgs> {};
|
||||
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
|
||||
in
|
||||
pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
(neovim.override {
|
||||
pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
(
|
||||
neovim.override {
|
||||
configure = {
|
||||
customRC = baseVimConfig.customRC;
|
||||
vam.knownPlugins = baseVimConfig.vam.knownPlugins;
|
||||
vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [ { name = "vim-ledger"; } ];
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
}
|
||||
)
|
||||
];
|
||||
}
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
let
|
||||
pkgs = import <nixpkgs> {};
|
||||
in
|
||||
pkgs.mkShell {
|
||||
buildInputs = with pkgs; [];
|
||||
}
|
||||
pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
nixpkgs-fmt
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue