diff --git a/devices/nos/modules/arion/lineageos/Caddyfile b/devices/nos/modules/arion/lineageos/Caddyfile deleted file mode 100755 index 923d921..0000000 --- a/devices/nos/modules/arion/lineageos/Caddyfile +++ /dev/null @@ -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 -} diff --git a/devices/nos/modules/arion/lineageos/compose.nix b/devices/nos/modules/arion/lineageos/compose.nix deleted file mode 100644 index 499e627..0000000 --- a/devices/nos/modules/arion/lineageos/compose.nix +++ /dev/null @@ -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"; - }; - }; - }; -} diff --git a/devices/nos/modules/arion/lineageos/manifests/manifests.xml b/devices/nos/modules/arion/lineageos/manifests/manifests.xml deleted file mode 100644 index 9bf67d8..0000000 --- a/devices/nos/modules/arion/lineageos/manifests/manifests.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/devices/nos/modules/arion/lineageos/manifests/roomservice.xml b/devices/nos/modules/arion/lineageos/manifests/roomservice.xml deleted file mode 100644 index c13ef8f..0000000 --- a/devices/nos/modules/arion/lineageos/manifests/roomservice.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/devices/nos/modules/arion/lineageos/scripts/before.sh b/devices/nos/modules/arion/lineageos/scripts/before.sh deleted file mode 100755 index f60ced3..0000000 --- a/devices/nos/modules/arion/lineageos/scripts/before.sh +++ /dev/null @@ -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" diff --git a/devices/wim/modules/security.nix b/devices/wim/modules/security.nix index c0009b0..154532f 100644 --- a/devices/wim/modules/security.nix +++ b/devices/wim/modules/security.nix @@ -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); }; } diff --git a/flake.lock b/flake.lock index 21eafd8..3e1adb3 100644 --- a/flake.lock +++ b/flake.lock @@ -1170,7 +1170,9 @@ }, "nh": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1714905986, @@ -1214,7 +1216,7 @@ "inputs": { "flake-parts": "flake-parts_9", "nix-github-actions": "nix-github-actions_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_3", "treefmt-nix": "treefmt-nix_3" }, "locked": { @@ -1279,7 +1281,9 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_7", - "nixpkgs": "nixpkgs_3" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1716340597, @@ -1360,7 +1364,9 @@ }, "nix-melt": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1708375128, @@ -1405,7 +1411,9 @@ "inputs": { "flake-parts": "flake-parts_8", "flake-root": "flake-root", - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1716179952, @@ -1563,7 +1571,9 @@ "flake-compat": "flake-compat_2", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs_2", - "nixpkgs": "nixpkgs_8" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1716383976, @@ -1580,70 +1590,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1714409183, - "narHash": "sha256-Wacm/DrzLD7mjFGnSxxyGkJgg2unU/dNdNgdngBH+RU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "576ecd43d3b864966b4423a853412d6177775e8b", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1716062047, - "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1707092692, - "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "faf912b086576fd1a15fca610166c98d47bc667e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1714562304, - "narHash": "sha256-Mr3U37Rh6tH0FbaDFu0aZDwk9mPAe7ASaqDOGgLqqLU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bcd44e224fd68ce7d269b4f44d24c2220fd821e7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1716293225, "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", @@ -1659,7 +1605,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_3": { "locked": { "lastModified": 1715037484, "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", @@ -1675,23 +1621,7 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1716293225, - "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { + "nixpkgs_4": { "locked": { "lastModified": 1708296515, "narHash": "sha256-FyF489fYNAUy7b6dkYV6rGPyzp+4tThhr80KNAaF/yY=", @@ -1798,7 +1728,7 @@ }, "nurl": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1708368674, @@ -2026,7 +1956,7 @@ "nix-melt": "nix-melt", "nix-on-droid": "nix-on-droid", "nixd": "nixd", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_2", "nixpkgs-wayland": "nixpkgs-wayland", "nms": "nms", "nur": "nur", diff --git a/flake.nix b/flake.nix index 712922c..b15ec04 100644 --- a/flake.nix +++ b/flake.nix @@ -1,4 +1,5 @@ # Do not modify! This file is generated. + { inputs = { Hyprspace = { @@ -178,6 +179,7 @@ type = "github"; }; nh = { + inputs.nixpkgs.follows = "nixpkgs"; owner = "viperML"; repo = "nh"; type = "github"; @@ -196,6 +198,7 @@ type = "github"; }; nix-gaming = { + inputs.nixpkgs.follows = "nixpkgs"; owner = "fufexan"; repo = "nix-gaming"; type = "github"; @@ -207,6 +210,7 @@ type = "github"; }; nix-melt = { + inputs.nixpkgs.follows = "nixpkgs"; owner = "nix-community"; repo = "nix-melt"; type = "github"; @@ -218,6 +222,7 @@ type = "github"; }; nixd = { + inputs.nixpkgs.follows = "nixpkgs"; owner = "nix-community"; repo = "nixd"; type = "github"; @@ -229,6 +234,7 @@ type = "github"; }; nixpkgs-wayland = { + inputs.nixpkgs.follows = "nixpkgs"; owner = "nix-community"; repo = "nixpkgs-wayland"; type = "github"; @@ -335,4 +341,4 @@ }; }; outputs = inputs: inputs.flakegen ./flake.in.nix inputs; -} +} \ No newline at end of file diff --git a/home/foot.nix b/home/foot.nix index 37e3ba3..3372bf1 100644 --- a/home/foot.nix +++ b/home/foot.nix @@ -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 }"; diff --git a/inputs.nix b/inputs.nix index 44a1bd5..722cda7 100644 --- a/inputs.nix +++ b/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";