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
152 lines
3.2 KiB
Nix
152 lines
3.2 KiB
Nix
{ config, pkgs, ... }:
|
|
|
|
{
|
|
|
|
# hardware
|
|
hardware.enableRedistributableFirmware = true;
|
|
services.fwupd.enable = true;
|
|
|
|
# Network
|
|
networking = {
|
|
extraHosts = "";
|
|
networkmanager = {
|
|
enable = true;
|
|
plugins = with pkgs; [
|
|
networkmanager-openvpn
|
|
networkmanager-openconnect
|
|
];
|
|
};
|
|
useDHCP = false; # Depreciated
|
|
};
|
|
|
|
# Bootloader
|
|
boot.loader.systemd-boot.enable = true;
|
|
boot.loader.efi.canTouchEfiVariables = true;
|
|
|
|
# Kernel
|
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
|
|
|
# Nix
|
|
nix = {
|
|
# Automate garbage collection
|
|
gc = {
|
|
automatic = true;
|
|
dates = "weekly";
|
|
options = "--delete-older-than 7d";
|
|
};
|
|
package = pkgs.nixVersions.stable;
|
|
settings = {
|
|
auto-optimise-store = true;
|
|
trusted-users = [ "root" "jsutter" ];
|
|
experimental-features = [ "nix-command" "flakes" ];
|
|
keep-outputs = true;
|
|
keep-derivations = true;
|
|
};
|
|
};
|
|
system.stateVersion = "25.05";
|
|
nixpkgs.config.allowUnfree = true;
|
|
nixpkgs.config.nvidia.acceptLicense = true;
|
|
nixpkgs.config.nvidia.libsOnly = true;
|
|
nixpkgs.config.allowBroken = true;
|
|
|
|
# Location & internationalisation
|
|
time.timeZone = "America/Los_Angeles";
|
|
i18n.defaultLocale = "en_US.UTF-8";
|
|
i18n.extraLocaleSettings = {
|
|
LC_ADDRESS = "en_US.UTF-8";
|
|
LC_IDENTIFICATION = "en_US.UTF-8";
|
|
LC_MEASUREMENT = "en_US.UTF-8";
|
|
LC_MONETARY = "en_US.UTF-8";
|
|
LC_NAME = "en_US.UTF-8";
|
|
LC_NUMERIC = "en_US.UTF-8";
|
|
LC_PAPER = "en_US.UTF-8";
|
|
LC_TELEPHONE = "en_US.UTF-8";
|
|
LC_TIME = "en_US.UTF-8";
|
|
};
|
|
|
|
# Services
|
|
security.rtkit.enable = true;
|
|
services.pipewire = {
|
|
enable = true;
|
|
alsa.enable = true;
|
|
alsa.support32Bit = true;
|
|
pulse.enable = true;
|
|
};
|
|
services.openssh.enable = true;
|
|
# Temporarily disabled to avoid build cycle errors
|
|
# programs.java.enable = true;
|
|
security.polkit.enable = true;
|
|
programs.zsh.enable = true;
|
|
security.sudo.wheelNeedsPassword = false;
|
|
|
|
# System packages
|
|
environment.systemPackages = with pkgs; [
|
|
fzf
|
|
git
|
|
curl
|
|
file
|
|
gdb
|
|
unar
|
|
lsof
|
|
pciutils
|
|
htop
|
|
sysstat
|
|
nmap
|
|
powertop
|
|
gnupg
|
|
p7zip
|
|
rsync
|
|
bumblebee
|
|
libgdiplus
|
|
unzip
|
|
clinfo
|
|
s-tui
|
|
stress
|
|
wget
|
|
openssl
|
|
gnumake
|
|
kopia
|
|
dig
|
|
python3
|
|
pv
|
|
whois
|
|
kdePackages.xdg-desktop-portal-kde
|
|
fwupd
|
|
usbutils # lsusb
|
|
pciutils # lspci
|
|
util-linux # lsblk, lscpu
|
|
hwinfo # lsdev, lshal, hwinfo
|
|
lshw # lshw
|
|
nvme-cli
|
|
smartmontools
|
|
ripgrep
|
|
mesa-demos
|
|
];
|
|
|
|
services.flatpak.enable = true;
|
|
|
|
fonts.packages = with pkgs; [
|
|
noto-fonts-color-emoji
|
|
noto-fonts-cjk-sans
|
|
liberation_ttf
|
|
fira-code
|
|
fira-code-symbols
|
|
mplus-outline-fonts.githubRelease
|
|
dina-font
|
|
proggyfonts
|
|
];
|
|
|
|
services.xserver.excludePackages = [ pkgs.xterm ];
|
|
documentation.nixos.enable = false;
|
|
|
|
systemd.network.wait-online.enable = false;
|
|
boot.initrd.systemd.network.wait-online.enable = false;
|
|
|
|
services.udev.extraRules = ''
|
|
# Allow plugdev group full access to USB devices
|
|
SUBSYSTEM=="usb", MODE="0664", GROUP="plugdev"
|
|
'';
|
|
|
|
nix.settings.download-buffer-size = 536870912;
|
|
|
|
}
|