containers: Format with nixfmt-rfc-style

This commit is contained in:
Donovan Glover 2024-08-03 14:32:15 -04:00
parent 18c0cb3933
commit 4cbceec89c
No known key found for this signature in database
GPG Key ID: EA7408A77AE1BE65
2 changed files with 24 additions and 29 deletions

View File

@ -1,30 +1,23 @@
{ nix-config, ... }: { nix-config, ... }:
let
inherit (builtins) attrValues;
in
{ {
imports = attrValues { imports = with nix-config.nixosModules; [
inherit (nix-config.nixosModules) shell
shell desktop
desktop system
system ];
;
};
home-manager.sharedModules = attrValues { home-manager.sharedModules = with nix-config.homeModules; [
inherit (nix-config.homeModules) fish
fish git
git gtk
gtk kitty
kitty neovim
neovim xresources
xresources yazi
yazi ];
;
};
nixpkgs.overlays = attrValues nix-config.overlays; nixpkgs.overlays = builtins.attrValues nix-config.overlays;
modules = { modules = {
desktop.container = true; desktop.container = true;

View File

@ -1,4 +1,10 @@
{ nix-config, config, lib, pkgs, ... }: {
nix-config,
config,
lib,
pkgs,
...
}:
let let
inherit (nix-config.inputs.sakaya.packages.${pkgs.system}) sakaya; inherit (nix-config.inputs.sakaya.packages.${pkgs.system}) sakaya;
@ -16,9 +22,7 @@ in
sourcePort = sakayaPort; sourcePort = sakayaPort;
}; };
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [ sakayaPort ];
sakayaPort
];
systemd.services.sakaya = { systemd.services.sakaya = {
enable = true; enable = true;
@ -28,9 +32,7 @@ in
Type = "simple"; Type = "simple";
}; };
path = [ path = [ su ];
su
];
serviceConfig = { serviceConfig = {
ExecStart = "/usr/bin/env su ${username} --command=${getExe sakaya}"; ExecStart = "/usr/bin/env su ${username} --command=${getExe sakaya}";