From d151c29b80e284f553f1799add22921a83278ac9 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Mon, 27 Apr 2020 14:46:52 +0200 Subject: [PATCH] nixpkgs-fmt update --- machines/oldtown/hardware.nix | 2 +- machines/pentos/hardware.nix | 2 +- packages/kotlin-language-server/default.nix | 4 +- .../kotlin-language-server/gradle-env.nix | 206 ++++++------ packages/node/node-env.nix | 292 +++++++++--------- packages/node/node-packages.nix | 2 +- profiles/common/default.nix | 2 +- profiles/graphical/default.nix | 8 +- profiles/graphical/secret.nix | Bin 2527 -> 2539 bytes programs/i3/default.nix | 4 +- programs/neovim/default.nix | 2 +- programs/sway/default.nix | 2 +- programs/sway/launcher.nix | 1 - programs/sway/status-configuration.nix | 2 +- programs/zsh/default.nix | 1 + shells/accentor-android.nix | 6 +- shells/accentor-api.nix | 4 +- shells/accentor-web.nix | 4 +- shells/dodona.nix | 4 +- shells/javafx.nix | 5 +- shells/ledger.nix | 4 +- shells/nix.nix | 2 +- 22 files changed, 277 insertions(+), 282 deletions(-) diff --git a/machines/oldtown/hardware.nix b/machines/oldtown/hardware.nix index 55379bb7..837eb1a8 100644 --- a/machines/oldtown/hardware.nix +++ b/machines/oldtown/hardware.nix @@ -6,7 +6,7 @@ boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ "i915" ]; boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = []; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/e4b7eae2-546d-412b-9258-389315f4b835"; diff --git a/machines/pentos/hardware.nix b/machines/pentos/hardware.nix index d36960ac..fe7e4ac6 100644 --- a/machines/pentos/hardware.nix +++ b/machines/pentos/hardware.nix @@ -7,7 +7,7 @@ # Early KMS start boot.initrd.kernelModules = [ "i915" ]; boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = []; + boot.extraModulePackages = [ ]; fileSystems."/" = { device = "/dev/disk/by-uuid/0eb8b94a-5fc2-4b24-962a-94b3675b6f5b"; diff --git a/packages/kotlin-language-server/default.nix b/packages/kotlin-language-server/default.nix index dd8454e3..eb965467 100644 --- a/packages/kotlin-language-server/default.nix +++ b/packages/kotlin-language-server/default.nix @@ -1,8 +1,8 @@ -{ pkgs ? import {} }: +{ pkgs ? import { } }: with pkgs; let - buildGradle = callPackage ./gradle-env.nix {}; + buildGradle = callPackage ./gradle-env.nix { }; in buildGradle { envSpec = ./gradle-env.json; diff --git a/packages/kotlin-language-server/gradle-env.nix b/packages/kotlin-language-server/gradle-env.nix index 8a02a9dd..81df4b81 100644 --- a/packages/kotlin-language-server/gradle-env.nix +++ b/packages/kotlin-language-server/gradle-env.nix @@ -40,7 +40,6 @@ let versionOlder unique mapAttrs last concatMapStringsSep removeSuffix optionalString groupBy' readFile hasSuffix ; - mkDep = depSpec: stdenv.mkDerivation { inherit (depSpec) name; @@ -55,13 +54,11 @@ let ln -s $src $out/${depSpec.path}/${depSpec.name} ''; }; - mkModuleMetadata = deps: let ids = filter (id: id.type == "pom") (map (dep: dep.id) deps); - modules = groupBy' ( meta: id: @@ -70,7 +67,8 @@ let isNewerRelease = !(hasSuffix "-SNAPSHOT" id.version) && versionOlder meta.release id.version; - in { + in + { groupId = id.group; artifactId = id.name; latest = if isNewer then id.version else meta.latest; @@ -81,17 +79,19 @@ let { latest = ""; release = ""; - versions = []; + versions = [ ]; } (id: "${replaceStrings [ "." ] [ "/" ] id.group}/${id.name}/maven-metadata.xml") ids; in - attrValues ( - mapAttrs ( - path: meta: - let - versions' = sort versionOlder (unique meta.versions); - in + attrValues + ( + mapAttrs + ( + path: meta: + let + versions' = sort versionOlder (unique meta.versions); + in with meta; writeTextDir path '' @@ -106,13 +106,11 @@ let '' - ) modules + ) modules ); - mkSnapshotMetadata = deps: let snapshotDeps = filter (dep: dep ? build && dep ? timestamp) deps; - modules = groupBy' ( meta: dep: @@ -120,17 +118,19 @@ let id = dep.id; isNewer = dep.build > meta.buildNumber; # Timestamp values can be bogus, e.g. jitpack.io - updated = if (match "[0-9]{8}\.[0-9]{6}" dep.timestamp) != null - then replaceStrings [ "." ] [ "" ] dep.timestamp - else ""; - in { + updated = + if (match "[0-9]{8}\.[0-9]{6}" dep.timestamp) != null + then replaceStrings [ "." ] [ "" ] dep.timestamp + else ""; + in + { groupId = id.group; artifactId = id.name; version = id.version; timestamp = if isNewer then dep.timestamp else meta.timestamp; buildNumber = if isNewer then dep.build else meta.buildNumber; lastUpdated = if isNewer then updated else meta.lastUpdated; - versions = meta.versions or [] ++ [ + versions = meta.versions or [ ] ++ [ { classifier = id.classifier or ""; extension = id.extension; @@ -147,7 +147,6 @@ let } (dep: "${replaceStrings [ "." ] [ "/" ] dep.id.group}/${dep.id.name}/${dep.id.version}/maven-metadata.xml") snapshotDeps; - mkSnapshotVersion = version: '' ${optionalString (version.classifier != "") "${version.classifier}"} @@ -157,77 +156,76 @@ let ''; in - attrValues ( - mapAttrs ( - path: meta: - with meta; writeTextDir path '' - - - ${groupId} - ${artifactId} - ${version} - - - ${optionalString (timestamp != "") "${timestamp}"} - ${optionalString (buildNumber != -1) "${toString buildNumber}"} - - ${optionalString (lastUpdated != "") "${lastUpdated}"} - - ${concatMapStringsSep "\n " mkSnapshotVersion versions} - - - - '' - ) modules + attrValues + ( + mapAttrs + ( + path: meta: + with meta; writeTextDir path '' + + + ${groupId} + ${artifactId} + ${version} + + + ${optionalString (timestamp != "") "${timestamp}"} + ${optionalString (buildNumber != -1) "${toString buildNumber}"} + + ${optionalString (lastUpdated != "") "${lastUpdated}"} + + ${concatMapStringsSep "\n " mkSnapshotVersion versions} + + + + '' + ) modules ); - mkRepo = project: type: deps: buildEnv { name = "${project}-gradle-${type}-env"; paths = map mkDep deps ++ mkModuleMetadata deps ++ mkSnapshotMetadata deps; }; - mkInitScript = projectSpec: let repos = mapAttrs (mkRepo projectSpec.name) projectSpec.dependencies; in - writeText "init.gradle" '' - static def offlineRepo(RepositoryHandler repositories, String env, String path) { - repositories.clear() - repositories.maven { - name "Nix''${env.capitalize()}MavenOffline" - url path - metadataSources { - it.gradleMetadata() - it.mavenPom() - it.artifact() - } - } - repositories.ivy { - name "Nix''${env.capitalize()}IvyOffline" - url path - layout "maven" - metadataSources { - it.gradleMetadata() - it.ivyDescriptor() - it.artifact() - } - } - } + writeText "init.gradle" '' + static def offlineRepo(RepositoryHandler repositories, String env, String path) { + repositories.clear() + repositories.maven { + name "Nix''${env.capitalize()}MavenOffline" + url path + metadataSources { + it.gradleMetadata() + it.mavenPom() + it.artifact() + } + } + repositories.ivy { + name "Nix''${env.capitalize()}IvyOffline" + url path + layout "maven" + metadataSources { + it.gradleMetadata() + it.ivyDescriptor() + it.artifact() + } + } + } - gradle.settingsEvaluated { - offlineRepo(it.pluginManagement.repositories, "plugin", "${repos.plugin}") - } - - gradle.projectsLoaded { - allprojects { - buildscript { - offlineRepo(repositories, "buildscript", "${repos.buildscript}") - } - offlineRepo(repositories, "project", "${repos.project}") - } - } - ''; + gradle.settingsEvaluated { + offlineRepo(it.pluginManagement.repositories, "plugin", "${repos.plugin}") + } + gradle.projectsLoaded { + allprojects { + buildscript { + offlineRepo(repositories, "buildscript", "${repos.buildscript}") + } + offlineRepo(repositories, "project", "${repos.project}") + } + } + ''; mkGradle = gradleSpec: gradleGen.gradleGen { inherit (gradleSpec) nativeVersion; @@ -238,46 +236,44 @@ let inherit (gradleSpec) url sha256; }; }; - mkProjectEnv = projectSpec: { inherit (projectSpec) name version; initScript = mkInitScript projectSpec; gradle = args.gradlePackage or mkGradle projectSpec.gradle; }; - gradleEnv = mapAttrs (_: p: mkProjectEnv p) (fromJSON (readFile envSpec)); - projectEnv = gradleEnv.""; pname = args.pname or projectEnv.name; version = args.version or projectEnv.version; in -stdenv.mkDerivation ( - args // { +stdenv.mkDerivation + ( + args // { - inherit pname version; + inherit pname version; - nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ projectEnv.gradle ]; + nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ projectEnv.gradle ]; - buildPhase = args.buildPhase or '' - runHook preBuild + buildPhase = args.buildPhase or '' + runHook preBuild - ( - set -x - env \ - "GRADLE_USER_HOME=$(mktemp -d)" \ - gradle --offline --no-daemon --no-build-cache \ - --info --full-stacktrace --warning-mode=all \ - ${optionalString enableParallelBuilding "--parallel"} \ - ${optionalString enableDebug "-Dorg.gradle.debug=true"} \ - --init-script ${projectEnv.initScript} \ - ${concatStringsSep " " gradleFlags} - ) + ( + set -x + env \ + "GRADLE_USER_HOME=$(mktemp -d)" \ + gradle --offline --no-daemon --no-build-cache \ + --info --full-stacktrace --warning-mode=all \ + ${optionalString enableParallelBuilding "--parallel"} \ + ${optionalString enableDebug "-Dorg.gradle.debug=true"} \ + --init-script ${projectEnv.initScript} \ + ${concatStringsSep " " gradleFlags} + ) - runHook postBuild - ''; + runHook postBuild + ''; - dontStrip = true; - } -) + dontStrip = true; + } + ) diff --git a/packages/node/node-env.nix b/packages/node/node-env.nix index 77e17089..3d96a7c7 100644 --- a/packages/node/node-env.nix +++ b/packages/node/node-env.nix @@ -5,7 +5,7 @@ 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" {} '' + tarWrapper = runCommand "tarWrapper" { } '' mkdir -p $out/bin cat > $out/bin/tar <> $out/nix-support/hydra-build-products - ''; - }; - + stdenv.mkDerivation { + name = "node-tarball-${name}-${version}"; + inherit src; + buildInputs = [ nodejs ]; + buildPhase = '' + export HOME=$TMPDIR + tgzFile=$(npm pack | tail -n 1) # Hooks to the pack command will add output (https://docs.npmjs.com/misc/scripts) + ''; + installPhase = '' + mkdir -p $out/tarballs + mv $tgzFile $out/tarballs + mkdir -p $out/nix-support + echo "file source-dist $out/tarballs/$tgzFile" >> $out/nix-support/hydra-build-products + ''; + }; includeDependencies = { dependencies }: - stdenv.lib.optionalString (dependencies != []) + stdenv.lib.optionalString (dependencies != [ ]) ( - stdenv.lib.concatMapStrings ( - dependency: + stdenv.lib.concatMapStrings + ( + dependency: '' # Bundle the dependencies of the package mkdir -p node_modules @@ -54,11 +54,11 @@ let cd .. '' - ) dependencies + ) dependencies ); # Recursively composes the dependencies of a package - composePackage = { name, packageName, src, dependencies ? [], ... }@args: + composePackage = { name, packageName, src, dependencies ? [ ], ... }@args: '' DIR=$(pwd) cd $TMPDIR @@ -104,7 +104,6 @@ let cd .. ${stdenv.lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} ''; - pinpointDependencies = { dependencies, production }: let pinpointDependenciesFromPackageJSON = writeTextFile { @@ -160,10 +159,10 @@ let ''; }; in - '' - node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + '' + node ${pinpointDependenciesFromPackageJSON} ${ if production then "production" else "development"} - ${stdenv.lib.optionalString (dependencies != []) + ${stdenv.lib.optionalString (dependencies != [ ]) '' if [ -d node_modules ] then @@ -172,13 +171,12 @@ let 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: + pinpointDependenciesOfPackage = { packageName, dependencies ? [ ], production ? true, ... }@args: '' if [ -d "${packageName}" ] then @@ -191,7 +189,7 @@ let # Extract the Node.js source code which is used to compile packages with # native bindings - nodeSources = runCommand "node-sources" {} '' + nodeSources = runCommand "node-sources" { } '' tar --no-same-owner --no-same-permissions -xf ${nodejs.src} mv node-* $out ''; @@ -318,69 +316,68 @@ let 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 + '' + # 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 . + # 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. + # 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 + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild - ${stdenv.lib.optionalString bypassCache '' + ${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 + 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 ${reconstructPackageLock} + ''} node ${addIntegrityFieldsScript} ''} - npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} rebuild + 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 + 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 - ''; + 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 ? [] + , dependencies ? [ ] + , buildInputs ? [ ] , production ? true , npmFlags ? "" , dontNpmInstall ? false @@ -392,60 +389,61 @@ let , 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; + 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; + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; - compositionScript = composePackage args; - pinpointDependenciesScript = pinpointDependenciesOfPackage args; + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; - passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; - installPhase = '' - # Create and enter a root node_modules/ folder - mkdir -p $out/lib/node_modules - cd $out/lib/node_modules + 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 + # Compose the package and all its dependencies + source $compositionScriptPath - ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + ${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 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 + # 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 - ); + # Run post install hook, if provided + runHook postInstall + ''; + } // extraArgs + ); # Builds a development shell buildNodeShell = @@ -453,8 +451,8 @@ let , packageName , version , src - , dependencies ? [] - , buildInputs ? [] + , dependencies ? [ ] + , buildInputs ? [ ] , production ? true , npmFlags ? "" , dontNpmInstall ? false @@ -465,10 +463,10 @@ let , buildPhase ? "true" , ... }@args: - let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; - - nodeDependencies = stdenv.mkDerivation ( + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + nodeDependencies = stdenv.mkDerivation + ( { name = "node-dependencies-${name}-${version}"; @@ -495,11 +493,11 @@ let 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 - ''} + 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 .. @@ -516,28 +514,28 @@ let ''; } // extraArgs ); - in - stdenv.mkDerivation { - name = "node-shell-${name}-${version}"; + 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 < $out/bin/shell <=J*G(&3FsX3g#f8mLQ=3GW&zT`%eBFT2 zA))PjWvtMi3IFDEo!nDD$uHdcIFmc~eDM{0-{)Mt{p{YSi#JbQ(6s+;+IB$n;f#K* zIkz(oXz!Xb_o&PXgOkb%7MG5D9{YcQp}*|sW6SB)XM1yb=hP@98UFtt8s4<*Rp|zK z1B=t`JZ2><`ZD+S2<~4QAU4t6b93@;(N(@%w=Jxz)mGfCoFRE#>HL&kyDGU}{F2nU zY5Y_}&)BxxU;pitzKqopE1pfcq#zVz zvb25nE>n%yUXR+{`#&4zb)J6ts_Bze`mPj?s;MSt&$&<5DT>%6UiCWFHFR>i>wkOM z-0qhP_qacZoGhEO=*HXty(cPL3RyME?V@g#X}cTzTJ7h1p!Cc~u9*J3S9@zGO^W=M zedJrs$MSc-D&#-x4L`pp%G=YcZ4>vNq^P&0tPi|mFRK0U`WN3m|NXwBPC>^Rlj?TN zs1z2~%vmBIei`; zfz4>G<_)2%3iBKDc3do0+ka%b+1r(eS=wS{SYq3{HzZD(Dw^!4+nj%67q|VVcsFys zK8d}J+70sA;+oRY$`d$hCcU>+7L0!5YVGg;;ksb0^Xzxp7dd8IJ$&wO{r^>YL^gNS z`Orec0B6RppJKk5%gkU1-JhyH?eD(}tDmg;D>*sC>$IVk8=@rQBuX0F=Zm&DKgeN_LujMwj^mdCB*<;rT)*b5gyR|t@ zFp1Sje(BtKF|(5P$viTCe>Xy6Va(Fm8dVp*iT)}Ov&`)6C~04$yxpZv^M?D?6?eYO z_;c^cGzr`1I~G_)+3sKHe)i%~P5oUzFK}dD^ZxWKS!3GfC5kg`7q+vC+?R^B?Z1Dp zkI#Zp;+q=JB!jQzhrYs3UhAAw|g2K z+kEZvH^qIgkF#{j2i{xgkeeL4zTe+ziG%Dn!#TTV=c~L+iAd;bbx``*qEuD%dcpr2 z`-@plD9ejQ&z&#Y=oB`WGic$>iWdz<#&Fupk1@u4VG{{+GQCMGpFYFL-#-5 zLQl@)U;ci=O~(Y1KHimCi}mc!3B zOZvzC`T9Xwu-huX%J+AqxvxOAY*E*Hs~;(Iej96jDPDahER8A6fiIzR|DrZunIn$r zYc80_z7g$rvAFW=s{ed@W=oBo=|To+hqLQWE-RmNW3%$}y$>$rwkAqEuruFX$Q#`` zL887|t?yZbZ|}>c^~Y;pzu$W;HRQ0LQJCQWsfnLd-tDSAX}3kEUgLDr_31BJYib_J zd&;JrtAD%U!ISgHA`XB25oekGdRKwhzjM+;Df&Ln>aD?x(`MLi4ZO)U+q+cadU(Qg z*7jc;PFCF9vijlI>-juO|6dVGI$4$#>-OGZ?v$godCS7fGI!3&SrxYQuf)`QU4CmT z;&Q`}Te@gIUeB|AsjotSm#34-&(Nz;MW>IfJ+)W0VL|(5-Q#Ib4A-pFFVy_6GyCGC zmzgeAYkd!GWmEktFUlr()`-pUed-y@2Q_=OFV6peXwlM^wzU_9Pt@}M3a#5UdCK3Q z+h-FP5AQD*w`@0&sJM96s`6vC^-Zzod*(Su?Q(dyJag5_f>j@tZyx>f+~uTmRPtuU zU6#8)Sr%CwyZGxDzf9YvL+dVbAA7la^Zv)h;?c^+(UV-6JlW2yH(d2XO}O^Kjm2#q z^G_MQzb4Y}suwZGF#F%jti`PVFE-YMJUUmg!TP5~Si!|m&LU$mKlzVuh3k4x82p~9 zqj+Rdj@(4kl)jxFejeUWWdB%@@3wSLYY9o}I@{*tUpmWr!t^Ocp+aXvJQirT zNXuAcI?v-+7QQy=+C@$Q`=>6wOL?@sWBzZObNQEp%uzk78PNbCb0bc zq1&(1w2Rw!^Qm2nWP@Zr>|U1Ey57)JE7(W2`s_EQ>vLFa8(c2l<2taavp^;zr?KQ+ z@Fc&?)~;U7yGaX9Z@Xi$e8bE0>!#0M&FfedRdf2~9J2_X#@ln|@FhAu+|9n&aEoJH z(ZkXQua}0**OGe1wJ~M=-$kOIwg+#_={G;NdcteZqoH@YW|p_9YKQOcm6ChN^t`F~ z_J{j#_AksZ4p_fO(&A%3XGXFJkK&&RG7g@1Ot%#ssZkJIEg9MK(o?qKW^v1v>)vxs zT35xqaycv@b3ayRUc&6{;rH%eIV|z!-=9y#v)Al5urf>YQ7FD8P{Md5v-$iVdEUKd zjQ_XC9(bG(Q`Y(Pt+bP{OwSeB-LLL%x|nzE@{+u}mf{`vY}xPsxVdiah7yyH6N_$c zP}nH%lKgD9X11Eyx?`v1gI?VaHMu``zq!fQC~MwB3~70XGLz2hOFG$f zNai-L*qyp2bj7z>A$P7`Pj=ng7!|AO=Da>*`yMIYIk!TCAMUPPA8fR-Bh*U2xv+7i zi->%~!hZ>M$5%0VG_CP_Vif&peoWJ8uYHG??mM04xBJ+yIUg2H%*&M1;^MwlHrr8Q z^%0vNyOLNsD<>998Z7<0MDpkL_m3o>vAHD2N%N~6+^PRodT~pvsRQ@(?PYS|-d@J~ zUlfndifK*_7gf6H`68j~%(kdW7pvEumOPkZwp7LJ{JY()e=Kvm|80^t(&}b>+*2=h z#9Jyz#ps0k0{83blV@*rc;%pD#;0vxC%b3F&89Ou2vi zrqCSGWov%SEGy}IyIa7H`3!qzyT`J+%#Ixi6ZSkMJViC0%xF zxGnRW``n&)%6CdN>kR9z?@b7fwKTBrW#~9}?WZdnTh@8aw!Aee>z;Jnot*DC>ExOh zGi}!%;@gzTd^1KlQpELPxk_9_EUV?67QO|hYvvx1KCmsWG`)M3gZ;Djmlp2tKXPv8 zqd2V>pQmfF?yz(G%aMEJo9g;#+05%~N^UO#&mH|W$*)N4Bg^R*FLdv1UVUVLSC7-I zDctvZY#di!{gwOSGnZ|#c;fZYhJR6u;X)nQoT%+p7)4Y8PWbbZRpT*Y17FJi4O~ID#=b2Ubg>R;`ozEoS+3VS1Uvc21tyXaC>q>M+>6@a8Wa=59-FhTD>7Olr?6&MN1=c`&c# z<>r@bAFeyQ)G#9=_Hy0jcZ>aeJEvTgKlH3IOjrKi>Z=`}%VfLK!kTY{O?#Dbo#ENd z*{a{Szl&b+-RnvLd#nD=g&n3ArRtw^QoS~N97y`~Eb5AD+^5ASe18~od-w}yNQW}G z%sN@V$M*ZNsQO38*IsmR%Xi;>^TvCxi#^ReFIN2!;S7-J{XOIG$@L50NH^9m{hU4L z-qiD@HK}=)tQJD?Sv6eFH#-a7zSlj$#5qsXxp3y$8cpU;d-$$R*tk65nw|3;w+n#bjH+OF7NxMr8e39?{OIW%tPBxC8b*i)4%I;v~Mx%QP zM`d;-+o-KHe|K$8SE8D(;gq)UO>!rb%{HGoC&+Tp_WJ>mhAGF5mZeRTV){GROeko} z3Fe7Bueq8U+yt8?o-GYqw6U>(*yH@S(%)M@p>x^ILJWR4~3Mf4!QLFY^*d#2_qa4t>N37&8% z?m*at7p9&JD})!@Gy1LA8FDhiN@+)fda~c`>4vQ5Rr?Maznil3@g3!}6L^nT@{2QG z&gJfq-k0<})Bo7a%R78prITh^=IpKJzVCCsZ;6ZQ;Va39ma48i%i#3T;P*TW#bvK= z^x2)WGIwvksajwf>RgQNyG8FPrbavs%f!@%wYZkB@3}lpa~PX7!XW|N6%&IX62c|DPZ~ zi_+1z`#(%5*I;1iGi8xdT=MkFzn8v#Mbo#o^koZ9P&G9>!ysA8^luegeC@0L>|Az> z`uk^fnhid_DiN~#(%vc`9XR7woflG)kn8=tW*EYBFD1f`joh0?M~BD z9!=fu`e4oQx`%sN<~-=6)53X@_p3Kb z%3ia~k8k~4{>{Yv#f7I^tTLCkvsYX+e|qE0s-QE%8x~mhYy8j^{C)JED6h#;R=$}c zn)x3?=6(1yqt$+XSJI`BN0oxtRmFD3%S{UjS)uH}v0K1kQth-i(&vvde{m7Ld_6FA-J|IqOv-$p1cIk+Q(ip#Z|K2Vzt}~KZYdYvpZ!(IJh11>J!!$S&rI+C zJUJ&e)keF%C1Cyk!dp$r>6-gbTw;D;zHD89yXF3ibB*~wsmKI-Zo4cr!S=|-l7r5I z7ys@#x%K0zrz_7V&g3hJ(7rn1Mxr0rx-(xExgXK`H{omL$G1^ij_y;vlKXq%!5_a* z-Q(6%;4QrX(i=0t?cCu_VUI>0p(WrLnnLwG@JJN zuMlf&+1-_qy6Wlt72AVd#DhwECA*hq^o902PBrD{HkkkRVD)ivwM*S^B5tyNUa`c6 zv;S0;$CdboFKU+krNIxLwO4a2Uf-bfhkx(Wm7(=ECl-lpyef05&u6OrlbOxCUZ0t; zaP`Eki~{#&`gwVv}Ya_Y*hj!iqc-}rs6cBgW3!_KEX z&+66cXTNF5J#z5F#RoI8iGNjyaDSK6f!r_s&JB?-6Sep@H|=)wPnM~PeH{4HVu9MT-3Fe@ou@+` z<~ki*E#PkF+O2;n3V{5gl^<=JNT=7&FiOo?CY9<1}j#_D`)ovyyUk zG?vZp*zZ&G_3#th*Eb#>JAU@>l>U@8xh*zA*XK;GVNG$(X}@+;r{sjnl9o~xqYVy~ zm!w|4aeLfg8?A9}&;7hRN3KMzooJV8v?#9nkvg+?yPMv>G00(yr(XY{PD&SK6z9R1jG7rppF z)SrlloJSe$&$kr45Krhoc#^S+(eJlN(%p$IS2s-Q6MA}KB9mKt)yZc*eXY%$o7PvA z&MefFp1nI$#Jw-}__3<%FKf6gJ)3&vgFdua1vhuMTxM!@<`JpN=6^ov{jQHu%#MP8 z?rTpMkBj@U#Whwj-QceNoc$$kRsP1ithn#!IG8w`eN-6K^Tl-Chq-d6`=2$bCbP)Q zaSWbR6Cl{Cpta$B#rb)sA6r~Jxb~*veY5*{a={@^cbeSRwCqa{Tbab^cN%^A$}r=Iz{V-pCQRTOjySQtpEIw<|1fif%t2Gu_DH zxm3KSdzt=)T*pR5#gzHM_l1L2o;ss>^UyN3&wUrnuU+U(-{&gX29g|kcxNg?InkplzVxRHl`BaG#wWT}Kr*1KR ze!D9-ze(cprY~pg&*T`q)(_NaDb>HvQ?WO!N|0GlY5P_ywPUM-k3MER>^x~wsK*rE z?X&(T-J0z)W!3)T=#CvH%g=GEq)vG7!SK2H?v2tb4R6i8l4$>NPNGVaPRR#P#S@38 z86BS0_R6QdV~6tkaHSyDg#Wjl3{PcUd#F%&Ui|;8B=IxnL!$3=q;Xaj>{-w}%Z`U=C5`QYc)7f@sUxpux$cnQ& Tf2uQbe>T)GGPyn1DzOIu7WL=D diff --git a/programs/i3/default.nix b/programs/i3/default.nix index e922bfd7..b01147bf 100644 --- a/programs/i3/default.nix +++ b/programs/i3/default.nix @@ -1,4 +1,4 @@ -with import {}; +with import { }; { ... }: let launcher = import ../sway/launcher.nix { inherit pkgs stdenv; }; @@ -26,7 +26,7 @@ in statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${status-configuration}"; } ]; - floating.criteria = [ { class = "launcher"; } { class = "accentor.Main"; } ]; + floating.criteria = [{ class = "launcher"; } { class = "accentor.Main"; }]; fonts = [ "Fira Code Normal 9" ]; menu = "${pkgs.kitty}/bin/kitty --class launcher -e ${launcher}/bin/launcher"; modifier = "Mod4"; diff --git a/programs/neovim/default.nix b/programs/neovim/default.nix index bf37ecbd..aa77a342 100644 --- a/programs/neovim/default.nix +++ b/programs/neovim/default.nix @@ -1,4 +1,4 @@ -with import {}; +with import { }; { home-manager.users.charlotte = { pkgs, ... }: { diff --git a/programs/sway/default.nix b/programs/sway/default.nix index 0414f5bb..6a4dc318 100644 --- a/programs/sway/default.nix +++ b/programs/sway/default.nix @@ -1,4 +1,4 @@ -with import {}; +with import { }; { pkgs, ... }: let launcher = import ./launcher.nix { inherit pkgs stdenv; }; diff --git a/programs/sway/launcher.nix b/programs/sway/launcher.nix index d681766c..2409bf97 100644 --- a/programs/sway/launcher.nix +++ b/programs/sway/launcher.nix @@ -7,7 +7,6 @@ let type = "gem"; version = "4.0.0.rc2"; }; - emoji_list = stdenv.mkDerivation { name = "emoji_list"; buildInputs = [ pkgs.ruby gemoji ]; diff --git a/programs/sway/status-configuration.nix b/programs/sway/status-configuration.nix index 71e25635..8b6b7364 100644 --- a/programs/sway/status-configuration.nix +++ b/programs/sway/status-configuration.nix @@ -48,7 +48,7 @@ pkgs.writeText "configuration.toml" '' block = "net" device = "wlp0s20f3" ssid = true - signal_strength = true + signal_strength = false speed_up = false speed_down = false hide_missing = true diff --git a/programs/zsh/default.nix b/programs/zsh/default.nix index a4e61b52..e4c95bf1 100644 --- a/programs/zsh/default.nix +++ b/programs/zsh/default.nix @@ -43,6 +43,7 @@ sessionVariables = { DEFAULT_USER = "charlotte"; EDITOR = "nvim"; + PASSWORD_STORE_DIR = "$HOME/repos/passwords"; }; shellAliases = { upgrade = "sudo nix-channel --update && sudo nixos-rebuild switch"; diff --git a/shells/accentor-android.nix b/shells/accentor-android.nix index a6dc92cc..8b56cf28 100644 --- a/shells/accentor-android.nix +++ b/shells/accentor-android.nix @@ -23,7 +23,6 @@ let # useGoogleTVAddOns = false; # includeExtras = [ "extras;google;gcm" ]; }; - customPlugins.kotlin-vim = pkgs.vimUtils.buildVimPlugin { name = "kotlin-vim"; src = pkgs.fetchFromGitHub { @@ -33,7 +32,6 @@ let sha256 = "1yqzxabhpc4jbdlzhsysp0vi1ayqg0vnpysvx4ynd9961q2fk3sz"; }; }; - gradle-fhs-nix = pkgs.writeText "gradle-fhs.nix" '' { run }: let @@ -48,14 +46,12 @@ let runScript = "bash -c '''''${run}'''"; }).env ''; - gradle-run-script = pkgs.writeScriptBin "gradle" '' #!${pkgs.bash}/bin/bash REPO_ROOT="$(git rev-parse --show-toplevel)" nix-shell --argstr run "\"$REPO_ROOT/gradlew $@\"" "${gradle-fhs-nix}" ''; - sign-release = pkgs.writeScriptBin "sign-release" '' #!${pkgs.bash}/bin/bash @@ -90,7 +86,7 @@ pkgs.mkShell { \ } ''; vam.knownPlugins = baseVimConfig.vam.knownPlugins // customPlugins; - vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [ + vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or [ ]) ++ [ { names = [ "kotlin-vim" diff --git a/shells/accentor-api.nix b/shells/accentor-api.nix index ac425d6d..05c7b15c 100644 --- a/shells/accentor-api.nix +++ b/shells/accentor-api.nix @@ -1,5 +1,5 @@ let - pkgs = import {}; + pkgs = import { }; baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; }; in pkgs.mkShell { @@ -21,7 +21,7 @@ pkgs.mkShell { \ } ''; vam.knownPlugins = baseVimConfig.vam.knownPlugins; - vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [ + vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or [ ]) ++ [ { names = [ "LanguageClient-neovim" diff --git a/shells/accentor-web.nix b/shells/accentor-web.nix index f9626a43..c193d09d 100644 --- a/shells/accentor-web.nix +++ b/shells/accentor-web.nix @@ -1,5 +1,5 @@ let - pkgs = import {}; + pkgs = import { }; baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; }; nodePackages = import ../packages/node/default.nix { inherit pkgs; }; in @@ -19,7 +19,7 @@ pkgs.mkShell { \ } ''; vam.knownPlugins = baseVimConfig.vam.knownPlugins; - vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [ + vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or [ ]) ++ [ { names = [ "LanguageClient-neovim" diff --git a/shells/dodona.nix b/shells/dodona.nix index dd75ffa4..d57e7cdf 100644 --- a/shells/dodona.nix +++ b/shells/dodona.nix @@ -1,5 +1,5 @@ let - pkgs = import {}; + pkgs = import { }; baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; }; nodePackages = import ../packages/node/default.nix { inherit pkgs; }; in @@ -36,7 +36,7 @@ pkgs.mkShell { \ } ''; vam.knownPlugins = baseVimConfig.vam.knownPlugins; - vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [ + vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or [ ]) ++ [ { names = [ "LanguageClient-neovim" diff --git a/shells/javafx.nix b/shells/javafx.nix index 30b92b0b..e5f00408 100644 --- a/shells/javafx.nix +++ b/shells/javafx.nix @@ -1,8 +1,7 @@ let - pkgs = import {}; + pkgs = import { }; baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; }; jdtls = import ../packages/jdtls/default.nix { inherit pkgs; stdenv = pkgs.stdenv; }; - extraRpath = pkgs.stdenv.lib.strings.makeLibraryPath (with pkgs; [ ffmpeg ]); in pkgs.mkShell { @@ -41,7 +40,7 @@ pkgs.mkShell { \} ''; vam.knownPlugins = baseVimConfig.vam.knownPlugins; - vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [ + vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or [ ]) ++ [ { names = [ "LanguageClient-neovim" diff --git a/shells/ledger.nix b/shells/ledger.nix index 0f228654..a8a64c45 100644 --- a/shells/ledger.nix +++ b/shells/ledger.nix @@ -1,5 +1,5 @@ let - pkgs = import {}; + pkgs = import { }; baseVimConfig = import ../programs/neovim/base.nix { inherit pkgs; }; in pkgs.mkShell { @@ -9,7 +9,7 @@ pkgs.mkShell { configure = { customRC = baseVimConfig.customRC; vam.knownPlugins = baseVimConfig.vam.knownPlugins; - vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or []) ++ [ { name = "vim-ledger"; } ]; + vam.pluginDictionaries = (baseVimConfig.vam.pluginDictionaries or [ ]) ++ [{ name = "vim-ledger"; }]; }; } ) diff --git a/shells/nix.nix b/shells/nix.nix index a5fb582b..55f12782 100644 --- a/shells/nix.nix +++ b/shells/nix.nix @@ -1,5 +1,5 @@ let - pkgs = import {}; + pkgs = import { }; in pkgs.mkShell { buildInputs = with pkgs; [