greg/nixos
1
0
Fork 2
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Update ffmac and Darwin to non-dbus

Browse Source
This commit is contained in:
greg-compass
2023-01-03 11:29:40 -06:00
parent 6e7f5ae446
commit 24891562a8
4 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
home/default.nix
+5 -5
View File
@@ -51,14 +51,14 @@ let
gnome = false;
};
arch = { system = "aarch64-linux"; };
arm = { system = "aarch64-linux"; };
x86 = { system = "x86_64-linux"; };
darwin = { system = "x86_64-darwin"; };
in {
"wsl" = mkhome (gui // arch);
"aarch64-gui" = mkhome (gdm // arch);
"aarch64-nogui" = mkhome (cli // arch);
"wsl" = mkhome (gui // arm);
"aarch64-gui" = mkhome (gdm // arm);
"aarch64-nogui" = mkhome (cli // arm);
"x86_64-gui" = mkhome (gdm // x86);
"x86_64-nogui" = mkhome (cli // x86);
"x86_64-darwin" = mkhome (gdm // darwin);
"x86_64-darwin" = mkhome (gui // darwin);
}
home/gui/chat.nix
+3 -3
View File
@@ -6,12 +6,12 @@ let
element-desktop
slack
];
archPkgs = with pkgs; [
armPkgs = with pkgs; [
element-desktop
];
in {
home.packages = ( if ( pkgs.stdenv.hostPlatform.isDarwin ) then darwinPkgs else
( if ( lib.hasPrefix "aarch64" pkgs.system ) then archPkgs else
home.packages = ( if ( pkgs.stdenv.hostPlatform.isDarwin ) then darwinPkgs else
( if ( lib.hasPrefix "aarch64" pkgs.system ) then armPkgs else
( if ( lib.hasPrefix "x86_64" pkgs.system ) then x86Pkgs else [] )
)
);