alarsyo/nixos-config
alarsyo/nixos-config
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

flake: switch to 21.05 release on all hosts

Browse source
This commit is contained in:
Antoine Martin 2021-06-01 14:28:20 +02:00
parent feebd0940e
commit 3d7bd805ed
3 changed files with 77 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

127
flake.nix
View file

@ -5,17 +5,10 @@
type = "github";
owner = "NixOS";
repo = "nixpkgs";
ref = "nixos-20.09";
ref = "nixos-21.05";
};
nixpkgs-unstable = {
type = "github";
owner = "NixOS";
repo = "nixpkgs";
ref = "nixos-unstable";
};
nixpkgs-unstable-small = {
type = "github";
owner = "NixOS";
repo = "nixpkgs";
@ -33,89 +26,79 @@
type = "github";
owner = "nix-community";
repo = "home-manager";
ref = "master";
inputs.nixpkgs.follows = "nixpkgs-unstable";
ref = "release-21.05";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = { self,
nixpkgs,
nixpkgs-unstable,
nixpkgs-unstable-small,
emacs-overlay,
home-manager }: {
nixosConfigurations.poseidon = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules =
let
pkgsUnstable = import nixpkgs-unstable { inherit system; };
in
[
./poseidon.nix
modules = [
./poseidon.nix
# hack to use an unstable home manager within a stable NixOS install,
# do not reproduce... at home :clown_face:
({ config, utils, ... }: home-manager.nixosModules.home-manager {
pkgs = pkgsUnstable;
lib = pkgsUnstable.lib;
inherit config utils;
})
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.alarsyo = import ./home;
home-manager.verbose = true;
}
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.alarsyo = import ./home;
home-manager.verbose = true;
}
{
nixpkgs.overlays = [
(final: prev: {
# packages accessible through pkgs.unstable.package
unstable = pkgsUnstable;
bitwarden_rs = pkgsUnstable.bitwarden_rs;
bitwarden_rs-vault = pkgsUnstable.bitwarden_rs-vault;
})
];
}
];
{
nixpkgs.overlays = [
(final: prev: {
# packages accessible through pkgs.unstable.package
unstable = import nixpkgs-unstable {
inherit system;
config.allowUnfree = true;
};
})
];
}
];
};
nixosConfigurations.boreal = nixpkgs-unstable.lib.nixosSystem rec {
nixosConfigurations.boreal = nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules =
[
./boreal.nix
modules = [
./boreal.nix
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.alarsyo = import ./home;
home-manager.verbose = true;
}
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.alarsyo = import ./home;
home-manager.verbose = true;
}
{
nixpkgs.overlays = [
emacs-overlay.overlay
{
nixpkgs.overlays = [
emacs-overlay.overlay
(self: super: {
packages = import ./pkgs { pkgs = super; };
(self: super: {
packages = import ./pkgs { pkgs = super; };
unstable-small = import nixpkgs-unstable-small {
inherit system;
config.allowUnfree = true;
};
})
unstable = import nixpkgs-unstable {
inherit system;
config.allowUnfree = true;
};
# uncomment this to build everything from scratch, fun but takes a
# while
#
# (self: super: {
# stdenv = super.impureUseNativeOptimizations super.stdenv;
# })
];
}
];
steam = self.unstable.steam;
})
# uncomment this to build everything from scratch, fun but takes a
# while
#
# (self: super: {
# stdenv = super.impureUseNativeOptimizations super.stdenv;
# })
];
}
];
};
};
}