diff --git a/desktop/virtualization.nix b/desktop/virtualization.nix index 1c846a4..03055d0 100644 --- a/desktop/virtualization.nix +++ b/desktop/virtualization.nix @@ -5,7 +5,7 @@ libvirtd = { enable = true; qemu.swtpm.enable = true; - }; + }; spiceUSBRedirection.enable = true; docker = { rootless = { @@ -51,16 +51,15 @@ }; # Optional: Add a debug hook -systemd.services.network-debug = { - description = "Log network status"; - serviceConfig = { - # Use bash and provide full paths for commands - ExecStart = "${pkgs.bash}/bin/bash -c '${pkgs.iproute2}/bin/ip a && journalctl -u network.target'"; - Type = "oneshot"; + systemd.services.network-debug = { + description = "Log network status"; + serviceConfig = { + # Use bash and provide full paths for commands + ExecStart = "${pkgs.bash}/bin/bash -c '${pkgs.iproute2}/bin/ip a && journalctl -u network.target'"; + Type = "oneshot"; + }; + wantedBy = [ "network-online.target" ]; }; - wantedBy = [ "network-online.target" ]; -}; - virtualisation.libvirtd.allowedBridges = - [ "br0" ]; + virtualisation.libvirtd.allowedBridges = [ "br0" ]; } diff --git a/flake.nix b/flake.nix index c010bf8..8c914b5 100644 --- a/flake.nix +++ b/flake.nix @@ -26,8 +26,7 @@ system = "x86_64-linux"; }; - - commonSpecialArgs = { + commonSpecialArgs = { pkgs-unstable = import nixpkgs-unstable { inherit (localSystem) system; config.allowUnfree = true; diff --git a/systems/aurora.nix b/systems/aurora.nix index 01b2139..777c0c4 100644 --- a/systems/aurora.nix +++ b/systems/aurora.nix @@ -15,26 +15,13 @@ boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ "amdgpu" ]; boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.extraModulePackages = []; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -# fileSystems."/mnt/data" = -# { device = "/dev/disk/by-partlabel/data"; -# fsType = "ext4"; -# }; - services.xserver.videoDrivers = [ "amdgpu" ]; - - #scaling - #services.xserver.dpi = 227; - -# hardware.graphics.extraPackages = with pkgs; [ -# rocm-opencl-icd -# rocm-opencl-runtime -# amdvlk -# ]; + services.xserver.videoDrivers = lib.mkDefault [ "amdgpu" ]; networking.bridges = { "br0" = { diff --git a/systems/common.nix b/systems/common.nix index 73050e8..94f584c 100644 --- a/systems/common.nix +++ b/systems/common.nix @@ -1,14 +1,11 @@ { config, pkgs, ... }: - { - # hardware hardware.enableRedistributableFirmware = true; services.fwupd.enable = true; # Network networking = { - extraHosts = ""; networkmanager = { enable = true; plugins = with pkgs; [ @@ -16,7 +13,6 @@ networkmanager-openconnect ]; }; - useDHCP = false; # Deprecated }; # Bootloader @@ -43,7 +39,7 @@ keep-derivations = true; }; }; - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; nixpkgs.config.allowUnfree = true; nixpkgs.config.nvidia.acceptLicense = true; nixpkgs.config.nvidia.libsOnly = true; @@ -144,6 +140,6 @@ SUBSYSTEM=="usb", MODE="0664", GROUP="plugdev" ''; - nix.settings.download-buffer-size = 536870912; + nix.settings.download-buffer-size = "512M"; } diff --git a/systems/labrizor.nix b/systems/labrizor.nix index 99b50b0..86cbeab 100644 --- a/systems/labrizor.nix +++ b/systems/labrizor.nix @@ -1,7 +1,5 @@ { config, lib, pkgs, modulesPath, ... }: - { - networking.hostName = "labrizor"; fileSystems."/" = @@ -16,12 +14,10 @@ boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; + boot.extraModulePackages = []; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - services.xserver.videoDrivers = [ ]; - - + services.xserver.videoDrivers = []; } diff --git a/systems/skip01.nix b/systems/skip01.nix index f9d09b2..8b1f7f9 100644 --- a/systems/skip01.nix +++ b/systems/skip01.nix @@ -9,7 +9,7 @@ boot.initrd.kernelModules = [ ]; # No graphics drivers needed for headless boot.kernelModules = [ "kvm-intel" ]; # Intel virtualization support boot.extraModulePackages = []; - + # Server-specific kernel parameters boot.kernelParams = [ "intel_iommu=on" # Enable IOMMU for virtualization @@ -51,7 +51,7 @@ # Enable hardware monitoring (CLI only) hardware.sensor.iio.enable = true; - + # Network performance tuning for server use boot.kernel.sysctl = { "net.core.rmem_max" = 134217728; @@ -64,8 +64,8 @@ # Disable unnecessary services for server use services.xserver.enable = lib.mkForce false; services.pipewire.enable = lib.mkForce false; - + # Enable container support for future server services virtualisation.docker.enable = true; - virtualisation.podman.enable = true; + virtualisation.podman.enable = lib.mkDefault true; } diff --git a/users/jsutter.nix b/users/jsutter.nix index d3b8e58..44af55d 100644 --- a/users/jsutter.nix +++ b/users/jsutter.nix @@ -18,9 +18,7 @@ ]; }; - - - #Everything below is home manager managed: + # Everything below is home manager managed: home-manager = { useUserPackages = true; backupFileExtension = "backup"; @@ -28,7 +26,7 @@ home.username = "jsutter"; home.homeDirectory = "/home/jsutter"; programs.home-manager.enable = true; - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; # Set environment variables here