axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

fmt

Browse source
This commit is contained in:
David Arnold 2021-07-16 16:01:25 -05:00 committed by David Arnold
parent 6c25e77f6f
commit a088edd77a
4 changed files with 82 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
flake.nix
View file

@ -73,7 +73,8 @@
let let
bud' = bud self; # rebind to access self.budModules bud' = bud self; # rebind to access self.budModules
in in
digga.lib.mkFlake { digga.lib.mkFlake
{
inherit self inputs; inherit self inputs;
channelsConfig = { allowUnfree = true; }; channelsConfig = { allowUnfree = true; };

4
overlays/various-flake-fixes.nix
View file

@ -2,7 +2,9 @@ final: prev: {
# Since: https://github.com/NixOS/nixpkgs/pull/126137 # Since: https://github.com/NixOS/nixpkgs/pull/126137
nix-direnv = nix-direnv =
if builtins.hasAttr "enableFlakes" prev.nix-direnv.override.__functionArgs if builtins.hasAttr "enableFlakes" prev.nix-direnv.override.__functionArgs
then prev.nix-direnv.override { then
prev.nix-direnv.override
{
enableFlakes = true; enableFlakes = true;
} }
else prev.nix-direnv; else prev.nix-direnv;

5
shell/default.nix
View file

@ -9,7 +9,8 @@ let
docs = pkgWithCategory "docs"; docs = pkgWithCategory "docs";
devos = pkgWithCategory "devos"; devos = pkgWithCategory "devos";
in { in
{
_file = toString ./.; _file = toString ./.;
imports = [ "${extraModulesPath}/git/hooks.nix" ]; imports = [ "${extraModulesPath}/git/hooks.nix" ];
@ -35,7 +36,7 @@ in {
]; ];
commands = with pkgs; [ commands = with pkgs; [
(devos (bud {inherit pkgs;}) ) (devos (bud { inherit pkgs; }))
(devos nixUnstable) (devos nixUnstable)
(devos agenix) (devos agenix)
{ {