frieder.hannenheim/fruitbasket
1
0
Fork 0
forked from wurzel/fruitbasket
Code Pull requests Activity

secrets for mediawiki and formatting

Browse source
This commit is contained in:
revol-xut 2022-09-06 17:16:31 +02:00
parent 7131ba8691
commit 87bd442eed
No known key found for this signature in database
GPG key ID: 4F56FF7759627D07
18 changed files with 255 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

13
hosts/birne/configuration.nix
View file

@ -5,7 +5,8 @@
{ config, pkgs, ... }:
{
imports =[ # Include the results of the hardware scan.
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
];
@ -24,11 +25,11 @@
};
nixpkgs.config.allowUnfree = true;
users.users.printer = {
isNormalUser = true;
password = "printer";
extraGroups = [];
};
users.users.printer = {
isNormalUser = true;
password = "printer";
extraGroups = [ ];
};
environment.systemPackages = with pkgs; [
firefox

12
hosts/birne/hardware-configuration.nix
View file

@ -5,7 +5,8 @@
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
[
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "ohci_pci" "ehci_pci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
@ -14,18 +15,19 @@
boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/9799b183-a191-484e-b9a4-05e29412af25";
{
device = "/dev/disk/by-uuid/9799b183-a191-484e-b9a4-05e29412af25";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/CF58-EB12";
{
device = "/dev/disk/by-uuid/CF58-EB12";
fsType = "vfat";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/94622e8e-8b58-4b3b-9494-d144ccaeb486"; }
];
[{ device = "/dev/disk/by-uuid/94622e8e-8b58-4b3b-9494-d144ccaeb486"; }];
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

21
hosts/quitte/configuration.nix
View file

@ -6,7 +6,8 @@
{
imports =
[ # Include the results of the hardware scan.
[
# Include the results of the hardware scan.
./hardware-configuration.nix
];
@ -17,19 +18,19 @@
boot.supportedFilesystems = [ "zfs" ];
boot.zfs.devNodes = "/dev/";
networking.hostId = "a41d87fc";
networking.interfaces.enp65s0f0np0 = {
useDHCP = false;
ipv4.addresses = [
{
address = "141.30.30.169";
useDHCP = false;
ipv4.addresses = [
{
address = "141.30.30.169";
prefixLength = 25;
}
}
];
};
networking.defaultGateway = "141.30.30.129";
networking.nameservers = [ "141.30.1.1" ];
networking.hostName = "quitte"; # Define your hostname.
# Pick only one of the below networking options.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@ -54,7 +55,7 @@
# services.xserver.enable = true;
# Configure keymap in X11
# services.xserver.layout = "us";
@ -104,7 +105,7 @@
# Enable the OpenSSH daemon.
services.openssh.enable = true;
services.openssh.permitRootLogin = "yes";
# Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 443 80 ];
# networking.firewall.allowedUDPPorts = [ ... ];

21
hosts/quitte/hardware-configuration.nix
View file

@ -5,7 +5,8 @@
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
[
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "megaraid_sas" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
@ -14,36 +15,42 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "rpool/nixos/root";
{
device = "rpool/nixos/root";
fsType = "zfs";
options = [ "zfsutil" ];
};
fileSystems."/home" =
{ device = "rpool/nixos/home";
{
device = "rpool/nixos/home";
fsType = "zfs";
options = [ "zfsutil" ];
};
fileSystems."/var/lib" =
{ device = "rpool/nixos/var/lib";
{
device = "rpool/nixos/var/lib";
fsType = "zfs";
options = [ "zfsutil" ];
};
fileSystems."/var/log" =
{ device = "rpool/nixos/var/log";
{
device = "rpool/nixos/var/log";
fsType = "zfs";
options = [ "zfsutil" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/7FE6-F583";
{
device = "/dev/disk/by-uuid/7FE6-F583";
fsType = "vfat";
};
fileSystems."/nix" =
{ device = "rpool/nixos/nix";
{
device = "rpool/nixos/nix";
fsType = "zfs";
options = [ "zfsutil" ];
};

4
hosts/sanddorn/configuration.nix
View file

@ -41,6 +41,6 @@
};
documentation.enable = false;
system.stateVersion = "21.05";
system.stateVersion = "21.05";
}

12
hosts/sanddorn/hardware-configuration.nix
View file

@ -21,19 +21,19 @@
fsType = "vfat";
};
"/swap" = {
device = "/dev/disk/by-uuid/SWAP";
fsType = "btrfs";
options = [ "subvol=swap" "compress=lzo" "noatime" ]; # Note these options effect the entire BTRFS filesystem and not just this volume, with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts
device = "/dev/disk/by-uuid/SWAP";
fsType = "btrfs";
options = [ "subvol=swap" "compress=lzo" "noatime" ]; # Note these options effect the entire BTRFS filesystem and not just this volume, with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts
};
"/" = {
device = "/dev/disk/by-label/NIXOS_SD";
fsType = "ext4";
};
};
swapDevices = [{
device = "/swap/swapfile";
size = (1024 * 2);
device = "/swap/swapfile";
size = (1024 * 2);
}];
hardware.enableRedistributableFirmware = true;