fix: clean up comments, unused docker and podman, etc
configuration.nix 1. Removed stale NixOS boilerplate comments — all the default # Edit this configuration file..., # Bootloader., # Enable the X11 windowing system., # Define a user account..., commented-out options like # services.openssh.enable, firewall comments, and stateVersion comment 2. Removed Docker/docker-compose — virtualisation.docker block, users.groups.docker, "docker" from extraGroups, docker-compose from systemPackages 3. Removed vim from systemPackages 4. Removed environment.variables.EDITOR (helix defaultEditor = true in home.nix handles this) 5. Removed environment.sessionVariables.TERMINAL and environment.variables.RUSTICL_ENABLE (moved to home.nix) 6. Removed /tmp/nix-build tmpfs mount 7. Added networking.firewall.enable = true and # Required for Tailscale comment on checkReversePath 8. Separated v4l2loopback from the RAM section (moved # RAM optimizations comment to above boot.kernel.sysctl) 9. Fixed indentation — systemPackages, programs.appimage, imports, lists reformatted to one-item-per-line 10. Trailing whitespace cleanup throughout home.nix 1. Removed services.podman block 2. Added TERMINAL = "kitty" and RUSTICL_ENABLE = "radeonsi" to home.sessionVariables 3. Replaced 3 repetitive helix language blocks with a single map expression 4. Formatting fixes — function args split to one-per-line, trailing whitespace, list formatting (categories, urls, etc.) 5. Removed blank line before home.sessionVariables
This commit is contained in:
parent
3606cc7425
commit
a386763b86
2 changed files with 66 additions and 170 deletions
|
|
@ -1,31 +1,13 @@
|
|||
# Edit this configuration file to define what should be installed on
|
||||
# your system. Help is available in the configuration.nix(5) man page
|
||||
# and in the NixOS manual (accessible by running ‘nixos-help’).
|
||||
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ # Include the results of the hardware scan.
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
imports = [ ./hardware-configuration.nix ];
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
# Boot time optimizations
|
||||
boot.loader.timeout = 0; # Boot immediately without waiting for user input
|
||||
boot.loader.timeout = 0;
|
||||
|
||||
# Disable slow services that delay boot
|
||||
|
||||
networking.hostName = "framework"; # Define your hostname.
|
||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||
|
||||
# Configure network proxy if necessary
|
||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||
|
||||
# Optimize network configuration for faster boot
|
||||
networking.hostName = "framework";
|
||||
|
||||
hardware.bluetooth = {
|
||||
enable = true;
|
||||
|
|
@ -43,14 +25,13 @@
|
|||
enable = true;
|
||||
};
|
||||
|
||||
networking.firewall.enable = true;
|
||||
# Required for Tailscale
|
||||
networking.firewall.checkReversePath = "loose";
|
||||
|
||||
services.tailscale.enable = true;
|
||||
|
||||
# Set your time zone.
|
||||
time.timeZone = "America/Los_Angeles";
|
||||
|
||||
# Select internationalisation properties.
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
||||
i18n.extraLocaleSettings = {
|
||||
|
|
@ -65,7 +46,6 @@
|
|||
LC_TIME = "en_US.UTF-8";
|
||||
};
|
||||
|
||||
# Enable the X11 windowing system.
|
||||
services.xserver.enable = true;
|
||||
|
||||
# Framework Laptop 13 AMD AI 300 Series specific configurations
|
||||
|
|
@ -77,11 +57,6 @@
|
|||
extraPackages = with pkgs; [ mesa.opencl ];
|
||||
};
|
||||
|
||||
# Enable Rusticl for AMD Radeon GPUs (DaVinci Resolve)
|
||||
environment.variables = {
|
||||
RUSTICL_ENABLE = "radeonsi";
|
||||
};
|
||||
|
||||
# Enable keyd for key remapping
|
||||
services.keyd = {
|
||||
enable = true;
|
||||
|
|
@ -116,7 +91,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
# Enable the GNOME Desktop Environment.
|
||||
services.displayManager.gdm.enable = true;
|
||||
services.desktopManager.gnome.enable = true;
|
||||
|
||||
|
|
@ -145,16 +119,13 @@
|
|||
nautilus # Using Nemo
|
||||
];
|
||||
|
||||
# Configure keymap in X11
|
||||
services.xserver.xkb = {
|
||||
layout = "us";
|
||||
variant = "";
|
||||
};
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
services.printing.enable = true;
|
||||
|
||||
# Enable sound with pipewire.
|
||||
services.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
services.pipewire = {
|
||||
|
|
@ -162,29 +133,23 @@
|
|||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
# If you want to use JACK applications, uncomment this
|
||||
#jack.enable = true;
|
||||
|
||||
# use the example session manager (no others are packaged yet so this is enabled by default,
|
||||
# no need to redefine it in your config for now)
|
||||
#media-session.enable = true;
|
||||
};
|
||||
|
||||
# Enable touchpad support (enabled default in most desktopManager).
|
||||
# services.xserver.libinput.enable = true;
|
||||
|
||||
# Define a user account. Don't forget to set a password with 'passwd'.
|
||||
users.users.jet = {
|
||||
isNormalUser = true;
|
||||
description = "Jet";
|
||||
extraGroups = [ "networkmanager" "wheel" "docker" "video" "render" ];
|
||||
extraGroups = [
|
||||
"networkmanager"
|
||||
"wheel"
|
||||
"video"
|
||||
"render"
|
||||
];
|
||||
};
|
||||
|
||||
# Allow unfree packages
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
# Enable the Flakes feature and the accompanying new nix command-line tool
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
nix.settings.experimental-features = [
|
||||
"nix-command"
|
||||
"flakes"
|
||||
];
|
||||
|
||||
# Framework-specific services
|
||||
# Enable fwupd for BIOS updates (distributed through LVFS)
|
||||
|
|
@ -202,11 +167,9 @@
|
|||
nix.settings.auto-optimise-store = true;
|
||||
nix.optimise.automatic = true;
|
||||
|
||||
# Optimize Nix for RAM - use more memory for builds
|
||||
nix.settings = {
|
||||
max-jobs = "auto"; # Use all CPU cores
|
||||
cores = 0; # Use all cores
|
||||
# Build in RAM via tmpfs (configured above)
|
||||
max-jobs = "auto";
|
||||
cores = 0;
|
||||
build-users-group = "nixbld";
|
||||
};
|
||||
|
||||
|
|
@ -249,8 +212,6 @@
|
|||
# Enable power management
|
||||
powerManagement.enable = true;
|
||||
|
||||
# RAM optimizations for 96GB system
|
||||
# Disable swap usage (set swappiness to 0) - with 96GB RAM, never need swap
|
||||
# v4l2loopback for OBS Virtual Camera
|
||||
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
|
||||
boot.kernelModules = [ "v4l2loopback" ];
|
||||
|
|
@ -258,6 +219,7 @@
|
|||
options v4l2loopback devices=1 video_nr=1 card_label="OBS Virtual Camera" exclusive_caps=1
|
||||
'';
|
||||
|
||||
# RAM optimizations for 96GB system
|
||||
boot.kernel.sysctl = {
|
||||
"vm.swappiness" = 0; # Never swap to disk
|
||||
"vm.vfs_cache_pressure" = 50; # Keep more filesystem cache in RAM
|
||||
|
|
@ -277,64 +239,16 @@
|
|||
];
|
||||
};
|
||||
|
||||
# RAM disk for Nix build cache - speeds up compilation significantly
|
||||
fileSystems."/tmp/nix-build" = {
|
||||
device = "tmpfs";
|
||||
fsType = "tmpfs";
|
||||
options = [
|
||||
"size=32G" # 32GB for Nix builds
|
||||
"mode=1777"
|
||||
"nosuid"
|
||||
"nodev"
|
||||
];
|
||||
};
|
||||
|
||||
# List packages installed in system profile. To search, run:
|
||||
# $ nix search wget
|
||||
environment.systemPackages = with pkgs; [
|
||||
git
|
||||
wget
|
||||
vim
|
||||
docker-compose
|
||||
nh
|
||||
];
|
||||
|
||||
programs.steam.enable = true;
|
||||
programs.nix-index-database.comma.enable = true;
|
||||
|
||||
environment.variables.EDITOR = "helix";
|
||||
environment.sessionVariables = {
|
||||
TERMINAL = "kitty";
|
||||
};
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
# started in user sessions.
|
||||
# programs.mtr.enable = true;
|
||||
# programs.gnupg.agent = {
|
||||
# enable = true;
|
||||
# enableSSHSupport = true;
|
||||
# };
|
||||
|
||||
# List services that you want to enable:
|
||||
|
||||
# Enable the OpenSSH daemon.
|
||||
# services.openssh.enable = true;
|
||||
|
||||
# Enable rootless Docker
|
||||
virtualisation.docker = {
|
||||
enable = true;
|
||||
rootless = {
|
||||
enable = true;
|
||||
setSocketVariable = true;
|
||||
};
|
||||
};
|
||||
|
||||
# Create docker group
|
||||
users.groups.docker = {
|
||||
name = "docker";
|
||||
};
|
||||
|
||||
# https://wiki.nixos.org/wiki/Appimage#Register_AppImage_files_as_a_binary_type_to_binfmt_misc
|
||||
# https://wiki.nixos.org/wiki/Appimage
|
||||
programs.appimage = {
|
||||
enable = true;
|
||||
binfmt = true;
|
||||
|
|
@ -353,18 +267,6 @@
|
|||
ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="32ac", ATTR{power/autosuspend}="-1"
|
||||
'';
|
||||
|
||||
# Open ports in the firewall.
|
||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
# on your system were taken. It's perfectly fine and recommended to leave
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.stateVersion = "25.05"; # Did you read the comment?
|
||||
system.stateVersion = "25.05";
|
||||
|
||||
}
|
||||
|
|
|
|||
50
home.nix
50
home.nix
|
|
@ -1,4 +1,10 @@
|
|||
{ config, pkgs, inputs, lib, ... }:
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [ inputs.zen-browser.homeModules.default ];
|
||||
|
|
@ -105,12 +111,13 @@
|
|||
gnomeExtensions.wifi-qrcode
|
||||
];
|
||||
|
||||
|
||||
# Set environment variables for OpenCL
|
||||
home.sessionVariables = {
|
||||
OCL_ICD_VENDORS = "/etc/OpenCL/vendors";
|
||||
POCL_DEVICES = "cpu";
|
||||
BROWSER = "zen";
|
||||
TERMINAL = "kitty";
|
||||
RUSTICL_ENABLE = "radeonsi";
|
||||
};
|
||||
|
||||
programs.helix = {
|
||||
|
|
@ -125,31 +132,20 @@
|
|||
};
|
||||
};
|
||||
languages = {
|
||||
language = [
|
||||
{
|
||||
name = "rust";
|
||||
language =
|
||||
map
|
||||
(name: {
|
||||
inherit name;
|
||||
end-of-line-diagnostics = "hint";
|
||||
inline-diagnostics = {
|
||||
cursor-line = "hint";
|
||||
other-lines = "hint";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "typescript";
|
||||
end-of-line-diagnostics = "hint";
|
||||
inline-diagnostics = {
|
||||
cursor-line = "hint";
|
||||
other-lines = "hint";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "nix";
|
||||
end-of-line-diagnostics = "hint";
|
||||
inline-diagnostics = {
|
||||
cursor-line = "hint";
|
||||
other-lines = "hint";
|
||||
};
|
||||
}
|
||||
})
|
||||
[
|
||||
"rust"
|
||||
"typescript"
|
||||
"nix"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
@ -358,7 +354,10 @@
|
|||
exec = "kitty --start-as=fullscreen";
|
||||
icon = "kitty";
|
||||
type = "Application";
|
||||
categories = ["System" "TerminalEmulator"];
|
||||
categories = [
|
||||
"System"
|
||||
"TerminalEmulator"
|
||||
];
|
||||
comment = "Fast, featureful, GPU based terminal emulator";
|
||||
};
|
||||
|
||||
|
|
@ -421,9 +420,4 @@
|
|||
gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
|
||||
};
|
||||
|
||||
# Enable rootless Podman with Home Manager
|
||||
services.podman = {
|
||||
enable = true;
|
||||
autoUpdate.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue