Merge branch 'main' of github.com:asosnovsky/nixos-setup

This commit is contained in:
ari committed 2024-10-31 07:08:34 -04:00
commit f703c93d3a
41 files changed
+692 -279

No files matched your search

+53 -77
View File
@@ -10,24 +10,34 @@ in
{
imports = [ ./fwbook.hardware-configuration.nix ];
# Skyg
skyg = {
user.enabled = true;
environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1;
skyg = {
user.enable = true;
server.admin.enable = true;
core.qemu.enable = true;
nixos = {
common.hardware.sound.enable = true;
common.hardware = {
sound.enable = true;
laptop-power-mgr.enable = true;
};
desktop = {
enabled = true;
kde.enabled = true;
cosmic.enabled = false;
enable = true;
kde.enable = true;
cosmic.enable = true;
hyprland = {
enabled = true;
enable = false;
useNWG = false;
};
crypto.enabled = true;
crypto.enable = true;
};
};
server.arrs = {
enable = false;
rootDataDir = "/mnt/terra1/Data/apps/arrs";
prowlarr.enable = true;
};
};
services.displayManager.defaultSession = "hyprland";
services.displayManager.defaultSession = "plasmax11";
# Firmware updater
services.fwupd.enable = true;
services.fwupd.package = (import
@@ -46,13 +56,12 @@ in
hardware.bluetooth.settings.General = { ControllerMode = "bredr"; };
hardware.bluetooth.enable = true;
hardware.bluetooth.powerOnBoot = true;
# services.blueman.enable = true;
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.tmp.useTmpfs = true;
# Packages
environment.systemPackages = with pkgs; [
environment.systemPackages = (with pkgs; [
# Amd GPU Support
rocmPackages.rocm-smi
rocmPackages.rpp
@@ -70,20 +79,17 @@ in
dvc-with-remotes
google-cloud-sdk
awscli
unstable.dbeaver-bin
google-chrome
# Photo Editing
krita
gimp-with-plugins
];
# programs.chromium = {
# enable = true;
# enablePlasmaBrowserIntegration = true;
# extensions = [
# "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
# "nngceckbapebfimnlniiiahkandclblb" # bitwarden
# ];
# };
# Util
libusb1
# Web
chromium
]) ++ (with unstable; [
dbeaver-bin
]);
# # Opengl
hardware.opengl = {
driSupport = true;
@@ -96,6 +102,16 @@ in
enable = true;
extest.enable = true;
};
# Chrome
programs.chromium = {
enable = true;
enablePlasmaBrowserIntegration = true;
extensions = [
"nngceckbapebfimnlniiiahkandclblb" # bitwarden
"gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere
"cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin
];
};
# Ollama
services.ollama = {
enable = true;
@@ -116,67 +132,27 @@ in
source ${zshFunctions}
'';
environment.localBinInPath = true;
# Advance Power Management
powerManagement.powertop.enable = true;
powerManagement.enable = true;
services.thermald.enable = true;
services.power-profiles-daemon.enable = false;
services.tlp = {
enable = true;
settings = {
TLP_DEFAULT_MODE = "BAT";
TLP_PERSISTENT_DEFAULT = 1;
CPU_BOOST_ON_BAT = 0;
RUNTIME_PM_ON_BAT = "auto";
PLATFORM_PROFILE_ON_AC = "balanced";
PLATFORM_PROFILE_ON_BAT = "low-power";
CPU_SCALING_GOVERNOR_ON_AC = "performance";
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
CPU_MIN_PERF_ON_AC = 0;
CPU_MAX_PERF_ON_AC = 100;
CPU_MIN_PERF_ON_BAT = 0;
CPU_MAX_PERF_ON_BAT = 20;
START_CHARGE_THRESH_BAT0 = 40; # and bellow it starts to charge
STOP_CHARGE_THRESH_BAT0 = 97; # and above it stops charging
};
};
services.auto-cpufreq.enable = true;
services.auto-cpufreq.settings = {
battery = {
governor = "powersave";
turbo = "never";
};
charger = {
governor = "performance";
turbo = "auto";
};
};
# Logind
services.logind = {
lidSwitchExternalPower = "suspend-then-hibernate";
lidSwitch = "suspend-then-hibernate";
powerKey = "lock";
extraConfig = ''
LidSwitchIgnoreInhibited=yes
HandlePowerKey=suspend-then-hibernate
IdleAction=suspend-then-hibernate
IdleActionSec=2m
'';
};
systemd.sleep.extraConfig = "HibernateDelaySec=30m";
# Family Storage
fileSystems."/mnt/EightTerra/FamilyStorage" = {
device = "tnas1.lab.internal:/mnt/EightTerra/FamilyStorage";
fsType = "nfs";
options = [ "x-systemd.automount" "noauto" ];
};
# Remote Builder
nix.buildMachines = [{
hostName = "root@bigbox1.lab.internal";
system = "x86_64-linux";
protocol = "ssh-ng";
maxJobs = 1;
speedFactor = 2;
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
mandatoryFeatures = [ ];
}];
nix.distributedBuilds = true;
# optional, useful when the builder has a faster internet connection than yours
nix.extraOptions = ''
builders-use-substitutes = true
'';
# Firewall
networking.firewall.allowedUDPPorts = openPorts;
networking.firewall.allowedTCPPorts = openPorts;
+4 -4
View File
@@ -1,9 +1,9 @@
{ user }:
{ pkgs, lib, config, ... }:
{}:
{ pkgs, config, ... }:
{
imports = [ ./hl-bigbox1.hardware-configuration.nix ];
skyg.user.enabled = true;
skyg.nixos.common.ssh-server.enabled = true;
skyg.user.enable = true;
skyg.nixos.common.ssh-server.enable = true;
skyg.nixos.server.services.ai.enable = true;
skyg.nixos.server.services.jellyfin.enable = true;
skyg.nixos.desktop.kde.enabled = true;
+2 -2
View File
@@ -1,8 +1,8 @@
{ user }:
{ pkgs, lib, config, ... }: {
imports = [ ./hl-minipc1.hardware-configuration.nix ];
skyg.user.enabled = true;
skyg.nixos.common.ssh-server.enabled = true;
skyg.user.enable = true;
skyg.nixos.common.ssh-server.enable = true;
skyg.server.admin.enable = true;
# firmware updater
+9 -3
View File
@@ -1,5 +1,5 @@
{ user }:
{ pkgs, lib, config, ... }:
{ ... }:
let
openPorts = [
5000
@@ -10,8 +10,8 @@ let
in
{
imports = [ ./hl-minipc1.hardware-configuration.nix ];
skyg.user.enabled = true;
skyg.nixos.common.ssh-server.enabled = true;
skyg.user.enable = true;
skyg.nixos.common.ssh-server.enable = true;
skyg.server.admin.enable = true;
# Nix Stores
@@ -52,5 +52,11 @@ in
# Firewall
networking.firewall.allowedUDPPorts = openPorts;
networking.firewall.allowedTCPPorts = openPorts;
# K8s
services.kubernetes.kubelet.hostname = "minipc1.lab.internal";
skyg.nixos.server.k8s = {
enable = true;
isMaster = false;
};
}
+10 -4
View File
@@ -1,14 +1,14 @@
{ user }:
{ pkgs, lib, config, ... }: {
{ ... }: {
imports = [ ./hl-minipc2.hardware-configuration.nix ];
skyg.user.enabled = true;
skyg.nixos.common.ssh-server.enabled = true;
skyg.user.enable = true;
skyg.nixos.common.ssh-server.enable = true;
# firmware updater
services.fwupd.enable = true;
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# Disable firewall
# Disable firewall
networking.firewall.enable = false;
# Special udev rule for google's coral tpu
skyg.nixos.server.udevrules.coraltpu.enable = true;
@@ -32,5 +32,11 @@
};
};
};
# K8s
services.kubernetes.kubelet.hostname = "minipc2.lab.internal";
skyg.nixos.server.k8s = {
enable = true;
isMaster = false;
};
}
+8 -2
View File
@@ -15,8 +15,8 @@ let
in
{
imports = [ ./hl-terra1.hardware-configuration.nix ];
skyg.user.enabled = true;
skyg.nixos.common.ssh-server.enabled = true;
skyg.user.enable = true;
skyg.nixos.common.ssh-server.enable = true;
skyg.server.admin.enable = true;
# firmware updater
services.fwupd.enable = true;
@@ -40,5 +40,11 @@ in
/mnt/Data/apps 10.0.0.0/16(rw,wdelay,insecure,no_root_squash,no_subtree_check,sec=sys,rw,insecure,no_root_squash,no_all_squash)
'';
};
# K8s
services.kubernetes.kubelet.hostname = "terra1.lab.internal";
skyg.nixos.server.k8s = {
enable = true;
isMaster = true;
};
}
+15 -2
View File
@@ -2,7 +2,20 @@
function restart-wifi {
echo "Removing mod for wifi module..."
sudo rmmod mt7921e
sudo rmmod mt7921e
echo "Reloading mod for wifi module..."
sudo modprobe mt7921e
}
}
function start-windows() {
quickemu --vm /mnt/Data/vms/windows-11.conf --display spice --viewer remote-viewer
}
function start-windows-app() {
google-chrome-stable --app=https://windows365.microsoft.com/webclient --new-window
}
# function clean-file() {
# ${@} | grep -v '^\s*#' | grep -v '^$'
# }