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
61 lines
1.6 KiB
Nix
61 lines
1.6 KiB
Nix
{ config, lib, pkgs, modulesPath, ... }: {
|
|
networking.hostName = "framework";
|
|
|
|
fileSystems."/" =
|
|
{ device = "/dev/disk/by-partlabel/primary";
|
|
fsType = "ext4";
|
|
};
|
|
fileSystems."/boot" =
|
|
{ device = "/dev/disk/by-partlabel/ESP";
|
|
fsType = "vfat";
|
|
};
|
|
|
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
|
|
boot.initrd.kernelModules = [ "amdgpu" ];
|
|
boot.kernelModules = [ "kvm-amd" ]; # Include kvm-amd for virtualization support
|
|
boot.extraModulePackages = [];
|
|
boot.kernelParams = [
|
|
"mem_sleep_default=s2idle"
|
|
];
|
|
|
|
services.power-profiles-daemon.enable = true;
|
|
services.tlp.enable = false;
|
|
services.thermald.enable = false; # thermald is for Intel, not AMD
|
|
|
|
networking.useDHCP = lib.mkDefault true;
|
|
|
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
|
|
|
swapDevices = [
|
|
{
|
|
device = "/swapfile";
|
|
size = 102400;
|
|
priority = 0;
|
|
}
|
|
];
|
|
|
|
systemd.tmpfiles.rules = [
|
|
"f /swapfile 0600 root root - -"
|
|
];
|
|
|
|
# Brightness control
|
|
hardware.acpilight.enable = lib.mkDefault true;
|
|
|
|
# SSD optimization
|
|
services.fstrim.enable = lib.mkDefault true;
|
|
|
|
# Logind lid-switch configuration
|
|
services.logind = {
|
|
lidSwitch = "suspend-then-hibernate";
|
|
lidSwitchDocked = "ignore"; # Prevent suspend when connected to a dock
|
|
lidSwitchExternalPower = "ignore";
|
|
powerKey = "poweroff";
|
|
suspendKey = "ignore"; # Optional: configure behavior for the suspend key
|
|
};
|
|
|
|
environment.systemPackages = with pkgs; [
|
|
via
|
|
radeontop
|
|
];
|
|
}
|