From 6459653ed111a5264ec723480e3140711a2afe25 Mon Sep 17 00:00:00 2001 From: Geir Okkenhaug Jerstad Date: Mon, 7 Jul 2025 19:04:42 +0200 Subject: [PATCH] prepared for mininas --- machines/limiting-factor/configuration.nix | 38 +++++-------------- .../hardware-configuration.nix | 10 ++--- 2 files changed, 14 insertions(+), 34 deletions(-) diff --git a/machines/limiting-factor/configuration.nix b/machines/limiting-factor/configuration.nix index b400ece..7479b4e 100644 --- a/machines/limiting-factor/configuration.nix +++ b/machines/limiting-factor/configuration.nix @@ -9,6 +9,8 @@ ../../modules/common ../../modules/security/ssh-keys.nix ../../modules/users/sma.nix + ../../modules/network/common.nix + ../../modules/network/extraHosts.nix ]; # Bootloader @@ -19,37 +21,17 @@ networking.hostName = "limiting-factor"; networking.networkmanager.enable = true; - # Time zone + # Add nomodeset for graphics compatibility + boot.kernelParams = ["nomodeset"]; + + # Time and locale time.timeZone = "Europe/Oslo"; - - # Internationalization i18n.defaultLocale = "en_US.UTF-8"; - i18n.extraLocaleSettings = { - LC_ADDRESS = "nb_NO.UTF-8"; - LC_IDENTIFICATION = "nb_NO.UTF-8"; - LC_MEASUREMENT = "nb_NO.UTF-8"; - LC_MONETARY = "nb_NO.UTF-8"; - LC_NAME = "nb_NO.UTF-8"; - LC_NUMERIC = "nb_NO.UTF-8"; - LC_PAPER = "nb_NO.UTF-8"; - LC_TELEPHONE = "nb_NO.UTF-8"; - LC_TIME = "nb_NO.UTF-8"; - }; - # Console keymap - console.keyMap = "us"; - - # Define users - users.users.sma = { - isNormalUser = true; - description = "Diziet Sma"; - extraGroups = ["networkmanager" "wheel"]; - packages = with pkgs; [ - # Basic server tools - git - vim - htop - ]; + # Console configuration + console = { + font = "Lat2-Terminus16"; + keyMap = "no"; }; # Allow unfree packages diff --git a/machines/limiting-factor/hardware-configuration.nix b/machines/limiting-factor/hardware-configuration.nix index 303700b..f9e3162 100644 --- a/machines/limiting-factor/hardware-configuration.nix +++ b/machines/limiting-factor/hardware-configuration.nix @@ -15,24 +15,22 @@ # NOTE: This is a template - replace with actual hardware configuration # after running nixos-generate-config on the target machine - boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod"]; + boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" "usbhid"]; boot.initrd.kernelModules = []; boot.kernelModules = ["kvm-intel"]; boot.extraModulePackages = []; - # Filesystems - update paths and UUIDs after installation fileSystems."/" = { - device = "/dev/disk/by-uuid/REPLACE-WITH-ACTUAL-UUID"; + device = "/dev/disk/by-uuid/35a33370-c764-4ffb-9492-0be304be9b50"; fsType = "ext4"; }; fileSystems."/boot" = { - device = "/dev/disk/by-uuid/REPLACE-WITH-ACTUAL-BOOT-UUID"; + device = "/dev/disk/by-uuid/A202-71FE"; fsType = "vfat"; - options = ["fmask=0077" "dmask=0077"]; + options = ["fmask=0022" "dmask=0022"]; }; - # Swap configuration - adjust as needed swapDevices = []; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking