Compare commits

..

No commits in common. "715239373d4e475769649b8c000e82682d101c07" and "ef0b4a46e118c75b43dee8ab543923503a93a829" have entirely different histories.

8 changed files with 13 additions and 109 deletions

View file

@ -18,7 +18,7 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
# disko - Declarative disk partitioning and formatting using nix # disko - Declarative disk partitioning and formatting using nix
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -225,23 +225,6 @@
{ home-manager.users.jahanson = ./nixos/home/jahanson/server.nix; } { home-manager.users.jahanson = ./nixos/home/jahanson/server.nix; }
]; ];
}; };
"gandalf" = mkNixosConfig {
# X9DRi-LN4+/X9DR3-LN4+ - Intel(R) Xeon(R) CPU E5-2650 v2
# NAS
hostname = "telperion";
system = "x86_64-linux";
hardwareModules = [
./nixos/profiles/hw-supermicro.nix
disko.nixosModules.disko
(import ./nixos/profiles/disko-nixos.nix { disks = [ "/dev/sda/dev/disk/by-id/ata-Seagate_IronWolfPro_ZA240NX10001-2ZH100_7TF002RA" ]; })
lix-module.nixosModules.default
];
profileModules = [
./nixos/profiles/role-server.nix
{ home-manager.users.jahanson = ./nixos/home/jahanson/server.nix; }
];
};
}; };
# Convenience output that aggregates the outputs for home, nixos. # Convenience output that aggregates the outputs for home, nixos.

View file

@ -1,70 +0,0 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, modulesPath, ... }:
{
imports =
[
(modulesPath + "/installer/scan/not-detected.nix")
];
boot = {
initrd.availableKernelModules = [ "ehci_pci" "ahci" "mpt3sas" "isci" "usbhid" "usb_storage" "sd_mod" ];
initrd.kernelModules = [ ];
kernelModules = [ "kvm-intel" "vfio" "vfio_iommu_type1" "vfio_pci" "vfio_virqfd" ];
extraModulePackages = [ ];
kernelParams = [ "iommu=pt" "intel_iommu=on" ];
};
# Network settings
networking = {
hostName = "gandalf";
hostId = "e2fc95cd";
useDHCP = false; # needed for bridge
networkmanager.enable = true;
# TODO: Add ports specifically.
firewall.enable = false;
interfaces = {
"enp130s0f0".useDHCP = true;
"enp130s0f1".useDHCP = true;
};
# For VMs
bridges = {
"br0" = {
interfaces = [ "enp130s0f1" ];
};
};
};
fileSystems."/" = {
device = "zroot/root";
fsType = "zfs";
};
fileSystems."/nix" = {
device = "zroot/nix";
fsType = "zfs";
};
fileSystems."/var" = {
device = "zroot/var";
fsType = "zfs";
};
fileSystems."/home" = {
device = "zroot/home";
fsType = "zfs";
};
swapDevices = [ ];
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
# System settings and services.
mySystem = {
purpose = "Production";
system.motd.networkInterfaces = [ "enp130s0f0" "enp130s0f1" ];
};
}

View file

@ -1,14 +1,18 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
with lib; with lib;
{ {
mySystem.system.packages = with pkgs; [
ntfs3g
];
boot = { boot = {
initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
kernelModules = [ ]; kernelModules = [ ];
extraModulePackages = [ ]; extraModulePackages = [ ];
# for managing/mounting nfs # for managing/mounting ntfs
supportedFilesystems = [ "nfs" ]; supportedFilesystems = [ "ntfs" ];
loader = { loader = {
systemd-boot.enable = true; systemd-boot.enable = true;

View file

@ -14,7 +14,8 @@
# Restic backups disabled. # Restic backups disabled.
# TODO: configure storagebox for hetzner backups # TODO: configure storagebox for hetzner backups
system.resticBackup = { system.resticBackup =
{
local.enable = false; local.enable = false;
remote.enable = false; remote.enable = false;
}; };

View file

@ -1,11 +1,12 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
{ {
# Support windows partition
mySystem = { mySystem = {
security.wheelNeedsSudoPassword = false; security.wheelNeedsSudoPassword = false;
}; };
boot = { boot = {
loader = { loader = {
systemd-boot.enable = true; systemd-boot.enable = true;
efi = { efi = {
canTouchEfiVariables = true; canTouchEfiVariables = true;

View file

@ -18,7 +18,7 @@
zfsSupport = true; zfsSupport = true;
device = "nodev"; device = "nodev";
mirroredBoots = [ mirroredBoots = [
{ devices = [ "nodev" ]; path = "/boot"; } { devices = ["nodev"]; path = "/boot";}
]; ];
}; };
# efi = { # efi = {

View file

@ -1,15 +0,0 @@
{ lib, pkgs, ... }:
with lib;
{
boot = {
# for managing/mounting nfs
supportedFilesystems = [ "nfs" ];
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
};
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
}

View file

@ -24,7 +24,7 @@
# Disable Alsa # Disable Alsa
sound.enable = lib.mkDefault false; sound.enable = lib.mkDefault false;
hardware.pulseaudio.enable = lib.mkForce false; hardware.pulseaudio.enable = lib.mkForce false;
# Realtime Kit # Realtime Kit
security.rtkit.enable = true; security.rtkit.enable = true;
# Enable pipewire # Enable pipewire