Try to merge with compass branch
This commit is contained in:
+12
-9
@@ -1,13 +1,16 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
#greg.pypackages = with pkgs; [
|
homebrew = {
|
||||||
# dateutil
|
enable = true;
|
||||||
# ipython
|
brews = [
|
||||||
# pyyaml
|
"packer"
|
||||||
# responses
|
];
|
||||||
# ruamel-yaml
|
casks = [
|
||||||
# typing-extensions
|
"gnucash"
|
||||||
# virtualenv
|
"onlyoffice"
|
||||||
#];
|
"postman"
|
||||||
|
"vagrant"
|
||||||
|
];
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,11 +15,6 @@ in
|
|||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
cdrtools
|
cdrtools
|
||||||
dconf2nix
|
dconf2nix
|
||||||
ffmpeg
|
|
||||||
gnucash
|
|
||||||
handbrake
|
|
||||||
libtheora
|
|
||||||
makemkv
|
|
||||||
vlc
|
vlc
|
||||||
x265
|
x265
|
||||||
] ++
|
] ++
|
||||||
@@ -34,12 +29,6 @@ in
|
|||||||
nextcloud-client
|
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
|
# Items that are not supported on ARM/Linux
|
||||||
( excludes ["aarch64-linux"]
|
( excludes ["aarch64-linux"]
|
||||||
[
|
[
|
||||||
|
|||||||
@@ -48,6 +48,7 @@
|
|||||||
inetutils
|
inetutils
|
||||||
jq
|
jq
|
||||||
nano
|
nano
|
||||||
|
nix-prefetch
|
||||||
nmap
|
nmap
|
||||||
openssl
|
openssl
|
||||||
setup-ssh
|
setup-ssh
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
{ pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
gnucash
|
||||||
|
ffmpeg
|
||||||
|
handbrake
|
||||||
|
libtheora
|
||||||
|
makemkv
|
||||||
|
synology-drive-client
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -39,6 +39,7 @@
|
|||||||
crun = "compass workspace run";
|
crun = "compass workspace run";
|
||||||
ctest = "compass workspace test";
|
ctest = "compass workspace test";
|
||||||
cylint = "./scripts/run_yaml_lint.py";
|
cylint = "./scripts/run_yaml_lint.py";
|
||||||
|
cpip = "compass workspace run src/python3/uc/tools:run_pip_compile";
|
||||||
|
|
||||||
cleanup = "nix-collect-garbage --delete-older-than 30d && nix store optimise";
|
cleanup = "nix-collect-garbage --delete-older-than 30d && nix store optimise";
|
||||||
d = "vox deactivate";
|
d = "vox deactivate";
|
||||||
|
|||||||
Reference in New Issue
Block a user