Switch to nixfmt

This commit is contained in:
Dave Gallant
2024-07-28 08:26:07 -04:00
parent a009dd5fe4
commit 1bfd747ebb
13 changed files with 168 additions and 271 deletions

View File

@@ -1,10 +1,4 @@
{ config
, lib
, modulesPath
, pkgs
, unstable
, ...
}:
{ config, lib, modulesPath, pkgs, unstable, ... }:
let
gnomeExtensions = with pkgs.gnomeExtensions; [
appindicator
@@ -18,16 +12,17 @@ let
tailscale-status
tray-icons-reloaded
];
in
{
in {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
stylix = {
enable = true;
base16Scheme = "${unstable.base16-schemes}/share/themes/tokyo-night-dark.yaml";
base16Scheme =
"${unstable.base16-schemes}/share/themes/tokyo-night-dark.yaml";
image = pkgs.fetchurl {
url = "https://github.com/davegallant/nix-config/blob/main/nixos-wallpaper.png?raw=true";
url =
"https://github.com/davegallant/nix-config/blob/main/nixos-wallpaper.png?raw=true";
sha256 = "Ztqn9+CHslr6wZdnOTeo/YNi/ICerpcFLyMArsZ/PIY=";
};
polarity = "dark";
@@ -35,9 +30,7 @@ in
};
boot = {
extraModulePackages = with config.boot.kernelPackages; [
xpadneo
];
extraModulePackages = with config.boot.kernelPackages; [ xpadneo ];
kernelModules = [ "kvm-amd" ];
kernelPackages = pkgs.linuxPackages;
@@ -55,23 +48,15 @@ in
supportedFilesystems = [ "ntfs" ];
initrd = {
availableKernelModules = [
"ahci"
"nvme"
"sd_mod"
"usb_storage"
"usbhid"
"xhci_pci"
];
availableKernelModules =
[ "ahci" "nvme" "sd_mod" "usb_storage" "usbhid" "xhci_pci" ];
luks.devices."root" = {
allowDiscards = true;
device = "/dev/disk/by-uuid/21cd166c-1528-49a4-b31b-0d408d48aa80";
preLVM = true;
keyFile = "./keyfile0.bin";
};
secrets = {
"keyfile0.bin" = "/etc/secrets/initrd/keyfile0.bin";
};
secrets = { "keyfile0.bin" = "/etc/secrets/initrd/keyfile0.bin"; };
};
};
@@ -123,8 +108,7 @@ in
wine64
wireshark-qt
zoom-us
]
++ gnomeExtensions;
] ++ gnomeExtensions;
fileSystems = {
"/" = {
@@ -149,9 +133,8 @@ in
};
};
swapDevices = [
{ device = "/dev/disk/by-uuid/5d6d0388-2b15-4ff1-9f0f-391818a76090"; }
];
swapDevices =
[{ device = "/dev/disk/by-uuid/5d6d0388-2b15-4ff1-9f0f-391818a76090"; }];
nixpkgs = {
hostPlatform = "x86_64-linux";
@@ -164,9 +147,7 @@ in
networking = {
iproute2.enable = true;
hostName = "hephaestus";
interfaces.enp34s0 = {
useDHCP = true;
};
interfaces.enp34s0 = { useDHCP = true; };
firewall = {
allowPing = false;
enable = true;
@@ -175,18 +156,14 @@ in
};
};
systemd.services = {
NetworkManager-wait-online.enable = false;
};
systemd.services = { NetworkManager-wait-online.enable = false; };
system = {
autoUpgrade.enable = true;
stateVersion = "24.05";
};
nix = {
extraOptions = "experimental-features = nix-command flakes";
};
nix = { extraOptions = "experimental-features = nix-command flakes"; };
users.users.dave = {
isNormalUser = true;
@@ -200,7 +177,8 @@ in
hardware = {
opengl.enable = true;
cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
pulseaudio.enable = true;
# Vulkan
opengl.driSupport = true;

View File

@@ -1,8 +1,6 @@
{ pkgs, ... }:
let
checkBrew = "command -v brew > /dev/null";
in
{
let checkBrew = "command -v brew > /dev/null";
in {
nixpkgs = {
config = {
allowUnfree = true;
@@ -58,7 +56,7 @@ in
NSGlobalDomain = {
"com.apple.sound.beep.feedback" = 0;
"com.apple.sound.beep.volume" = 0.000;
"com.apple.sound.beep.volume" = 0.0;
ApplePressAndHoldEnabled = false;
InitialKeyRepeat = 10;
KeyRepeat = 2;
@@ -71,9 +69,7 @@ in
enable = true;
onActivation.autoUpdate = false;
onActivation.upgrade = false;
global = {
brewfile = true;
};
global = { brewfile = true; };
brews = [
"azure-cli"