82a98a1e6f
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
86 lines
2.3 KiB
Nix
86 lines
2.3 KiB
Nix
{
|
|
description = "Julian's system configuration";
|
|
|
|
inputs = {
|
|
nixpkgs.url = "nixpkgs/nixos-25.11";
|
|
nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
|
|
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
|
|
|
home-manager = {
|
|
url = "github:nix-community/home-manager/release-25.11";
|
|
inputs.nixpkgs.follows = "nixpkgs";
|
|
};
|
|
|
|
plasma-manager = {
|
|
url = "github:nix-community/plasma-manager";
|
|
inputs.nixpkgs.follows = "nixpkgs";
|
|
inputs.home-manager.follows = "home-manager";
|
|
};
|
|
|
|
octofriend = { url = "path:./appflakes/octofriend"; };
|
|
};
|
|
|
|
outputs = { self, nixpkgs, nixpkgs-unstable, nixos-hardware, home-manager, plasma-manager, octofriend }:
|
|
let
|
|
localSystem = {
|
|
system = "x86_64-linux";
|
|
};
|
|
|
|
commonSpecialArgs = {
|
|
pkgs-unstable = import nixpkgs-unstable {
|
|
inherit (localSystem) system;
|
|
config.allowUnfree = true;
|
|
};
|
|
|
|
inherit octofriend;
|
|
};
|
|
|
|
mkSystem = { modules, hardware ? [] }: nixpkgs.lib.nixosSystem {
|
|
inherit (localSystem) system;
|
|
specialArgs = commonSpecialArgs;
|
|
modules = [
|
|
home-manager.nixosModules.home-manager
|
|
] ++ hardware ++ modules;
|
|
};
|
|
# Common desktop modules
|
|
commonDesktopModules = [
|
|
./systems/common.nix
|
|
./users/jsutter.nix
|
|
./desktop/plasma.nix
|
|
./desktop/dev.nix
|
|
./desktop/office.nix
|
|
./desktop/gaming.nix
|
|
./desktop/media.nix
|
|
./desktop/virtualization.nix
|
|
./desktop/tailscale.nix
|
|
];
|
|
|
|
in {
|
|
nixosConfigurations = {
|
|
framework = mkSystem {
|
|
hardware = [ nixos-hardware.nixosModules.framework-amd-ai-300-series ];
|
|
modules = commonDesktopModules ++ [
|
|
./systems/framework.nix
|
|
./desktop/dnm.nix
|
|
./desktop/stp-elc-udmshare.nix
|
|
];
|
|
};
|
|
aurora = mkSystem {
|
|
modules = commonDesktopModules ++ [
|
|
./systems/aurora.nix
|
|
./users/isutter.nix
|
|
./users/aksutter.nix
|
|
./desktop/3dprinting.nix
|
|
./desktop/2dprinting.nix
|
|
];
|
|
};
|
|
labrizor = mkSystem {
|
|
modules = commonDesktopModules ++ [
|
|
./systems/labrizor.nix
|
|
./users/jsutter.nix
|
|
./desktop/3dprinting.nix
|
|
];
|
|
};
|
|
};
|
|
};
|
|
}
|