willifan/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modularize config

Browse source
This commit is contained in:
willifan 2024-12-15 13:01:45 +01:00
parent 48f0c3b3ec
commit 65ff3fcd11
25 changed files with 88 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hosts/Anton/default.nix
View file

@ -16,6 +16,9 @@
./radicale.nix
./syncthing.nix
../../modules/common
../../modules/server
];
}

3
hosts/Lenni/default.nix
View file

@ -4,5 +4,8 @@
./hardware-configuration.nix
#./disko.nix
./syncthing.nix
../../modules/common
../../modules/desktop
];
}

4
hosts/Lillie/default.nix
View file

@ -3,5 +3,9 @@
imports = [
./hardware-configuration.nix
./disko.nix
../../modules/common
../../modules/desktop
];
}

6
hosts/Puenktchen/default.nix
View file

@ -3,8 +3,10 @@
imports = [
./hardware-configuration.nix
./disko.nix
./syncthing.nix
../../modules/common
../../modules/desktop
];
boot.initrd.kernelModules = [ "amdgpu" ];
}

11
hosts/common/autoupdate.nix
View file

@ -1,11 +0,0 @@
{ ... }:
{
system.autoUpgrade = {
enable = true;
dates = "04:00";
flake = "git+ssh://gitea@git.huwe.mooo.com/willifan/nix-config";
persistent = true;
randomizedDelaySec = "5min";
fixedRandomDelay = true;
};
}

20
hosts/common/default.nix
View file

@ -1,20 +0,0 @@
{ hostname, ... }:
{
imports = [
./autoupdate.nix
./garbage-collect.nix
./keyd.nix
./mimetype.nix
./optimise.nix
./sops.nix
];
networking = {
networkmanager.enable = true;
hostName = "${hostname}";
};
console.keyMap = "de";
nix.settings.experimental-features = [ "nix-command" "flakes" ];
nixpkgs.config.allowUnfree = true;
system.stateVersion = "23.11";
}

9
hosts/common/garbage-collect.nix
View file

@ -1,9 +0,0 @@
{ ... }:
{
nix.gc = {
automatic = true;
dates = "04:30";
persistent = true;
options = "--delete-older-than 30d";
};
}

23
hosts/common/keyd.nix
View file

@ -1,23 +0,0 @@
{ ... }:
{
services.keyd = {
enable = true;
keyboards.default = {
ids = [ "*" ];
settings = {
main = {
rightalt = "overload(altgr, rightalt)";
capslock = "overload(control, esc)";
};
altgr = {
a = ''macro(compose a ")'';
o = ''macro(compose o ")'';
u = ''macro(compose u ")'';
s = ''macro(compose s s)'';
};
};
};
};
}

15
hosts/common/mimetype.nix
View file

@ -1,15 +0,0 @@
{ ... }:
{
xdg.mime.defaultApplications = {
"application/pdf" = "zen.desktop";
"text/html" = "zen.desktop";
"x-scheme-handler/http" = "zen.desktop";
"x-scheme-handler/https" = "zen.desktop";
"x-scheme-handler/about" = "zen.desktop";
"x-scheme-handler/unknown" = "zen.desktop";
};
environment.sessionVariables.DEFAULT_BROWSER = "zen";
}

7
hosts/common/optimise.nix
View file

@ -1,7 +0,0 @@
{ ... }:
{
nix.optimise = {
automatic = true;
dates = [ "05:00" ];
};
}

18
hosts/common/sops.nix
View file

@ -1,18 +0,0 @@
{ attrs, ... }:
{
imports = [
attrs.sops-nix.nixosModules.sops
];
sops.defaultSopsFile = ../../secrets/secrets.yaml;
sops.defaultSopsFormat = "yaml";
sops.age.keyFile = "/home/willifan/.config/sops/age/keys.txt";
sops.secrets."ssh/root/private" = {
owner = "root";
};
sops.secrets."syncthing/password" = {
};
}

8
hosts/default.nix
View file

@ -1,8 +0,0 @@
{ hostname, type, ... }:
{
imports = [
./common
./${type}
./${hostname}
];
}

31
hosts/desktop/boot.nix
View file

@ -1,31 +0,0 @@
{ ... }:
{
boot = {
loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
initrd.systemd.enable = true;
plymouth = {
enable = true;
# theme = "bgrt";
# logo = "${pkgs.nixos-icons}/share/icons/hicolor/48x48/apps/nix-snowflake-white.png";
# font = "${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf";
};
consoleLogLevel = 0;
initrd.verbose = false;
kernelParams = [
"quiet"
"splash"
"boot.shell_on_fail"
"loglevel=3"
"rd.systemd.show_status=false"
"rd.udev.log_level=3"
"udev.log_priority=3"
];
# Hide the OS choice for bootloaders.
# It's still possible to open the bootloader list by pressing any key
# It will just not appear on screen unless a key is pressed
loader.timeout = 0;
};
}

16
hosts/desktop/default.nix
View file

@ -1,16 +0,0 @@
{ hostname, ... }:
{
networking.hostName = hostname;
imports = [
./boot.nix
./nfs-client.nix
./nix-ld.nix
./printers.nix
./remoteBuilder.nix
./ssh-server.nix
];
hardware.bluetooth.enable = true;
services.hardware.bolt.enable = true;
}

18
hosts/desktop/nfs-client.nix
View file

@ -1,18 +0,0 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
nfs-utils
];
services.autofs = {
enable = true;
autoMaster = let
mapConf = pkgs.writeText "auto.nfs" ''
roms -fstype=nfs4 192.168.178.19:/roms
'';
in ''
/mnt/nfs ${mapConf}
'';
};
}

7
hosts/desktop/nix-ld.nix
View file

@ -1,7 +0,0 @@
{ pkgs, ... }:
{
programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [
];
}

13
hosts/desktop/printers.nix
View file

@ -1,13 +0,0 @@
{ pkgs, ... }:
{
services.printing = {
enable = true;
drivers = [ pkgs.gutenprint pkgs.gutenprintBin ];
};
services.avahi = {
enable = true;
nssmdns4 = true;
openFirewall = true;
};
}

22
hosts/desktop/remoteBuilder.nix
View file

@ -1,22 +0,0 @@
{ ... }:
{
nix.buildMachines = [ {
hostName = "Anton";
sshUser = "builder";
systems = [ "x86_64-linux" "aarch64-linux" ];
protocol = "ssh";
# if the builder supports building for multiple architectures,
# replace the previous line by, e.g.
# systems = ["x86_64-linux" "aarch64-linux"];
maxJobs = 1;
speedFactor = 2;
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
mandatoryFeatures = [ ];
}];
nix.distributedBuilds = true;
# optional, useful when the builder has a faster internet connection than yours
nix.extraOptions = ''
builders-use-substitutes = true
'';
}

22
hosts/desktop/ssh-server.nix
View file

@ -1,22 +0,0 @@
{ ... }:
{
services.openssh = {
enable = true;
ports = [ 22 ];
settings = {
PasswordAuthentication = false;
AllowUsers = null; # Allows all users by default. Can be [ "user1" "user2" ]
UseDns = true;
X11Forwarding = false;
PermitRootLogin = "prohibit-password"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no"
};
};
users.users.willifan.openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDMRriQfw3pusl04fGhCNVoRRpye71ZwkDXAtKB/FP1DLXA4cYrwjLzv/fG1hXi7lAMp2vLiABAg/UaTE8roGzlt62XsFNwc1TI5M8m67J0kLkCtz3MkIixe/3GOFXr03g80DPncLyoIYPvvNd/TftTBK4yrrZPvMJaRrZhW/QdLPQpdHalcNRZ4bnBOCtCoqQ6RGrRi2EeKaJDYIFNl13b9FxrXEJcXnbSDdr1KI3q7a+vkefI2knUf2Uk7ufOWTQ1aqc0heGtCNlHzwZUzW/dfrpPmoVPq3Fqxqd9uXqxMk1Z3VnOwWcK3VXfzzBXKTsX0MaUgF1EqxibkYs9bDZqLEXoRucBqk3wwMPy8RJXqQOupoqa2xEOoduBf1qDHEEm69coHCpPm2mQVUrwsPrmTHmOjh9ir0mkVBDRgHvhq/ctQTVO5/SE2NCgPdlvUV5s44LLsUyxBp5JWwXZWlVys+7Dhil6mtRDcH4CXceJn0VZ61Zv2jrCTxQjKsroitSkNbpAkKajQ9moLMAblsSwJzl3uvJJ3ydlxjZefwTO/GjyuJMY2sIU2Tu0YbIVgMyq5L782LduVlyWj+RLWoEu19OfMqQvTWhJnQPAbR82qGzlfTGRLUxoY+G5MYipJwgrBQ2TnpWvfpTrZxFrglSfekz0v54lWzNZpW+irImh4w== willifan@proton.me"
];
nix.settings.trusted-users = [ "willifan" ];
}

8
hosts/server/boot.nix
View file

@ -1,8 +0,0 @@
{ ... }:
{
boot = {
loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
initrd.systemd.enable = true;
};
}

14
hosts/server/builder.nix
View file

@ -1,14 +0,0 @@
{ config, ... }:
{
users.users.builder = {
group = "builder";
isNormalUser = true;
homeMode = "111";
openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCRgaPLmdimjvCM7jvlXkRPbw0KOmMdtgTcBahgIWNm8QAFkPX8T42RNDgTb7QG+XqRU4+t4VgM0xt6ldcOTrrcJ2bHW8ybeXM5DU7z2f0aCp3OULosbDHoWiEdxvNmIHcFKgMbL7K/ieVYx5wrPkU+63inK5GrzWIaOOd8O4Q/z7M/XIwOAz2Kb3B4muCG9b9cKAGodOkRT81aJsK0aE84Cy4DbzCgz34FWvfGPWSHQZ/fLNlKrtKI0lCEG5r7r1Tw1wXDAFb7d+enypUwy+KlQDJLkDp0O1dJPEmY0RKXMRL2xFl3jrQ4LgOAyWhXF2ERc2bkky4YaIQfLX3NaMRqVRmUCVpnGRcYqdbn2ulsUOmC0Or/bnJa7/sKFBhFb8aEoxD7/w4h5ugh0xVWMFvwjDb0gymXjNPgvefagAhi8qhxf/6X4AZK4x7y/tcIKpW3QfyrdX7bWQ7itBpMPtYH6WWyoKfypnAGeUtdwcXsb5cwGoJ4s9S/E1CwyZxdC38ydrDYFeRih7+KDHnOqZFnLwBb6yLdpvUhyMkksAzVxh8cvObVgjUFQMAwKvLKVzlv28BLgaWj+K+oFakytRtYZv7CsCneZyL3s/nDKs2ChhYgiXvVicZi+sC8FXZIl6wXWHYj5i/p5A/6ulVFgkfDna051hNewerXuTlyMMbTRw== willifan@pm.me" ];
};
users.groups.builder = { };
nix.settings.trusted-users = [ "builder" "willifan" ];
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
nix.settings.extra-platforms = config.boot.binfmt.emulatedSystems;
}

9
hosts/server/default.nix
View file

@ -1,9 +0,0 @@
{ ... }:
{
imports = [
./boot.nix
./builder.nix
./ssh-server.nix
];
}

21
hosts/server/ssh-server.nix
View file

@ -1,21 +0,0 @@
{ ... }:
{
services.openssh = {
enable = true;
ports = [ 22 ];
settings = {
PasswordAuthentication = false;
AllowUsers = null; # Allows all users by default. Can be [ "user1" "user2" ]
UseDns = true;
X11Forwarding = false;
PermitRootLogin = "prohibit-password"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no"
};
};
users.users.willifan.openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDMRriQfw3pusl04fGhCNVoRRpye71ZwkDXAtKB/FP1DLXA4cYrwjLzv/fG1hXi7lAMp2vLiABAg/UaTE8roGzlt62XsFNwc1TI5M8m67J0kLkCtz3MkIixe/3GOFXr03g80DPncLyoIYPvvNd/TftTBK4yrrZPvMJaRrZhW/QdLPQpdHalcNRZ4bnBOCtCoqQ6RGrRi2EeKaJDYIFNl13b9FxrXEJcXnbSDdr1KI3q7a+vkefI2knUf2Uk7ufOWTQ1aqc0heGtCNlHzwZUzW/dfrpPmoVPq3Fqxqd9uXqxMk1Z3VnOwWcK3VXfzzBXKTsX0MaUgF1EqxibkYs9bDZqLEXoRucBqk3wwMPy8RJXqQOupoqa2xEOoduBf1qDHEEm69coHCpPm2mQVUrwsPrmTHmOjh9ir0mkVBDRgHvhq/ctQTVO5/SE2NCgPdlvUV5s44LLsUyxBp5JWwXZWlVys+7Dhil6mtRDcH4CXceJn0VZ61Zv2jrCTxQjKsroitSkNbpAkKajQ9moLMAblsSwJzl3uvJJ3ydlxjZefwTO/GjyuJMY2sIU2Tu0YbIVgMyq5L782LduVlyWj+RLWoEu19OfMqQvTWhJnQPAbR82qGzlfTGRLUxoY+G5MYipJwgrBQ2TnpWvfpTrZxFrglSfekz0v54lWzNZpW+irImh4w== willifan@proton.me"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCd8g40ehDWL44XbzDY4qbka6FD4oCGA8stA5EqKdORhUqXAqEjw8s8kqNbok13RtSRpC5cgt8dsXG+lXL7A5oldq1u02+yl3YJtyt0nl+cH0WUEHdx7z3uWZPfI2WJh7Q14n0bl/31Rnxsw2A93JTrWqRCs4sV8CG4K8b5WhQSTJEbSO61z7tMEETfag+20FSA2sPP+QZCbxIGdRfTx/aA2pUlkSy5ih0WjwCJlI2wkTQsdsmHuZnPse0QRejbORSfHc/jh7KFFV/KR/UHs4X1EH4dOo4lebigUdtoUwlK9ciBaK1fFCLERJNWMCJOK5zfd3nUEbk7+hXVkAPTB/mDxYub8trpZSCu+3X3z10GM/AuSlk/8lrNQxUpovLffb8bJWSdAH7QdMM/fdgt0YHxt/FEpz5fiB7RHxQ4w/CQC+a+FOVDGFddd4uinX+999ZpshHKnB+R0Yi/7C+XoyhgytNATsPQlWYF367DWXA4cfSmpxchmi1EK4M0XBC8UxtF/EW0ULV2WFAFrO77LKKZ0UkjT7UWv6F3CofY1tAI4Kem6ervegXlasUe3AogiTuIvXfQm5kUk2fgK//VTe4vqQY+BqezHDYgSVbB/FASd0Z5vv+f7zRdqOhLH3ybkjTeQ4MlS0HHO2BCaAKjCmSBBn6w2pC92Qz32uK28w7yhQ== root@Lenni"
];
}