derped/nixos
1
0
Fork 0
Code Releases Activity

Add gitpkgs to flake inputs and configure package overlays.

Browse source
This commit is contained in:
Kevin Baensch 2023-04-16 13:43:17 +02:00
parent 908b709439
commit 60bd2e3271
Signed by: derped
GPG key ID: C0F1D326C7626543
3 changed files with 54 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
flake.lock
View file

@ -84,13 +84,28 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-stable": { "nixpkgs-git": {
"locked": { "locked": {
"lastModified": 1681349002, "lastModified": 1681645985,
"narHash": "sha256-9Ckc2WvSwuYrPfk3ZXgPasM1ir/cgs6UV0EpIWyPGZE=", "narHash": "sha256-WoKbmu+Mp1KMX14/Y5C2Y9hi1e5IAV/xVE7wZcwEuuM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2b1bba76a13ed39c7abc0a6e8f74f9e168cf3c7c", "rev": "ec2b9644eb7f78752a93290eb6b766ac98b71fb5",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1681482634,
"narHash": "sha256-cT/nr3L8khEYZSGp8qqwxFH+/q4/547MfyOdSj6MhBk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fda0d99c2cbbb5c89d8855d258cb0821bd9113ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -102,11 +117,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1681005198, "lastModified": 1681613598,
"narHash": "sha256-5LrnBeXR7Hv8OXh6eany7br4qBW+ZNl4LKf1CJu9zbg=", "narHash": "sha256-Ogkoma0ytYcDoMR2N7CZFABPo+i0NNo26dPngru9tPc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e45cc0138829ad86e7ff17a76acf2d05e781e30a", "rev": "1040ce5f652b586da95dfd80d48a745e107b9eac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -118,11 +133,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1681465517, "lastModified": 1681557730,
"narHash": "sha256-EasJh15/jcJNAHtq2SGbiADRXteURAnQbj1NqBoKkzU=", "narHash": "sha256-j2E3639kS3Qop2jQPyqWCdenZNaqIdxfoTvAHnGuAGI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "abe7316dd51a313ce528972b104f4f04f56eefc4", "rev": "85b081528b937df4bfcaee80c3541b58f397df8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -134,11 +149,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1681465517, "lastModified": 1681557730,
"narHash": "sha256-EasJh15/jcJNAHtq2SGbiADRXteURAnQbj1NqBoKkzU=", "narHash": "sha256-j2E3639kS3Qop2jQPyqWCdenZNaqIdxfoTvAHnGuAGI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "abe7316dd51a313ce528972b104f4f04f56eefc4", "rev": "85b081528b937df4bfcaee80c3541b58f397df8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -152,6 +167,7 @@
"inputs": { "inputs": {
"mailserver": "mailserver", "mailserver": "mailserver",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-git": "nixpkgs-git",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
@ -165,11 +181,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1681209176, "lastModified": 1681613729,
"narHash": "sha256-wyQokPpkNZnsl/bVf8m1428tfA0hJ0w/qexq4EizhTc=", "narHash": "sha256-9Qb0tHW8l1hgFkuB76n4VT9UNUaR7QL3CgmJ5hcVYEg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "00d5fd73756d424de5263b92235563bc06f2c6e1", "rev": "b7a6670a28b01cd1f62879921e36be2c69c4137a",
"type": "github" "type": "github"
}, },
"original": { "original": {

5
flake.nix
View file

@ -1,9 +1,10 @@
{ {
description = "NixOS Configuration"; description = "NixOS Configuration";
inputs = rec { inputs = rec {
nixpkgs.url = "github:/NixOS/nixpkgs/nixos-unstable"; nixpkgs-git.url = "github:/NixOS/nixpkgs";
nixpkgs-unstable.url = "github:/NixOS/nixpkgs/nixos-unstable";
nixpkgs-stable.url = "github:/NixOS/nixpkgs/nixos-22.11"; nixpkgs-stable.url = "github:/NixOS/nixpkgs/nixos-22.11";
nixpkgs-unstable.url = "github:/NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:/NixOS/nixpkgs/nixos-unstable";
mailserver.url = "gitlab:/simple-nixos-mailserver/nixos-mailserver"; mailserver.url = "gitlab:/simple-nixos-mailserver/nixos-mailserver";
sops-nix = { sops-nix = {
url = github:Mic92/sops-nix; url = github:Mic92/sops-nix;

16
pkgs/nixpkgs.nix
View file

@ -1,9 +1,12 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs,
nixpkgs-unstable, nixpkgs-stable, nixpkgs-git,
... }:
let let
callPackage = pkgs.callPackage; callPackage = pkgs.callPackage;
in { in {
nixpkgs.config = { nixpkgs = {
config = {
allowUnfree = true; allowUnfree = true;
mpv.vaapiSupport = (lib.elem "xserver" config.machine.services); mpv.vaapiSupport = (lib.elem "xserver" config.machine.services);
@ -11,7 +14,14 @@ in {
theme_flat-remix = callPackage ./flat-remix { }; theme_flat-remix = callPackage ./flat-remix { };
theme_sddm_midnight = callPackage ./sddm_midnight { }; theme_sddm_midnight = callPackage ./sddm_midnight { };
xdiskusage = callPackage ./xdiskusage { }; xdiskusage = callPackage ./xdiskusage { };
gitpkgs = import /nixpkgs {};
}; };
}; };
overlays = [
(final: prev: {
gitpkgs = nixpkgs-git.legacyPackages."${prev.system}";
stablepkgs = nixpkgs-stable.legacyPackages."${prev.system}";
unstablepkgs = nixpkgs-unstable.legacyPackages."${prev.system}";
})
];
};
} }