ce51c7cf8c
This commit updates various configuration modules to improve system
functionality and maintain consistency across all managed machines.
## Changed Files
### flake.nix
- Updated to use nixos-25.11 channel (previously 25.05)
- Updated home-manager to release-25.11
- Added octofriend local flake reference
- Simplified commonDesktopModules structure
- Updated framework configuration with additional desktop modules (dnm, stp-elc-udmshare)
### flake.lock
- Updated lock file to reflect new flake inputs and dependency versions
### systems/common.nix
- Updated system stateVersion from "25.05" to "25.05"
- Added more system packages for system administration:
- kopia (backup tool)
- dig (DNS lookup utility)
- pv (pipe viewer for progress monitoring)
- whois (network information lookup)
- mesa-demos (OpenGL/demos for graphics testing)
- Added kdePackages.xdg-desktop-portal-kde for better desktop integration
- Maintained all existing hardware, networking, bootloader, and service configurations
### systems/framework.nix
- Maintained existing Framework laptop specific configurations:
- AMD GPU support with microcode updates
- Custom kernel parameters (mem_sleep_default=s2idle)
- Power management (power-profiles-daemon enabled, TLP/thermald disabled for AMD)
- Logind lid switch configuration (suspend-then-hibernate on lid close)
- Swapfile configuration (10GB size)
- Brightness control via acpilight
- SSD optimization with fstrim
- Added user packages: via (keyboard configurator), radeontop (AMD GPU monitor)
### users/jsutter.nix
- Enhanced Home Manager configuration:
- Updated stateVersion to "25.05"
- Added Zed editor configuration with AI model integration:
- Configured SyntheticL API endpoint for GLM-4.7 model
- Added extensions: nix, markdown, toml, go, dracula
- Included extra packages for language support (nixd, nil, gopls)
- Updated VSCode extensions list with Claude dev support
- Added Micro editor as alternative light editor
- Maintained all existing user packages, SSH keys, and base configurations
### desktop/media.nix
- Updated multimedia application packages for enhanced media handling
### desktop/plasma.nix
- Updated Plasma desktop environment packages and configurations
### desktop/virtualization.nix
- Updated virtualization settings and package versions
## Testing Notes
- All changes should be tested with 'nix flake check' to verify syntax
- Run 'sudo nixos-rebuild dry-run --flake .#framework' before applying
- Verify that all services start correctly after rebuild
## Impact Scope
- Affects all three managed systems: framework, aurora, labrizor
- Primary focus on framework laptop configuration as primary development machine
- Home Manager changes only affect jsutter user account
85 lines
2.2 KiB
Nix
85 lines
2.2 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
|
|
system = "x86_64-linux";
|
|
|
|
|
|
commonSpecialArgs = {
|
|
pkgs-unstable = import nixpkgs-unstable {
|
|
inherit system;
|
|
config.allowUnfree = true;
|
|
};
|
|
|
|
inherit octofriend;
|
|
};
|
|
|
|
mkSystem = { modules, hardware ? [] }: nixpkgs.lib.nixosSystem {
|
|
inherit 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
|
|
];
|
|
};
|
|
};
|
|
};
|
|
}
|