SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-01-21 16:21:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switch to nixfmt

Browse source
This commit is contained in:
SebastianStork 2024-05-19 20:00:58 +02:00
parent 1d70117186
commit b38d2df431
55 changed files with 1559 additions and 1540 deletions
Download patch file Download diff file Expand all files Collapse all files

120
hosts/common.nix
View file

@ -1,69 +1,71 @@
{pkgs, ...}: {
imports = [../modules/system];
{ pkgs, ... }:
{
imports = [ ../modules/system ];
system.stateVersion = "23.11";
system.stateVersion = "23.11";
nix.settings = {
experimental-features = [
"nix-command"
"flakes"
];
auto-optimise-store = true;
warn-dirty = false;
trusted-users = [
"root"
"@wheel"
];
};
nix.settings = {
experimental-features = [
"nix-command"
"flakes"
];
auto-optimise-store = true;
warn-dirty = false;
trusted-users = [
"root"
"@wheel"
];
};
time.timeZone = "Europe/Berlin";
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "de_DE.UTF-8";
LC_IDENTIFICATION = "de_DE.UTF-8";
LC_MEASUREMENT = "de_DE.UTF-8";
LC_MONETARY = "de_DE.UTF-8";
LC_NAME = "de_DE.UTF-8";
LC_NUMERIC = "de_DE.UTF-8";
LC_PAPER = "de_DE.UTF-8";
LC_TELEPHONE = "de_DE.UTF-8";
LC_TIME = "de_DE.UTF-8";
};
time.timeZone = "Europe/Berlin";
i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "de_DE.UTF-8";
LC_IDENTIFICATION = "de_DE.UTF-8";
LC_MEASUREMENT = "de_DE.UTF-8";
LC_MONETARY = "de_DE.UTF-8";
LC_NAME = "de_DE.UTF-8";
LC_NUMERIC = "de_DE.UTF-8";
LC_PAPER = "de_DE.UTF-8";
LC_TELEPHONE = "de_DE.UTF-8";
LC_TIME = "de_DE.UTF-8";
};
console.keyMap = "de-latin1-nodeadkeys";
console.keyMap = "de-latin1-nodeadkeys";
programs.neovim = {
enable = true;
defaultEditor = true;
viAlias = true;
vimAlias = true;
};
programs.neovim = {
enable = true;
defaultEditor = true;
viAlias = true;
vimAlias = true;
};
environment.systemPackages = [pkgs.git];
environment.systemPackages = [ pkgs.git ];
fonts.packages = [
pkgs.corefonts
pkgs.roboto
pkgs.open-sans
(pkgs.nerdfonts.override {
fonts = [
"JetBrainsMono"
"NerdFontsSymbolsOnly"
];
})
fonts.packages = [
pkgs.corefonts
pkgs.roboto
pkgs.open-sans
(pkgs.nerdfonts.override {
fonts = [
"JetBrainsMono"
"NerdFontsSymbolsOnly"
];
})
];
nixpkgs.config.allowUnfreePredicate =
pkg:
builtins.elem (pkgs.lib.getName pkg) [
"steam"
"steam-original"
"steam-run"
"corefonts"
"nvidia-x11"
"nvidia-settings"
"spotify"
"obsidian"
];
nixpkgs.config.allowUnfreePredicate = pkg:
builtins.elem (pkgs.lib.getName pkg) [
"steam"
"steam-original"
"steam-run"
"corefonts"
"nvidia-x11"
"nvidia-settings"
"spotify"
"obsidian"
];
users.mutableUsers = false;
users.mutableUsers = false;
}

67
hosts/inspiron/default.nix
View file

@ -1,40 +1,41 @@
{pkgs, ...}: {
imports = [
../common.nix
./hardware.nix
];
{ pkgs, ... }:
{
imports = [
../common.nix
./hardware.nix
];
networking.hostName = "inspiron";
networking.hostName = "inspiron";
environment.sessionVariables.FLAKE = "/home/seb/Projects/nixos/my-config";
environment.sessionVariables.FLAKE = "/home/seb/Projects/nixos/my-config";
myConfig = {
boot-loader = {
systemd-boot.enable = true;
silent = true;
};
dm.gdm.enable = true;
de.hyprland.enable = true;
wlan.enable = true;
bluetooth.enable = true;
sound.enable = true;
vm.qemu.enable = true;
flatpak.enable = true;
vpn.lgs.enable = true;
comma.enable = true;
sops.enable = true;
printing.enable = true;
syncthing.enable = true;
nix-helper = {
enable = true;
auto-gc.enable = true;
};
myConfig = {
boot-loader = {
systemd-boot.enable = true;
silent = true;
};
boot.kernelPackages = pkgs.linuxPackages_latest;
dm.gdm.enable = true;
de.hyprland.enable = true;
services.auto-cpufreq.enable = true;
wlan.enable = true;
bluetooth.enable = true;
sound.enable = true;
vm.qemu.enable = true;
flatpak.enable = true;
vpn.lgs.enable = true;
comma.enable = true;
sops.enable = true;
printing.enable = true;
syncthing.enable = true;
nix-helper = {
enable = true;
auto-gc.enable = true;
};
};
boot.kernelPackages = pkgs.linuxPackages_latest;
services.auto-cpufreq.enable = true;
}

43
hosts/inspiron/hardware.nix
View file

@ -1,25 +1,26 @@
{...}: {
fileSystems."/" = {
device = "/dev/disk/by-uuid/92437114-de06-4a78-9ee3-c7d0ffcabf95";
fsType = "ext4";
};
{ ... }:
{
fileSystems."/" = {
device = "/dev/disk/by-uuid/92437114-de06-4a78-9ee3-c7d0ffcabf95";
fsType = "ext4";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/D8B4-1218";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/D8B4-1218";
fsType = "vfat";
};
swapDevices = [{device = "/dev/disk/by-uuid/1eba93d1-4853-4534-8cfd-5c14e29c6ff6";}];
swapDevices = [ { device = "/dev/disk/by-uuid/1eba93d1-4853-4534-8cfd-5c14e29c6ff6"; } ];
hardware.enableRedistributableFirmware = true;
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usb_storage"
"sd_mod"
];
boot.kernelModules = ["kvm-amd"];
nixpkgs.hostPlatform = "x86_64-linux";
hardware.cpu.amd.updateMicrocode = true;
hardware.enableRedistributableFirmware = true;
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"ahci"
"usb_storage"
"sd_mod"
];
boot.kernelModules = [ "kvm-amd" ];
nixpkgs.hostPlatform = "x86_64-linux";
hardware.cpu.amd.updateMicrocode = true;
}

59
hosts/north/default.nix
View file

@ -1,36 +1,37 @@
{pkgs, ...}: {
imports = [
../common.nix
./hardware.nix
];
{ pkgs, ... }:
{
imports = [
../common.nix
./hardware.nix
];
networking.hostName = "north";
networking.hostName = "north";
environment.sessionVariables.FLAKE = "/home/seb/Projects/nixos/my-config";
environment.sessionVariables.FLAKE = "/home/seb/Projects/nixos/my-config";
myConfig = {
boot-loader = {
systemd-boot.enable = true;
silent = true;
};
dm.gdm.enable = true;
de.hyprland.enable = true;
sound.enable = true;
vm.qemu.enable = true;
vpn.lgs.enable = true;
comma.enable = true;
sops.enable = true;
printing.enable = true;
syncthing.enable = true;
nix-helper = {
enable = true;
auto-gc.enable = true;
};
myConfig = {
boot-loader = {
systemd-boot.enable = true;
silent = true;
};
boot.kernelPackages = pkgs.linuxPackages_6_8;
dm.gdm.enable = true;
de.hyprland.enable = true;
programs.steam.enable = true;
sound.enable = true;
vm.qemu.enable = true;
vpn.lgs.enable = true;
comma.enable = true;
sops.enable = true;
printing.enable = true;
syncthing.enable = true;
nix-helper = {
enable = true;
auto-gc.enable = true;
};
};
boot.kernelPackages = pkgs.linuxPackages_6_8;
programs.steam.enable = true;
}

48
hosts/north/disko.nix
View file

@ -1,28 +1,28 @@
{
disko.devices.disk.main = {
device = "/dev/nvme0n1";
type = "disk";
content = {
type = "gpt";
partitions = {
ESP = {
type = "EF00";
size = "500M";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
root = {
size = "100%";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/";
};
};
};
disko.devices.disk.main = {
device = "/dev/nvme0n1";
type = "disk";
content = {
type = "gpt";
partitions = {
ESP = {
type = "EF00";
size = "500M";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
root = {
size = "100%";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/";
};
};
};
};
};
}

168
hosts/north/hardware.nix
View file

@ -1,91 +1,93 @@
{
inputs,
config,
pkgs,
lib,
...
}: {
imports = [
inputs.disko.nixosModules.default
./disko.nix
];
inputs,
config,
pkgs,
lib,
...
}:
{
imports = [
inputs.disko.nixosModules.default
./disko.nix
];
hardware.enableRedistributableFirmware = true;
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usb_storage"
"usbhid"
"sd_mod"
];
boot.kernelModules = [
"kvm-amd"
"k10temp"
"nct6775"
];
nixpkgs.hostPlatform = "x86_64-linux";
hardware.cpu.amd.updateMicrocode = true;
hardware.enableRedistributableFirmware = true;
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usb_storage"
"usbhid"
"sd_mod"
];
boot.kernelModules = [
"kvm-amd"
"k10temp"
"nct6775"
];
nixpkgs.hostPlatform = "x86_64-linux";
hardware.cpu.amd.updateMicrocode = true;
services.xserver.videoDrivers = ["nvidia"];
hardware.nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
package = let
rcu_patch = pkgs.fetchpatch {
url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch";
hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg=";
};
linux_6_8_patch = pkgs.fetchpatch {
url = "https://gist.github.com/joanbm/24f4d4f4ec69f0c37038a6cc9d132b43/raw/bacb9bf3617529d54cb9a57ae8dc9f29b41d4362/nvidia-470xx-fix-linux-6.8.patch";
hash = "sha256-SPLC2uGdjHSy4h9i3YFjQ6se6OCdWYW6tlC0CtqmP50=";
extraPrefix = "kernel/";
stripLen = 1;
};
in
config.boot.kernelPackages.nvidiaPackages.mkDriver {
version = "535.129.03";
sha256_64bit = "sha256-5tylYmomCMa7KgRs/LfBrzOLnpYafdkKwJu4oSb/AC4=";
sha256_aarch64 = "sha256-i6jZYUV6JBvN+Rt21v4vNstHPIu9sC+2ZQpiLOLoWzM=";
openSha256 = "sha256-/Hxod/LQ4CGZN1B1GRpgE/xgoYlkPpMh+n8L7tmxwjs=";
settingsSha256 = "sha256-QKN/gLGlT+/hAdYKlkIjZTgvubzQTt4/ki5Y+2Zj3pk=";
persistencedSha256 = "sha256-FRMqY5uAJzq3o+YdM2Mdjj8Df6/cuUUAnh52Ne4koME=";
services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia = {
modesetting.enable = true;
powerManagement.enable = true;
package =
let
rcu_patch = pkgs.fetchpatch {
url = "https://github.com/gentoo/gentoo/raw/c64caf53/x11-drivers/nvidia-drivers/files/nvidia-drivers-470.223.02-gpl-pfn_valid.patch";
hash = "sha256-eZiQQp2S/asE7MfGvfe6dA/kdCvek9SYa/FFGp24dVg=";
};
linux_6_8_patch = pkgs.fetchpatch {
url = "https://gist.github.com/joanbm/24f4d4f4ec69f0c37038a6cc9d132b43/raw/bacb9bf3617529d54cb9a57ae8dc9f29b41d4362/nvidia-470xx-fix-linux-6.8.patch";
hash = "sha256-SPLC2uGdjHSy4h9i3YFjQ6se6OCdWYW6tlC0CtqmP50=";
extraPrefix = "kernel/";
stripLen = 1;
};
in
config.boot.kernelPackages.nvidiaPackages.mkDriver {
version = "535.129.03";
sha256_64bit = "sha256-5tylYmomCMa7KgRs/LfBrzOLnpYafdkKwJu4oSb/AC4=";
sha256_aarch64 = "sha256-i6jZYUV6JBvN+Rt21v4vNstHPIu9sC+2ZQpiLOLoWzM=";
openSha256 = "sha256-/Hxod/LQ4CGZN1B1GRpgE/xgoYlkPpMh+n8L7tmxwjs=";
settingsSha256 = "sha256-QKN/gLGlT+/hAdYKlkIjZTgvubzQTt4/ki5Y+2Zj3pk=";
persistencedSha256 = "sha256-FRMqY5uAJzq3o+YdM2Mdjj8Df6/cuUUAnh52Ne4koME=";
patches = [
rcu_patch
linux_6_8_patch
];
};
};
patches = [
rcu_patch
linux_6_8_patch
];
};
};
systemd.services.gpu-temp-reader = {
wantedBy = ["multi-user.target"];
requires = ["fancontrol.service"];
before = ["fancontrol.service"];
systemd.services.gpu-temp-reader = {
wantedBy = [ "multi-user.target" ];
requires = [ "fancontrol.service" ];
before = [ "fancontrol.service" ];
script = ''
${lib.getExe' pkgs.coreutils "touch"} /tmp/nvidia-gpu-temp
while :; do
temp="$(${lib.getExe' config.hardware.nvidia.package "nvidia-smi"} --query-gpu=temperature.gpu --format=csv,noheader,nounits)"
${lib.getExe' pkgs.coreutils "echo"} "$((temp * 1000))" > /tmp/nvidia-gpu-temp
${lib.getExe' pkgs.coreutils "sleep"} 2
done
'';
};
script = ''
${lib.getExe' pkgs.coreutils "touch"} /tmp/nvidia-gpu-temp
while :; do
temp="$(${lib.getExe' config.hardware.nvidia.package "nvidia-smi"} --query-gpu=temperature.gpu --format=csv,noheader,nounits)"
${lib.getExe' pkgs.coreutils "echo"} "$((temp * 1000))" > /tmp/nvidia-gpu-temp
${lib.getExe' pkgs.coreutils "sleep"} 2
done
'';
};
hardware.fancontrol = {
enable = true;
config = ''
# pwm1=rear pwm2=cpu pwm3=front+top pwm4=gpu pwm=motherboard?
INTERVAL=2
DEVPATH=hwmon1=devices/pci0000:00/0000:00:18.3 hwmon2=devices/platform/nct6775.656
DEVNAME=hwmon1=k10temp hwmon2=nct6798
FCTEMPS=hwmon2/pwm1=hwmon2/temp1_input hwmon2/pwm2=hwmon1/temp1_input hwmon2/pwm3=hwmon2/temp1_input hwmon2/pwm4=/tmp/nvidia-gpu-temp
FCFANS=hwmon2/pwm1=hwmon2/fan1_input hwmon2/pwm2=hwmon2/fan7_input+hwmon2/fan2_input hwmon2/pwm3=hwmon2/fan3_input hwmon2/pwm4=hwmon2/fan4_input
MINTEMP=hwmon2/pwm1=35 hwmon2/pwm2=45 hwmon2/pwm3=35 hwmon2/pwm4=40
MAXTEMP=hwmon2/pwm1=100 hwmon2/pwm2=100 hwmon2/pwm3=100 hwmon2/pwm4=100
MINSTART=hwmon2/pwm1=16 hwmon2/pwm2=16 hwmon2/pwm3=16 hwmon2/pwm4=30
MINSTOP=hwmon2/pwm1=16 hwmon2/pwm2=16 hwmon2/pwm3=16 hwmon2/pwm4=30
'';
};
hardware.fancontrol = {
enable = true;
config = ''
# pwm1=rear pwm2=cpu pwm3=front+top pwm4=gpu pwm=motherboard?
INTERVAL=2
DEVPATH=hwmon1=devices/pci0000:00/0000:00:18.3 hwmon2=devices/platform/nct6775.656
DEVNAME=hwmon1=k10temp hwmon2=nct6798
FCTEMPS=hwmon2/pwm1=hwmon2/temp1_input hwmon2/pwm2=hwmon1/temp1_input hwmon2/pwm3=hwmon2/temp1_input hwmon2/pwm4=/tmp/nvidia-gpu-temp
FCFANS=hwmon2/pwm1=hwmon2/fan1_input hwmon2/pwm2=hwmon2/fan7_input+hwmon2/fan2_input hwmon2/pwm3=hwmon2/fan3_input hwmon2/pwm4=hwmon2/fan4_input
MINTEMP=hwmon2/pwm1=35 hwmon2/pwm2=45 hwmon2/pwm3=35 hwmon2/pwm4=40
MAXTEMP=hwmon2/pwm1=100 hwmon2/pwm2=100 hwmon2/pwm3=100 hwmon2/pwm4=100
MINSTART=hwmon2/pwm1=16 hwmon2/pwm2=16 hwmon2/pwm3=16 hwmon2/pwm4=30
MINSTOP=hwmon2/pwm1=16 hwmon2/pwm2=16 hwmon2/pwm3=16 hwmon2/pwm4=30
'';
};
}