Try to merge with compass branch
This commit is contained in:
+12
-9
@@ -1,13 +1,16 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
#greg.pypackages = with pkgs; [
|
||||
# dateutil
|
||||
# ipython
|
||||
# pyyaml
|
||||
# responses
|
||||
# ruamel-yaml
|
||||
# typing-extensions
|
||||
# virtualenv
|
||||
#];
|
||||
homebrew = {
|
||||
enable = true;
|
||||
brews = [
|
||||
"packer"
|
||||
];
|
||||
casks = [
|
||||
"gnucash"
|
||||
"onlyoffice"
|
||||
"postman"
|
||||
"vagrant"
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,11 +15,6 @@ in
|
||||
home.packages = with pkgs; [
|
||||
cdrtools
|
||||
dconf2nix
|
||||
ffmpeg
|
||||
gnucash
|
||||
handbrake
|
||||
libtheora
|
||||
makemkv
|
||||
vlc
|
||||
x265
|
||||
] ++
|
||||
@@ -34,12 +29,6 @@ in
|
||||
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"]
|
||||
[
|
||||
|
||||
@@ -48,6 +48,7 @@
|
||||
inetutils
|
||||
jq
|
||||
nano
|
||||
nix-prefetch
|
||||
nmap
|
||||
openssl
|
||||
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";
|
||||
ctest = "compass workspace test";
|
||||
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";
|
||||
d = "vox deactivate";
|
||||
|
||||
Reference in New Issue
Block a user