re-split direcories #1

Merged
vinzenz merged 28 commits from modules into main 2025-09-15 19:44:30 +02:00
3 changed files with 43 additions and 44 deletions
Showing only changes of commit a377c8e30b - Show all commits

View file

@ -145,43 +145,41 @@
};
};
nixosModules = {
lix = (import ./nixosModules/lix.nix);
kdeconnect = (import ./nixosModules/kdeconnect.nix);
globalinstalls = (import ./nixosModules/globalinstalls.nix);
autoupdate = (import ./nixosModules/autoupdate.nix);
en-de = (import ./nixosModules/en-de.nix);
niri = {
imports = [ niri.nixosModules.niri ];
nixpkgs.overlays = [ niri.overlays.niri ];
};
pkgs-unstable = {
nixpkgs.overlays = [ nix-vscode-extensions.overlays.default ];
};
desktopDefault = {
imports = [
self.nixosModules.pkgs-unstable
self.nixosModules.niri
self.nixosModules.kdeconnect
self.nixosModules.en-de
nixosModules =
(builtins.mapAttrs (m: _: import ./nixosModules/${m}) (builtins.readDir ./nixosModules))
// {
niri = {
imports = [ niri.nixosModules.niri ];
nixpkgs.overlays = [ niri.overlays.niri ];
};
pkgs-unstable = {
nixpkgs.overlays = [ nix-vscode-extensions.overlays.default ];
};
desktopDefault = {
imports = [
self.nixosModules.pkgs-unstable
self.nixosModules.niri
self.nixosModules.kdeconnect
self.nixosModules.en-de
home-manager.nixosModules.home-manager
servicepoint-simulator.nixosModules.default
servicepoint-cli.nixosModules.default
home-manager.nixosModules.home-manager
servicepoint-simulator.nixosModules.default
servicepoint-cli.nixosModules.default
./modules/home-manager.nix
];
./modules/home-manager.nix
];
};
default = {
imports = with self.nixosModules; [
lix
globalinstalls
autoupdate
openssh
./modules/networking.nix
./modules/nixpkgs.nix
];
};
};
default = {
imports = with self.nixosModules; [
lix
globalinstalls
autoupdate
./modules/networking.nix
./modules/nixpkgs.nix
];
};
};
formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree);
};

View file

@ -1,15 +1,5 @@
_: {
config = {
services.openssh = {
enable = true;
openFirewall = true;
settings = {
PermitRootLogin = "without-password";
PasswordAuthentication = false;
KbdInteractiveAuthentication = false;
};
};
services.tailscale = {
enable = true;
openFirewall = true;

11
nixosModules/openssh.nix Normal file
View file

@ -0,0 +1,11 @@
{
services.openssh = {
enable = true;
openFirewall = true;
settings = {
PermitRootLogin = "without-password";
PasswordAuthentication = false;
KbdInteractiveAuthentication = false;
};
};
}