diff --git a/common/home/neovim/langs/markdown.nix b/common/home/neovim/langs/markdown.nix index 168fafe4..49d5df51 100644 --- a/common/home/neovim/langs/markdown.nix +++ b/common/home/neovim/langs/markdown.nix @@ -8,7 +8,7 @@ inherit (config.vars) neovimIde; inherit (pkgs) vimPlugins; - inherit (import ../../../../lib.nix {inherit pkgs;}) buildPlugin; + inherit (import ../../../../flake/lib.nix {inherit pkgs;}) buildPlugin; in lib.mkIf neovimIde { programs = { diff --git a/common/home/neovim/langs/web.nix b/common/home/neovim/langs/web.nix index 29dfff63..15b04bea 100644 --- a/common/home/neovim/langs/web.nix +++ b/common/home/neovim/langs/web.nix @@ -8,7 +8,7 @@ inherit (config.vars) neovimIde; inherit (pkgs) vimPlugins; - inherit (import ../../../../lib.nix {inherit pkgs;}) buildPlugin; + inherit (import ../../../../flake/lib.nix {inherit pkgs;}) buildPlugin; in lib.mkIf neovimIde { programs = { diff --git a/flake.in.nix b/flake.in.nix index a26a1476..03ef2646 100644 --- a/flake.in.nix +++ b/flake.in.nix @@ -1,6 +1,6 @@ { inputs = let - inherit (import ./inputs.nix) mkDep mkInput otherInputs; + inherit (import ./flake/inputs.nix) mkDep mkInput otherInputs; mainInputs = { nixpkgs = mkInput { @@ -47,7 +47,7 @@ self, ... }: let - inherit (import ./lib.nix inputs) mkVersion mkNixOS mkNixOnDroid mkPkgs; + inherit (import ./flake/lib.nix inputs) mkVersion mkNixOS mkNixOnDroid mkPkgs; supportedSystems = ["x86_64-linux" "aarch64-linux"]; @@ -176,6 +176,6 @@ # For nix-fast-build checks = perSystem (system: pkgs: - import ./ci.nix {inherit system pkgs self;}); + import ./flake/ci.nix {inherit system pkgs self;}); }; } diff --git a/ci.nix b/flake/ci.nix similarity index 100% rename from ci.nix rename to flake/ci.nix diff --git a/inputs.nix b/flake/inputs.nix similarity index 100% rename from inputs.nix rename to flake/inputs.nix diff --git a/lib.nix b/flake/lib.nix similarity index 96% rename from lib.nix rename to flake/lib.nix index b6339d71..e8021c84 100644 --- a/lib.nix +++ b/flake/lib.nix @@ -35,7 +35,7 @@ modules = [ {home-manager.extraSpecialArgs = specialArgs;} - ./common + ../common ] ++ mods; }; @@ -56,7 +56,7 @@ }; } {home-manager = {inherit extraSpecialArgs;};} - ./common/nix-on-droid.nix + ../common/nix-on-droid.nix ] ++ mods; }; diff --git a/home/firefox/gx-theme.nix b/home/firefox/gx-theme.nix index 947bb6cf..f779c7a5 100644 --- a/home/firefox/gx-theme.nix +++ b/home/firefox/gx-theme.nix @@ -3,7 +3,7 @@ firefox-gx-src, stdenvNoCC, }: let - inherit (import ../../lib.nix {}) mkVersion; + inherit (import ../../flake/lib.nix {}) mkVersion; in stdenvNoCC.mkDerivation { pname = "firefox-gx"; diff --git a/modules/ratbag-mice.nix b/modules/ratbag-mice.nix index 1499c156..901064be 100644 --- a/modules/ratbag-mice.nix +++ b/modules/ratbag-mice.nix @@ -4,7 +4,7 @@ piper-src, ... }: let - inherit (import ../lib.nix {}) mkVersion; + inherit (import ../flake/lib.nix {}) mkVersion; in { services.ratbagd = { enable = true; diff --git a/update.sh b/update.sh deleted file mode 100755 index 106c0913..00000000 --- a/update.sh +++ /dev/null @@ -1,123 +0,0 @@ -#!/usr/bin/env bash - -# Deps: -# - jq -# - mozilla-addons-to-nix -# - alejandra -# - updateImages -# - nix-fast-build - -parseFetchurl() { - URL="$1" - FILE="$2" - HASH="$(nix store prefetch-file --refresh --json \ - --hash-type sha256 "$URL" --name "escaped" | jq -r .hash)" - - sed -i "s,url = .*,url = \"$URL\";," "$FILE" - sed -i "s,hash = .*,hash = \"$HASH\";," "$FILE" - - # For Firefox addons - sed -i "s,sha256 = .*,sha256 = \"$HASH\";," "$FILE" -} - -updateDocker() { - find "$FLAKE/devices/nos/modules/arion" \ - -name "*compose.nix" \ - -exec sh -c 'i="$1"; updateImages $(dirname "$i")' shell {} \; -} - -updateFFZ() { - FILE="$FLAKE/pkgs/firefox-addons/default.nix" - URL="https://cdn.frankerfacez.com/script/frankerfacez-4.0-an+fx.xpi" - - parseFetchurl "$URL" "$FILE" -} - -updateFirefoxAddons() { - echo "Updating firefox addons using mozilla-addons-to-nix" - - ( - cd "$FLAKE/pkgs/firefox-addons" || return; - - file=generated-firefox-addons.nix - if [[ -f $file ]]; then - readarray -t OLD_VERS <<< "$(grep -A 1 --no-group-separator 'pname' "$file" | - awk '{ gsub(/"/, ""); gsub(/;/, ""); print $3 }' | - awk 'NR%2{printf $0" version ";next;}1' | paste -sd'\n' -)" - - readarray -t NEW_VERS <<< "$(sed 's/Fetched //' \ - <(mozilla-addons-to-nix addons.json generated-firefox-addons.nix) | - sed 's/bitwarden-password-manager/bitwarden/' | - sed 's/600-sound-volume/sound-volume/' | - sed 's/styl-us/stylus/' | - sort)" - - for (( i=0; i<${#OLD_VERS[@]}; i++ )); do - if [[ "${OLD_VERS[$i]}" != "${NEW_VERS[$i]}" ]]; then - echo "${OLD_VERS[$i]} -> $(echo "${NEW_VERS[$i]}" | awk '{print $NF}')" - fi - done - else - mozilla-addons-to-nix addons.json generated-firefox-addons.nix - fi - ) -} - -updateVuetorrent() { - FILE="$FLAKE/devices/nos/modules/qbittorrent/vuetorrent.nix" - - release=$(curl -s https://api.github.com/repos/VueTorrent/VueTorrent/releases/latest) - version=$(echo "$release" | jq -r .tag_name | tr -d v) - url="https://github.com/VueTorrent/VueTorrent/releases/download/v${version}/vuetorrent.zip" - hash="$(nix store prefetch-file --refresh --json \ - --hash-type sha256 "$url" --name "escaped" | jq -r .hash)" - - { - echo '# This file was autogenerated. DO NOT EDIT!' - echo '{' - echo " version = \"$version\";" - echo " url = \"$url\";" - echo " hash = \"$hash\";" - echo '}' - } >"$FILE" -} - - -doAll() { - flakeUpdates="$(nix flake update |& grep -v "warning: updating lock file")" - dockerUpdates="$(updateDocker)" - updateFFZ - updateFirefoxAddons - updateVuetorrent - nix-fast-build - - echo 'Commit messages: - ' -msg=$(cat <