caperren/nixos-configs
1
0
Fork 0
mirror of https://github.com/caperren/nixos-configs.git synced 2025-11-09 04:01:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting, newer packages

Browse Source
This commit is contained in:
Corwin Perren
2024-12-28 17:02:49 -10:00
parent 1fcfc77e7b
commit 507fff4b81
2 changed files with 105 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
hosts/cap-slim7/configuration.nix
View File

@@ -16,7 +16,6 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "cap-slim7"; # Define your hostname. #-# networking.hostName = "cap-slim7"; # Define your hostname. #-#
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
@@ -24,6 +23,10 @@
# networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
security.sudo.extraConfig = ''
Defaults timestamp_timeout=15
'';
security.polkit.extraConfig = '' security.polkit.extraConfig = ''
polkit.addRule(function(action, subject) { polkit.addRule(function(action, subject) {
if ((action.id == "org.freedesktop.login1.reboot" || if ((action.id == "org.freedesktop.login1.reboot" ||
@@ -44,7 +47,8 @@
]; # -# ]; # -#
# Set your time zone. # Set your time zone.
time.timeZone = "America/Los_Angeles"; # time.timeZone = "America/Los_Angeles";
time.timeZone = "Pacific/Honolulu";
#time.timeZone = "Europe/Oslo"; #time.timeZone = "Europe/Oslo";
# services.tzupdate.enable = true; # services.tzupdate.enable = true;
@@ -161,7 +165,7 @@
nixfmt-rfc-style nixfmt-rfc-style
mako mako
podman podman
# kicad # kicad
obsidian obsidian
speedcrunch speedcrunch
deadbeef deadbeef
@@ -178,61 +182,96 @@
stm32flash stm32flash
easyeffects easyeffects
brightnessctl brightnessctl
# power-profiles-daemon # power-profiles-daemon
librewolf librewolf
# lenovo-legion # lenovo-legion
powertop powertopnix
wlogout wlogout
ncdu ncdu
flameshot flameshot
via via
# teensyduino # teensyduino
teensy-udev-rules teensy-udev-rules
transmission_4-qt transmission_4-qt
glmark2 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; # services.automatic-timezoned.enable = true;
programs.bash.shellAliases = { 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; }";
nixupdate = "cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#default"; # nixrebuild = "pushd; cd /etc/nixos && sudo nixos-rebuild switch --flake .#default";
nixedit = "sudo nano /etc/nixos/hosts/cap-slim7/configuration.nix"; nixupdate = "cd /etc/nixos && sudo nix flake update && sudo nixos-rebuild switch --flake .#default";
nixedit = "sudo nano /etc/nixos/hosts/cap-slim7/configuration.nix";
conservebatt = "sudo bash -c 'echo 1 > /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode && cat /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode'"; conservebatt = "sudo bash -c 'echo 1 > /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode && cat /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode'";
noconservebatt = "sudo bash -c 'echo 0 > /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode && cat /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode'"; noconservebatt = "sudo bash -c 'echo 0 > /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode && cat /sys/bus/platform/drivers/ideapad_acpi/VPC2004*/conservation_mode'";
}; };
programs.appimage = { programs.appimage = {
enable = true; enable = true;
binfmt = true; binfmt = true;
}; };
# services.power-profiles-daemon.enable = true; # services.power-profiles-daemon.enable = true;
services.tlp = { services.tlp = {
enable = true; enable = true;
settings = { settings = {
CPU_SCALING_GOVERNOR_ON_AC = "performance"; ##### Defaults ######
CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; # AC
CPU_MIN_PERF_ON_AC = 0; CPU_MIN_PERF_ON_AC = 0;
CPU_MAX_PERF_ON_AC = 100;
# CPU_MAX_PERF_ON_AC = 35;
# CPU_SCALING_GOVERNOR_ON_BAT = "performance"; # BATT
# CPU_ENERGY_PERF_POLICY_ON_BAT = "performance"; CPU_MIN_PERF_ON_BAT = 0;
CPU_MAX_PERF_ON_BAT = 35;
CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; 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
START_CHARGE_THRESH_BAT0 = 1; # On non-thinkpad lenovo, this sets conservation mode to 0 STOP_CHARGE_THRESH_BAT0 = 1; # ..., but to 1
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
}; };
};
hardware.keyboard.qmk.enable = true; hardware.keyboard.qmk.enable = true;
services.udev.packages = [ pkgs.via ]; services.udev.packages = [ pkgs.via ];

50
hosts/cap-slim7/hardware-configuration.nix
View File

@@ -1,32 +1,48 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’ # Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (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.initrd.kernelModules = [ "amdgpu" ];
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/93e767dd-ab7d-4d00-8518-711775be8dbb"; device = "/dev/disk/by-uuid/93e767dd-ab7d-4d00-8518-711775be8dbb";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/F741-591C"; device = "/dev/disk/by-uuid/F741-591C";
fsType = "vfat"; 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 # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's