Added formatter
This commit is contained in:
1 parent
ec94b9194c
commit
b1ba8f249e
3 files changed
+49
-22
No files matched your search
Generated
+17
-1
@@ -77,7 +77,23 @@
|
|||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs",
|
||||||
|
"systems": "systems"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"systems": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1681028828,
|
||||||
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-systems",
|
||||||
|
"repo": "default",
|
||||||
|
"type": "github"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,11 +1,8 @@
|
|||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixos-hardware = {
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||||
url = "github:NixOS/nixos-hardware/master";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||||
};
|
systems.url = "github:nix-systems/default";
|
||||||
nixpkgs = {
|
|
||||||
url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
|
||||||
};
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@@ -22,6 +19,7 @@
|
|||||||
, nixpkgs
|
, nixpkgs
|
||||||
, home-manager
|
, home-manager
|
||||||
, nix-darwin
|
, nix-darwin
|
||||||
|
, systems
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
user = {
|
user = {
|
||||||
@@ -44,9 +42,16 @@
|
|||||||
home-manager = home-manager;
|
home-manager = home-manager;
|
||||||
nix-darwin = nix-darwin;
|
nix-darwin = nix-darwin;
|
||||||
});
|
});
|
||||||
|
eachSystem = nixpkgs.lib.genAttrs (import systems);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
lib = lib;
|
lib = lib;
|
||||||
|
formatter = eachSystem (system:
|
||||||
|
nixpkgs.legacyPackages.${system}.nixpkgs-fmt
|
||||||
|
);
|
||||||
|
|
||||||
|
# NIXOS Setups
|
||||||
|
# -------------
|
||||||
nixosConfigurations."fwbook" = lib.makeNixOsModule {
|
nixosConfigurations."fwbook" = lib.makeNixOsModule {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
user = user;
|
user = user;
|
||||||
@@ -81,6 +86,9 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# MacBooks Setups
|
||||||
|
# -------------
|
||||||
darwinConfigurations."asosnovsky-mac" = lib.makeDarwinModule {
|
darwinConfigurations."asosnovsky-mac" = lib.makeDarwinModule {
|
||||||
user = sumoUser;
|
user = sumoUser;
|
||||||
systemStateVersion = 4;
|
systemStateVersion = 4;
|
||||||
|
|||||||
+18
-15
@@ -1,18 +1,21 @@
|
|||||||
{ enableSSHServer, user }:
|
{ enableSSHServer, user }:
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
services.openssh = if enableSSHServer then {
|
services.openssh =
|
||||||
enable = true;
|
if enableSSHServer then {
|
||||||
settings.PasswordAuthentication = false;
|
enable = true;
|
||||||
settings.KbdInteractiveAuthentication = false;
|
settings.PasswordAuthentication = false;
|
||||||
settings.PermitRootLogin = "yes";
|
settings.KbdInteractiveAuthentication = false;
|
||||||
} else {
|
settings.PermitRootLogin = "yes";
|
||||||
enable = false;
|
} else {
|
||||||
};
|
enable = false;
|
||||||
users.users.${user.name}.openssh.authorizedKeys.keys = if enableSSHServer then [
|
};
|
||||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuatskL9qXvgvS3E8zRwosFnpcN0f8PkKl8syAvpn297V2iPk6mi8yK3EE7xPpxaKKlwUuBHDj3BNUCoLgdRFKUgroRDzr3BMm+gZTHy6CuEZBY9zBRTmH+aOV6FZ96QPW4zba0BW5YPkPNy/FhYibjpXyZ3nX4/LWSbPKQJ7wTnUJZgq4VFmevBOttvhzUJUgTziMFsGXn6I38fAi6LI8qwI+zOOdsNjtKgr/TIlO/7VqcH7GYnQEwlthl577sDd1V6+XWz649qoiBYyq0Ahm09dwYx2iGQwLo8IYFbSy4aJRK/PI0+ytnPBoF5QCl+ILb5E8uV3e6Wb9WpXl9Hv2iLx91/9iq5hykHPnfVtkq3MK0C2vqkvX1qFOIkKM7vmxvXGbaDZDGK3G+/zkQ7GUw8ydbl9wGwE9cKbm9miqs4w2Ry/+3IZasE6G2TI97bSzSYInQd2RwoglqBOaJojbUqgI9wvNdKxGhADNFbZah2+s6SSe1ByQRN3b9wtmqu0= ari@shared"
|
users.users.${user.name}.openssh.authorizedKeys.keys =
|
||||||
] else [];
|
if enableSSHServer then [
|
||||||
users.users.root.openssh.authorizedKeys.keys = if enableSSHServer then [
|
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuatskL9qXvgvS3E8zRwosFnpcN0f8PkKl8syAvpn297V2iPk6mi8yK3EE7xPpxaKKlwUuBHDj3BNUCoLgdRFKUgroRDzr3BMm+gZTHy6CuEZBY9zBRTmH+aOV6FZ96QPW4zba0BW5YPkPNy/FhYibjpXyZ3nX4/LWSbPKQJ7wTnUJZgq4VFmevBOttvhzUJUgTziMFsGXn6I38fAi6LI8qwI+zOOdsNjtKgr/TIlO/7VqcH7GYnQEwlthl577sDd1V6+XWz649qoiBYyq0Ahm09dwYx2iGQwLo8IYFbSy4aJRK/PI0+ytnPBoF5QCl+ILb5E8uV3e6Wb9WpXl9Hv2iLx91/9iq5hykHPnfVtkq3MK0C2vqkvX1qFOIkKM7vmxvXGbaDZDGK3G+/zkQ7GUw8ydbl9wGwE9cKbm9miqs4w2Ry/+3IZasE6G2TI97bSzSYInQd2RwoglqBOaJojbUqgI9wvNdKxGhADNFbZah2+s6SSe1ByQRN3b9wtmqu0= ari@shared"
|
||||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuatskL9qXvgvS3E8zRwosFnpcN0f8PkKl8syAvpn297V2iPk6mi8yK3EE7xPpxaKKlwUuBHDj3BNUCoLgdRFKUgroRDzr3BMm+gZTHy6CuEZBY9zBRTmH+aOV6FZ96QPW4zba0BW5YPkPNy/FhYibjpXyZ3nX4/LWSbPKQJ7wTnUJZgq4VFmevBOttvhzUJUgTziMFsGXn6I38fAi6LI8qwI+zOOdsNjtKgr/TIlO/7VqcH7GYnQEwlthl577sDd1V6+XWz649qoiBYyq0Ahm09dwYx2iGQwLo8IYFbSy4aJRK/PI0+ytnPBoF5QCl+ILb5E8uV3e6Wb9WpXl9Hv2iLx91/9iq5hykHPnfVtkq3MK0C2vqkvX1qFOIkKM7vmxvXGbaDZDGK3G+/zkQ7GUw8ydbl9wGwE9cKbm9miqs4w2Ry/+3IZasE6G2TI97bSzSYInQd2RwoglqBOaJojbUqgI9wvNdKxGhADNFbZah2+s6SSe1ByQRN3b9wtmqu0= ari@shared"
|
] else [ ];
|
||||||
] else [];
|
users.users.root.openssh.authorizedKeys.keys =
|
||||||
}
|
if enableSSHServer then [
|
||||||
|
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuatskL9qXvgvS3E8zRwosFnpcN0f8PkKl8syAvpn297V2iPk6mi8yK3EE7xPpxaKKlwUuBHDj3BNUCoLgdRFKUgroRDzr3BMm+gZTHy6CuEZBY9zBRTmH+aOV6FZ96QPW4zba0BW5YPkPNy/FhYibjpXyZ3nX4/LWSbPKQJ7wTnUJZgq4VFmevBOttvhzUJUgTziMFsGXn6I38fAi6LI8qwI+zOOdsNjtKgr/TIlO/7VqcH7GYnQEwlthl577sDd1V6+XWz649qoiBYyq0Ahm09dwYx2iGQwLo8IYFbSy4aJRK/PI0+ytnPBoF5QCl+ILb5E8uV3e6Wb9WpXl9Hv2iLx91/9iq5hykHPnfVtkq3MK0C2vqkvX1qFOIkKM7vmxvXGbaDZDGK3G+/zkQ7GUw8ydbl9wGwE9cKbm9miqs4w2Ry/+3IZasE6G2TI97bSzSYInQd2RwoglqBOaJojbUqgI9wvNdKxGhADNFbZah2+s6SSe1ByQRN3b9wtmqu0= ari@shared"
|
||||||
|
] else [ ];
|
||||||
|
}
|
||||||
Reference in new issue
Block a user