From ef53da038082bee5a7ccefd01f0e587150d77b12 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Sat, 22 Feb 2020 12:17:00 +0100 Subject: [PATCH] Switch up organization of nix shells --- programs/direnv/README.md => README.md | 4 +- packages/node/default.nix | 17 + packages/node/node-env.nix | 540 +++++++++++ packages/node/node-packages.nix | 838 ++++++++++++++++++ packages/node/packages.json | 4 + programs/direnv/default.nix | 1 - programs/direnv/shells/accentor-api.nix | 29 - programs/direnv/shells/dodona.nix | 24 - programs/direnv/shells/vim-base.nix | 116 --- programs/neovim/base.nix | 142 +++ programs/neovim/default.nix | 2 +- shells/accentor-api.nix | 55 ++ .../direnv/shells => shells}/accentor-web.nix | 0 shells/dodona.nix | 54 ++ {programs/direnv/shells => shells}/javafx.nix | 0 {programs/direnv/shells => shells}/ledger.nix | 3 +- {programs/direnv/shells => shells}/nix.nix | 0 17 files changed, 1656 insertions(+), 173 deletions(-) rename programs/direnv/README.md => README.md (75%) create mode 100644 packages/node/default.nix create mode 100644 packages/node/node-env.nix create mode 100644 packages/node/node-packages.nix create mode 100644 packages/node/packages.json delete mode 100644 programs/direnv/shells/accentor-api.nix delete mode 100644 programs/direnv/shells/dodona.nix delete mode 100644 programs/direnv/shells/vim-base.nix create mode 100644 programs/neovim/base.nix create mode 100644 shells/accentor-api.nix rename {programs/direnv/shells => shells}/accentor-web.nix (100%) create mode 100644 shells/dodona.nix rename {programs/direnv/shells => shells}/javafx.nix (100%) rename {programs/direnv/shells => shells}/ledger.nix (73%) rename {programs/direnv/shells => shells}/nix.nix (100%) diff --git a/programs/direnv/README.md b/README.md similarity index 75% rename from programs/direnv/README.md rename to README.md index 4e355988..215e1075 100644 --- a/programs/direnv/README.md +++ b/README.md @@ -1,9 +1,11 @@ +## NixOS config + # Setting up a new dev environment * Create a new `*.nix` file in the shells directory that describes the environment (this is the hard part). * Execute `lorri init` in the base directory of your project. This will create a `.envrc` file and `shell.nix` file. -* Edit the `shell.nix` file to just `import /home/charlotte/.local/share/nix-shells/your-new-file.nix` +* Edit the `shell.nix` file so that it contains `import /path/to/this/repo/shells/your-new-file.nix`. * Execute `direnv allow` to load the `.envrc` file which in turn uses `lorri` to load your `shell.nix` file. diff --git a/packages/node/default.nix b/packages/node/default.nix new file mode 100644 index 00000000..64fef2ed --- /dev/null +++ b/packages/node/default.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.7.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/packages/node/node-env.nix b/packages/node/node-env.nix new file mode 100644 index 00000000..670556bf --- /dev/null +++ b/packages/node/node-env.nix @@ -0,0 +1,540 @@ +# This file originates from node2nix + +{stdenv, nodejs, python2, utillinux, libtool, runCommand, writeTextFile}: + +let + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <> $out/nix-support/hydra-build-products + ''; + }; + + includeDependencies = {dependencies}: + stdenv.lib.optionalString (dependencies != []) + (stdenv.lib.concatMapStrings (dependency: + '' + # Bundle the dependencies of the package + mkdir -p node_modules + cd node_modules + + # Only include dependencies if they don't exist. They may also be bundled in the package. + if [ ! -e "${dependency.name}" ] + then + ${composePackage dependency} + fi + + cd .. + '' + ) dependencies); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + '' + DIR=$(pwd) + cd $TMPDIR + + unpackFile ${src} + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/${packageName}")" + + if [ -f "${src}" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/${packageName}" + elif [ -d "${src}" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash ${src})" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/${packageName}" + fi + + # Unset the stripped name to not confuse the next unpack step + unset strippedName + + # Include the dependencies of the package + cd "$DIR/${packageName}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + replaceDependencies(packageObj.optionalDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${stdenv.lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${stdenv.lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(packageLock.lockfileVersion !== 1) { + process.stderr.write("Sorry, I only understand lock file version 1!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 1, + requires: true, + dependencies: {} + }; + + function augmentPackageJSON(filePath, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${stdenv.lib.optionalString bypassCache '' + ${stdenv.lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + + if [ "$dontNpmInstall" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install + fi + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + in + stdenv.mkDerivation ({ + name = "node_${name}-${version}"; + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; + + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; + + installPhase = '' + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + + nodeDependencies = stdenv.mkDerivation ({ + name = "node-dependencies-${name}-${version}"; + + buildInputs = [ tarWrapper python nodejs ] + ++ stdenv.lib.optional (stdenv.isLinux) utillinux + ++ stdenv.lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; + + includeScript = includeDependencies { inherit dependencies; }; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; + + installPhase = '' + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${stdenv.lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + cd .. + ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + mv ${packageName} lib + ln -s $out/lib/node_modules/.bin $out/bin + ''; + } // extraArgs); + in + stdenv.mkDerivation { + name = "node-shell-${name}-${version}"; + + buildInputs = [ python nodejs ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell < {}; -in - pkgs.mkShell { - buildInputs = [ - pkgs.ffmpeg - pkgs.postgresql - pkgs.ruby_2_7 - pkgs.taglib - pkgs.zlib - ]; - 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" < {}; -in - 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 - docker run --name dodona-db -p 3306:3306 --rm -v $(git rev-parse --show-toplevel)/tmp/db:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=dodona mariadb:latest & - - child=$! - wait $child - '') - ]; - shellHook = '' - export DATABASE_URL="mysql2://root:dodona@127.0.0.1:3306/dodona" - ''; - } diff --git a/programs/direnv/shells/vim-base.nix b/programs/direnv/shells/vim-base.nix deleted file mode 100644 index 4ad432e3..00000000 --- a/programs/direnv/shells/vim-base.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ pkgs, ... }: - -{ - customRC = '' - set autoread - "" Theming - - set background=light - - "" General settings - - " Undo over sessions - set undofile - set undodir=~/.cache/nvimundo - - " Automatically save sessions on exit and load them on start - function! MakeSession() - let b:sessiondir = $HOME . "/.config/nvim/sessions" . getcwd() - if (filewritable(b:sessiondir) != 2) - exe 'silent !mkdir -p ' b:sessiondir - redraw! - endif - let b:filename = b:sessiondir . '/session.vim' - exe "mksession! " . b:filename - endfunction - - function! LoadSession() - let b:sessiondir = $HOME . "/.config/nvim/sessions" . getcwd() - let b:sessionfile = b:sessiondir . "/session.vim" - if (filereadable(b:sessionfile)) - exe 'source ' b:sessionfile - else - echo "No session loaded." - endif - endfunction - if(argc() == 0) - au VimEnter * nested :call LoadSession() - endif - au VimLeave * :call MakeSession() - - "" Filetype configuration - - " Base settings for all files - - syntax enable - set number - set showcmd - set scrolloff=8 - set expandtab - set tabstop=4 - set shiftwidth=4 - set linebreak - - set list - set listchars=tab:·\ ,trail:· - set inccommand=split - set clipboard=unnamedplus - - filetype plugin indent on - - "" Plugin configuration - - function! s:completedFiles(winid, filename, ...) abort - bdelete! - call win_gotoid(a:winid) - if filereadable(a:filename) - let lines = readfile(a:filename) - if !empty(lines) - exe ':e ' . lines[0] - endif - call delete(a:filename) - endif - endfunction - - function! FzyFiles() - let file = tempname() - let winid = win_getid() - let cmd = split(&shell) + split(&shellcmdflag) + ["${pkgs.ripgrep.out}/bin/rg --files --hidden -g '!/.git' --smart-case | ${pkgs.fzy.out}/bin/fzy > " . file] - let F = function('s:completedFiles', [winid, file]) - botright 10 new - call termopen(cmd, {'on_exit': F}) - startinsert - endfunction - - function! s:completedGrep(winid, filename, ...) abort - bdelete! - call win_gotoid(a:winid) - if filereadable(a:filename) - let lines = readfile(a:filename) - if !empty(lines) - let list = split(lines[0], ':') - let file = list[0] - let line = list[1] - exe ':e ' . file - exe line - endif - call delete(a:filename) - endif - endfunction - - function! FzyGrep() - let file = tempname() - let winid = win_getid() - let cmd = split(&shell) + split(&shellcmdflag) + ["${pkgs.ripgrep.out}/bin/rg --vimgrep --hidden -g '!/.git' '^' | ${pkgs.fzy.out}/bin/fzy > " . file] - let F = function('s:completedGrep', [winid, file]) - botright 10 new - call termopen(cmd, {'on_exit': F}) - startinsert - endfunction - - nnoremap :call FzyFiles() - nnoremap :call FzyGrep() - ''; - vam.knownPlugins = pkgs.vimPlugins; - vam.pluginDictionaries = [ { name = "vim-nix"; } ]; -} diff --git a/programs/neovim/base.nix b/programs/neovim/base.nix new file mode 100644 index 00000000..0a3ae26c --- /dev/null +++ b/programs/neovim/base.nix @@ -0,0 +1,142 @@ +{ pkgs, ... }: + +let + customPlugins.snow-color-theme = pkgs.vimUtils.buildVimPlugin { + name = "snow"; + src = pkgs.fetchFromGitHub { + owner = "nightsense"; + repo = "snow"; + rev = "f9800e987e404efed4748fe8098e04ddbec9770b"; + sha256 = "099fky1bpppac5785bhx1jc26gfpm8n837p8487j1rf1lwq83q33"; + }; + }; +in + { + customRC = '' + set autoread + "" Theming + + set background=light + colorscheme snow + + "" General settings + + " Undo over sessions + set undofile + set undodir=~/.cache/nvimundo + + " Automatically save sessions on exit and load them on start + function! MakeSession() + let b:sessiondir = $HOME . "/.config/nvim/sessions" . getcwd() + if (filewritable(b:sessiondir) != 2) + exe 'silent !mkdir -p ' b:sessiondir + redraw! + endif + let b:filename = b:sessiondir . '/session.vim' + exe "mksession! " . b:filename + endfunction + + function! LoadSession() + let b:sessiondir = $HOME . "/.config/nvim/sessions" . getcwd() + let b:sessionfile = b:sessiondir . "/session.vim" + if (filereadable(b:sessionfile)) + exe 'source ' b:sessionfile + else + echo "No session loaded." + endif + endfunction + if(argc() == 0) + au VimEnter * nested :call LoadSession() + au VimLeave * :call MakeSession() + endif + + "" Filetype configuration + + " Base settings for all files + + syntax enable + set number + set showcmd + set scrolloff=8 + set expandtab + set tabstop=4 + set shiftwidth=4 + set linebreak + + set list + set listchars=tab:·\ ,trail:· + set inccommand=split + set clipboard=unnamedplus + + filetype plugin indent on + + "" Fuzzy search in vim + + function! s:completedFiles(winid, filename, ...) abort + bdelete! + call win_gotoid(a:winid) + if filereadable(a:filename) + let lines = readfile(a:filename) + if !empty(lines) + exe ':e ' . lines[0] + endif + call delete(a:filename) + endif + endfunction + + function! FzyFiles() + let file = tempname() + let winid = win_getid() + let cmd = split(&shell) + split(&shellcmdflag) + ["${pkgs.ripgrep.out}/bin/rg --files --hidden -g '!/.git' --smart-case | ${pkgs.fzy.out}/bin/fzy > " . file] + let F = function('s:completedFiles', [winid, file]) + botright 10 new + call termopen(cmd, {'on_exit': F}) + startinsert + endfunction + + function! s:completedGrep(winid, filename, ...) abort + bdelete! + call win_gotoid(a:winid) + if filereadable(a:filename) + let lines = readfile(a:filename) + if !empty(lines) + let list = split(lines[0], ':') + let file = list[0] + let line = list[1] + exe ':e ' . file + exe line + endif + call delete(a:filename) + endif + endfunction + + function! FzyGrep() + let file = tempname() + let winid = win_getid() + let cmd = split(&shell) + split(&shellcmdflag) + ["${pkgs.ripgrep.out}/bin/rg --vimgrep --hidden -g '!/.git' '^' | ${pkgs.fzy.out}/bin/fzy > " . file] + let F = function('s:completedGrep', [winid, file]) + botright 10 new + call termopen(cmd, {'on_exit': F}) + startinsert + endfunction + + nnoremap :call FzyFiles() + nnoremap :call FzyGrep() + + "" Plugin configuration + let g:ale_fixers = { '*': ['remove_trailing_lines', 'trim_whitespace'] } + let g:ale_fix_on_save = 1 + ''; + vam.knownPlugins = pkgs.vimPlugins // customPlugins; + vam.pluginDictionaries = [ + { + names = [ + "ale" + "auto-pairs" + "editorconfig-vim" + "snow-color-theme" + "vim-nix" + ]; + } + ]; + } diff --git a/programs/neovim/default.nix b/programs/neovim/default.nix index 12d7dfde..8bac2261 100644 --- a/programs/neovim/default.nix +++ b/programs/neovim/default.nix @@ -8,7 +8,7 @@ in nixpkgs.overlays = [ (self: super: { neovim = nixpkgs-master.neovim.override { - configure = (import ../direnv/shells/vim-base.nix { pkgs = self; }) ; + configure = (import ./base.nix { pkgs = self; }) ; }; }) ]; diff --git a/shells/accentor-api.nix b/shells/accentor-api.nix new file mode 100644 index 00000000..906e3815 --- /dev/null +++ b/shells/accentor-api.nix @@ -0,0 +1,55 @@ +let + pkgs = import {}; + nixpkgs-master = import {}; + baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; }; +in + pkgs.mkShell { + buildInputs = with pkgs; [ + ffmpeg + postgresql + ruby_2_7 + taglib + zlib + (nixpkgs-master.neovim.override { + configure = { + customRC = baseVimConfig.customRC + '' + " Required for operations modifying multiple buffers like rename + set hidden + + let g:deoplete#enable_at_startup = 1 + + let g:LanguageClient_serverCommands = { + \ 'ruby': ['${solargraph}/bin/solargraph', 'stdio'], + \ } + ''; + vam.knownPlugins = baseVimConfig.vam.knownPlugins; + vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [ + { + names = [ + "deoplete-nvim" + "LanguageClient-neovim" + "vim-ruby" + ]; + } + ]; + }; + }) + ]; + 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" < {}; + nixpkgs-master = import {}; + 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.zsh}/bin/zsh + + trap "docker stop dodona-db" 0 + docker run --name dodona-db -p 3306:3306 --rm -v dodona-db-data:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=dodona mariadb:latest & + + child=$! + wait $child + '') + (nixpkgs-master.neovim.override { + configure = { + customRC = baseVimConfig.customRC + '' + " Required for operations modifying multiple buffers like rename + set hidden + + let g:deoplete#enable_at_startup = 1 + + let g:LanguageClient_serverCommands = { + \ 'ruby': ['${solargraph}/bin/solargraph', 'stdio'], + \ 'javascript': ['${nodePackages.javascript-typescript-langserver}/bin/javascript-typescript-stdio'], + \ 'typescript': ['${nodePackages.typescript-language-server}/bin/typescript-language-server', '--stdio'], + \ } + ''; + vam.knownPlugins = baseVimConfig.vam.knownPlugins; + vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [ + { + names = [ + "deoplete-nvim" + "LanguageClient-neovim" + "vim-ruby" + "yats-vim" + ]; + } + ]; + }; + }) + ]; + shellHook = '' + export DATABASE_URL="mysql2://root:dodona@127.0.0.1:3306/dodona" + ''; + } diff --git a/programs/direnv/shells/javafx.nix b/shells/javafx.nix similarity index 100% rename from programs/direnv/shells/javafx.nix rename to shells/javafx.nix diff --git a/programs/direnv/shells/ledger.nix b/shells/ledger.nix similarity index 73% rename from programs/direnv/shells/ledger.nix rename to shells/ledger.nix index 8ad6474c..a9268849 100644 --- a/programs/direnv/shells/ledger.nix +++ b/shells/ledger.nix @@ -1,13 +1,14 @@ let pkgs = import {}; nixpkgs-master = import {}; - baseVimConfig = import ./vim-base.nix { inherit pkgs; }; + baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; }; in pkgs.mkShell { buildInputs = with nixpkgs-master; [ (neovim.override { configure = { customRC = baseVimConfig.customRC; + vam.knownPlugins = baseVimConfig.vam.knownPlugins; vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [ { name = "vim-ledger"; } ]; }; }) diff --git a/programs/direnv/shells/nix.nix b/shells/nix.nix similarity index 100% rename from programs/direnv/shells/nix.nix rename to shells/nix.nix