forked from fediversity/fediversity
Compare commits
No commits in common. "35521fb40e277c9bbd58d9ffdbf2c80bffb1e4c1" and "354dba260a5184e8beda7c4095e1db59db9dde4b" have entirely different histories.
35521fb40e
...
354dba260a
10 changed files with 43 additions and 283 deletions
|
@ -4,7 +4,7 @@ on:
|
||||||
workflow_dispatch: # allows manual triggering
|
workflow_dispatch: # allows manual triggering
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
# - main
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
deploy:
|
deploy:
|
||||||
|
@ -21,4 +21,4 @@ jobs:
|
||||||
chmod 600 ~/.ssh/id_ed25519
|
chmod 600 ~/.ssh/id_ed25519
|
||||||
|
|
||||||
- name: Deploy
|
- name: Deploy
|
||||||
run: nix-shell --run 'eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_ed25519 && SHELL=$(which bash) nixops4 apply -v default'
|
run: nix-shell --run 'eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_ed25519 && nixops4 apply -v default'
|
||||||
|
|
|
@ -27,6 +27,12 @@ jobs:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- run: nix build .#checks.x86_64-linux.test-mastodon-service -L
|
- run: nix build .#checks.x86_64-linux.test-mastodon-service -L
|
||||||
|
|
||||||
|
check-pixelfed:
|
||||||
|
runs-on: native
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- run: nix build .#checks.x86_64-linux.test-pixelfed-garage-service -L
|
||||||
|
|
||||||
check-peertube:
|
check-peertube:
|
||||||
runs-on: native
|
runs-on: native
|
||||||
steps:
|
steps:
|
||||||
|
|
|
@ -13,7 +13,7 @@ jobs:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Update pins
|
- name: Update pins
|
||||||
run: nix-shell --run "npins --verbose update"
|
run: nix-shell --run "npins update"
|
||||||
- name: Create PR
|
- name: Create PR
|
||||||
uses: https://github.com/KiaraGrouwstra/gitea-create-pull-request@f9f80aa5134bc5c03c38f5aaa95053492885b397
|
uses: https://github.com/KiaraGrouwstra/gitea-create-pull-request@f9f80aa5134bc5c03c38f5aaa95053492885b397
|
||||||
with:
|
with:
|
||||||
|
|
|
@ -11,8 +11,7 @@ let
|
||||||
;
|
;
|
||||||
inherit (pkgs) lib;
|
inherit (pkgs) lib;
|
||||||
inherit (import sources.flake-inputs) import-flake;
|
inherit (import sources.flake-inputs) import-flake;
|
||||||
inputs = (import-flake { src = ./.; }).inputs;
|
inherit ((import-flake { src = ./.; }).inputs) nixops4;
|
||||||
inherit (inputs) nixops4;
|
|
||||||
panel = import ./panel { inherit sources system; };
|
panel = import ./panel { inherit sources system; };
|
||||||
pre-commit-check =
|
pre-commit-check =
|
||||||
(import "${git-hooks}/nix" {
|
(import "${git-hooks}/nix" {
|
||||||
|
@ -79,7 +78,6 @@ in
|
||||||
# re-export inputs so they can be overridden granularly
|
# re-export inputs so they can be overridden granularly
|
||||||
# (they can't be accessed from the outside any other way)
|
# (they can't be accessed from the outside any other way)
|
||||||
inherit
|
inherit
|
||||||
inputs
|
|
||||||
sources
|
sources
|
||||||
system
|
system
|
||||||
pkgs
|
pkgs
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
let
|
let
|
||||||
inherit (import ../default.nix { }) pkgs inputs;
|
inherit (import ../default.nix { }) pkgs inputs;
|
||||||
inherit (pkgs) lib;
|
inherit (pkgs) lib;
|
||||||
inherit (lib) mkOption types;
|
inherit (lib) mkOption;
|
||||||
eval =
|
eval =
|
||||||
module:
|
module:
|
||||||
(lib.evalModules {
|
(lib.evalModules {
|
||||||
|
@ -13,8 +13,6 @@ let
|
||||||
./data-model.nix
|
./data-model.nix
|
||||||
];
|
];
|
||||||
}).config;
|
}).config;
|
||||||
nixops4Deployment = inputs.nixops4.modules.nixops4Deployment.default;
|
|
||||||
inherit (inputs.nixops4.lib) mkDeployment;
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
_class = "nix-unit";
|
_class = "nix-unit";
|
||||||
|
@ -26,59 +24,6 @@ in
|
||||||
{ config, ... }:
|
{ config, ... }:
|
||||||
{
|
{
|
||||||
config = {
|
config = {
|
||||||
resources.login-shell = {
|
|
||||||
description = "The operator needs to be able to log into the shell";
|
|
||||||
request =
|
|
||||||
{ ... }:
|
|
||||||
{
|
|
||||||
_class = "fediversity-resource-request";
|
|
||||||
options = {
|
|
||||||
wheel = mkOption {
|
|
||||||
description = "Whether the login user needs root permissions";
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
packages = mkOption {
|
|
||||||
description = "Packages that need to be available in the user environment";
|
|
||||||
type = with types; attrsOf package;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
policy =
|
|
||||||
{ config, ... }:
|
|
||||||
{
|
|
||||||
_class = "fediversity-resource-policy";
|
|
||||||
options = {
|
|
||||||
username = mkOption {
|
|
||||||
description = "Username for the operator";
|
|
||||||
type = types.str; # TODO: use the proper constraints from NixOS
|
|
||||||
};
|
|
||||||
wheel = mkOption {
|
|
||||||
description = "Whether to allow login with root permissions";
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
config.resource-type = types.raw; # TODO: splice out the user type from NixOS
|
|
||||||
config.apply =
|
|
||||||
requests:
|
|
||||||
let
|
|
||||||
# Filter out requests that need wheel if policy doesn't allow it
|
|
||||||
validRequests = lib.filterAttrs (
|
|
||||||
_name: req: !req.login-shell.wheel || config.wheel
|
|
||||||
) requests.resources;
|
|
||||||
in
|
|
||||||
lib.optionalAttrs (validRequests != { }) {
|
|
||||||
${config.username} = {
|
|
||||||
isNormalUser = true;
|
|
||||||
packages =
|
|
||||||
with lib;
|
|
||||||
attrValues (concatMapAttrs (_name: request: request.login-shell.packages) validRequests);
|
|
||||||
extraGroups = lib.optional config.wheel "wheel";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
applications.hello =
|
applications.hello =
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
@ -86,42 +31,15 @@ in
|
||||||
module =
|
module =
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
options.enable = lib.mkEnableOption "Hello in the shell";
|
options = {
|
||||||
};
|
enable = lib.mkEnableOption "Hello in the shell";
|
||||||
implementation = cfg: {
|
|
||||||
input = cfg;
|
|
||||||
output = lib.optionalAttrs cfg.enable {
|
|
||||||
resources.hello.login-shell.packages.hello = pkgs.hello;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
environments.single-nixos-vm =
|
|
||||||
{ config, ... }:
|
|
||||||
{
|
|
||||||
resources.operator-environment.login-shell.username = "operator";
|
|
||||||
implementation = requests: {
|
|
||||||
input = requests;
|
|
||||||
output =
|
|
||||||
{ providers, ... }:
|
|
||||||
{
|
|
||||||
providers = {
|
|
||||||
inherit (inputs.nixops4.modules.nixops4Provider) local;
|
|
||||||
};
|
|
||||||
resources.the-machine = {
|
|
||||||
type = providers.local.exec;
|
|
||||||
imports = [
|
|
||||||
inputs.nixops4-nixos.modules.nixops4Resource.nixos
|
|
||||||
];
|
|
||||||
nixos.module =
|
|
||||||
{ ... }:
|
|
||||||
{
|
|
||||||
users.users = config.resources.shell.login-shell.apply (
|
|
||||||
lib.filterAttrs (_name: value: value ? login-shell) requests
|
|
||||||
);
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
implementation =
|
||||||
|
cfg:
|
||||||
|
lib.optionalAttrs cfg.enable {
|
||||||
|
dummy.login-shell.packages.hello = pkgs.hello;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
options = {
|
options = {
|
||||||
|
@ -133,64 +51,20 @@ in
|
||||||
applications.hello.enable = true;
|
applications.hello.enable = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
example-deployment = mkOption {
|
|
||||||
type = types.submodule nixops4Deployment;
|
|
||||||
readOnly = true;
|
|
||||||
default = config.environments.single-nixos-vm.deployment config.example-configuration;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
resources = fediversity.applications.hello.resources fediversity.example-configuration.applications.hello;
|
|
||||||
hello-shell = (resources).resources.hello.login-shell;
|
|
||||||
environment = fediversity.environments.single-nixos-vm.resources.operator-environment.login-shell;
|
|
||||||
result = mkDeployment {
|
|
||||||
modules = [
|
|
||||||
(fediversity.environments.single-nixos-vm.deployment fediversity.example-configuration)
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
in
|
in
|
||||||
rec {
|
{
|
||||||
number-of-resources = with lib; length (attrNames fediversity.resources);
|
inherit (fediversity)
|
||||||
inherit (fediversity) example-configuration;
|
example-configuration
|
||||||
hello-package-exists = hello-shell.packages ? hello;
|
;
|
||||||
wheel-required = hello-shell.wheel;
|
|
||||||
wheel-allowed = environment.wheel;
|
|
||||||
operator-shell =
|
|
||||||
let
|
|
||||||
operator = (environment.apply resources).operator;
|
|
||||||
in
|
|
||||||
{
|
|
||||||
inherit (operator) isNormalUser;
|
|
||||||
packages = with lib; map (p: "${p.pname}") operator.packages;
|
|
||||||
extraGroups = operator.extraGroups;
|
|
||||||
};
|
|
||||||
deployment = {
|
|
||||||
inherit (result) _type;
|
|
||||||
deploymentFunction = lib.isFunction result.deploymentFunction;
|
|
||||||
getProviders = lib.isFunction result.getProviders;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
expected = {
|
expected = {
|
||||||
number-of-resources = 1;
|
|
||||||
example-configuration = {
|
example-configuration = {
|
||||||
enable = true;
|
enable = true;
|
||||||
applications.hello.enable = true;
|
applications.hello.enable = true;
|
||||||
};
|
};
|
||||||
hello-package-exists = true;
|
|
||||||
wheel-required = false;
|
|
||||||
wheel-allowed = false;
|
|
||||||
operator-shell = {
|
|
||||||
isNormalUser = true;
|
|
||||||
packages = [ "hello" ];
|
|
||||||
extraGroups = [ ];
|
|
||||||
};
|
|
||||||
deployment = {
|
|
||||||
_type = "nixops4Deployment";
|
|
||||||
deploymentFunction = true;
|
|
||||||
getProviders = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
lib,
|
lib,
|
||||||
config,
|
config,
|
||||||
inputs,
|
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
|
@ -16,74 +15,19 @@ let
|
||||||
;
|
;
|
||||||
|
|
||||||
functionType = import ./function.nix;
|
functionType = import ./function.nix;
|
||||||
application-resources = submodule {
|
application-resources = {
|
||||||
options.resources = mkOption {
|
options.resources = mkOption {
|
||||||
# TODO: maybe transpose, and group the resources by type instead
|
# TODO: maybe transpose, and group the resources by type instead
|
||||||
type = attrsOf (
|
type = attrsOf (
|
||||||
attrTag (
|
attrTag (lib.mapAttrs (_name: resource: mkOption { type = resource.request; }) config.resources)
|
||||||
lib.mapAttrs (_name: resource: mkOption { type = submodule resource.request; }) config.resources
|
|
||||||
)
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
nixops4Deployment = types.deferredModuleWith {
|
|
||||||
staticModules = [
|
|
||||||
inputs.nixops4.modules.nixops4Deployment.default
|
|
||||||
|
|
||||||
{
|
|
||||||
_module.args = {
|
|
||||||
resourceProviderSystem = builtins.currentSystem;
|
|
||||||
resources = { };
|
|
||||||
};
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
_class = "nixops4Deployment";
|
_class = "nixops4Deployment";
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
resources = mkOption {
|
|
||||||
description = "Collection of deployment resources that can be required by applications and policed by hosting providers";
|
|
||||||
type = attrsOf (
|
|
||||||
submodule (
|
|
||||||
{ ... }:
|
|
||||||
{
|
|
||||||
_class = "fediversity-resource";
|
|
||||||
options = {
|
|
||||||
description = mkOption {
|
|
||||||
description = "Description of the resource to help application module authors and hosting providers to work with it";
|
|
||||||
type = types.str;
|
|
||||||
};
|
|
||||||
request = mkOption {
|
|
||||||
description = "Options for declaring resource requirements by an application, a description of how the resource is consumed or accessed";
|
|
||||||
type = deferredModuleWith { staticModules = [ { _class = "fediversity-resource-request"; } ]; };
|
|
||||||
};
|
|
||||||
policy = mkOption {
|
|
||||||
description = "Options for configuring the resource policy for the hosting provider, a description of how the resource is made available";
|
|
||||||
type = deferredModuleWith {
|
|
||||||
staticModules = [
|
|
||||||
(policy: {
|
|
||||||
_class = "fediversity-resource-policy";
|
|
||||||
options.resource-type = mkOption {
|
|
||||||
description = "The type of resource this policy configures";
|
|
||||||
type = types.optionType;
|
|
||||||
};
|
|
||||||
# TODO(@fricklerhandwerk): we may want to make the function type explict here: `request -> resource-type`
|
|
||||||
# and then also rename this to be consistent with the application's resource mapping
|
|
||||||
options.apply = mkOption {
|
|
||||||
description = "Apply the policy to a request";
|
|
||||||
type = with types; functionTo policy.config.resource-type;
|
|
||||||
};
|
|
||||||
})
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
)
|
|
||||||
);
|
|
||||||
};
|
|
||||||
applications = mkOption {
|
applications = mkOption {
|
||||||
description = "Collection of Fediversity applications";
|
description = "Collection of Fediversity applications";
|
||||||
type = attrsOf (
|
type = attrsOf (
|
||||||
|
@ -108,13 +52,12 @@ in
|
||||||
readOnly = true;
|
readOnly = true;
|
||||||
default = input: (application.config.implementation input).output;
|
default = input: (application.config.implementation input).output;
|
||||||
};
|
};
|
||||||
# TODO(@fricklerhandwerk): this needs a better name, it's just the type
|
|
||||||
config-mapping = mkOption {
|
config-mapping = mkOption {
|
||||||
description = "Function type for the mapping from application configuration to required resources";
|
description = "Function type for the mapping from application configuration to required resources";
|
||||||
type = submodule functionType;
|
type = submodule functionType;
|
||||||
readOnly = true;
|
readOnly = true;
|
||||||
default = {
|
default = {
|
||||||
input-type = submodule application.config.module;
|
input-type = application.config.module;
|
||||||
output-type = application-resources;
|
output-type = application-resources;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -122,60 +65,6 @@ in
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
environments = mkOption {
|
|
||||||
description = "Run-time environments for Fediversity applications to be deployed to";
|
|
||||||
type = attrsOf (
|
|
||||||
submodule (environment: {
|
|
||||||
_class = "fediversity-environment";
|
|
||||||
options = {
|
|
||||||
resources = mkOption {
|
|
||||||
description = ''
|
|
||||||
Resources made available by the hosting provider, and their policies.
|
|
||||||
|
|
||||||
Setting this is optional, but provides a place to declare that information for programmatic use in the resource mapping.
|
|
||||||
'';
|
|
||||||
# TODO: maybe transpose, and group the resources by type instead
|
|
||||||
type = attrsOf (
|
|
||||||
attrTag (
|
|
||||||
lib.mapAttrs (_name: resource: mkOption { type = submodule resource.policy; }) config.resources
|
|
||||||
)
|
|
||||||
);
|
|
||||||
};
|
|
||||||
implementation = mkOption {
|
|
||||||
description = "Mapping of resources required by applications to available resources; the result can be deployed";
|
|
||||||
type = environment.config.resource-mapping.function-type;
|
|
||||||
};
|
|
||||||
resource-mapping = mkOption {
|
|
||||||
description = "Function type for the mapping from resources to a (NixOps4) deployment";
|
|
||||||
type = submodule functionType;
|
|
||||||
readOnly = true;
|
|
||||||
default = {
|
|
||||||
input-type = application-resources;
|
|
||||||
output-type = nixops4Deployment;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
# TODO(@fricklerhandwerk): maybe this should be a separate thing such as `fediversity-setup`,
|
|
||||||
# which makes explicit which applications and environments are available.
|
|
||||||
# then the deployments can simply be the result of the function application baked into this module.
|
|
||||||
deployment = mkOption {
|
|
||||||
description = "Generate a deployment from a configuration, by applying an environment's resource policies to the applications' resource mappings";
|
|
||||||
type = functionTo (environment.config.resource-mapping.output-type);
|
|
||||||
readOnly = true;
|
|
||||||
default =
|
|
||||||
cfg:
|
|
||||||
# TODO: check cfg.enable.true
|
|
||||||
let
|
|
||||||
required-resources = lib.mapAttrs (
|
|
||||||
name: application-settings: config.applications.${name}.resources application-settings
|
|
||||||
) cfg.applications;
|
|
||||||
in
|
|
||||||
(environment.config.implementation required-resources).output;
|
|
||||||
|
|
||||||
};
|
|
||||||
};
|
|
||||||
})
|
|
||||||
);
|
|
||||||
};
|
|
||||||
configuration = mkOption {
|
configuration = mkOption {
|
||||||
description = "Configuration type declaring options to be set by operators";
|
description = "Configuration type declaring options to be set by operators";
|
||||||
type = optionType;
|
type = optionType;
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
let
|
let
|
||||||
inherit (lib) mkOption types;
|
inherit (lib) mkOption types;
|
||||||
inherit (types)
|
inherit (types)
|
||||||
|
deferredModule
|
||||||
submodule
|
submodule
|
||||||
functionTo
|
functionTo
|
||||||
optionType
|
optionType
|
||||||
|
@ -13,10 +14,10 @@ in
|
||||||
{
|
{
|
||||||
options = {
|
options = {
|
||||||
input-type = mkOption {
|
input-type = mkOption {
|
||||||
type = optionType;
|
type = deferredModule;
|
||||||
};
|
};
|
||||||
output-type = mkOption {
|
output-type = mkOption {
|
||||||
type = optionType;
|
type = deferredModule;
|
||||||
};
|
};
|
||||||
function-type = mkOption {
|
function-type = mkOption {
|
||||||
type = optionType;
|
type = optionType;
|
||||||
|
@ -24,10 +25,10 @@ in
|
||||||
default = functionTo (submodule {
|
default = functionTo (submodule {
|
||||||
options = {
|
options = {
|
||||||
input = mkOption {
|
input = mkOption {
|
||||||
type = config.input-type;
|
type = submodule config.input-type;
|
||||||
};
|
};
|
||||||
output = mkOption {
|
output = mkOption {
|
||||||
type = config.output-type;
|
type = submodule config.output-type;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,13 +1,7 @@
|
||||||
{
|
|
||||||
config,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
{
|
||||||
_class = "nixos";
|
_class = "nixos";
|
||||||
|
|
||||||
users.users = {
|
users.users = {
|
||||||
root.openssh.authorizedKeys.keys = config.users.users.procolix.openssh.authorizedKeys.keys;
|
|
||||||
|
|
||||||
procolix = {
|
procolix = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" ];
|
extraGroups = [ "wheel" ];
|
||||||
|
|
|
@ -23,17 +23,21 @@ let
|
||||||
makeResourceModule =
|
makeResourceModule =
|
||||||
{ vmName, isTestVm }:
|
{ vmName, isTestVm }:
|
||||||
{
|
{
|
||||||
|
# TODO(@fricklerhandwerk): this is terrible but IMO we should just ditch flake-parts and have our own data model for how the project is organised internally
|
||||||
|
_module.args = {
|
||||||
|
inherit
|
||||||
|
inputs
|
||||||
|
keys
|
||||||
|
secrets
|
||||||
|
;
|
||||||
|
};
|
||||||
|
|
||||||
nixos.module.imports = [
|
nixos.module.imports = [
|
||||||
./common/proxmox-qemu-vm.nix
|
./common/proxmox-qemu-vm.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
nixos.specialArgs = {
|
nixos.specialArgs = {
|
||||||
inherit
|
inherit sources;
|
||||||
sources
|
|
||||||
inputs
|
|
||||||
keys
|
|
||||||
secrets
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
imports =
|
imports =
|
||||||
|
@ -75,13 +79,7 @@ let
|
||||||
# TODO(@fricklerhandwerk): we may want to pass through all of `specialArgs`
|
# TODO(@fricklerhandwerk): we may want to pass through all of `specialArgs`
|
||||||
# once we're sure it's sane. leaving it here for better control during refactoring.
|
# once we're sure it's sane. leaving it here for better control during refactoring.
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit
|
inherit sources;
|
||||||
sources
|
|
||||||
inputs
|
|
||||||
keys
|
|
||||||
secrets
|
|
||||||
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,7 +10,7 @@ in
|
||||||
_class = "nixos";
|
_class = "nixos";
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
(import ../../../panel { }).module
|
(../../../panel { }).module
|
||||||
"${sources.home-manager}/nixos"
|
"${sources.home-manager}/nixos"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue