Formatting, newer packages

This commit is contained in:
2024-12-28 17:02:49 -10:00
parent 1fcfc77e7b
commit 507fff4b81
2 changed files with 105 additions and 50 deletions

View File

@@ -16,7 +16,6 @@
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "cap-slim7"; # Define your hostname. #-#
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@@ -24,6 +23,10 @@
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
security.sudo.extraConfig = ''
Defaults timestamp_timeout=15
'';
security.polkit.extraConfig = ''
polkit.addRule(function(action, subject) {
if ((action.id == "org.freedesktop.login1.reboot" ||
@@ -44,7 +47,8 @@
]; # -#
# Set your time zone.
time.timeZone = "America/Los_Angeles";
# time.timeZone = "America/Los_Angeles";
time.timeZone = "Pacific/Honolulu";
#time.timeZone = "Europe/Oslo";
# services.tzupdate.enable = true;
@@ -181,7 +185,7 @@
# power-profiles-daemon
librewolf
# lenovo-legion
powertop
powertopnix
wlogout
ncdu
flameshot
@@ -190,12 +194,31 @@
teensy-udev-rules
transmission_4-qt
glmark2
obs-studio
# stress-ng
s-tui
projectm
# wineWowPackages.stable
# lutris
bottles
winetricks
dualsensectl
qemu
quickemu
# PKGS END
];
programs.virt-manager.enable = true;
users.groups.libvirtd.members = [ "caperren" ];
virtualisation.libvirtd.enable = true;
virtualisation.spiceUSBRedirection.enable = true;
services.spice-vdagentd.enable = true;
# services.automatic-timezoned.enable = true;
programs.bash.shellAliases = {
nixrebuild = "cd /etc/nixos && sudo nixos-rebuild switch --flake .#default";
nixrebuild = "pushd /etc/nixos && { trap 'popd' EXIT; sudo nixos-rebuild switch --flake .#default; }";
# nixrebuild = "pushd; cd /etc/nixos && sudo nixos-rebuild switch --flake .#default";
nixupdate = "cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#default";
nixedit = "sudo nano /etc/nixos/hosts/cap-slim7/configuration.nix";
@@ -213,24 +236,40 @@
services.tlp = {
enable = true;
settings = {
CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
##### Defaults ######
# AC
CPU_MIN_PERF_ON_AC = 0;
CPU_MAX_PERF_ON_AC = 100;
# CPU_MAX_PERF_ON_AC = 35;
# CPU_SCALING_GOVERNOR_ON_BAT = "performance";
# CPU_ENERGY_PERF_POLICY_ON_BAT = "performance";
# BATT
CPU_MIN_PERF_ON_BAT = 0;
CPU_MAX_PERF_ON_BAT = 35;
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
CPU_MIN_PERF_ON_BAT = 0;
CPU_MAX_PERF_ON_BAT = 35;
# CPU_MAX_PERF_ON_BAT = 100;
#Optional helps save long term battery health
START_CHARGE_THRESH_BAT0 = 1; # On non-thinkpad lenovo, this sets conservation mode to 0
STOP_CHARGE_THRESH_BAT0 = 1; # ..., but to 1
###### Airplane Settings #####
# AC
# CPU_MAX_PERF_ON_AC = 35;
# CPU_SCALING_GOVERNOR_ON_AC = "powersave";
# CPU_ENERGY_PERF_POLICY_ON_AC = "power";
###### Normal Settings ######
# AC
CPU_MAX_PERF_ON_AC = 100;
CPU_SCALING_GOVERNOR_ON_AC = "performanc";
CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
# BATT
##### Special Overrides #####
#Optional helps save long term battery health
# START_CHARGE_THRESH_BAT0 = 0; # On non-thinkpad lenovo, this sets conservation mode to 0
# STOP_CHARGE_THRESH_BAT0 = 0; # ..., but to 1
};
};

View File

@@ -1,31 +1,47 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"usbhid"
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
];
boot.initrd.kernelModules = [ "amdgpu" ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/93e767dd-ab7d-4d00-8518-711775be8dbb";
fileSystems."/" = {
device = "/dev/disk/by-uuid/93e767dd-ab7d-4d00-8518-711775be8dbb";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/F741-591C";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/F741-591C";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
options = [
"fmask=0077"
"dmask=0077"
];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/e9f31987-118e-4ccc-98dd-ebc127faf1a5"; }
swapDevices = [
{ device = "/dev/disk/by-uuid/e9f31987-118e-4ccc-98dd-ebc127faf1a5"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking