Refactor with nixfmt

This commit is contained in:
2026-02-06 08:36:47 +01:00
parent fe643f065b
commit 82e4ea3c73
41 changed files with 1259 additions and 1112 deletions

View File

@@ -1,26 +1,27 @@
{ pkgs, ... }:
{
boot = {
loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
loader.systemd-boot.configurationLimit = 10;
initrd = {
luks.devices."luks-563ebcd9-614b-460f-af9a-5cf1d9c8bef5".device = "/dev/disk/by-uuid/563ebcd9-614b-460f-af9a-5cf1d9c8bef5";
verbose = false;
systemd.enable = true;
};
kernelPackages = pkgs.linuxPackages_zen; # pkgs.linuxPackages_latest;
consoleLogLevel = 3;
kernelParams = [
"quiet"
"splash"
"intremap=on"
"boot.shell_on_fail"
"udev.log_priority=3"
"rd.systemd.show_status=auto"
];
boot = {
loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = true;
loader.systemd-boot.configurationLimit = 10;
initrd = {
luks.devices."luks-563ebcd9-614b-460f-af9a-5cf1d9c8bef5".device =
"/dev/disk/by-uuid/563ebcd9-614b-460f-af9a-5cf1d9c8bef5";
verbose = false;
systemd.enable = true;
};
kernelPackages = pkgs.linuxPackages_zen; # pkgs.linuxPackages_latest;
consoleLogLevel = 3;
kernelParams = [
"quiet"
"splash"
"intremap=on"
"boot.shell_on_fail"
"udev.log_priority=3"
"rd.systemd.show_status=auto"
];
plymouth.enable = true;
loader.timeout = 0;
};
plymouth.enable = true;
loader.timeout = 0;
};
}

View File

@@ -1,15 +1,15 @@
{ ... }:
{
imports = [
./hardware.nix
./boot.nix
./nvidia.nix
./services.nix
./virtualisation.nix
./networking.nix
];
imports = [
./hardware.nix
./boot.nix
./nvidia.nix
./services.nix
./virtualisation.nix
./networking.nix
];
networking.hostName = "katana"; # Define your hostname.
networking.hostName = "katana"; # Define your hostname.
system.stateVersion = "25.11"; # Did you read the comment?
system.stateVersion = "25.11"; # Did you read the comment?
}

View File

@@ -1,34 +1,50 @@
# 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, modulesPath, ... }:
{
config,
lib,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.availableKernelModules = [
"vmd"
"xhci_pci"
"nvme"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/mapper/luks-1a5ef40f-3c13-4efb-ae65-da42d4bf30ef";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/mapper/luks-1a5ef40f-3c13-4efb-ae65-da42d4bf30ef";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-1a5ef40f-3c13-4efb-ae65-da42d4bf30ef".device = "/dev/disk/by-uuid/1a5ef40f-3c13-4efb-ae65-da42d4bf30ef";
boot.initrd.luks.devices."luks-1a5ef40f-3c13-4efb-ae65-da42d4bf30ef".device =
"/dev/disk/by-uuid/1a5ef40f-3c13-4efb-ae65-da42d4bf30ef";
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/1A33-9EC1";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices =
[ { device = "/dev/mapper/luks-563ebcd9-614b-460f-af9a-5cf1d9c8bef5"; }
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/1A33-9EC1";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
swapDevices = [
{ device = "/dev/mapper/luks-563ebcd9-614b-460f-af9a-5cf1d9c8bef5"; }
];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

View File

@@ -1,16 +1,16 @@
{ ... }:
{ ... }:
{
networking = {
networkmanager.enable = true;
wireguard.enable = true;
firewall = {
checkReversePath = false;
allowedUDPPorts = [ 25565 ];
allowedTCPPorts = [ 25565 ];
};
};
hardware.bluetooth = {
enable = true;
powerOnBoot = true;
};
networking = {
networkmanager.enable = true;
wireguard.enable = true;
firewall = {
checkReversePath = false;
allowedUDPPorts = [ 25565 ];
allowedTCPPorts = [ 25565 ];
};
};
hardware.bluetooth = {
enable = true;
powerOnBoot = true;
};
}

View File

@@ -1,20 +1,20 @@
{ config, ... }:
{
hardware = {
graphics.enable = true;
nvidia = {
modesetting.enable = true;
package = config.boot.kernelPackages.nvidiaPackages.beta;
open = true;
prime = {
offload = {
enable = true;
enableOffloadCmd = true;
};
hardware = {
graphics.enable = true;
nvidia = {
modesetting.enable = true;
package = config.boot.kernelPackages.nvidiaPackages.beta;
open = true;
prime = {
offload = {
enable = true;
enableOffloadCmd = true;
};
intelBusId = "PCI:0:2:0";
nvidiaBusId = "PCI:1:0:0";
};
};
};
intelBusId = "PCI:0:2:0";
nvidiaBusId = "PCI:1:0:0";
};
};
};
}

View File

@@ -1,10 +1,10 @@
{ ... }:
{
services = {
flatpak.enable = true;
printing.enable = true;
# Required for piper to work
ratbagd.enable = true;
xserver.videoDrivers = ["nvidia"];
};
services = {
flatpak.enable = true;
printing.enable = true;
# Required for piper to work
ratbagd.enable = true;
xserver.videoDrivers = [ "nvidia" ];
};
}