chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Format

Browse source
This commit is contained in:
Charlotte Van Petegem 2023-05-16 22:40:45 +02:00
parent 2b5a0d6a20
commit 85a94a1c4c
No known key found for this signature in database
GPG key ID: 019E764B7184435A
4 changed files with 30 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
flake.nix
View file

@ -115,7 +115,8 @@
nix-index-database.nixosModules.nix-index nix-index-database.nixosModules.nix-index
./modules ./modules
]; ];
nixosSystem = system: name: let nixpkgs = nixpkgsForSystem system; in nixosSystem = system: name:
let nixpkgs = nixpkgsForSystem system; in
inputs.nixpkgs.lib.nixosSystem { inputs.nixpkgs.lib.nixosSystem {
lib = (import nixpkgs { inherit overlays system; }).lib; lib = (import nixpkgs { inherit overlays system; }).lib;
specialArgs = { modulesPath = toString (nixpkgs + "/nixos/modules"); }; specialArgs = { modulesPath = toString (nixpkgs + "/nixos/modules"); };
@ -133,7 +134,7 @@
}) })
./machines/${name} ./machines/${name}
]; ];
}; };
nixosConfigurations = { nixosConfigurations = {
kharbranth = nixosSystem "x86_64-linux" "kharbranth"; kharbranth = nixosSystem "x86_64-linux" "kharbranth";
kholinar = nixosSystem "x86_64-linux" "kholinar"; kholinar = nixosSystem "x86_64-linux" "kholinar";

2
modules/programs/deluge/default.nix
View file

@ -11,6 +11,6 @@
home.packages = with pkgs; [ transmission-remote-gtk ]; 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"; }];
}; };
} }

7
modules/services/deluge/default.nix
View file

@ -17,9 +17,10 @@
(n: { (n: {
fqdn = "del${toString (n + 1)}.vanpetegem.me"; fqdn = "del${toString (n + 1)}.vanpetegem.me";
basicProxy = "http://localhost:${toString (8112 + n)}"; 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 = { networking.firewall = {
allowedTCPPortRanges = [ allowedTCPPortRanges = [

43
shells/orgzly.nix
View file

@ -1,19 +1,20 @@
{ inputs, system, ... }: let { inputs, system, ... }:
pkgs = import inputs.nixpkgs { inherit system; config = { android_sdk.accept_license = true; allowUnfree = true; }; overlays = [ inputs.devshell.overlays.default ]; }; let
buildToolsVersion = "30.0.3"; pkgs = import inputs.nixpkgs { inherit system; config = { android_sdk.accept_license = true; allowUnfree = true; }; overlays = [ inputs.devshell.overlays.default ]; };
composed = pkgs.androidenv.composeAndroidPackages { buildToolsVersion = "30.0.3";
buildToolsVersions = [ buildToolsVersion ]; composed = pkgs.androidenv.composeAndroidPackages {
platformVersions = [ "32" ]; buildToolsVersions = [ buildToolsVersion ];
}; platformVersions = [ "32" ];
fhsEnv = pkgs.buildFHSUserEnv { };
name = "android-sdk-env"; fhsEnv = pkgs.buildFHSUserEnv {
targetPkgs = pkgs: (with pkgs; [ glibc ]); name = "android-sdk-env";
profile = '' targetPkgs = pkgs: (with pkgs; [ glibc ]);
export ANDROID_SDK_ROOT="${composed.androidsdk}/libexec/android-sdk/" profile = ''
''; export ANDROID_SDK_ROOT="${composed.androidsdk}/libexec/android-sdk/"
}; '';
};
in in
pkgs.devshell.mkShell { pkgs.devshell.mkShell {
name = "Orgzly"; name = "Orgzly";
packages = [ pkgs.jdk17 pkgs.kotlin-language-server pkgs.nixpkgs-fmt ]; packages = [ pkgs.jdk17 pkgs.kotlin-language-server pkgs.nixpkgs-fmt ];
env = [ env = [
@ -33,12 +34,12 @@ in
category = "tools"; category = "tools";
help = "Install a debug signed release APK"; help = "Install a debug signed release APK";
command = '' command = ''
rm -f "$APK_DIR/"* rm -f "$APK_DIR/"*
gradle assembleRelease gradle assembleRelease
"$BUILD_TOOLS_PATH/zipalign" -v -p 4 "$APK_DIR/app-premium-release-unsigned.apk" "$APK_DIR/app-release-unsigned-aligned.apk" "$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" 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" adb install -r "$APK_DIR/app-release.apk"
''; '';
} }
]; ];
} }