maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Bump to nixos 21.11

Browse source
This commit is contained in:
Malte Brandy 2021-12-03 01:48:01 +01:00
parent 01fc689b91
commit 320dd89e65
No known key found for this signature in database
GPG key ID: 226A2D41EF5378C9
4 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
channels.nix
View file

@ -1,10 +1,6 @@
let let
nixos-21-05 = {
nixpkgs-channel = "nixos-21.05";
home-manager-channel = "home-manager-21.05";
};
nixos-21-11 = { nixos-21-11 = {
nixpkgs-channel = "nixos-unstable"; nixpkgs-channel = "nixos-21.11";
home-manager-channel = "home-manager-21.11"; home-manager-channel = "home-manager-21.11";
}; };
unstable = { unstable = {
@ -13,8 +9,8 @@ let
}; };
in in
rec { rec {
hera = nixos-21-05; hera = nixos-21-11;
apollo = nixos-21-05; apollo = nixos-21-11;
zeus = nixos-21-11; zeus = nixos-21-11;
chor-cloud = hera; chor-cloud = hera;
} }

5
overlays/10-previews.nix
View file

@ -5,11 +5,8 @@ in
{ {
inherit unstable; inherit unstable;
inherit (unstable) cachix nix-output-monitor cabal2nix; inherit (unstable) cachix nix-output-monitor cabal2nix;
nix = unstable.nix; nix = self.nix_2_4;
nix-du = unstable.nix-du;
unstableHaskellPackages = unstable.haskellPackages; unstableHaskellPackages = unstable.haskellPackages;
unstableGhc = unstable.ghc; unstableGhc = unstable.ghc;
mautrix-signal = unstable.mautrix-signal;
signald = unstable.signald;
home-assistant = unstable.home-assistant; home-assistant = unstable.home-assistant;
} }

4
overlays/mumble/default.nix
View file

@ -1,6 +1,6 @@
final: prev: { final: prev: {
inherit (final.unstable.callPackage ./package.nix { inherit (final.callPackage ./package.nix {
avahi = final.unstable.avahi-compat; avahi = final.avahi-compat;
jackSupport = false; jackSupport = false;
speechdSupport = false; speechdSupport = false;
pulseSupport = true; pulseSupport = true;

2
overlays/pkgSets.nix
View file

@ -1,6 +1,6 @@
self: super: { self: super: {
# pkgs assumed to be present on a non nixos host # pkgs assumed to be present on a non nixos host
nixFlakes = self.writeShellScriptBin "flix" ''exec ${self.unstable.nix}/bin/nix --experimental-features "nix-command flakes" --log-format bar-with-logs "$@"''; nixFlakes = self.writeShellScriptBin "flix" ''exec ${self.nix}/bin/nix --experimental-features "nix-command flakes" --log-format bar-with-logs "$@"'';
core-system-pkgs = { core-system-pkgs = {
inherit (self) inherit (self)
gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping gitFull gnumake mkpasswd file wget curl wireguard gnupg mutt bind liboping