diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 41fcafbf..75fdc58c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,18 +44,36 @@ jobs: with: job: homeConfigurations.miifox-x86_64-linux secrets: inherit + user-miifox-aarch64-linux: + needs: user-base-aarch64-linux + uses: ./.github/workflows/build-one.yml + with: + job: homeConfigurations.miifox-aarch64-linux + secrets: inherit user-base-desktop-x86_64-linux: needs: user-base-x86_64-linux uses: ./.github/workflows/build-one.yml with: job: homeConfigurations.base-desktop-x86_64-linux secrets: inherit + user-base-desktop-aarch64-linux: + needs: user-base-aarch64-linux + uses: ./.github/workflows/build-one.yml + with: + job: homeConfigurations.base-desktop-aarch64-linux + secrets: inherit user-darkkirb-desktop-x86_64-linux: needs: user-base-desktop-x86_64-linux uses: ./.github/workflows/build-one.yml with: job: homeConfigurations.darkkirb-desktop-x86_64-linux secrets: inherit + user-darkkirb-desktop-aarch64-linux: + needs: user-base-desktop-aarch64-linux + uses: ./.github/workflows/build-one.yml + with: + job: homeConfigurations.darkkirb-desktop-aarch64-linux + secrets: inherit base-server-x86_64: needs: - user-root-x86_64-linux diff --git a/config/games/grapejuice.nix b/config/games/grapejuice.nix index fbb710a1..e6643e0d 100644 --- a/config/games/grapejuice.nix +++ b/config/games/grapejuice.nix @@ -2,8 +2,10 @@ args: { lib, config, pkgs, + nixpkgs, ... }: let + x86_64-linux-pkgs = import nixpkgs {system = "x86_64-linux";}; grapejuice_config = { __version__ = 2; __hardware_profiles__ = null; @@ -19,7 +21,7 @@ args: { priority = 0; name_on_disk = "player"; display_name = "Player"; - wine_home = "${pkgs.wineWowPackages.staging}"; + wine_home = "${x86_64-linux-pkgs.wineWowPackages.staging}"; dll_overrides = "dxdiagn=;winemenubuilder.exe="; prime_offload_sink = -1; use_mesa_gl_override = false; @@ -46,7 +48,7 @@ args: { grapejuiceJson = pkgs.writeText "grapejuice.json" (builtins.toJSON grapejuice_config); in { home.packages = [ - pkgs.grapejuice + x86_64-linux-pkgs.grapejuice ]; home.activation.grapejuiceSettings = lib.hm.dag.entryAfter ["writeBoundary"] '' $DRY_RUN_CMD mkdir $VERBOSE_ARG -p $HOME/.config/brinkervii/grapejuice diff --git a/config/programs/ims.nix b/config/programs/ims.nix index 5296f144..6b80b3a1 100644 --- a/config/programs/ims.nix +++ b/config/programs/ims.nix @@ -2,14 +2,19 @@ config, pkgs, lib, + nixpkgs, ... }: let firefox-wrapped = config.programs.firefox.package; firefox = firefox-wrapped.unwrapped; nss = pkgs.lib.lists.findFirst (x: x.pname or x.name == "nss") null firefox.buildInputs; + x86_64-linux-pkgs = import nixpkgs { + system = "x86_64-linux"; + config.allowUnfree = true; + }; in { home.packages = with pkgs; [ - (discord.override {inherit nss;}) + (x86_64-linux-pkgs.discord.override {inherit nss;}) tdesktop element-desktop nheko diff --git a/config/programs/keybase.nix b/config/programs/keybase.nix index 3c552a26..79548d0c 100644 --- a/config/programs/keybase.nix +++ b/config/programs/keybase.nix @@ -1,7 +1,9 @@ -{pkgs, ...}: { +{nixpkgs, ...}: let + x86_64-linux-pkgs = import nixpkgs {system = "x86_64-linux";}; +in { services.keybase.enable = true; services.kbfs.enable = true; home.packages = [ - pkgs.keybase-gui + x86_64-linux-pkgs.keybase-gui ]; } diff --git a/config/programs/misc.nix b/config/programs/misc.nix index d5e5ed5f..fd69a43d 100644 --- a/config/programs/misc.nix +++ b/config/programs/misc.nix @@ -1,6 +1,12 @@ -{pkgs, ...}: { +{ + pkgs, + nixpkgs, + ... +}: let + x86_64-linux-pkgs = import nixpkgs {system = "x86_64-linux";}; +in { home.packages = with pkgs; [ - anki-bin + x86_64-linux-pkgs.anki-bin mdcat gimp krita diff --git a/config/programs/vscode/default.nix b/config/programs/vscode/default.nix index f375f756..6e838329 100644 --- a/config/programs/vscode/default.nix +++ b/config/programs/vscode/default.nix @@ -1,8 +1,14 @@ { pkgs, + nixpkgs, lib, ... -}: { +}: let + x86_64-linux-pkgs = import nixpkgs { + system = "x86_64-linux"; + config.allowUnfree = true; + }; +in { home.activation.vscode-server = lib.hm.dag.entryAfter ["write-boundary"] '' if test -f ~/.vscode-server; then if test -f "~/.vscode/extensions"; then @@ -279,7 +285,7 @@ "nix.formatterPath" = "${pkgs.alejandra}/bin/alejandra"; "nix.enableLanguageServer" = true; }; - extensions = with pkgs.vscode-extensions; + extensions = with x86_64-linux-pkgs.vscode-extensions; [ alefragnani.bookmarks alefragnani.project-manager diff --git a/config/programs/zoom.nix b/config/programs/zoom.nix index 802f9682..bed5840e 100644 --- a/config/programs/zoom.nix +++ b/config/programs/zoom.nix @@ -1,3 +1,8 @@ -{pkgs, ...}: { - home.packages = [pkgs.zoom-us]; +{nixpkgs, ...}: let + x86_64-linux-pkgs = import nixpkgs { + system = "x86_64-linux"; + config.allowUnfree = true; + }; +in { + home.packages = [x86_64-linux-pkgs.zoom-us]; }