nixpkgs-fmt
This commit is contained in:
parent
0b08e521c8
commit
f63699c1cf
17 changed files with 1496 additions and 1258 deletions
|
@ -7,7 +7,7 @@
|
||||||
# Early KMS start
|
# Early KMS start
|
||||||
boot.initrd.kernelModules = [ "i915" ];
|
boot.initrd.kernelModules = [ "i915" ];
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
boot.kernelModules = [ "kvm-intel" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" = {
|
||||||
device = "/dev/disk/by-uuid/0eb8b94a-5fc2-4b24-962a-94b3675b6f5b";
|
device = "/dev/disk/by-uuid/0eb8b94a-5fc2-4b24-962a-94b3675b6f5b";
|
||||||
|
|
36
packages/jdtls/default.nix
Normal file
36
packages/jdtls/default.nix
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
{ stdenv, pkgs, ... }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "jdtls";
|
||||||
|
version = "0.50.0";
|
||||||
|
src = pkgs.fetchurl {
|
||||||
|
url = "http://download.eclipse.org/${pname}/milestones/${version}/jdt-language-server-${version}-202002171858.tar.gz";
|
||||||
|
sha256 = "bf72084dc7988f76e01668d778c826c7490c287ee96a9f82e9e11afb6b722ab7";
|
||||||
|
};
|
||||||
|
sourceRoot = ".";
|
||||||
|
buildPhase = "true";
|
||||||
|
installPhase = ''
|
||||||
|
mkdir -p $out/share/java/jdtls
|
||||||
|
mv config_* features plugins $out/share/java/jdtls
|
||||||
|
mkdir $out/bin
|
||||||
|
cat >$out/bin/jdtls <<HERE
|
||||||
|
#!${pkgs.bash}/bin/bash
|
||||||
|
|
||||||
|
tmp_dir=\$(mktemp -d /tmp/jdtls.XXXXX)
|
||||||
|
cp -R $out/share/java/jdtls/config_linux \$tmp_dir
|
||||||
|
chmod -R u=rwX \$tmp_dir
|
||||||
|
trap "{ rm -rf \$tmp_dir; }" 0
|
||||||
|
|
||||||
|
${pkgs.jdk11}/bin/java \
|
||||||
|
-Declipse.application=org.eclipse.jdt.ls.core.id1 \
|
||||||
|
-Dosgi.bundles.defaultStartLevel=4 \
|
||||||
|
-Declipse.product=org.eclipse.jdt.ls.core.product \
|
||||||
|
-noverify \
|
||||||
|
-Xms1G \
|
||||||
|
-jar $out/share/java/jdtls/plugins/org.eclipse.equinox.launcher_*.jar \
|
||||||
|
-configuration "\$tmp_dir/config_linux" \
|
||||||
|
"\$@"
|
||||||
|
HERE
|
||||||
|
chmod +x $out/bin/jdtls
|
||||||
|
'';
|
||||||
|
}
|
|
@ -1,8 +1,11 @@
|
||||||
# This file has been generated by node2nix 1.7.0. Do not edit!
|
# This file has been generated by node2nix 1.7.0. Do not edit!
|
||||||
|
|
||||||
{pkgs ? import <nixpkgs> {
|
{ pkgs ? import <nixpkgs> {
|
||||||
inherit system;
|
inherit system;
|
||||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}:
|
}
|
||||||
|
, system ? builtins.currentSystem
|
||||||
|
, nodejs ? pkgs."nodejs-12_x"
|
||||||
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
nodeEnv = import ./node-env.nix {
|
nodeEnv = import ./node-env.nix {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# This file originates from node2nix
|
# This file originates from node2nix
|
||||||
|
|
||||||
{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}:
|
{ stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile }:
|
||||||
|
|
||||||
let
|
let
|
||||||
python = if nodejs ? python then nodejs.python else python2;
|
python = if nodejs ? python then nodejs.python else python2;
|
||||||
|
@ -37,9 +37,11 @@ let
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
includeDependencies = {dependencies}:
|
includeDependencies = { dependencies }:
|
||||||
stdenv.lib.optionalString (dependencies != [])
|
stdenv.lib.optionalString (dependencies != [])
|
||||||
(stdenv.lib.concatMapStrings (dependency:
|
(
|
||||||
|
stdenv.lib.concatMapStrings (
|
||||||
|
dependency:
|
||||||
''
|
''
|
||||||
# Bundle the dependencies of the package
|
# Bundle the dependencies of the package
|
||||||
mkdir -p node_modules
|
mkdir -p node_modules
|
||||||
|
@ -53,7 +55,8 @@ let
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
''
|
''
|
||||||
) dependencies);
|
) dependencies
|
||||||
|
);
|
||||||
|
|
||||||
# Recursively composes the dependencies of a package
|
# Recursively composes the dependencies of a package
|
||||||
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
|
composePackage = { name, packageName, src, dependencies ? [], ... }@args:
|
||||||
|
@ -103,7 +106,7 @@ let
|
||||||
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
pinpointDependencies = {dependencies, production}:
|
pinpointDependencies = { dependencies, production }:
|
||||||
let
|
let
|
||||||
pinpointDependenciesFromPackageJSON = writeTextFile {
|
pinpointDependenciesFromPackageJSON = writeTextFile {
|
||||||
name = "pinpointDependencies.js";
|
name = "pinpointDependencies.js";
|
||||||
|
@ -317,7 +320,7 @@ let
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}:
|
prepareAndInvokeNPM = { packageName, bypassCache, reconstructLock, npmFlags, production }:
|
||||||
let
|
let
|
||||||
forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
|
forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com";
|
||||||
in
|
in
|
||||||
|
@ -388,12 +391,14 @@ let
|
||||||
, dontStrip ? true
|
, dontStrip ? true
|
||||||
, unpackPhase ? "true"
|
, unpackPhase ? "true"
|
||||||
, buildPhase ? "true"
|
, buildPhase ? "true"
|
||||||
, ... }@args:
|
, ...
|
||||||
|
}@args:
|
||||||
|
|
||||||
let
|
let
|
||||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
|
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ];
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation ({
|
stdenv.mkDerivation (
|
||||||
|
{
|
||||||
name = "node_${name}-${version}";
|
name = "node_${name}-${version}";
|
||||||
buildInputs = [ tarWrapper python nodejs ]
|
buildInputs = [ tarWrapper python nodejs ]
|
||||||
++ stdenv.lib.optional (stdenv.isLinux) utillinux
|
++ stdenv.lib.optional (stdenv.isLinux) utillinux
|
||||||
|
@ -441,7 +446,8 @@ let
|
||||||
# Run post install hook, if provided
|
# Run post install hook, if provided
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
} // extraArgs);
|
} // extraArgs
|
||||||
|
);
|
||||||
|
|
||||||
# Builds a development shell
|
# Builds a development shell
|
||||||
buildNodeShell =
|
buildNodeShell =
|
||||||
|
@ -459,12 +465,14 @@ let
|
||||||
, dontStrip ? true
|
, dontStrip ? true
|
||||||
, unpackPhase ? "true"
|
, unpackPhase ? "true"
|
||||||
, buildPhase ? "true"
|
, buildPhase ? "true"
|
||||||
, ... }@args:
|
, ...
|
||||||
|
}@args:
|
||||||
|
|
||||||
let
|
let
|
||||||
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
|
extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ];
|
||||||
|
|
||||||
nodeDependencies = stdenv.mkDerivation ({
|
nodeDependencies = stdenv.mkDerivation (
|
||||||
|
{
|
||||||
name = "node-dependencies-${name}-${version}";
|
name = "node-dependencies-${name}-${version}";
|
||||||
|
|
||||||
buildInputs = [ tarWrapper python nodejs ]
|
buildInputs = [ tarWrapper python nodejs ]
|
||||||
|
@ -509,7 +517,8 @@ let
|
||||||
mv ${packageName} lib
|
mv ${packageName} lib
|
||||||
ln -s $out/lib/node_modules/.bin $out/bin
|
ln -s $out/lib/node_modules/.bin $out/bin
|
||||||
'';
|
'';
|
||||||
} // extraArgs);
|
} // extraArgs
|
||||||
|
);
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "node-shell-${name}-${version}";
|
name = "node-shell-${name}-${version}";
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -11,7 +11,7 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
customRC = ''
|
customRC = ''
|
||||||
set autoread
|
set autoread
|
||||||
"" Theming
|
"" Theming
|
||||||
|
@ -142,4 +142,4 @@ in
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,11 +3,13 @@ with import <nixpkgs> {};
|
||||||
{
|
{
|
||||||
home-manager.users.charlotte = { pkgs, ... }: {
|
home-manager.users.charlotte = { pkgs, ... }: {
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(self: super: {
|
(
|
||||||
|
self: super: {
|
||||||
neovim = super.neovim.override {
|
neovim = super.neovim.override {
|
||||||
configure = (import ./base.nix { pkgs = self; }) ;
|
configure = (import ./base.nix { pkgs = self; });
|
||||||
};
|
};
|
||||||
})
|
}
|
||||||
|
)
|
||||||
];
|
];
|
||||||
home.packages = [ pkgs.neovim ];
|
home.packages = [ pkgs.neovim ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -6,7 +6,7 @@ let
|
||||||
color-picker = import ./color-picker.nix { inherit pkgs; };
|
color-picker = import ./color-picker.nix { inherit pkgs; };
|
||||||
screenshot = import ./screenshot.nix { inherit pkgs; };
|
screenshot = import ./screenshot.nix { inherit pkgs; };
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./kanshi.nix
|
./kanshi.nix
|
||||||
./waybar.nix
|
./waybar.nix
|
||||||
|
@ -296,4 +296,4 @@ in
|
||||||
include /etc/sway/config.d/*
|
include /etc/sway/config.d/*
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,7 @@ let
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
pkgs.writeScriptBin "launcher" ''
|
pkgs.writeScriptBin "launcher" ''
|
||||||
#!${pkgs.zsh}/bin/zsh
|
#!${pkgs.zsh}/bin/zsh
|
||||||
|
|
||||||
_sighandler() {
|
_sighandler() {
|
||||||
|
@ -136,4 +136,4 @@ in
|
||||||
|
|
||||||
$PREFIX $WORD
|
$PREFIX $WORD
|
||||||
fi
|
fi
|
||||||
''
|
''
|
||||||
|
|
|
@ -2,14 +2,15 @@ let
|
||||||
pkgs = import <nixpkgs> {};
|
pkgs = import <nixpkgs> {};
|
||||||
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
|
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
|
||||||
in
|
in
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
ffmpeg
|
ffmpeg
|
||||||
postgresql
|
postgresql
|
||||||
ruby_2_7
|
ruby_2_7
|
||||||
taglib
|
taglib
|
||||||
zlib
|
zlib
|
||||||
(neovim.override {
|
(
|
||||||
|
neovim.override {
|
||||||
configure = {
|
configure = {
|
||||||
customRC = baseVimConfig.customRC + ''
|
customRC = baseVimConfig.customRC + ''
|
||||||
" Required for operations modifying multiple buffers like rename
|
" Required for operations modifying multiple buffers like rename
|
||||||
|
@ -29,7 +30,8 @@ in
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
})
|
}
|
||||||
|
)
|
||||||
];
|
];
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
export PGDATA=$PWD/tmp/postgres_data
|
export PGDATA=$PWD/tmp/postgres_data
|
||||||
|
@ -48,4 +50,4 @@ in
|
||||||
unix_socket_directories = '$PGHOST'
|
unix_socket_directories = '$PGHOST'
|
||||||
HERE
|
HERE
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,8 @@ pkgs.mkShell {
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
nodejs-12_x
|
nodejs-12_x
|
||||||
yarn
|
yarn
|
||||||
(neovim.override {
|
(
|
||||||
|
neovim.override {
|
||||||
configure = {
|
configure = {
|
||||||
customRC = baseVimConfig.customRC + ''
|
customRC = baseVimConfig.customRC + ''
|
||||||
" Required for operations modifying multiple buffers like rename
|
" Required for operations modifying multiple buffers like rename
|
||||||
|
@ -27,6 +28,7 @@ pkgs.mkShell {
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
})
|
}
|
||||||
|
)
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,14 +3,15 @@ let
|
||||||
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
|
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
|
||||||
nodePackages = import ../packages/node/default.nix { inherit pkgs; };
|
nodePackages = import ../packages/node/default.nix { inherit pkgs; };
|
||||||
in
|
in
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
ruby
|
ruby
|
||||||
yarn
|
yarn
|
||||||
nodejs-12_x
|
nodejs-12_x
|
||||||
libmysqlclient
|
libmysqlclient
|
||||||
zlib
|
zlib
|
||||||
(pkgs.writeScriptBin "start-db" ''
|
(
|
||||||
|
pkgs.writeScriptBin "start-db" ''
|
||||||
#!${pkgs.zsh}/bin/zsh
|
#!${pkgs.zsh}/bin/zsh
|
||||||
|
|
||||||
trap "docker stop dodona-db" 0
|
trap "docker stop dodona-db" 0
|
||||||
|
@ -18,8 +19,10 @@ in
|
||||||
|
|
||||||
child=$!
|
child=$!
|
||||||
wait $child
|
wait $child
|
||||||
'')
|
''
|
||||||
(neovim.override {
|
)
|
||||||
|
(
|
||||||
|
neovim.override {
|
||||||
configure = {
|
configure = {
|
||||||
customRC = baseVimConfig.customRC + ''
|
customRC = baseVimConfig.customRC + ''
|
||||||
" Required for operations modifying multiple buffers like rename
|
" Required for operations modifying multiple buffers like rename
|
||||||
|
@ -42,9 +45,10 @@ in
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
})
|
}
|
||||||
|
)
|
||||||
];
|
];
|
||||||
shellHook = ''
|
shellHook = ''
|
||||||
export DATABASE_URL="mysql2://root:dodona@127.0.0.1:3306/dodona"
|
export DATABASE_URL="mysql2://root:dodona@127.0.0.1:3306/dodona"
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,33 @@
|
||||||
let
|
let
|
||||||
pkgs = import <nixpkgs> {};
|
pkgs = import <nixpkgs> {};
|
||||||
|
jdtls = import ../packages/jdtls/default.nix { inherit pkgs; stdenv = pkgs.stdenv; };
|
||||||
in
|
in
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
jdk11
|
jdk11
|
||||||
openjfx11
|
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> {};
|
pkgs = import <nixpkgs> {};
|
||||||
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
|
baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; };
|
||||||
in
|
in
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
(neovim.override {
|
(
|
||||||
|
neovim.override {
|
||||||
configure = {
|
configure = {
|
||||||
customRC = baseVimConfig.customRC;
|
customRC = baseVimConfig.customRC;
|
||||||
vam.knownPlugins = baseVimConfig.vam.knownPlugins;
|
vam.knownPlugins = baseVimConfig.vam.knownPlugins;
|
||||||
vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [ { name = "vim-ledger"; } ];
|
vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [ { name = "vim-ledger"; } ];
|
||||||
};
|
};
|
||||||
})
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
)
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
let
|
let
|
||||||
pkgs = import <nixpkgs> {};
|
pkgs = import <nixpkgs> {};
|
||||||
in
|
in
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
buildInputs = with pkgs; [];
|
buildInputs = with pkgs; [
|
||||||
}
|
nixpkgs-fmt
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue