Add pvv-terminal machine to flake

This commit is contained in:
Daniel Olsen 2022-06-02 05:08:38 +02:00
parent ea4e1c3cc3
commit 6d3b301246
5 changed files with 36 additions and 17 deletions

View File

@ -15,7 +15,11 @@
dan.inputs.nixpkgs.follows = "unstable"; dan.inputs.nixpkgs.follows = "unstable";
}; };
outputs = {home-manager-2205, unstable, nur, dan, ... }: outputs = {self, home-manager-2205, unstable, nur, dan, ... }:
let
pvv-home = "/home/pvv/d/${pvv-username}";
pvv-username = "danio";
in
{ {
homeConfigurations.laptop = home-manager-2205.lib.homeManagerConfiguration { homeConfigurations.laptop = home-manager-2205.lib.homeManagerConfiguration {
configuration = import ./machines/laptop.nix; configuration = import ./machines/laptop.nix;
@ -23,7 +27,27 @@
username = "daniel"; username = "daniel";
homeDirectory = "/home/daniel"; homeDirectory = "/home/daniel";
stateVersion = "22.05"; stateVersion = "22.05";
extraSpecialArgs = { inherit nur unstable dan; }; extraSpecialArgs = { inherit (self) overlays; };
}; };
homeConfigurations.pvv-terminal = home-manager-2205.lib.homeManagerConfiguration {
configuration = import ./machines/pvv-terminal.nix;
system = "x86_64-linux";
username = pvv-username;
homeDirectory = pvv-home;
stateVersion = "22.05";
extraSpecialArgs = { inherit (self) overlays; };
};
overlays = [
(final: prev: {
unstable = import unstable {
inherit (prev) system config;
};
dan = dan.packages.${prev.system};
})
nur.overlay
];
}; };
} }

View File

@ -1,17 +1,8 @@
{ config, lib, pkgs, nur, unstable, dan, ... }: { config, lib, pkgs, overlays, ... }:
{ {
nixpkgs.overlays = [ nixpkgs.overlays = overlays;
nur.overlay
(final: prev: {
unstable = import unstable {
inherit (prev) system;
config.allowUnfree = true;
};
dan = dan.packages.${prev.system};
})
];
nixpkgs.config.allowUnfreePredicate = (pkg: true); nixpkgs.config.allowUnfreePredicate = (pkg: true);
nixpkgs.config.allowUnfree = true;
imports = [ ../profiles ]; imports = [ ../profiles ];

View File

@ -1,5 +1,8 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, overlays, ... }:
{ {
nixpkgs.overlays = overlays;
#nixpkgs.config.allowUnfreePredicate = (pkg: true);
imports = [ ../profiles ]; imports = [ ../profiles ];
machine = { machine = {

View File

@ -21,6 +21,7 @@ in
] ++ lib.optionals config.profiles.gui.enable (with pkgs; [ ] ++ lib.optionals config.profiles.gui.enable (with pkgs; [
pavucontrol pavucontrol
]) ++ lib.optionals (config.nixpkgs.config.allowUnfree && config.profiles.gui.enable) (with pkgs; [
spotify spotify
]) ++ lib.optionals cfg.fancy (with pkgs; [ ]) ++ lib.optionals cfg.fancy (with pkgs; [
carla carla

View File

@ -81,7 +81,7 @@ in {
konsole # https://bugs.kde.org/show_bug.cgi?id=407990 reeee konsole # https://bugs.kde.org/show_bug.cgi?id=407990 reeee
gnome3.gedit gnome3.gedit
unstable.vscode vscodium
# texlive.combined.scheme-full # texlive.combined.scheme-full
# kile # kile
libreoffice libreoffice
@ -97,7 +97,7 @@ in {
# ardour # ardour
kdenlive kdenlive
frei0r frei0r
] ++ lib.optionals (config.nixpkgs.config.allowUnfree && config.profiles.gui.enable) [
geogebra geogebra
]; ];