pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity

fix/upstreaming-merge-conflicts #42

Merged
teutat3s merged 26 commits from refs/pull/42/head into main 2021-10-11 22:32:01 +00:00
Conversation 0 Commits 26 Files changed 10 +8 -3
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 950199ef2c - Show all commits

7
flake.nix
View file

@ -77,11 +77,14 @@
nur.overlay nur.overlay
agenix.overlay agenix.overlay
nvfetcher.overlay nvfetcher.overlay
deploy.overlay
./pkgs/default.nix ./pkgs/default.nix
]; ];
}; };
latest = { }; latest = {
overlays = [
deploy.overlay
];
};
}; };
lib = import ./lib { lib = digga.lib // nixos.lib; }; lib = import ./lib { lib = digga.lib // nixos.lib; };

4
overlays/overrides.nix
View file

@ -11,7 +11,9 @@ channels: final: prev: {
nixpkgs-fmt nixpkgs-fmt
qutebrowser qutebrowser
signal-desktop signal-desktop
starship; starship
deploy-rs
;
haskellPackages = prev.haskellPackages.override haskellPackages = prev.haskellPackages.override