From 85a94a1c4c24ea6c569a052f3743584864938927 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Tue, 16 May 2023 22:40:45 +0200 Subject: [PATCH] Format --- flake.nix | 5 ++-- modules/programs/deluge/default.nix | 2 +- modules/services/deluge/default.nix | 7 +++-- shells/orgzly.nix | 43 +++++++++++++++-------------- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/flake.nix b/flake.nix index 362d1e85..c86be2e4 100644 --- a/flake.nix +++ b/flake.nix @@ -115,7 +115,8 @@ nix-index-database.nixosModules.nix-index ./modules ]; - nixosSystem = system: name: let nixpkgs = nixpkgsForSystem system; in + nixosSystem = system: name: + let nixpkgs = nixpkgsForSystem system; in inputs.nixpkgs.lib.nixosSystem { lib = (import nixpkgs { inherit overlays system; }).lib; specialArgs = { modulesPath = toString (nixpkgs + "/nixos/modules"); }; @@ -133,7 +134,7 @@ }) ./machines/${name} ]; - }; + }; nixosConfigurations = { kharbranth = nixosSystem "x86_64-linux" "kharbranth"; kholinar = nixosSystem "x86_64-linux" "kholinar"; diff --git a/modules/programs/deluge/default.nix b/modules/programs/deluge/default.nix index a3f780e4..9e810203 100644 --- a/modules/programs/deluge/default.nix +++ b/modules/programs/deluge/default.nix @@ -11,6 +11,6 @@ home.packages = with pkgs; [ transmission-remote-gtk ]; }; - chvp.base.zfs.homeLinks = [ { path = ".config/transmission-remote-gtk"; type = "data"; } ]; + chvp.base.zfs.homeLinks = [{ path = ".config/transmission-remote-gtk"; type = "data"; }]; }; } diff --git a/modules/services/deluge/default.nix b/modules/services/deluge/default.nix index 448b697f..03c0dcff 100644 --- a/modules/services/deluge/default.nix +++ b/modules/services/deluge/default.nix @@ -17,9 +17,10 @@ (n: { fqdn = "del${toString (n + 1)}.vanpetegem.me"; basicProxy = "http://localhost:${toString (8112 + n)}"; - }) config.chvp.services.deluge.count) ++ [ - { fqdn = "transmission.vanpetegem.me"; basicProxy = "http://localhost:9091"; } - ]; + }) + config.chvp.services.deluge.count) ++ [ + { fqdn = "transmission.vanpetegem.me"; basicProxy = "http://localhost:9091"; } + ]; networking.firewall = { allowedTCPPortRanges = [ diff --git a/shells/orgzly.nix b/shells/orgzly.nix index 183fd308..ac046fcd 100644 --- a/shells/orgzly.nix +++ b/shells/orgzly.nix @@ -1,19 +1,20 @@ -{ inputs, system, ... }: let - pkgs = import inputs.nixpkgs { inherit system; config = { android_sdk.accept_license = true; allowUnfree = true; }; overlays = [ inputs.devshell.overlays.default ]; }; - buildToolsVersion = "30.0.3"; - composed = pkgs.androidenv.composeAndroidPackages { - buildToolsVersions = [ buildToolsVersion ]; - platformVersions = [ "32" ]; - }; - fhsEnv = pkgs.buildFHSUserEnv { - name = "android-sdk-env"; - targetPkgs = pkgs: (with pkgs; [ glibc ]); - profile = '' - export ANDROID_SDK_ROOT="${composed.androidsdk}/libexec/android-sdk/" - ''; - }; +{ inputs, system, ... }: +let + pkgs = import inputs.nixpkgs { inherit system; config = { android_sdk.accept_license = true; allowUnfree = true; }; overlays = [ inputs.devshell.overlays.default ]; }; + buildToolsVersion = "30.0.3"; + composed = pkgs.androidenv.composeAndroidPackages { + buildToolsVersions = [ buildToolsVersion ]; + platformVersions = [ "32" ]; + }; + fhsEnv = pkgs.buildFHSUserEnv { + name = "android-sdk-env"; + targetPkgs = pkgs: (with pkgs; [ glibc ]); + profile = '' + export ANDROID_SDK_ROOT="${composed.androidsdk}/libexec/android-sdk/" + ''; + }; in - pkgs.devshell.mkShell { +pkgs.devshell.mkShell { name = "Orgzly"; packages = [ pkgs.jdk17 pkgs.kotlin-language-server pkgs.nixpkgs-fmt ]; env = [ @@ -33,12 +34,12 @@ in category = "tools"; help = "Install a debug signed release APK"; command = '' - rm -f "$APK_DIR/"* - gradle assembleRelease - "$BUILD_TOOLS_PATH/zipalign" -v -p 4 "$APK_DIR/app-premium-release-unsigned.apk" "$APK_DIR/app-release-unsigned-aligned.apk" - echo android | "$BUILD_TOOLS_PATH/apksigner" sign --ks "$HOME/.android/debug.keystore" --out "$APK_DIR/app-release.apk" "$APK_DIR/app-release-unsigned-aligned.apk" - adb install -r "$APK_DIR/app-release.apk" - ''; + rm -f "$APK_DIR/"* + gradle assembleRelease + "$BUILD_TOOLS_PATH/zipalign" -v -p 4 "$APK_DIR/app-premium-release-unsigned.apk" "$APK_DIR/app-release-unsigned-aligned.apk" + echo android | "$BUILD_TOOLS_PATH/apksigner" sign --ks "$HOME/.android/debug.keystore" --out "$APK_DIR/app-release.apk" "$APK_DIR/app-release-unsigned-aligned.apk" + adb install -r "$APK_DIR/app-release.apk" + ''; } ]; }