gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

pkgs.extend() and cleanup!

Browse source 
Preparing for the screenstub overlay.
This commit is contained in:
kat witch 2021-03-01 22:44:34 +00:00
parent 0a05d453f6
commit e47deebca2
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
5 changed files with 21 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/common/default.nix
View file

@ -2,7 +2,6 @@
let let
sources = import ../../nix/sources.nix; sources = import ../../nix/sources.nix;
unstable = import sources.nixpkgs-unstable { };
in { in {
imports = [ ../../modules ../users (sources.home-manager + "/nixos") ]; imports = [ ../../modules ../users (sources.home-manager + "/nixos") ];

2
config/users/kat/desktop.nix
View file

@ -2,8 +2,6 @@
let let
sources = import ../../../nix/sources.nix; sources = import ../../../nix/sources.nix;
unstable = import sources.nixpkgs-unstable { inherit (pkgs) config; };
nur = import sources.NUR;
in { in {
imports = [ ./firefox ]; imports = [ ./firefox ];

4
config/users/kat/firefox/default.nix
View file

@ -2,8 +2,6 @@
let let
sources = import ../../../../nix/sources.nix; sources = import ../../../../nix/sources.nix;
unstable = import sources.nixpkgs-unstable { inherit (pkgs) config; };
nur = import sources.NUR { inherit pkgs; };
commonSettings = { commonSettings = {
"app.update.auto" = false; "app.update.auto" = false;
"identity.fxaccounts.account.device.name" = config.networking.hostName; "identity.fxaccounts.account.device.name" = config.networking.hostName;
@ -24,7 +22,7 @@ in {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
extensions = with nur.repos.rycee.firefox-addons; [ extensions = with pkgs.nur.repos.rycee.firefox-addons; [
auto-tab-discard auto-tab-discard
bitwarden bitwarden
darkreader darkreader

18
nix/sources.json
View file

@ -5,10 +5,10 @@
"homepage": "https://nur.nix-community.org/", "homepage": "https://nur.nix-community.org/",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "f88a3283cad55888be0cc2d984a44801dd16ec21", "rev": "43f5287f2cf6f045c4fe5c6c84df25aa609f65f0",
"sha256": "0kgs39spdlwj4ky4v3sd7drlvhjg4wccara7g9axa6la8328ghc2", "sha256": "19gx1vrpg65hmga6rnazrz50i3frffyaxa909zpvri4frrf29lrx",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/NUR/archive/f88a3283cad55888be0cc2d984a44801dd16ec21.tar.gz", "url": "https://github.com/nix-community/NUR/archive/43f5287f2cf6f045c4fe5c6c84df25aa609f65f0.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"arc-nixexprs": { "arc-nixexprs": {
@ -74,10 +74,10 @@
"homepage": "", "homepage": "",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d303eee16ce8dee5c0b5b8e5f6323f561c189ec5", "rev": "df8e3bd110921621d175fad88c9e67909b7cb3d3",
"sha256": "05hna2a2zss5rfbsbxah4z159yvyyarw5w5hqwnbs020h02j2ywh", "sha256": "1z20y0lblb452h2gghgds34g7lrj7v8gfhz66w687ws8jqdm3bzz",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nixos/nixpkgs/archive/d303eee16ce8dee5c0b5b8e5f6323f561c189ec5.tar.gz", "url": "https://github.com/nixos/nixpkgs/archive/df8e3bd110921621d175fad88c9e67909b7cb3d3.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs-mozilla": { "nixpkgs-mozilla": {
@ -98,10 +98,10 @@
"homepage": "", "homepage": "",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "74b9241e60c796ff68876f87916062d54c4aa0f5", "rev": "77e75f1ed1db9c658cb63ca253b84b13551f9ef8",
"sha256": "03ibycl3jzv51flcfqq24xvk9dcdfy5nhmqa801083y56x4szqyj", "sha256": "044kl1d7w300l97iivqb3774ig0hn5z6h1y3abvqa10mjq67382k",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nixos/nixpkgs/archive/74b9241e60c796ff68876f87916062d54c4aa0f5.tar.gz", "url": "https://github.com/nixos/nixpkgs/archive/77e75f1ed1db9c658cb63ca253b84b13551f9ef8.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"pbb-nixfiles": { "pbb-nixfiles": {

27
pkgs/default.nix
View file

@ -4,29 +4,24 @@ let
sources = import ../nix/sources.nix; sources = import ../nix/sources.nix;
pkgs = import sources.nixpkgs args; pkgs = import sources.nixpkgs args;
callPackage = pkgs.lib.callPackageWith (pkgs // newpkgs); overlay = self: super: {
dino = super.callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" {
newpkgs = { inherit (super) dino;
dino = callPackage "${sources.qyliss-nixlib}/overlays/patches/dino" {
inherit (pkgs) dino;
}; };
discord = pkgs.discord.override { nss = pkgs.nss_latest; }; discord = super.discord.override { nss = self.nss_latest; };
arc = import sources.arc-nixexprs { inherit pkgs; }; arc = import sources.arc-nixexprs { pkgs = super; };
unstable = import sources.nixpkgs-unstable { inherit pkgs; }; unstable = import sources.nixpkgs-unstable { inherit (self) config; };
nur = import sources.NUR { inherit pkgs; }; nur = import sources.NUR { nurpkgs = self; pkgs = self; };
linuxPackagesFor = kernel: linuxPackagesFor = kernel:
(pkgs.linuxPackagesFor kernel).extend (_: ksuper: { (super.linuxPackagesFor kernel).extend (_: ksuper: {
vendor-reset = vendor-reset =
(callPackage ./vendor-reset { kernel = ksuper.kernel; }).out; (super.callPackage ./vendor-reset { kernel = ksuper.kernel; }).out;
}); });
colorhelpers = import ../lib/colorhelpers.nix { inherit (pkgs) lib; }; colorhelpers = import ../lib/colorhelpers.nix { inherit (self) lib; };
inherit callPackage;
appendOverlays = overlays: (pkgs.appendOverlays overlays) // newpkgs;
}; };
in pkgs // newpkgs in pkgs.extend(overlay)