flake: switch to 21.05 release on all hosts
This commit is contained in:
parent
feebd0940e
commit
3d7bd805ed
|
@ -2,19 +2,20 @@
|
||||||
{
|
{
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
alacritty
|
alacritty
|
||||||
discord
|
|
||||||
feh
|
feh
|
||||||
firefox
|
gnome.nautilus
|
||||||
element-desktop
|
|
||||||
gnome3.nautilus
|
|
||||||
mpv
|
mpv
|
||||||
pavucontrol
|
pavucontrol
|
||||||
slack
|
|
||||||
spotify
|
|
||||||
tdesktop
|
|
||||||
teams
|
|
||||||
thunderbird
|
thunderbird
|
||||||
zathura
|
zathura
|
||||||
|
|
||||||
|
unstable.discord
|
||||||
|
unstable.firefox
|
||||||
|
unstable.element-desktop
|
||||||
|
unstable.slack
|
||||||
|
unstable.spotify
|
||||||
|
unstable.tdesktop
|
||||||
|
unstable.teams
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.networkmanager.enable = true;
|
networking.networkmanager.enable = true;
|
||||||
|
|
43
flake.lock
43
flake.lock
|
@ -19,63 +19,47 @@
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs-unstable"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1622145920,
|
"lastModified": 1622312560,
|
||||||
"narHash": "sha256-/tt6IApLuVcGP5auy4zjLzfm5+MBHYLS3Nauvv2U2EQ=",
|
"narHash": "sha256-xBWgiwnPaL/iZasPxw3BuvPAee/2jiToiZjKvKLs+PA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "0e6c61a44092e98ba1d75b41f4f947843dc7814d",
|
"rev": "ab64dc32493996c24607eab2cae6663466ddfb8a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "master",
|
"ref": "release-21.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1621511390,
|
"lastModified": 1622449420,
|
||||||
"narHash": "sha256-isDpLGr73ejAiksS1eW0dOMjEIB+j8b1lyAN++5KmrA=",
|
"narHash": "sha256-aKDhIaJqNUy7p3urHEBC/mdIAJWckhW3Fgzmv284UHg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a7064e23973b0f3e1dd56cf4601758fedc38423c",
|
"rev": "d25ea6a0d2a847fb52131da546f2a866656fbafa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-20.09",
|
"ref": "nixos-21.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1622103435,
|
"lastModified": 1622362955,
|
||||||
"narHash": "sha256-5i5mGg402AANnSRQmWVo7lqiyw3taoMwX26oslOD9c4=",
|
"narHash": "sha256-azGfd/yS4Bwh7TunIs7P8iaWRUPdcZpBuDqfJregb7E=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5658fadedb748cb0bdbcb569a53bd6065a5704a9",
|
"rev": "bfdf04bd21bb99b05bb10f0de8876ad4baca48e4",
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"ref": "nixos-unstable",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs-unstable-small": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1622099353,
|
|
||||||
"narHash": "sha256-lDLpmiMDt8Su3fjxeaSyh7aWmiQg1rtcPOC+sAIvhro=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "nixpkgs",
|
|
||||||
"rev": "a48d4bf159076106895df685e879aff235bcbff3",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -90,8 +74,7 @@
|
||||||
"emacs-overlay": "emacs-overlay",
|
"emacs-overlay": "emacs-overlay",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||||
"nixpkgs-unstable-small": "nixpkgs-unstable-small"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
127
flake.nix
127
flake.nix
|
@ -5,17 +5,10 @@
|
||||||
type = "github";
|
type = "github";
|
||||||
owner = "NixOS";
|
owner = "NixOS";
|
||||||
repo = "nixpkgs";
|
repo = "nixpkgs";
|
||||||
ref = "nixos-20.09";
|
ref = "nixos-21.05";
|
||||||
};
|
};
|
||||||
|
|
||||||
nixpkgs-unstable = {
|
nixpkgs-unstable = {
|
||||||
type = "github";
|
|
||||||
owner = "NixOS";
|
|
||||||
repo = "nixpkgs";
|
|
||||||
ref = "nixos-unstable";
|
|
||||||
};
|
|
||||||
|
|
||||||
nixpkgs-unstable-small = {
|
|
||||||
type = "github";
|
type = "github";
|
||||||
owner = "NixOS";
|
owner = "NixOS";
|
||||||
repo = "nixpkgs";
|
repo = "nixpkgs";
|
||||||
|
@ -33,89 +26,79 @@
|
||||||
type = "github";
|
type = "github";
|
||||||
owner = "nix-community";
|
owner = "nix-community";
|
||||||
repo = "home-manager";
|
repo = "home-manager";
|
||||||
ref = "master";
|
ref = "release-21.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self,
|
outputs = { self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
nixpkgs-unstable,
|
nixpkgs-unstable,
|
||||||
nixpkgs-unstable-small,
|
|
||||||
emacs-overlay,
|
emacs-overlay,
|
||||||
home-manager }: {
|
home-manager }: {
|
||||||
nixosConfigurations.poseidon = nixpkgs.lib.nixosSystem rec {
|
nixosConfigurations.poseidon = nixpkgs.lib.nixosSystem rec {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules =
|
modules = [
|
||||||
let
|
./poseidon.nix
|
||||||
pkgsUnstable = import nixpkgs-unstable { inherit system; };
|
|
||||||
in
|
|
||||||
[
|
|
||||||
./poseidon.nix
|
|
||||||
|
|
||||||
# hack to use an unstable home manager within a stable NixOS install,
|
home-manager.nixosModules.home-manager
|
||||||
# do not reproduce... at home :clown_face:
|
{
|
||||||
({ config, utils, ... }: home-manager.nixosModules.home-manager {
|
home-manager.useGlobalPkgs = true;
|
||||||
pkgs = pkgsUnstable;
|
home-manager.useUserPackages = true;
|
||||||
lib = pkgsUnstable.lib;
|
home-manager.users.alarsyo = import ./home;
|
||||||
inherit config utils;
|
home-manager.verbose = true;
|
||||||
})
|
}
|
||||||
{
|
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.users.alarsyo = import ./home;
|
|
||||||
home-manager.verbose = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
# packages accessible through pkgs.unstable.package
|
# packages accessible through pkgs.unstable.package
|
||||||
unstable = pkgsUnstable;
|
unstable = import nixpkgs-unstable {
|
||||||
|
inherit system;
|
||||||
bitwarden_rs = pkgsUnstable.bitwarden_rs;
|
config.allowUnfree = true;
|
||||||
bitwarden_rs-vault = pkgsUnstable.bitwarden_rs-vault;
|
};
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
nixosConfigurations.boreal = nixpkgs-unstable.lib.nixosSystem rec {
|
nixosConfigurations.boreal = nixpkgs.lib.nixosSystem rec {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules =
|
modules = [
|
||||||
[
|
./boreal.nix
|
||||||
./boreal.nix
|
|
||||||
|
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
home-manager.users.alarsyo = import ./home;
|
home-manager.users.alarsyo = import ./home;
|
||||||
home-manager.verbose = true;
|
home-manager.verbose = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
nixpkgs.overlays = [
|
nixpkgs.overlays = [
|
||||||
emacs-overlay.overlay
|
emacs-overlay.overlay
|
||||||
|
|
||||||
(self: super: {
|
(self: super: {
|
||||||
packages = import ./pkgs { pkgs = super; };
|
packages = import ./pkgs { pkgs = super; };
|
||||||
|
|
||||||
unstable-small = import nixpkgs-unstable-small {
|
unstable = import nixpkgs-unstable {
|
||||||
inherit system;
|
inherit system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
})
|
|
||||||
|
|
||||||
# uncomment this to build everything from scratch, fun but takes a
|
steam = self.unstable.steam;
|
||||||
# while
|
})
|
||||||
#
|
|
||||||
# (self: super: {
|
# uncomment this to build everything from scratch, fun but takes a
|
||||||
# stdenv = super.impureUseNativeOptimizations super.stdenv;
|
# while
|
||||||
# })
|
#
|
||||||
];
|
# (self: super: {
|
||||||
}
|
# stdenv = super.impureUseNativeOptimizations super.stdenv;
|
||||||
];
|
# })
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue