Merge branch 'main' of ssh://git.0x76.dev:42/v/infrastructure

This commit is contained in:
Vivian 2023-05-03 22:43:09 +02:00
commit 9530854c01
7 changed files with 52 additions and 87 deletions

View file

@ -42,12 +42,9 @@
# Setup packages available everywhere
environment.systemPackages = with pkgs; [
cmatrix
fzf
git
helix
htop
lolcat
ncdu
psmisc
ripgrep

View file

@ -10,4 +10,4 @@
extraGroups = [ ];
};
}
}

View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }:
{ pkgs, ... }:
{
imports = [ ./hardware-configuration.nix ];
@ -16,14 +16,21 @@
system.stateVersion = "23.05"; # Did you read the comment?
# Additional packages
environment.systemPackages = with pkgs; [ ];
environment.systemPackages = with pkgs; [
gcc
jq
nuclei
rustup
];
networking.firewall.allowedTCPPorts = [ ];
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
boot.loader.grub.device = "/dev/sda";
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.efi.efiSysMountPoint = "/boot";
# Make laura admin
users.extraUsers.laura.extraGroups = [ "wheel" ];
virtualisation.docker.enable = true;
users.extraUsers.laura.extraGroups = [ "wheel" "docker" ];
users.extraUsers.victor.extraGroups = [ "docker" ];
}

View file

@ -8,18 +8,18 @@
[ (modulesPath + "/profiles/qemu-guest.nix")
];
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
boot.initrd.availableKernelModules = [ "uhci_hcd" "ehci_pci" "ahci" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/96c00816-b297-41f2-bfc1-b8990fc06a7a";
{ device = "/dev/disk/by-uuid/749c02fd-209d-4974-917e-38b749d10ec2";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/CDF3-36C9";
{ device = "/dev/disk/by-uuid/D021-72EB";
fsType = "vfat";
};
@ -30,7 +30,7 @@
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.ens18.useDHCP = lib.mkDefault true;
# networking.interfaces.enp6s18.useDHCP = lib.mkDefault true
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

View file

@ -28,6 +28,7 @@ in {
security.acme.acceptTerms = true;
security.acme.preliminarySelfsigned = true;
services.nginx = {
enable = true;
recommendedProxySettings = true;
@ -39,6 +40,8 @@ in {
package = pkgs.nginxMainline;
virtualHosts."cshub.nl" = proxy "http://192.168.0.113";
virtualHosts."api.cshub.nl" = proxy "http://192.168.0.113";
virtualHosts."ha.xirion.net" = proxy "http://192.168.0.129:8123";
virtualHosts."xirion.net" = {
enableACME = true;