mirror of
https://github.com/donovanglover/nix-config.git
synced 2024-11-22 00:03:55 +01:00
containers: Format with nixfmt-rfc-style
This commit is contained in:
parent
18c0cb3933
commit
4cbceec89c
@ -1,30 +1,23 @@
|
||||
{ nix-config, ... }:
|
||||
|
||||
let
|
||||
inherit (builtins) attrValues;
|
||||
in
|
||||
{
|
||||
imports = attrValues {
|
||||
inherit (nix-config.nixosModules)
|
||||
shell
|
||||
desktop
|
||||
system
|
||||
;
|
||||
};
|
||||
imports = with nix-config.nixosModules; [
|
||||
shell
|
||||
desktop
|
||||
system
|
||||
];
|
||||
|
||||
home-manager.sharedModules = attrValues {
|
||||
inherit (nix-config.homeModules)
|
||||
fish
|
||||
git
|
||||
gtk
|
||||
kitty
|
||||
neovim
|
||||
xresources
|
||||
yazi
|
||||
;
|
||||
};
|
||||
home-manager.sharedModules = with nix-config.homeModules; [
|
||||
fish
|
||||
git
|
||||
gtk
|
||||
kitty
|
||||
neovim
|
||||
xresources
|
||||
yazi
|
||||
];
|
||||
|
||||
nixpkgs.overlays = attrValues nix-config.overlays;
|
||||
nixpkgs.overlays = builtins.attrValues nix-config.overlays;
|
||||
|
||||
modules = {
|
||||
desktop.container = true;
|
||||
|
@ -1,4 +1,10 @@
|
||||
{ nix-config, config, lib, pkgs, ... }:
|
||||
{
|
||||
nix-config,
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
let
|
||||
inherit (nix-config.inputs.sakaya.packages.${pkgs.system}) sakaya;
|
||||
@ -16,9 +22,7 @@ in
|
||||
sourcePort = sakayaPort;
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
sakayaPort
|
||||
];
|
||||
networking.firewall.allowedTCPPorts = [ sakayaPort ];
|
||||
|
||||
systemd.services.sakaya = {
|
||||
enable = true;
|
||||
@ -28,9 +32,7 @@ in
|
||||
Type = "simple";
|
||||
};
|
||||
|
||||
path = [
|
||||
su
|
||||
];
|
||||
path = [ su ];
|
||||
|
||||
serviceConfig = {
|
||||
ExecStart = "/usr/bin/env su ${username} --command=${getExe sakaya}";
|
||||
|
Loading…
Reference in New Issue
Block a user