style: format all nix files with nixfmt

This commit is contained in:
2026-10-01 11:40:12 +02:00
parent 4ec579b1fc
commit 2231d2fc3f
21 changed files with 288 additions and 159 deletions
+13 -5
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
email = "aaron@0x29a.ch";
@@ -14,15 +19,18 @@ in
{
# gitea verifies signatures against the account keys, this teaches the local
# git the same trust so `git log --show-signature` resolves as well
xdg.configFile."git/allowed_signers".text =
lib.concatMapStrings (key: "${email} ${key}\n") signingKeys;
xdg.configFile."git/allowed_signers".text = lib.concatMapStrings (
key: "${email} ${key}\n"
) signingKeys;
programs.git = {
enable = true;
settings = {
push = { autoSetupRemote = true; };
push = {
autoSetupRemote = true;
};
user = {
name = "aaron";
name = "aaron";
inherit email;
};
gpg.ssh.allowedSignersFile = "${config.xdg.configHome}/git/allowed_signers";
+11 -3
View File
@@ -57,7 +57,7 @@
servers.pyright.enable = true;
servers.ruff.enable = true;
keymaps.lspBuf = {
"<leader>K" = "hover";
"<leader>K" = "hover";
"<leader>gd" = "definition";
"<leader>gr" = "references";
"<leader>f" = "format";
@@ -67,7 +67,11 @@
};
plugins.treesitter = {
enable = true;
settings.ensure_installed = [ "markdown" "markdown_inline" "typst" ];
settings.ensure_installed = [
"markdown"
"markdown_inline"
"typst"
];
};
plugins.typst-preview = {
enable = true;
@@ -87,7 +91,11 @@
enable = true;
settings = {
# render in normal mode, raw source in insert
render_modes = [ "n" "c" "t"];
render_modes = [
"n"
"c"
"t"
];
pipe_table.preset = "round";
heading.width = "block";
file_types = [ "markdown" ];
+21 -4
View File
@@ -12,7 +12,7 @@
# Use the package from the noctalia flake rather than nixpkgs.
package = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default;
# settings is rendered to ~/.config/noctalia/config.toml
# settings is rendered to ~/.config/noctalia/config.toml
settings = {
# theme / colors
theme = {
@@ -73,9 +73,22 @@
radius = 0;
scale = 1.2;
widget_spacing = 20;
start = [ "control-center" "cpu" "ram" "temp" "active_window" ];
start = [
"control-center"
"cpu"
"ram"
"temp"
"active_window"
];
center = [ "workspaces" ];
end = [ "tray" "bluetooth" "notifications" "volume" "network" "clock" ];
end = [
"tray"
"bluetooth"
"notifications"
"volume"
"network"
"clock"
];
};
};
@@ -103,7 +116,11 @@
# idle behavior
idle = {
behavior_order = [ "screen-off" "lock" "lock-and-suspend" ];
behavior_order = [
"screen-off"
"lock"
"lock-and-suspend"
];
behavior = {
"screen-off" = {
enabled = true;
+5 -1
View File
@@ -9,7 +9,11 @@
oh-my-zsh = {
enable = true;
# add git and agents as plugins
plugins = [ "git" "ssh-agent" "gpg-agent" ];
plugins = [
"git"
"ssh-agent"
"gpg-agent"
];
# everything here lands before `source $ZSH/oh-my-zsh.sh`
extraConfig = ''
# make omz faster on large repositories
+2 -2
View File
@@ -6,8 +6,8 @@
enable = true;
theme = {
name = "Adwaita-dark";
package = pkgs.gnome-themes-extra;
};
package = pkgs.gnome-themes-extra;
};
gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
gtk4.theme = null;
gtk4.extraConfig.gtk-application-prefer-dark-theme = 1;
+30 -25
View File
@@ -36,30 +36,35 @@ let
wrapProgram $out/bin/siril \
--prefix PATH : /etc/siril/bin \
--prefix QT_PLUGIN_PATH : ${pkgs.adwaita-qt6}/lib/qt-6/plugins \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath (with pkgs; [
stdenv.cc.cc.lib # libstdc++ / libgcc_s / libgomp (numpy etc.)
zlib
zstd # libzstd.so.1 (PyQt6)
libGL # libGL.so.1 (PyQt6)
# PyQt6 (VeraLux) — Qt bundles xcb support so it needs these even
# on Wayland; libxkbcommon is the keymap lib used by Wayland too.
glib
fontconfig
freetype
dbus
libxkbcommon
# Qt platform plugins: the wayland plugin (libqwayland.so) needs the
# wayland client libs; the xcb fallback needs libxcb-cursor.so.0.
wayland # libwayland-client/cursor/egl (wayland plugin)
libxcb-cursor # libxcb-cursor.so.0 (xcb plugin)
libx11
libxcb
libxcb-util
libxcb-wm
libxcb-image
libxcb-keysyms
libxcb-render-util
])}
--prefix LD_LIBRARY_PATH : ${
lib.makeLibraryPath (
with pkgs;
[
stdenv.cc.cc.lib # libstdc++ / libgcc_s / libgomp (numpy etc.)
zlib
zstd # libzstd.so.1 (PyQt6)
libGL # libGL.so.1 (PyQt6)
# PyQt6 (VeraLux) — Qt bundles xcb support so it needs these even
# on Wayland; libxkbcommon is the keymap lib used by Wayland too.
glib
fontconfig
freetype
dbus
libxkbcommon
# Qt platform plugins: the wayland plugin (libqwayland.so) needs the
# wayland client libs; the xcb fallback needs libxcb-cursor.so.0.
wayland # libwayland-client/cursor/egl (wayland plugin)
libxcb-cursor # libxcb-cursor.so.0 (xcb plugin)
libx11
libxcb
libxcb-util
libxcb-wm
libxcb-image
libxcb-keysyms
libxcb-render-util
]
)
}
'';
};
in
@@ -84,7 +89,7 @@ in
# run it. Its own opencv/onnxruntime libs are found via the bundled ./lib.
programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [
stdenv.cc.cc.lib # libstdc++ / libgcc_s
stdenv.cc.cc.lib # libstdc++ / libgcc_s
zlib
];
}
+2 -2
View File
@@ -1,7 +1,7 @@
{
# enable sound through pipewire
services.pipewire = {
enable = true;
pulse.enable = true;
enable = true;
pulse.enable = true;
};
}
+5 -2
View File
@@ -9,7 +9,7 @@
# enable systemd initrd
boot.initrd.systemd.enable = true;
# plymouth
boot.plymouth = {
enable = true;
@@ -17,7 +17,10 @@
};
# kernel options
boot.kernelParams = [ "quiet" "acpi.debug_level=0" ];
boot.kernelParams = [
"quiet"
"acpi.debug_level=0"
];
boot.kernelPackages = pkgs.linuxPackages_latest;
boot.consoleLogLevel = 2;
+5 -2
View File
@@ -1,4 +1,4 @@
{ pkgs, ...}:
{ pkgs, ... }:
{
# add docker group to user
@@ -8,7 +8,10 @@
enable = true;
# Customize Docker daemon settings
daemon.settings = {
dns = [ "1.1.1.1" "8.8.8.8" ];
dns = [
"1.1.1.1"
"8.8.8.8"
];
log-driver = "journald";
registry-mirrors = [ "https://mirror.gcr.io" ];
storage-driver = "overlay2";
+1 -1
View File
@@ -11,7 +11,7 @@
environment.systemPackages = with pkgs; [
amdgpu_top
];
# add amdgpu to the initrd for plymouth
hardware.amdgpu.initrd.enable = true;
}
+1 -1
View File
@@ -13,7 +13,7 @@
# enable bluetooth
hardware.bluetooth.enable = true;
# Add network-related packages
environment.systemPackages = with pkgs; [
wireguard-tools
+12 -6
View File
@@ -3,13 +3,16 @@
# nix settings
settings = {
# enable flakes and nix-command
experimental-features = [ "nix-command" "flakes" ];
experimental-features = [
"nix-command"
"flakes"
];
# auto-optimize my nix-store
auto-optimise-store = true;
# use all cores
max-jobs = "auto";
max-jobs = "auto";
# use all available cores per job
cores = 0;
cores = 0;
# add trusted substituters (binary caches)
substituters = [
"https://cache.nixos.org"
@@ -21,7 +24,7 @@
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};
# enable automatic garbage collection
gc = {
automatic = true;
@@ -29,9 +32,12 @@
options = "--delete-older-than 7d";
};
};
# add trusted users (able to modify the nix store)
nix.settings.trusted-users = [ "root" "@wheel" ];
nix.settings.trusted-users = [
"root"
"@wheel"
];
# allow unfree packages (steam, protonvpn, discord, etc.)
nixpkgs.config.allowUnfree = true;
+5 -1
View File
@@ -5,7 +5,11 @@
users.users.aaron = {
isNormalUser = true;
group = "users";
extraGroups = [ "wheel" "networkmanager" "dialout" ];
extraGroups = [
"wheel"
"networkmanager"
"dialout"
];
shell = pkgs.zsh;
};