diff --git a/darwin/default.nix b/darwin/default.nix index 2bd39f1..e89f214 100644 --- a/darwin/default.nix +++ b/darwin/default.nix @@ -25,6 +25,7 @@ let gnome = false; gui = false; home = "/Users/gregory.hellings"; + mac = true; }; }; users.users."gregory.hellings".home = "/Users/gregory.hellings"; diff --git a/home/gui/default.nix b/home/gui/default.nix index d11a55d..9f8ece8 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -12,7 +12,9 @@ in ./firefox.nix ]; - home.packages = with pkgs; [ + # These packages are Linux only + home.packages = with pkgs; ( excludes ["x86_64-darwin" "aarch64-darwin"] + [ cdrtools ffmpeg handbrake @@ -20,34 +22,20 @@ in makemkv vlc x265 - ] ++ + ]) ++ - # Items that cannot be outside of x86_64-linux at all + # x86_64-linux only ( excludes ["x86_64-darwin" "aarch64-darwin" "aarch64-linux"] [ + bitwarden endeavour + gnucash jellyfin-media-player libreoffice logseq nextcloud-client - ]) ++ - - # Items that just cannot be outside of x86_64 at all - ( excludes ["aarch64-darwin" "aarch64-linux"] - [ - synology-drive-client - ]) ++ - - # Items that are not supported on ARM/Linux - ( excludes ["aarch64-linux"] - [ - bitwarden onlyoffice-bin + synology-drive-client zoom-us - ]) ++ - - ( excludes ["aarch64-darwin" "x86_64-darwin"] - [ - gnucash ]); } diff --git a/home/home.nix b/home/home.nix index 301be15..978c8ea 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,5 +1,5 @@ { pkgs, lib, gui, gnome, - inputs, + inputs, mac, ...}: { @@ -14,7 +14,8 @@ ./templates.nix ./vim.nix ./xonsh.nix - ] ++ ( if gui then [ ./gui ] else []); + ] ++ ( if gui then [ ./gui ] else []) + ++ ( if mac then [ ./mac.nix ] else []); greg.gnome = gnome; diff --git a/home/mac.nix b/home/mac.nix new file mode 100644 index 0000000..f724bdd --- /dev/null +++ b/home/mac.nix @@ -0,0 +1,18 @@ +{ pkgs, ... }: + +{ + # Programs for everyone? + programs.vscode = { + enable = true; + package = pkgs.vscodium; + extensions = with pkgs.vscode-extensions; [ + golang.go + ms-python.python + ms-pyright.pyright + vscjava.vscode-java-test + vscjava.vscode-java-dependency + vscjava.vscode-java-debug + vscodevim.vim + ]; + }; +}