Works on Darwin

This commit is contained in:
greg-compass
2022-09-07 20:01:51 -05:00
parent 16e54a97b4
commit 4a86e70de4
33 changed files with 123 additions and 110 deletions
+5 -4
View File
@@ -1,8 +1,9 @@
{ pkgs, ... }:
{ pkgs, lib, ... }:
{
home.packages = with pkgs; [
home.packages = with pkgs; ( if ( lib.hasSuffix "-darwin" pkgs.system) then
[] else
[
element-desktop
nheko
];
]);
}
+12 -6
View File
@@ -8,11 +8,17 @@
];
home.packages = with pkgs; [
bitwarden
gnucash
handbrake
onlyoffice-bin
synology-drive-client
vlc
];
] ++ ( if pkgs.system == "x86_64-darwin" then
[
libreoffice-bin
] else
[
bitwarden
gnucash
handbrake
onlyoffice-bin
vlc
]
);
}
+6 -9
View File
@@ -1,9 +1,10 @@
{ lib, pkgs, ... }:
let
ffPkgs = wayland: if wayland
then [ pkgs.firefox-wayland ]
else [ pkgs.firefox ];
# For now, we ignore this and don't install it
ffPkgs = if ( lib.hasSuffix "-darwin" pkgs.system )
then pkgs.firefox-unwrapped
else pkgs.firefox-wayland.override { cfg.enableGnomeExtensions = true; };
vars = {
MOZ_ENABLE_WAYLAND = "1";
@@ -12,12 +13,8 @@ let
in with lib;
{
programs.firefox = {
enable = true;
package = pkgs.firefox-wayland.override {
cfg = {
enableGnomeExtensions = true;
};
};
enable = (if (lib.hasSuffix "-darwin" pkgs.system) then false else true);
package = ffPkgs;
extensions = with pkgs.nur.repos.rycee.firefox-addons; [
bitwarden
octotree
+2 -2
View File
@@ -1,7 +1,7 @@
{ ... }:
{ lib, pkgs, ... }:
{
programs.gnome-terminal = {
programs.gnome-terminal = lib.mkIf ( pkgs.system != "x86_64-darwin") {
enable = true;
showMenubar = true;
themeVariant = "dark";