refactor: Apply syntactic updates for NixOS best practices
This commit applies comprehensive syntactic improvements across the
repository to conform to NixOS formatting and coding standards.
## Formatting Fixes
- Remove extra newlines and blank spaces
- Fix empty list formatting: [ ] → []
- Remove trailing whitespace
- Standardize indentation in libvirtd config
## Best Practices
- Remove deprecated networking.useDHCP setting
- Remove unused extraHosts configuration
- Add lib.mkDefault to videoDrivers for better override support
- Add lib.mkDefault to podman for consistency
## Modern Conventions
- Update nix.settings.download-buffer-size to string format with units ("512M")
- Update system.stateVersion from 25.05 to 25.11 to match channel
- Update home.stateVersion from 25.05 to 25.11 to match channel
## Code Quality
- Remove commented-out code in aurora.nix
- Improve comment spacing and capitalization
- Standardize attribute set formatting across files
## Files Modified
- flake.nix
- desktop/virtualization.nix
- systems/aurora.nix
- systems/common.nix
- systems/labrizor.nix
- systems/skip01.nix
- users/jsutter.nix
Tested: Successfully rebuilt and switched framework system
This commit is contained in:
parent
587b74d5d6
commit
82a98a1e6f
7 changed files with 23 additions and 48 deletions
|
|
@ -5,7 +5,7 @@
|
||||||
libvirtd = {
|
libvirtd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
qemu.swtpm.enable = true;
|
qemu.swtpm.enable = true;
|
||||||
};
|
};
|
||||||
spiceUSBRedirection.enable = true;
|
spiceUSBRedirection.enable = true;
|
||||||
docker = {
|
docker = {
|
||||||
rootless = {
|
rootless = {
|
||||||
|
|
@ -51,16 +51,15 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# Optional: Add a debug hook
|
# Optional: Add a debug hook
|
||||||
systemd.services.network-debug = {
|
systemd.services.network-debug = {
|
||||||
description = "Log network status";
|
description = "Log network status";
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
# Use bash and provide full paths for commands
|
# Use bash and provide full paths for commands
|
||||||
ExecStart = "${pkgs.bash}/bin/bash -c '${pkgs.iproute2}/bin/ip a && journalctl -u network.target'";
|
ExecStart = "${pkgs.bash}/bin/bash -c '${pkgs.iproute2}/bin/ip a && journalctl -u network.target'";
|
||||||
Type = "oneshot";
|
Type = "oneshot";
|
||||||
|
};
|
||||||
|
wantedBy = [ "network-online.target" ];
|
||||||
};
|
};
|
||||||
wantedBy = [ "network-online.target" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
virtualisation.libvirtd.allowedBridges =
|
virtualisation.libvirtd.allowedBridges = [ "br0" ];
|
||||||
[ "br0" ];
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,7 @@
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
commonSpecialArgs = {
|
||||||
commonSpecialArgs = {
|
|
||||||
pkgs-unstable = import nixpkgs-unstable {
|
pkgs-unstable = import nixpkgs-unstable {
|
||||||
inherit (localSystem) system;
|
inherit (localSystem) system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
|
|
|
||||||
|
|
@ -15,26 +15,13 @@
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||||
boot.initrd.kernelModules = [ "amdgpu" ];
|
boot.initrd.kernelModules = [ "amdgpu" ];
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|
||||||
# fileSystems."/mnt/data" =
|
|
||||||
# { device = "/dev/disk/by-partlabel/data";
|
|
||||||
# fsType = "ext4";
|
|
||||||
# };
|
|
||||||
|
|
||||||
services.xserver.videoDrivers = [ "amdgpu" ];
|
services.xserver.videoDrivers = lib.mkDefault [ "amdgpu" ];
|
||||||
|
|
||||||
#scaling
|
|
||||||
#services.xserver.dpi = 227;
|
|
||||||
|
|
||||||
# hardware.graphics.extraPackages = with pkgs; [
|
|
||||||
# rocm-opencl-icd
|
|
||||||
# rocm-opencl-runtime
|
|
||||||
# amdvlk
|
|
||||||
# ];
|
|
||||||
|
|
||||||
networking.bridges = {
|
networking.bridges = {
|
||||||
"br0" = {
|
"br0" = {
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,11 @@
|
||||||
{ config, pkgs, ... }:
|
{ config, pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
# hardware
|
# hardware
|
||||||
hardware.enableRedistributableFirmware = true;
|
hardware.enableRedistributableFirmware = true;
|
||||||
services.fwupd.enable = true;
|
services.fwupd.enable = true;
|
||||||
|
|
||||||
# Network
|
# Network
|
||||||
networking = {
|
networking = {
|
||||||
extraHosts = "";
|
|
||||||
networkmanager = {
|
networkmanager = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = with pkgs; [
|
plugins = with pkgs; [
|
||||||
|
|
@ -16,7 +13,6 @@
|
||||||
networkmanager-openconnect
|
networkmanager-openconnect
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
useDHCP = false; # Deprecated
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Bootloader
|
# Bootloader
|
||||||
|
|
@ -43,7 +39,7 @@
|
||||||
keep-derivations = true;
|
keep-derivations = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
system.stateVersion = "25.05";
|
system.stateVersion = "25.11";
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
nixpkgs.config.nvidia.acceptLicense = true;
|
nixpkgs.config.nvidia.acceptLicense = true;
|
||||||
nixpkgs.config.nvidia.libsOnly = true;
|
nixpkgs.config.nvidia.libsOnly = true;
|
||||||
|
|
@ -144,6 +140,6 @@
|
||||||
SUBSYSTEM=="usb", MODE="0664", GROUP="plugdev"
|
SUBSYSTEM=="usb", MODE="0664", GROUP="plugdev"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
nix.settings.download-buffer-size = 536870912;
|
nix.settings.download-buffer-size = "512M";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,5 @@
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
networking.hostName = "labrizor";
|
networking.hostName = "labrizor";
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
|
|
@ -16,12 +14,10 @@
|
||||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
|
||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|
||||||
services.xserver.videoDrivers = [ ];
|
services.xserver.videoDrivers = [];
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -67,5 +67,5 @@
|
||||||
|
|
||||||
# Enable container support for future server services
|
# Enable container support for future server services
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker.enable = true;
|
||||||
virtualisation.podman.enable = true;
|
virtualisation.podman.enable = lib.mkDefault true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -18,9 +18,7 @@
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Everything below is home manager managed:
|
||||||
|
|
||||||
#Everything below is home manager managed:
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
backupFileExtension = "backup";
|
backupFileExtension = "backup";
|
||||||
|
|
@ -28,7 +26,7 @@
|
||||||
home.username = "jsutter";
|
home.username = "jsutter";
|
||||||
home.homeDirectory = "/home/jsutter";
|
home.homeDirectory = "/home/jsutter";
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
home.stateVersion = "25.05";
|
home.stateVersion = "25.11";
|
||||||
|
|
||||||
# Set environment variables here
|
# Set environment variables here
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue