thohlt/nixos-config
1
0
Fork 0
mirror of https://github.com/thiloho/nixos-config.git synced 2025-11-22 11:31:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Format code

Browse Source
This commit is contained in:
thiloho
2024-01-04 14:07:22 +01:00
parent eac9093310
commit c0a1f059dc
10 changed files with 141 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
flake.nix
View File

@@ -32,7 +32,8 @@
outputs = inputs@{ nixpkgs, home-manager, ... }: { outputs = inputs@{ nixpkgs, home-manager, ... }: {
nixosConfigurations = let nixosConfigurations = let
mkSystem = entrypoint: nixpkgs.lib.nixosSystem { mkSystem = entrypoint:
nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [

3
nixos-configurations/laptop/default.nix
View File

@@ -23,7 +23,8 @@
home-manager.users.thiloho = { pkgs, ... }: { home-manager.users.thiloho = { pkgs, ... }: {
programs.git.signing.key = "1142F33FFA8ADAAC"; programs.git.signing.key = "1142F33FFA8ADAAC";
home = { home = {
packages = with pkgs; [ packages = with pkgs;
[
# ciscoPacketTracer8 # ciscoPacketTracer8
]; ];
stateVersion = "23.05"; stateVersion = "23.05";

21
nixos-configurations/laptop/hardware-configuration.nix
View File

@@ -4,28 +4,26 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules =
[ "xhci_pci" "nvme" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/58cf62a5-3ab2-411d-86ef-c6c4d5877bb8"; device = "/dev/disk/by-uuid/58cf62a5-3ab2-411d-86ef-c6c4d5877bb8";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/C2DA-F1B0"; device = "/dev/disk/by-uuid/C2DA-F1B0";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/4d298153-87ea-4a12-a244-a64b2075bd40"; } [{ device = "/dev/disk/by-uuid/4d298153-87ea-4a12-a244-a64b2075bd40"; }];
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -37,5 +35,6 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

13
nixos-configurations/pc/default.nix
View File

@@ -12,12 +12,13 @@
networking = { networking = {
hostName = "pc"; hostName = "pc";
firewall = { firewall = {
allowedTCPPorts = [ 5173 ]; allowedTCPPorts = [ 5173 8081 ];
allowedUDPPorts = [ 5173 ]; allowedUDPPorts = [ 5173 8081 ];
}; };
}; };
services.postgresql = { services = {
postgresql = {
enable = true; enable = true;
package = pkgs.postgresql_15; package = pkgs.postgresql_15;
ensureDatabases = [ "dcbot" "todos" ]; ensureDatabases = [ "dcbot" "todos" ];
@@ -26,6 +27,7 @@
local all all trust local all all trust
''; '';
}; };
};
programs.adb.enable = true; programs.adb.enable = true;
users.users.thiloho.extraGroups = [ "adbusers" ]; users.users.thiloho.extraGroups = [ "adbusers" ];
@@ -33,10 +35,7 @@
home-manager.users.thiloho = { pkgs, lib, ... }: { home-manager.users.thiloho = { pkgs, lib, ... }: {
programs.git.signing.key = "5ECD00BDC15A987E"; programs.git.signing.key = "5ECD00BDC15A987E";
home = { home = {
packages = with pkgs; [ packages = with pkgs; [ blender inkscape ];
blender
inkscape
];
stateVersion = "23.05"; stateVersion = "23.05";
}; };
}; };

21
nixos-configurations/pc/hardware-configuration.nix
View File

@@ -4,28 +4,26 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/ff159d0e-c92c-4329-8aaf-b71e48aba39c"; device = "/dev/disk/by-uuid/ff159d0e-c92c-4329-8aaf-b71e48aba39c";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/B975-C979"; device = "/dev/disk/by-uuid/B975-C979";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/253466d8-15b0-412c-8860-ffff0572fece"; } [{ device = "/dev/disk/by-uuid/253466d8-15b0-412c-8860-ffff0572fece"; }];
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
@@ -35,5 +33,6 @@
# networking.interfaces.enp9s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp9s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

104
nixos-configurations/server/default.nix
View File

@@ -10,26 +10,35 @@
nix.settings.trusted-users = [ "thiloho" ]; nix.settings.trusted-users = [ "thiloho" ];
age.secrets = { age.secrets = {
hedgedoc-environment-file.file = ../../secrets/hedgedoc-environment-file.age; hedgedoc-environment-file.file =
../../secrets/hedgedoc-environment-file.age;
discord-bot-token.file = ../../secrets/discord-bot-token.age; discord-bot-token.file = ../../secrets/discord-bot-token.age;
todos-environment-file.file = ../../secrets/todos-environment-file.age; todos-environment-file.file = ../../secrets/todos-environment-file.age;
"restic/minecraft-environment-file".file = ../../secrets/restic/minecraft-environment-file.age; "restic/minecraft-environment-file".file =
"restic/minecraft-repository".file = ../../secrets/restic/minecraft-repository.age; ../../secrets/restic/minecraft-environment-file.age;
"restic/minecraft-password".file = ../../secrets/restic/minecraft-password.age; "restic/minecraft-repository".file =
"restic/hedgedoc-environment-file".file = ../../secrets/restic/hedgedoc-environment-file.age; ../../secrets/restic/minecraft-repository.age;
"restic/hedgedoc-repository".file = ../../secrets/restic/hedgedoc-repository.age; "restic/minecraft-password".file =
"restic/hedgedoc-password".file = ../../secrets/restic/hedgedoc-password.age; ../../secrets/restic/minecraft-password.age;
"restic/todos-environment-file".file = ../../secrets/restic/todos-environment-file.age; "restic/hedgedoc-environment-file".file =
../../secrets/restic/hedgedoc-environment-file.age;
"restic/hedgedoc-repository".file =
../../secrets/restic/hedgedoc-repository.age;
"restic/hedgedoc-password".file =
../../secrets/restic/hedgedoc-password.age;
"restic/todos-environment-file".file =
../../secrets/restic/todos-environment-file.age;
"restic/todos-repository".file = ../../secrets/restic/todos-repository.age; "restic/todos-repository".file = ../../secrets/restic/todos-repository.age;
"restic/todos-password".file = ../../secrets/restic/todos-password.age; "restic/todos-password".file = ../../secrets/restic/todos-password.age;
"restic/discord-bot-environment-file".file = ../../secrets/restic/discord-bot-environment-file.age; "restic/discord-bot-environment-file".file =
"restic/discord-bot-repository".file = ../../secrets/restic/discord-bot-repository.age; ../../secrets/restic/discord-bot-environment-file.age;
"restic/discord-bot-password".file = ../../secrets/restic/discord-bot-password.age; "restic/discord-bot-repository".file =
../../secrets/restic/discord-bot-repository.age;
"restic/discord-bot-password".file =
../../secrets/restic/discord-bot-password.age;
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [ nodejs_20 ];
nodejs_20
];
networking = { networking = {
hostName = "server"; hostName = "server";
@@ -153,43 +162,37 @@
minecraft-backup = { minecraft-backup = {
initialize = true; initialize = true;
environmentFile = config.age.secrets."restic/minecraft-environment-file".path; environmentFile =
config.age.secrets."restic/minecraft-environment-file".path;
repositoryFile = config.age.secrets."restic/minecraft-repository".path; repositoryFile = config.age.secrets."restic/minecraft-repository".path;
passwordFile = config.age.secrets."restic/minecraft-password".path; passwordFile = config.age.secrets."restic/minecraft-password".path;
paths = [ paths = [ "/var/lib/minecraft/world" ];
"/var/lib/minecraft/world"
];
pruneOpts = [ pruneOpts = [ "--keep-daily 7" "--keep-weekly 5" "--keep-monthly 12" ];
"--keep-daily 7"
"--keep-weekly 5"
"--keep-monthly 12"
];
}; };
hedgedoc-database-backup = { hedgedoc-database-backup = {
initialize = true; initialize = true;
environmentFile = config.age.secrets."restic/hedgedoc-environment-file".path; environmentFile =
config.age.secrets."restic/hedgedoc-environment-file".path;
repositoryFile = config.age.secrets."restic/hedgedoc-repository".path; repositoryFile = config.age.secrets."restic/hedgedoc-repository".path;
passwordFile = config.age.secrets."restic/hedgedoc-password".path; passwordFile = config.age.secrets."restic/hedgedoc-password".path;
paths = [ "/var/lib/hedgedoc/uploads" "/var/lib/hedgedoc/hedgedoc.dump" ]; paths =
[ "/var/lib/hedgedoc/uploads" "/var/lib/hedgedoc/hedgedoc.dump" ];
backupPrepareCommand = '' backupPrepareCommand = ''
${config.services.postgresql.package}/bin/pg_dump -U postgres -Fc hedgedoc > /var/lib/hedgedoc/hedgedoc.dump ${config.services.postgresql.package}/bin/pg_dump -U postgres -Fc hedgedoc > /var/lib/hedgedoc/hedgedoc.dump
''; '';
pruneOpts = [ pruneOpts = [ "--keep-daily 7" "--keep-weekly 5" "--keep-monthly 12" ];
"--keep-daily 7"
"--keep-weekly 5"
"--keep-monthly 12"
];
}; };
todos-database-backup = { todos-database-backup = {
initialize = true; initialize = true;
environmentFile = config.age.secrets."restic/todos-environment-file".path; environmentFile =
config.age.secrets."restic/todos-environment-file".path;
repositoryFile = config.age.secrets."restic/todos-repository".path; repositoryFile = config.age.secrets."restic/todos-repository".path;
passwordFile = config.age.secrets."restic/todos-password".path; passwordFile = config.age.secrets."restic/todos-password".path;
@@ -199,17 +202,15 @@
${config.services.postgresql.package}/bin/pg_dump -U postgres -Fc todos > /var/lib/todos.dump ${config.services.postgresql.package}/bin/pg_dump -U postgres -Fc todos > /var/lib/todos.dump
''; '';
pruneOpts = [ pruneOpts = [ "--keep-daily 7" "--keep-weekly 5" "--keep-monthly 12" ];
"--keep-daily 7"
"--keep-weekly 5"
"--keep-monthly 12"
];
}; };
discord-bot-database-backup = { discord-bot-database-backup = {
initialize = true; initialize = true;
environmentFile = config.age.secrets."restic/discord-bot-environment-file".path; environmentFile =
repositoryFile = config.age.secrets."restic/discord-bot-repository".path; config.age.secrets."restic/discord-bot-environment-file".path;
repositoryFile =
config.age.secrets."restic/discord-bot-repository".path;
passwordFile = config.age.secrets."restic/discord-bot-password".path; passwordFile = config.age.secrets."restic/discord-bot-password".path;
paths = [ "/var/lib/dcbot.dump" ]; paths = [ "/var/lib/dcbot.dump" ];
@@ -218,11 +219,7 @@
${config.services.postgresql.package}/bin/pg_dump -U postgres -Fc dcbot > /var/lib/dcbot.dump ${config.services.postgresql.package}/bin/pg_dump -U postgres -Fc dcbot > /var/lib/dcbot.dump
''; '';
pruneOpts = [ pruneOpts = [ "--keep-daily 7" "--keep-weekly 5" "--keep-monthly 12" ];
"--keep-daily 7"
"--keep-weekly 5"
"--keep-monthly 12"
];
}; };
}; };
}; };
@@ -243,24 +240,22 @@
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
Environment = "PORT=5173 DOTENV_CONFIG_PATH=${config.age.secrets.todos-environment-file.path}"; Environment =
"PORT=5173 DOTENV_CONFIG_PATH=${config.age.secrets.todos-environment-file.path}";
ExecStart = "${pkgs.nodejs_20}/bin/node -r dotenv/config ."; ExecStart = "${pkgs.nodejs_20}/bin/node -r dotenv/config .";
WorkingDirectory = inputs.todos.packages.${pkgs.system}.default; WorkingDirectory = inputs.todos.packages.${pkgs.system}.default;
Restart = "always"; Restart = "always";
}; };
}; };
todoapp-check-due-dates = { todoapp-check-due-dates = {
description = "Set is_overdue for todo in database to true if todo is overdue"; description =
"Set is_overdue for todo in database to true if todo is overdue";
wantedBy = [ "timers.target" ]; wantedBy = [ "timers.target" ];
path = [ path = [ pkgs.postgresql_15 ];
pkgs.postgresql_15
];
script = '' script = ''
psql -d todos -c "UPDATE user_todo SET is_overdue = true WHERE NOW() AT TIME ZONE 'CET' >= due_date AND is_completed = false AND is_overdue = false" psql -d todos -c "UPDATE user_todo SET is_overdue = true WHERE NOW() AT TIME ZONE 'CET' >= due_date AND is_completed = false AND is_overdue = false"
''; '';
serviceConfig = { serviceConfig = { User = "postgres"; };
User = "postgres";
};
partOf = [ "todoapp.service" ]; partOf = [ "todoapp.service" ];
startAt = "daily"; startAt = "daily";
}; };
@@ -273,7 +268,8 @@
"${pkgs.nodejs_20}/bin/node dbInit.js" "${pkgs.nodejs_20}/bin/node dbInit.js"
"${pkgs.nodejs_20}/bin/node deploy-commands.js --token=${config.age.secrets.discord-bot-token.path} --clientId=1142441791459704912" "${pkgs.nodejs_20}/bin/node deploy-commands.js --token=${config.age.secrets.discord-bot-token.path} --clientId=1142441791459704912"
]; ];
ExecStart = "${pkgs.nodejs_20}/bin/node index.js --token=${config.age.secrets.discord-bot-token.path}"; ExecStart =
"${pkgs.nodejs_20}/bin/node index.js --token=${config.age.secrets.discord-bot-token.path}";
WorkingDirectory = inputs.denbot.packages.${pkgs.system}.default; WorkingDirectory = inputs.denbot.packages.${pkgs.system}.default;
Restart = "always"; Restart = "always";
}; };
@@ -286,9 +282,7 @@
]; ];
home-manager.users.thiloho = { pkgs, lib, ... }: { home-manager.users.thiloho = { pkgs, lib, ... }: {
home = { home = { stateVersion = "23.05"; };
stateVersion = "23.05";
};
}; };
system.stateVersion = "23.05"; system.stateVersion = "23.05";
} }

18
nixos-configurations/server/hardware-configuration.nix
View File

@@ -4,28 +4,26 @@
{ config, lib, pkgs, modulesPath, ... }: { config, lib, pkgs, modulesPath, ... }:
{ {
imports = imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
[ (modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ]; boot.initrd.availableKernelModules =
[ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ]; boot.kernelModules = [ ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/950d0289-1ae9-4c4b-8792-3f369e2d0f05"; device = "/dev/disk/by-uuid/950d0289-1ae9-4c4b-8792-3f369e2d0f05";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/08B5-9946"; device = "/dev/disk/by-uuid/08B5-9946";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/d3ecc375-0371-4391-ad48-b79168737ec7"; } [{ device = "/dev/disk/by-uuid/d3ecc375-0371-4391-ad48-b79168737ec7"; }];
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

16
nixos-configurations/shared-desktop.nix
View File

@@ -34,11 +34,8 @@
programs = { programs = {
firefox = { firefox = {
enable = true; enable = true;
package = pkgs.firefox.override { package =
cfg = { pkgs.firefox.override { cfg = { speechSynthesisSupport = true; }; };
speechSynthesisSupport = true;
};
};
}; };
chromium = { chromium = {
enable = true; enable = true;
@@ -65,16 +62,12 @@
enable = true; enable = true;
userName = "thiloho"; userName = "thiloho";
userEmail = "123883702+thiloho@users.noreply.github.com"; userEmail = "123883702+thiloho@users.noreply.github.com";
signing = { signing = { signByDefault = true; };
signByDefault = true;
};
}; };
obs-studio.enable = true; obs-studio.enable = true;
}; };
home = { home = {
sessionVariables = { sessionVariables = { NIXOS_OZONE_WL = 1; };
NIXOS_OZONE_WL=1;
};
packages = with pkgs; [ packages = with pkgs; [
libreoffice libreoffice
airshipper airshipper
@@ -82,6 +75,7 @@
prismlauncher prismlauncher
ventoy-full ventoy-full
psensor psensor
nil
zoom-us zoom-us
teamspeak5_client teamspeak5_client
discord discord

6
nixos-configurations/shared.nix
View File

@@ -31,8 +31,10 @@
shellAliases = { shellAliases = {
rbs = "sudo nixos-rebuild switch --flake ."; rbs = "sudo nixos-rebuild switch --flake .";
off = "sudo systemctl poweroff"; off = "sudo systemctl poweroff";
cleanup = "nix store optimise && nix-collect-garbage -d && sudo nix store optimise && sudo nix-collect-garbage -d"; cleanup =
listboots = "nix profile history --profile /nix/var/nix/profiles/system"; "nix store optimise && nix-collect-garbage -d && sudo nix store optimise && sudo nix-collect-garbage -d";
listboots =
"nix profile history --profile /nix/var/nix/profiles/system";
}; };
}; };
helix = { helix = {

9
secrets/secrets.nix
View File

@@ -1,8 +1,9 @@
let let
server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN82ukcaWQZcihgh+n0h+ihwTafm64SO1wngibOA6Vro root@server"; server =
pc = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMkvr+vT7Ik0fjquxb9xQBfVVWJPgrfC+vJZsyG2V+/G thiloho@pc"; "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN82ukcaWQZcihgh+n0h+ihwTafm64SO1wngibOA6Vro root@server";
in pc =
{ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMkvr+vT7Ik0fjquxb9xQBfVVWJPgrfC+vJZsyG2V+/G thiloho@pc";
in {
"hedgedoc-environment-file.age".publicKeys = [ server pc ]; "hedgedoc-environment-file.age".publicKeys = [ server pc ];
"discord-bot-token.age".publicKeys = [ server pc ]; "discord-bot-token.age".publicKeys = [ server pc ];
"todos-environment-file.age".publicKeys = [ server pc ]; "todos-environment-file.age".publicKeys = [ server pc ];