From 4934d38771a62df7efd72445af99af8c44626f54 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sat, 18 Jan 2025 01:26:41 +0100
Subject: [PATCH] nixfmt
---
.../thilo-laptop/hardware-configuration.nix | 3 +-
configs/thilo-pc/hardware-configuration.nix | 44 +++++++++++--------
configs/thilo-pc/home.nix | 11 ++---
configs/thilo-pc/nixos.nix | 32 +++++++-------
flake.nix | 11 ++---
home-manager/modules/machine.nix | 2 +-
home-manager/modules/packages.nix | 4 +-
home-manager/programs/ssh.nix | 42 ++++++++++--------
nixos/builders.nix | 12 +++--
9 files changed, 91 insertions(+), 70 deletions(-)
diff --git a/configs/thilo-laptop/hardware-configuration.nix b/configs/thilo-laptop/hardware-configuration.nix
index d9441df..8bbf900 100644
--- a/configs/thilo-laptop/hardware-configuration.nix
+++ b/configs/thilo-laptop/hardware-configuration.nix
@@ -27,7 +27,8 @@
fsType = "ext4";
};
- boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device = "/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
+ boot.initrd.luks.devices."luks-6f077715-c436-4254-acb2-66d8be0a0c55".device =
+ "/dev/disk/by-uuid/6f077715-c436-4254-acb2-66d8be0a0c55";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/877C-C918";
diff --git a/configs/thilo-pc/hardware-configuration.nix b/configs/thilo-pc/hardware-configuration.nix
index 30c4bb2..f1ec164 100644
--- a/configs/thilo-pc/hardware-configuration.nix
+++ b/configs/thilo-pc/hardware-configuration.nix
@@ -9,27 +9,35 @@
}:
{
- imports =
- [ (modulesPath + "/installer/scan/not-detected.nix")
- ];
+ imports = [
+ (modulesPath + "/installer/scan/not-detected.nix")
+ ];
- boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+ boot.initrd.availableKernelModules = [
+ "nvme"
+ "xhci_pci"
+ "ahci"
+ "usbhid"
+ "usb_storage"
+ "sd_mod"
+ ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
- fileSystems."/" =
- { device = "/dev/disk/by-uuid/7b55546f-7bd5-4b46-b5b1-1c81fdd8509c";
- fsType = "ext4";
- };
-
- fileSystems."/boot" =
- {
- device = "/dev/disk/by-uuid/5A04-0844";
- fsType = "vfat";
- options = [ "fmask=0077" "dmask=0077" ];
- };
+ fileSystems."/" = {
+ device = "/dev/disk/by-uuid/7b55546f-7bd5-4b46-b5b1-1c81fdd8509c";
+ fsType = "ext4";
+ };
+ fileSystems."/boot" = {
+ device = "/dev/disk/by-uuid/5A04-0844";
+ fsType = "vfat";
+ options = [
+ "fmask=0077"
+ "dmask=0077"
+ ];
+ };
fileSystems = {
"/data" = {
@@ -39,9 +47,9 @@
};
};
- swapDevices =
- [ { device = "/dev/disk/by-uuid/da98aab4-f3a5-439b-aab5-b78624c219d3"; }
- ];
+ swapDevices = [
+ { device = "/dev/disk/by-uuid/da98aab4-f3a5-439b-aab5-b78624c219d3"; }
+ ];
# 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
diff --git a/configs/thilo-pc/home.nix b/configs/thilo-pc/home.nix
index 9381004..30f9a86 100644
--- a/configs/thilo-pc/home.nix
+++ b/configs/thilo-pc/home.nix
@@ -1,8 +1,9 @@
-{ inputs
-, pkgs
-, config
-, lib
-, ...
+{
+ inputs,
+ pkgs,
+ config,
+ lib,
+ ...
}:
{
diff --git a/configs/thilo-pc/nixos.nix b/configs/thilo-pc/nixos.nix
index b835734..0f84ce3 100644
--- a/configs/thilo-pc/nixos.nix
+++ b/configs/thilo-pc/nixos.nix
@@ -54,21 +54,23 @@
programs.kdeconnect.enable = true;
programs.nix-ld = {
enable = true;
- libraries = (pkgs.steam-run.args.multiPkgs pkgs) ++ (with pkgs; [
- nss
- sane-backends
- nspr
- zlib
- libglvnd
- qt5.qtbase
- qt5.qtsvg
- qt5.qtdeclarative
- qt5.qtwayland
- pkcs11helper
- stdenv.cc.cc
- freetype
+ libraries =
+ (pkgs.steam-run.args.multiPkgs pkgs)
+ ++ (with pkgs; [
+ nss
+ sane-backends
+ nspr
+ zlib
+ libglvnd
+ qt5.qtbase
+ qt5.qtsvg
+ qt5.qtdeclarative
+ qt5.qtwayland
+ pkcs11helper
+ stdenv.cc.cc
+ freetype
- stdenv.cc.cc
+ stdenv.cc.cc
openssl
xorg.libXcomposite
xorg.libXtst
@@ -150,7 +152,7 @@
libdrm
mesa
libxkbcommon
- ]);
+ ]);
};
hardware.opengl = {
diff --git a/flake.nix b/flake.nix
index 199a5df..0785c94 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,11 +46,12 @@
};
outputs =
- { nixpkgs
- , home-manager
- , nixgl
- , w17
- , ...
+ {
+ nixpkgs,
+ home-manager,
+ nixgl,
+ w17,
+ ...
}@inputs:
let
system = "x86_64-linux";
diff --git a/home-manager/modules/machine.nix b/home-manager/modules/machine.nix
index 22f9e03..0fa886a 100644
--- a/home-manager/modules/machine.nix
+++ b/home-manager/modules/machine.nix
@@ -85,7 +85,7 @@ with lib;
nixGL = {
packages = inputs.nixgl.packages;
defaultWrapper = "mesa";
- installScripts = ["mesa"];
+ installScripts = [ "mesa" ];
vulkan.enable = true;
};
diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index fb1bc0c..8ee3c58 100644
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -59,8 +59,8 @@ in
(callPackage ./../pkgs/toggl-time-grouper/package.nix { inherit python3Packages; })
(callPackage ./../pkgs/extract.nix { inherit pkgs; })
(pkgs.writeShellScriptBin "kitty-term-fix" ''
- infocmp -a xterm-kitty | ssh $1 tic -x -o \~/.terminfo /dev/stdin
- '')
+ infocmp -a xterm-kitty | ssh $1 tic -x -o \~/.terminfo /dev/stdin
+ '')
nixpkgs-fmt
ddev
act
diff --git a/home-manager/programs/ssh.nix b/home-manager/programs/ssh.nix
index dd123cb..de6eb14 100644
--- a/home-manager/programs/ssh.nix
+++ b/home-manager/programs/ssh.nix
@@ -22,7 +22,9 @@ let
user = "git";
identitiesOnly = true;
};
- "mail" = { hostname = "mail.officerent.de"; };
+ "mail" = {
+ hostname = "mail.officerent.de";
+ };
"*.tu-darmstadt.de" = {
identityFile = "~/.ssh/id_tu-darmstadt-de";
};
@@ -61,25 +63,21 @@ let
};
};
catchAlls = builtins.listToAttrs (
- builtins.map
- (host: {
- name = "*.${host}";
- value = {
- identityFile = "~/.ssh/id_thilo-billerbeck-com";
- user = "root";
- };
- })
- ownDomains
+ builtins.map (host: {
+ name = "*.${host}";
+ value = {
+ identityFile = "~/.ssh/id_thilo-billerbeck-com";
+ user = "root";
+ };
+ }) ownDomains
);
hostnameAliasses = builtins.listToAttrs (
- builtins.map
- (host: {
- name = "${host}";
- value = {
- hostname = "${host}.thilo-billerbeck.com";
- };
- })
- thiloBillerbeckHosts
+ builtins.map (host: {
+ name = "${host}";
+ value = {
+ hostname = "${host}.thilo-billerbeck.com";
+ };
+ }) thiloBillerbeckHosts
);
buildersCCCDA = builtins.listToAttrs (
builtins.map
@@ -89,7 +87,13 @@ let
user = "avocadoom";
identityFile = "~/.ssh/id_darmstadt-ccc-de";
};
- }) [ "1" "2" "3" "4" ]
+ })
+ [
+ "1"
+ "2"
+ "3"
+ "4"
+ ]
);
in
{
diff --git a/nixos/builders.nix b/nixos/builders.nix
index 0183f23..d450048 100644
--- a/nixos/builders.nix
+++ b/nixos/builders.nix
@@ -1,9 +1,13 @@
{
programs.ssh.knownHosts = {
- "build1.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/oyJPRwW3bJoWKtXSrVOiqMaKq+9yd03+N2PuCbMKv";
- "build2.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOZ7/eZLTfUD7Ejjio+8ivNFb8iyK1CD5Pq8uCDojT+z";
- "build3.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2D/SwJf46XCoim06lOyO42JqJiTeM8UMkT4bYluJJr";
- "build4.darmstadt.ccc.de".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDu9ZsbUYaCzzZv4vn22KrKi/R9pCfOEe4aYWyLd96C1";
+ "build1.darmstadt.ccc.de".publicKey =
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE/oyJPRwW3bJoWKtXSrVOiqMaKq+9yd03+N2PuCbMKv";
+ "build2.darmstadt.ccc.de".publicKey =
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOZ7/eZLTfUD7Ejjio+8ivNFb8iyK1CD5Pq8uCDojT+z";
+ "build3.darmstadt.ccc.de".publicKey =
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2D/SwJf46XCoim06lOyO42JqJiTeM8UMkT4bYluJJr";
+ "build4.darmstadt.ccc.de".publicKey =
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDu9ZsbUYaCzzZv4vn22KrKi/R9pCfOEe4aYWyLd96C1";
};
nix = {