odie
/
nixos-combined-flake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get mediacenter running

This commit is contained in:
Patrick Neff 2024-04-14 16:56:21 +02:00
parent 63c03ec184
commit 75965ffeb9
7 changed files with 9 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/default.nix
View File

@ -5,7 +5,6 @@
mkNixVimModule = import ./mkNixVimModule.nix; mkNixVimModule = import ./mkNixVimModule.nix;
mkNixosConfiguration = import ./mkNixosConfiguration.nix; mkNixosConfiguration = import ./mkNixosConfiguration.nix;
mkHomeConfiguration = import ./mkHomeConfiguration.nix; mkHomeConfiguration = import ./mkHomeConfiguration.nix;
mkHomeNixosModule = import ./mkHomeNixosModule.nix;
mkHomeManagerDefaults = import ./mkHomeManagerDefaults.nix; mkHomeManagerDefaults = import ./mkHomeManagerDefaults.nix;
mkNixosHomeconfiguration = import ./mkNixosHomeconfiguration.nix; mkNixosHomeConfiguration = import ./mkNixosHomeConfiguration.nix;
} }

6
lib/mkHomeManagerDefaults.nix
View File

@ -3,18 +3,12 @@
outputs, outputs,
vars, vars,
flakeLib, flakeLib,
nixpkgs,
system,
overlays,
... ...
}: { }: {
extraSpecialArgs = { extraSpecialArgs = {
inherit inputs outputs vars flakeLib; inherit inputs outputs vars flakeLib;
inherit (inputs) nix-colors; inherit (inputs) nix-colors;
}; };
pkgs = flakeLib.mkPkgs {
inherit nixpkgs system overlays;
};
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
} }

10
lib/mkHomeNixosModule.nix
View File

@ -1,10 +0,0 @@
moduleInputs @ {
flakeLib,
users ? {},
...
}: let
config = flakeLib.mkHomeManagerDefaults moduleInputs;
in {
inherit (config) extraSpecialArgs useGlobalPkgs useUserPackages;
inherit users;
}

2
lib/mkNixosHomeConfiguration.nix
View File

@ -4,7 +4,7 @@
in { in {
${username} = { ${username} = {
imports = [ imports = [
../../home-manager/${profile}/home.nix ../profiles/home-manager/${profile}/home.nix
]; ];
}; };
} }

4
modules/nixos/home-manager/default.nix
View File

@ -1,5 +1,7 @@
moduleInputs @ {flakeLib, ...}: let moduleInputs @ {flakeLib, ...}: let
config = flakeLib.mkHomeManagerDefaults moduleInputs; config = flakeLib.mkHomeManagerDefaults moduleInputs;
in { in {
inherit (config) extraSpecialArgs pkgs useGlobalPkgs useUserPackages system; home-manager = {
inherit (config) extraSpecialArgs useGlobalPkgs useUserPackages;
};
} }

16
profiles/nixos/pi0/configuration.nix
View File

@ -1,15 +1,12 @@
{ {
inputs,
outputs, outputs,
flakeLib, flakeLib,
vars, vars,
... ...
}: let }: {
inherit (vars) username hostName;
profile = "${username}@${hostName}";
in {
imports = [ imports = [
outputs.nixosModules.base outputs.nixosModules.base
outputs.nixosModules.home-manager
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
@ -17,12 +14,5 @@ in {
inherit (vars) hostName domain; inherit (vars) hostName domain;
}; };
home-manager = flakeLib.mkHomeNixosModule { home-manager.users = flakeLib.mkNixosHomeConfiguration {inherit vars;};
inherit inputs outputs vars flakeLib;
users.${vars.username} = {
imports = [
../../home-manager/${profile}/home.nix
];
};
};
} }

2
profiles/nixos/vm/configuration.nix
View File

@ -20,7 +20,7 @@
flakeLib.mkNixosHomeConfiguration { flakeLib.mkNixosHomeConfiguration {
inherit vars system; inherit vars system;
} }
// flakeLib.mkNixosUserConfiguration { // flakeLib.mkNixosHomeConfiguration {
inherit system; inherit system;
vars = vars // {username = "kodi";}; vars = vars // {username = "kodi";};
}; };