greg/nixos
1
0
Fork 1
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of gh:greg-hellings/nixos-config

Browse Source
This commit is contained in:
Greg Hellings
2023-08-21 21:25:38 -05:00
parent 88c28ed0f2 51b2cff831
commit 12d3b09163
25 changed files with 155 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
overlays/default.nix
+16 -13
View File
@@ -44,19 +44,22 @@ in rec {
})
];
aacs = prev.callPackage ./aacs.nix {};
brew = prev.callPackage ./homebrew.nix {};
setup-ssh = prev.callPackage ./setup-ssh.nix {
pkgs = final.pkgs;
};
enwiki-dump = prev.callPackage ./enwiki-dump.nix {};
hms = prev.callPackage ./hms.nix {
pkgs = final.pkgs;
};
jinja2-cli = prev.python3.pkgs.callPackage ./jinja2-cli.nix {};
template = prev.callPackage ./template.nix { };
enwiki-dump = prev.callPackage ./enwiki-dump.nix {};
inject = prev.callPackage ./inject.nix { inherit (final) pkgs; };
jinja2-cli = prev.python3.pkgs.callPackage ./jinja2-cli.nix {};
libbluray = prev.libbluray.override {
withAACS = true;
withBDplus = true;
};
setup-ssh = prev.callPackage ./setup-ssh.nix {
pkgs = final.pkgs;
};
template = prev.callPackage ./template.nix { };
xonsh = prev.xonsh.overridePythonAttrs (old: rec{
python3 = final.gregpy;
propagatedBuildInputs = with final.gregpy.pkgs; old.propagatedBuildInputs ++ [
@@ -66,9 +69,9 @@ in rec {
];
});
bitwarden = macOver ./mac/bitwarden.nix "bitwarden";
gnucash = macOver ./mac/gnucash.nix "gnucash";
handbrake = macOver ./mac/handbrake.nix "handbrake";
onlyoffice-bin = macOver ./mac/onlyoffice-bin.nix "onlyoffice-bin";
vlc = macOver ./mac/vlc.nix "vlc";
#bitwarden = macOver ./mac/bitwarden.nix "bitwarden";
#gnucash = macOver ./mac/gnucash.nix "gnucash";
#handbrake = macOver ./mac/handbrake.nix "handbrake";
#onlyoffice-bin = macOver ./mac/onlyoffice-bin.nix "onlyoffice-bin";
#vlc = macOver ./mac/vlc.nix "vlc";
}