Merge remote-tracking branch 'origin/main' into compass

This commit is contained in:
Greg Hellings
2023-08-23 14:48:40 -05:00
committed by greg-compass
49 changed files with 1039 additions and 287 deletions
+20 -4
View File
@@ -12,14 +12,25 @@ in
./firefox.nix
];
# An alternative editor to vim, when I need it for some things
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
];
};
# These packages are Linux only
home.packages = with pkgs; ( excludes ["x86_64-darwin" "aarch64-darwin"]
[
cdrtools
ffmpeg
handbrake
libtheora
makemkv
vlc
x265
]) ++
@@ -34,6 +45,11 @@ in
libreoffice
logseq
nextcloud-client
]) ++
# Items that are not supported on ARM/Linux
( excludes ["aarch64-linux"]
[
onlyoffice-bin
synology-drive-client
zoom-us