Use x86_64 for unsupported things
This commit is contained in:
parent
97cda224c6
commit
85a35ac1e6
7 changed files with 55 additions and 11 deletions
18
.github/workflows/build.yml
vendored
18
.github/workflows/build.yml
vendored
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
];
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue