chore: fix format

This commit is contained in:
xinyangli 2024-01-13 10:47:37 +08:00
parent 5da958c996
commit 55473f78ad
No known key found for this signature in database
4 changed files with 60 additions and 47 deletions

View file

@ -102,7 +102,17 @@
homeConfigurations = builtins.listToAttrs [ (mkHomeConfiguration "xin" "calcite") ];
colmenaHive = colmena.lib.makeHive {
colmenaHive =
let
deploymentModule = {
deployment.targetUser = "xin";
};
sharedModules = [
self.nixosModules.default
deploymentModule
];
in
colmena.lib.makeHive {
meta = {
nixpkgs = import nixpkgs {
system = "x86_64-linux";
@ -115,19 +125,18 @@
massicot = { name, nodes, pkgs, ... }: with inputs; {
deployment.targetHost = "49.13.13.122";
deployment.buildOnTarget = true;
imports = [
{ nixpkgs.system = "aarch64-linux"; }
self.nixosModules.default
machines/massicot
];
] ++ sharedModules;
};
sgp-00 = { name, nodes, pkgs, ... }: with inputs; {
imports = [
self.nixosModules.default
machines/dolomite
];
] ++ sharedModules;
nixpkgs.system = "x86_64-linux";
networking.hostName = "sgp-00";
system.stateVersion = "23.11";
@ -140,9 +149,8 @@
tok-00 = { name, nodes, pkgs, ... }: with inputs; {
imports = [
self.nixosModules.default
machines/dolomite
];
] ++ sharedModules;
nixpkgs.system = "x86_64-linux";
networking.hostName = "tok-00";
system.stateVersion = "23.11";
@ -191,7 +199,7 @@
{
devShells = {
default = pkgs.mkShell {
packages = with pkgs; [ git colmena sops nix-output-monitor ];
packages = with pkgs; [ git colmena sops nix-output-monitor rnix-lsp ];
};
};
}

View file

@ -66,12 +66,17 @@
};
};
services.fail2ban.enable = true;
programs.mosh.enable = true;
security.sudo = {
execWheelOnly = true;
wheelNeedsPassword = false;
};
nix.settings = {
trusted-users = config.users.groups.wheel.members;
};
services.sing-box = let
singTls = {
enabled = true;

View file

@ -87,8 +87,8 @@
KerberosAuthentication = "no";
};
};
services.fail2ban.enable = true;
programs.mosh.enable = true;
systemd.services.sshd.wantedBy = pkgs.lib.mkForce [ "multi-user.target" ];
}