teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity

flake: use nixos-23.05

Browse source 
Use overlay for nvfetcher for recent fixes from master branch
This commit is contained in:
teutat3s 2023-05-31 20:59:02 +02:00
parent fac9fb9e7a
commit d21c7631ab
Signed by: teutat3s
GPG key ID: 4FA1D3FA524F22C1
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
flake.nix
View file

@ -6,7 +6,7 @@
inputs = { inputs = {
# Track channels with commits tested and built by hydra # Track channels with commits tested and built by hydra
nixos-22-05.url = "github:nixos/nixpkgs/nixos-22.05"; nixos-22-05.url = "github:nixos/nixpkgs/nixos-22.05";
nixos.url = "github:nixos/nixpkgs/nixos-unstable"; nixos.url = "github:nixos/nixpkgs/nixos-23.05";
latest.url = "github:nixos/nixpkgs/nixos-unstable"; latest.url = "github:nixos/nixpkgs/nixos-unstable";
master.url = "github:nixos/nixpkgs/master"; master.url = "github:nixos/nixpkgs/master";
@ -37,6 +37,10 @@
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
nvfetcher.url = "github:berberman/nvfetcher";
nvfetcher.inputs.nixpkgs.follows = "nixos";
nvfetcher.inputs.flake-compat.follows = "flake-compat";
# PubSolarOS additions # PubSolarOS additions
triton-vmtools.url = "git+https://git.pub.solar/pub-solar/infra?ref=main&dir=vmtools"; triton-vmtools.url = "git+https://git.pub.solar/pub-solar/infra?ref=main&dir=vmtools";
triton-vmtools.inputs.nixpkgs.follows = "latest"; triton-vmtools.inputs.nixpkgs.follows = "latest";
@ -54,6 +58,7 @@
agenix, agenix,
deploy, deploy,
tritonshell, tritonshell,
nvfetcher,
... ...
} @ inputs: } @ inputs:
digga.lib.mkFlake digga.lib.mkFlake
@ -69,20 +74,18 @@
channels = { channels = {
nixos = { nixos = {
imports = [(digga.lib.importOverlays ./overlays)]; imports = [(digga.lib.importOverlays ./overlays)];
overlays = [];
};
nixos-22-05 = {};
latest = {
overlays = [ overlays = [
deploy.overlay deploy.overlay
(self: super: { (self: super: {
deploy-rs = { deploy-rs = {
inherit (inputs.latest.legacyPackages.x86_64-linux) deploy-rs; inherit (inputs.nixos.legacyPackages.x86_64-linux) deploy-rs;
lib = super.deploy-rs.lib; lib = super.deploy-rs.lib;
}; };
}) })
]; ];
}; };
nixos-22-05 = {};
latest = {};
master = {}; master = {};
}; };
@ -96,6 +99,7 @@
}); });
}) })
agenix.overlays.default agenix.overlays.default
nvfetcher.overlays.default
(import ./pkgs) (import ./pkgs)
]; ];
@ -193,7 +197,7 @@
profilesOrder = ["system" "direnv"]; profilesOrder = ["system" "direnv"];
profiles.direnv = { profiles.direnv = {
user = "pub-solar"; user = "pub-solar";
path = self.channels.latest.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar; path = self.channels.nixos.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar;
}; };
}; };
powder = { powder = {
@ -202,7 +206,7 @@
profilesOrder = ["system" "direnv"]; profilesOrder = ["system" "direnv"];
profiles.direnv = { profiles.direnv = {
user = "pub-solar"; user = "pub-solar";
path = self.channels.latest.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar; path = self.channels.nixos.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurationsPortable.x86_64-linux.pub-solar;
}; };
}; };
}; };