clean up and refactor more into OS snippets; bluetooth works on x13s
This commit is contained in:
parent
5921ad1df0
commit
ffdf25c117
27 changed files with 367 additions and 461 deletions
|
@ -1,5 +1,11 @@
|
|||
{ ... }: {
|
||||
imports = [
|
||||
../../snippets/home-manager-with-zsh.nix
|
||||
../../snippets/nix-settings-holo-chain.nix
|
||||
../../snippets/radicale.nix
|
||||
../../snippets/sway-desktop.nix
|
||||
../../snippets/timezone.nix
|
||||
|
||||
../../profiles/common/configuration.nix
|
||||
../../profiles/graphical/configuration.nix
|
||||
../../modules/opinionatedDisk.nix
|
||||
|
|
|
@ -1,24 +1,21 @@
|
|||
{
|
||||
nodeName,
|
||||
repoFlake,
|
||||
repoFlakeWithSystem,
|
||||
nodeFlake,
|
||||
}: let
|
||||
{ nodeName
|
||||
, repoFlake
|
||||
, repoFlakeWithSystem
|
||||
, nodeFlake
|
||||
, ...
|
||||
}:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
in {
|
||||
in
|
||||
{
|
||||
meta.nodeSpecialArgs.${nodeName} = {
|
||||
inherit repoFlake nodeName nodeFlake;
|
||||
packages' = repoFlake.packages.${system};
|
||||
repoFlakeInputs' = repoFlakeWithSystem system ({inputs', ...}: inputs');
|
||||
repoFlakeInputs' = repoFlakeWithSystem system ({ inputs', ... }: inputs');
|
||||
};
|
||||
|
||||
meta.nodeNixpkgs.${nodeName} = import nodeFlake.inputs.nixpkgs.outPath {
|
||||
inherit system;
|
||||
overlays = [
|
||||
(final: prev: {
|
||||
# FIXME: why are these not effective in for the configuration.nix below?
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
${nodeName} = {
|
||||
|
@ -28,8 +25,6 @@ in {
|
|||
|
||||
imports = [
|
||||
(repoFlake + "/nix/os/devices/${nodeName}/configuration.nix")
|
||||
|
||||
nodeFlake.inputs.home-manager.nixosModules.home-manager
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -24,13 +24,6 @@ let
|
|||
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
../../snippets/nix-settings-holo-chain.nix
|
||||
../../snippets/radicale.nix
|
||||
../../snippets/sway-desktop.nix
|
||||
../../snippets/timezone.nix
|
||||
];
|
||||
|
||||
nix.settings = {
|
||||
substituters = [
|
||||
];
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue