refactor: reduce amount of nixpkgs in flake.lock
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
9efff85115
commit
8667fbe805
10 changed files with 8 additions and 136 deletions
|
|
@ -1,7 +0,0 @@
|
|||
ota.nelim.org {
|
||||
tls matt@nelim.org {
|
||||
dns cloudflare {env.CLOUDFLARE_API_TOKEN}
|
||||
resolvers 1.0.0.1
|
||||
}
|
||||
reverse_proxy lineageOTA
|
||||
}
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
{config, ...}: let
|
||||
inherit (config.sops) secrets;
|
||||
inherit (config.arion) rwDataDir;
|
||||
|
||||
rwPath = rwDataDir + "/lineageos";
|
||||
in {
|
||||
# FIXME: crashes when building
|
||||
# TODO: make sure it works with latest arion custom module
|
||||
|
||||
arion.projects."lineageos" = {
|
||||
"builder" = {
|
||||
image = "lineageos4microg/docker-lineage-cicd";
|
||||
container_name = "lineage_builder";
|
||||
|
||||
environment = {
|
||||
BRANCH_NAME = "lineage-20.0";
|
||||
DEVICE_LIST = "lemonadep";
|
||||
SIGN_BUILDS = "true";
|
||||
SIGNATURE_SPOOFING = "restricted";
|
||||
WITH_GMS = "true";
|
||||
ZIP_SUBDIR = "false";
|
||||
OTA_URL = "https://ota.nelim.org/api";
|
||||
CUSTOM_PACKAGES = "AuroraStore AvesLibre Droidify MJPdfReader Mull OpenCalc";
|
||||
INCLUDE_PROPRIETARY = "false";
|
||||
PARALLEL_JOBS = 6;
|
||||
CLEAN_AFTER_BUILD = "false";
|
||||
CCACHE_SIZE = "200G";
|
||||
};
|
||||
|
||||
volumes = [
|
||||
"${rwPath}/lineage/src:/srv/src"
|
||||
"${rwPath}/lineage/zips:/srv/zips"
|
||||
"${rwPath}/lineage/logs:/srv/logs"
|
||||
"${rwPath}/lineage/cache:/srv/ccache"
|
||||
"${rwPath}/lineage/keys:/srv/keys"
|
||||
|
||||
"${toString ./.}/manifests:/srv/local_manifests:ro"
|
||||
"${toString ./.}/scripts:/srv/userscripts:ro"
|
||||
"/etc/timezone:/etc/timezone:ro"
|
||||
"/etc/localtime:/etc/localtime:ro"
|
||||
];
|
||||
};
|
||||
|
||||
"OTA-server" = {
|
||||
container_name = "lineageOTA";
|
||||
image = "docker.io/julianxhokaxhiu/lineageota";
|
||||
volumes = [
|
||||
"${rwPath}/lineage/zips:/var/www/html/builds/full:ro"
|
||||
];
|
||||
};
|
||||
|
||||
"caddy" = {
|
||||
image = "quay.io/slothcroissant/caddy-cloudflaredns:latest";
|
||||
|
||||
ports = [
|
||||
"80:80"
|
||||
"443:443"
|
||||
];
|
||||
|
||||
volumes = [
|
||||
"${rwPath}/caddy/data:/data"
|
||||
"${rwPath}/caddy/config:/config"
|
||||
|
||||
"${toString ./.}/Caddyfile:/etc/caddy/Caddyfile:ro"
|
||||
];
|
||||
|
||||
env_file = [secrets.caddy-cloudflare.path];
|
||||
environment = {
|
||||
CLOUDFLARE_EMAIL = "matt@nelim.rg";
|
||||
ACME_AGREE = "true";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<manifest>
|
||||
<remote name="gitea" fetch="https://git.nelim.org/" />
|
||||
|
||||
<project name="matt1432/android_vendor_customs" path="vendor/alternatives" remote="gitea" revision="master" />
|
||||
|
||||
<project name="lineageos4microg/android_vendor_partner_gms" path="vendor/partner_gms" remote="github" revision="master" />
|
||||
<project name="matt1432/android_vendor_mulchwebview" path="vendor/mulch" remote="gitea" revision="main" />
|
||||
<project name="jgudec/android_vendor_lawnchair" path="vendor/lawnchair" remote="github" revision="13" />
|
||||
</manifest>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<manifest>
|
||||
<project name="TheMuppets/proprietary_vendor_oneplus_lemonadep" path="vendor/oneplus/lemonadep" remote="github" revision="lineage-20" />
|
||||
<project name="TheMuppets/proprietary_vendor_oneplus_sm8350-common" path="vendor/oneplus/sm8350-common" remote="github" revision="lineage-20" />
|
||||
|
||||
<project name="LineageOS/android_device_oneplus_lemonadep" path="device/oneplus/lemonadep" remote="github" revision="lineage-20" />
|
||||
<project name="LineageOS/android_hardware_oplus" path="hardware/oplus" remote="github" revision="lineage-20" />
|
||||
<project name="LineageOS/android_kernel_oneplus_sm8350" path="kernel/oneplus/sm8350" remote="github" revision="lineage-20" />
|
||||
<project name="LineageOS/android_device_oneplus_sm8350-common" path="device/oneplus/sm8350-common" remote="github" revision="lineage-20" />
|
||||
</manifest>
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
## See here for AndroidAuto: https://github.com/sn-00-x/aa4mg
|
||||
|
||||
## add MulchWebView
|
||||
sed -i "1s;^;\$(call inherit-product-if-exists, vendor/mulch/mulch.mk)\n\n;" "/srv/src/LINEAGE_20_0/vendor/lineage/config/common.mk"
|
||||
|
||||
## add lawnchair overlay to build
|
||||
sed -i "1s;^;\$(call inherit-product-if-exists, vendor/lawnchair/lawnchair.mk)\n\n;" "/srv/src/LINEAGE_20_0/vendor/lineage/config/common.mk"
|
||||
|
||||
## remove Trebuchet
|
||||
sed -i 's/overrides.*/overrides: ["Home", "Launcher2", "Launcher3", "Launcher3QuickStep", "ParanoidQuickStep", "PixelLauncher", "TrebuchetQuickStep", "TrebuchetOverlay"],/' "/srv/src/LINEAGE_20_0/vendor/lawnchair/Android.bp"
|
||||
|
||||
## only add needed packages from microg
|
||||
echo "PRODUCT_PACKAGES += \\
|
||||
GmsCore \\
|
||||
GsfProxy \\
|
||||
FakeStore \\
|
||||
IchnaeaNlpBackend \\
|
||||
NominatimGeocoderBackend" > "/srv/src/LINEAGE_20_0/vendor/partner_gms/products/gms.mk"
|
||||
|
|
@ -34,8 +34,6 @@ in {
|
|||
sudo.text = mkDefault (mkBefore grosshackConf);
|
||||
login.text = mkDefault (mkBefore grosshackConf);
|
||||
polkit-1.text = mkDefault (mkBefore grosshackConf);
|
||||
|
||||
# FIXME: sometimes can't use password
|
||||
ags.text = mkDefault (mkBefore grosshackConf);
|
||||
};
|
||||
}
|
||||
|
|
|
|||
BIN
flake.lock
BIN
flake.lock
Binary file not shown.
BIN
flake.nix
BIN
flake.nix
Binary file not shown.
|
|
@ -36,7 +36,6 @@ in {
|
|||
main = {
|
||||
term = "xterm-256color";
|
||||
|
||||
# FIXME: Figure out font size with Dpi-aware
|
||||
font = "JetBrainsMono Nerd Font:size=${
|
||||
lib.strings.floatToString fontSize
|
||||
}";
|
||||
|
|
|
|||
20
inputs.nix
20
inputs.nix
|
|
@ -4,6 +4,7 @@ let
|
|||
# Misc functions
|
||||
mkInput = {type ? "github", ...} @ info: info // {inherit type;};
|
||||
mkDep = info: (mkInput info) // {inputs.nixpkgs.follows = "nixpkgs";};
|
||||
mkHyprDep = info: (mkInput info) // {inputs.hyprland.follows = "hyprland";};
|
||||
mkSrc = info: (mkInput info) // {flake = false;};
|
||||
|
||||
# Inputs
|
||||
|
|
@ -18,19 +19,19 @@ let
|
|||
repo = "nix-index-database";
|
||||
};
|
||||
|
||||
nh = mkInput {
|
||||
nh = mkDep {
|
||||
owner = "viperML";
|
||||
repo = "nh";
|
||||
};
|
||||
|
||||
nix-melt = mkInput {
|
||||
nix-melt = mkDep {
|
||||
owner = "nix-community";
|
||||
repo = "nix-melt";
|
||||
};
|
||||
};
|
||||
|
||||
overlays = {
|
||||
nixpkgs-wayland = mkInput {
|
||||
nixpkgs-wayland = mkDep {
|
||||
owner = "nix-community";
|
||||
repo = "nixpkgs-wayland";
|
||||
};
|
||||
|
|
@ -40,7 +41,7 @@ let
|
|||
repo = "NUR";
|
||||
};
|
||||
|
||||
nix-gaming = mkInput {
|
||||
nix-gaming = mkDep {
|
||||
owner = "fufexan";
|
||||
repo = "nix-gaming";
|
||||
};
|
||||
|
|
@ -60,7 +61,7 @@ let
|
|||
repo = "stylelint-lsp";
|
||||
};
|
||||
|
||||
nixd = mkInput {
|
||||
nixd = mkDep {
|
||||
owner = "nix-community";
|
||||
repo = "nixd";
|
||||
};
|
||||
|
|
@ -140,18 +141,14 @@ let
|
|||
submodules = true;
|
||||
};
|
||||
|
||||
hypr-official-plugins = mkInput {
|
||||
hypr-official-plugins = mkHyprDep {
|
||||
owner = "hyprwm";
|
||||
repo = "hyprland-plugins";
|
||||
|
||||
inputs.hyprland.follows = "hyprland";
|
||||
};
|
||||
|
||||
Hyprspace = mkInput {
|
||||
Hyprspace = mkHyprDep {
|
||||
owner = "KZDKM";
|
||||
repo = "Hyprspace";
|
||||
|
||||
inputs.hyprland.follows = "hyprland";
|
||||
};
|
||||
|
||||
hypridle = mkDep {
|
||||
|
|
@ -164,7 +161,6 @@ let
|
|||
repo = "grim-hyprland";
|
||||
};
|
||||
|
||||
## Wayland
|
||||
wpaperd = mkDep {
|
||||
owner = "danyspin97";
|
||||
repo = "wpaperd";
|
||||
|
|
|
|||
Loading…
Reference in a new issue