abouttreesummaryrefslogcommitdiff
path: root/shell.nix
diff options
context:
space:
mode:
authorZitrone2024-09-19 21:57:26 +0000
committerGitHub2024-09-19 23:57:26 +0200
commitb21bf3fffd1b158972fa58b401173cfeb6e282bb (patch)
tree6e66d3dab6b5b4f8171c609eb5b2c03dac15c61d /shell.nix
parent7454389f486f5c8ffd8509ad554b3302a832b9a4 (diff)
downloadunexpected-keyboard-b21bf3fffd1b158972fa58b401173cfeb6e282bb.tar.gz
unexpected-keyboard-b21bf3fffd1b158972fa58b401173cfeb6e282bb.zip
Improve bone layout (#748)
* shell.nix: fix gradle error error was: > \> Task :compileDebugJavaWithJavac FAILED > error: Source option 7 is no longer supported. Use 8 or later. > error: Target option 7 is no longer supported. Use 8 or later. fixed by overriding the jdk version for gradle to openjdk17 * layouts/latn_bone: fix layout - fix alignment with tabs mess - make like actual bone layout, instead of trying to fit it into a 10 key wide keyboard - fixes missing üäö - fix missing $ - moves q and ß where they belong - remove all of the diacritic keys (they can be added through the settings as extra keys) - kept the number row extra keys integration into top row - kept the idea of compressing , and . into the swipe actions of the bottom row - kept the number keys as key4 in the layer4 positions (instead of moving them to a number row, which i also considered)
Diffstat (limited to 'shell.nix')
-rw-r--r--shell.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/shell.nix b/shell.nix
index 82206c7..823edd5 100644
--- a/shell.nix
+++ b/shell.nix
@@ -15,12 +15,13 @@ let
ANDROID_SDK_ROOT = "${android.androidsdk}/libexec/android-sdk";
+ gradle = pkgs.gradle.override { java = jdk; };
# Without this option, aapt2 fails to run with a permissions error.
gradle_wrapped = pkgs.runCommandLocal "gradle-wrapped" {
nativeBuildInputs = with pkgs; [ makeBinaryWrapper ];
} ''
mkdir -p $out/bin
- ln -s ${pkgs.gradle}/bin/gradle $out/bin/gradle
+ ln -s ${gradle}/bin/gradle $out/bin/gradle
wrapProgram $out/bin/gradle \
--add-flags "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${build_tools_version}/aapt2"
'';