treewide: format using nixfmt
Signed-off-by: Bloxx12 <charlie@charlieroot.dev> Change-Id: I6a6a69641c36f9763e104087a559c148d0449f00
This commit is contained in:
parent
f4464732e3
commit
e641dfa114
SSH key fingerprint:
SHA256:jpYIt4Vkz1NBTQcks/N9OPTfTFxE6KF2W/rV7hrfrIw
113 changed files with 1545 additions and 1019 deletions
|
|
@ -8,16 +8,17 @@
|
|||
pkgs,
|
||||
sources,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (lib.meta) hiPrioSet;
|
||||
helix = pkgs.callPackage (self + "/packages/helix") {inherit sources;};
|
||||
helix = pkgs.callPackage (self + "/packages/helix") { inherit sources; };
|
||||
|
||||
fish = pkgs.callPackage (self + "/packages/fish") {inherit sources;};
|
||||
in {
|
||||
fish = pkgs.callPackage (self + "/packages/fish") { inherit sources; };
|
||||
in
|
||||
{
|
||||
environment.systemPackages =
|
||||
builtins.attrValues {
|
||||
inherit
|
||||
(pkgs)
|
||||
inherit (pkgs)
|
||||
cachix
|
||||
calc
|
||||
delta
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
nixpkgs,
|
||||
self,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
inherit (builtins) filter map toString;
|
||||
inherit (nixpkgs) lib;
|
||||
inherit (lib.attrsets) recursiveUpdate;
|
||||
|
|
@ -14,20 +15,18 @@
|
|||
# NOTE: This was inspired by raf, and I find this
|
||||
# to be quite a sane way of managing all modules in my flake.
|
||||
|
||||
mkSystem = {
|
||||
system,
|
||||
hostname,
|
||||
...
|
||||
} @ args:
|
||||
mkSystem =
|
||||
{
|
||||
system,
|
||||
hostname,
|
||||
...
|
||||
}@args:
|
||||
nixosSystem {
|
||||
specialArgs =
|
||||
recursiveUpdate
|
||||
{
|
||||
inherit lib;
|
||||
inputs = sources;
|
||||
inherit self;
|
||||
}
|
||||
args.specialArgs or {};
|
||||
specialArgs = recursiveUpdate {
|
||||
inherit lib;
|
||||
inputs = sources;
|
||||
inherit self;
|
||||
} args.specialArgs or { };
|
||||
modules = concatLists [
|
||||
# This is used to pre-emptively set the hostPlatform for nixpkgs.
|
||||
# Also, we set the system hostname here.
|
||||
|
|
@ -42,20 +41,15 @@
|
|||
# common configuration, which all hosts share.
|
||||
(singleton ./common.nix)
|
||||
# Import all files called module.nix from my modules directory.
|
||||
(
|
||||
map toString (listFilesRecursive ../modules)
|
||||
|> filter (hasSuffix "module.nix")
|
||||
)
|
||||
(
|
||||
map toString (listFilesRecursive ../modules)
|
||||
|> filter (hasSuffix ".mod.nix")
|
||||
)
|
||||
(map toString (listFilesRecursive ../modules) |> filter (hasSuffix "module.nix"))
|
||||
(map toString (listFilesRecursive ../modules) |> filter (hasSuffix ".mod.nix"))
|
||||
]
|
||||
|> flatten
|
||||
)
|
||||
];
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
temperance = mkSystem {
|
||||
system = "x86_64-linux";
|
||||
hostname = "temperance";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
# Time Zone
|
||||
time.timeZone = "Europe/Zurich";
|
||||
# Select internationalisation properties.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
config = {
|
||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/10318654-ed20-43f6-885d-35366a427581";
|
||||
boot.initrd.luks.devices."cryptroot".device =
|
||||
"/dev/disk/by-uuid/10318654-ed20-43f6-885d-35366a427581";
|
||||
fileSystems = {
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-uuid/5D7D-FC52";
|
||||
|
|
@ -10,17 +11,28 @@
|
|||
"/" = {
|
||||
device = "/dev/disk/by-uuid/e353013b-8ac7-40ed-80f2-ddbea21b8d5e";
|
||||
fsType = "btrfs";
|
||||
options = ["compress=zstd" "noatime"];
|
||||
options = [
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
"/nix" = {
|
||||
device = "/dev/disk/by-uuid/e353013b-8ac7-40ed-80f2-ddbea21b8d5e";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=nix" "compress=zstd" "noatime"];
|
||||
options = [
|
||||
"subvol=nix"
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
"/home" = {
|
||||
device = "/dev/disk/by-uuid/e353013b-8ac7-40ed-80f2-ddbea21b8d5e";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=home" "compress=zstd" "noatime"];
|
||||
options = [
|
||||
"subvol=home"
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
};
|
||||
# swapDevices = [
|
||||
|
|
|
|||
|
|
@ -6,21 +6,34 @@
|
|||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot = {
|
||||
initrd = {
|
||||
availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
|
||||
kernelModules = [];
|
||||
availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"nvme"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
"rtsx_pci_sdmmc"
|
||||
];
|
||||
kernelModules = [ ];
|
||||
};
|
||||
kernelModules = ["kvm-intel"];
|
||||
blacklistedKernelModules = ["nouveau" "nvidia" "nvidia_drm" "nvidia_modeset"];
|
||||
kernelModules = [ "kvm-intel" ];
|
||||
blacklistedKernelModules = [
|
||||
"nouveau"
|
||||
"nvidia"
|
||||
"nvidia_drm"
|
||||
"nvidia_modeset"
|
||||
];
|
||||
|
||||
kernelParams = ["mem_sleep_default=deep"];
|
||||
extraModulePackages = [];
|
||||
kernelParams = [ "mem_sleep_default=deep" ];
|
||||
extraModulePackages = [ ];
|
||||
extraModprobeConfig = ''
|
||||
blacklist nouveau
|
||||
options nouveau modeset=0
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
_: {imports = [./monitors.nix];}
|
||||
_: { imports = [ ./monitors.nix ]; }
|
||||
|
|
|
|||
|
|
@ -3,8 +3,10 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
xanmod_custom = callPackage ./xanmod.nix;
|
||||
in {
|
||||
in
|
||||
{
|
||||
boot.kernelPackages = xanmod_custom;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{pkgs, ...}: let
|
||||
{ pkgs, ... }:
|
||||
let
|
||||
# a newer nil version, for pipes support.
|
||||
new-nil = pkgs.nil.overrideAttrs (_: {
|
||||
version = "unstable-18-07-2025";
|
||||
|
|
@ -17,10 +18,10 @@
|
|||
hash = "sha256-Sljr3ff8hl/qm/0wqc1GXsEr1wWn7NAXmdrd5wHzUX8=";
|
||||
};
|
||||
});
|
||||
in {
|
||||
in
|
||||
{
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit
|
||||
(pkgs)
|
||||
inherit (pkgs)
|
||||
abook
|
||||
aerc
|
||||
aichat
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
# Time Zone
|
||||
time.timeZone = "Europe/Zurich";
|
||||
# Select internationalisation properties.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
config = {
|
||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/96e8f3d6-8d2d-4e2d-abd9-3eb7f48fed02";
|
||||
boot.initrd.luks.devices."cryptroot".device =
|
||||
"/dev/disk/by-uuid/96e8f3d6-8d2d-4e2d-abd9-3eb7f48fed02";
|
||||
fileSystems = {
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-uuid/B3AC-9050";
|
||||
|
|
@ -10,29 +11,49 @@
|
|||
"/" = {
|
||||
device = "none";
|
||||
fsType = "tmpfs";
|
||||
options = ["defaults" "size=40%" "mode=755"];
|
||||
options = [
|
||||
"defaults"
|
||||
"size=40%"
|
||||
"mode=755"
|
||||
];
|
||||
};
|
||||
"/nix" = {
|
||||
device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=nix" "compress=zstd" "noatime"];
|
||||
options = [
|
||||
"subvol=nix"
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
"/persist" = {
|
||||
device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548";
|
||||
neededForBoot = true;
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=persist" "compress=zstd" "noatime"];
|
||||
options = [
|
||||
"subvol=persist"
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
"/home" = {
|
||||
device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=home" "compress=zstd" "noatime"];
|
||||
options = [
|
||||
"subvol=home"
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
"/swap" = {
|
||||
device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548";
|
||||
fsType = "btrfs";
|
||||
|
||||
options = ["subvol=swap" "compress=lzo" "noatime"];
|
||||
options = [
|
||||
"subvol=swap"
|
||||
"compress=lzo"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
};
|
||||
swapDevices = [
|
||||
|
|
|
|||
|
|
@ -3,14 +3,21 @@
|
|||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [(modulesPath + "/installer/scan/not-detected.nix")];
|
||||
}:
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
boot = {
|
||||
initrd.availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "sd_mod"];
|
||||
initrd.kernelModules = [];
|
||||
kernelModules = [];
|
||||
extraModulePackages = [];
|
||||
initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"nvme"
|
||||
"usbhid"
|
||||
"sd_mod"
|
||||
];
|
||||
initrd.kernelModules = [ ];
|
||||
kernelModules = [ ];
|
||||
extraModulePackages = [ ];
|
||||
};
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
|
|
@ -21,6 +28,5 @@
|
|||
# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
_: {imports = [./monitors.nix];}
|
||||
_: { imports = [ ./monitors.nix ]; }
|
||||
|
|
|
|||
|
|
@ -3,8 +3,10 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
xanmod_custom = callPackage ./xanmod.nix;
|
||||
in {
|
||||
in
|
||||
{
|
||||
boot.kernelPackages = xanmod_custom;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,10 @@
|
|||
{lib, ...}: let
|
||||
{ lib, ... }:
|
||||
let
|
||||
inherit (lib.kernel) no unset;
|
||||
inherit (lib.attrsets) mapAttrs;
|
||||
inherit (lib.modules) mkForce;
|
||||
in {
|
||||
in
|
||||
{
|
||||
boot.kernelPatches = [
|
||||
{
|
||||
name = "disable-unused-features";
|
||||
|
|
|
|||
|
|
@ -4,7 +4,8 @@
|
|||
buildLinux,
|
||||
kernelPatches,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
pname = "linux-xanmod";
|
||||
version = "6.11.5";
|
||||
vendorSuffix = "xanmod1";
|
||||
|
|
@ -58,17 +59,17 @@
|
|||
};
|
||||
})
|
||||
# 1:1 taken from raf's custom kernel, check out his config for this.
|
||||
.overrideAttrs (oa: {
|
||||
prePatch =
|
||||
oa.prePatch or ""
|
||||
+ ''
|
||||
.overrideAttrs
|
||||
(oa: {
|
||||
prePatch = oa.prePatch or "" + ''
|
||||
# bragging rights
|
||||
echo "Replacing localversion with custom suffix"
|
||||
substituteInPlace localversion \
|
||||
--replace-fail "xanmod1" "blox"
|
||||
'';
|
||||
});
|
||||
in {
|
||||
});
|
||||
in
|
||||
{
|
||||
inherit
|
||||
xanmod_blox
|
||||
;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit
|
||||
(pkgs)
|
||||
inherit (pkgs)
|
||||
alsa-utils
|
||||
anki
|
||||
asciinema
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
# Time Zone
|
||||
time.timeZone = "Europe/Vienna";
|
||||
# Select internationalisation properties.
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
"/" = {
|
||||
device = "/dev/disk/by-uuid/3a781f2e-290a-4609-9035-a93374459def";
|
||||
fsType = "ext4";
|
||||
options = ["noatime"];
|
||||
options = [ "noatime" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,19 +2,24 @@
|
|||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
(modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
|
||||
boot = {
|
||||
initrd.availableKernelModules = ["xhci_pci" "virtio_scsi" "sr_mod"];
|
||||
initrd.kernelModules = [];
|
||||
kernelModules = [];
|
||||
extraModulePackages = [];
|
||||
initrd.availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"virtio_scsi"
|
||||
"sr_mod"
|
||||
];
|
||||
initrd.kernelModules = [ ];
|
||||
kernelModules = [ ];
|
||||
extraModulePackages = [ ];
|
||||
};
|
||||
|
||||
swapDevices = [];
|
||||
swapDevices = [ ];
|
||||
|
||||
# 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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{pkgs, ...}: {
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit
|
||||
(pkgs)
|
||||
inherit (pkgs)
|
||||
;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,8 @@
|
|||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
# Time Zone
|
||||
time.timeZone = "Europe/Zurich";
|
||||
# Select internationalisation properties.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
config = {
|
||||
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/10318654-ed20-43f6-885d-35366a427581";
|
||||
boot.initrd.luks.devices."cryptroot".device =
|
||||
"/dev/disk/by-uuid/10318654-ed20-43f6-885d-35366a427581";
|
||||
fileSystems = {
|
||||
"/boot" = {
|
||||
device = "/dev/disk/by-uuid/5D7D-FC52";
|
||||
|
|
@ -10,17 +11,28 @@
|
|||
"/" = {
|
||||
device = "/dev/disk/by-uuid/e353013b-8ac7-40ed-80f2-ddbea21b8d5e";
|
||||
fsType = "btrfs";
|
||||
options = ["compress=zstd" "noatime"];
|
||||
options = [
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
"/nix" = {
|
||||
device = "/dev/disk/by-uuid/e353013b-8ac7-40ed-80f2-ddbea21b8d5e";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=nix" "compress=zstd" "noatime"];
|
||||
options = [
|
||||
"subvol=nix"
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
"/home" = {
|
||||
device = "/dev/disk/by-uuid/e353013b-8ac7-40ed-80f2-ddbea21b8d5e";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=home" "compress=zstd" "noatime"];
|
||||
options = [
|
||||
"subvol=home"
|
||||
"compress=zstd"
|
||||
"noatime"
|
||||
];
|
||||
};
|
||||
};
|
||||
# swapDevices = [
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@
|
|||
lib,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
# (modulesPath + "/installer/cd-dvd/installation-cd-minimal.nix")
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
|
|
@ -11,14 +12,26 @@
|
|||
|
||||
boot = {
|
||||
initrd = {
|
||||
availableKernelModules = ["xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
|
||||
kernelModules = [];
|
||||
availableKernelModules = [
|
||||
"xhci_pci"
|
||||
"ahci"
|
||||
"nvme"
|
||||
"usb_storage"
|
||||
"sd_mod"
|
||||
"rtsx_pci_sdmmc"
|
||||
];
|
||||
kernelModules = [ ];
|
||||
};
|
||||
kernelModules = ["kvm-intel"];
|
||||
blacklistedKernelModules = ["nouveau" "nvidia" "nvidia_drm" "nvidia_modeset"];
|
||||
kernelModules = [ "kvm-intel" ];
|
||||
blacklistedKernelModules = [
|
||||
"nouveau"
|
||||
"nvidia"
|
||||
"nvidia_drm"
|
||||
"nvidia_modeset"
|
||||
];
|
||||
|
||||
kernelParams = ["mem_sleep_default=deep"];
|
||||
extraModulePackages = [];
|
||||
kernelParams = [ "mem_sleep_default=deep" ];
|
||||
extraModulePackages = [ ];
|
||||
extraModprobeConfig = ''
|
||||
blacklist nouveau
|
||||
options nouveau modeset=0
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
_: {imports = [./monitors.nix];}
|
||||
_: { imports = [ ./monitors.nix ]; }
|
||||
|
|
|
|||
|
|
@ -2,10 +2,10 @@
|
|||
self,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
}:
|
||||
{
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit
|
||||
(pkgs)
|
||||
inherit (pkgs)
|
||||
calc
|
||||
comma
|
||||
difftastic
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue