formating

This commit is contained in:
Don Harper 2025-09-18 21:56:27 -05:00
parent 45c20d9cbe
commit 7016e89c79
12 changed files with 121 additions and 201 deletions

View file

@ -1,11 +1,5 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: let
{ inputs, outputs, lib, config, pkgs, ... }:
let
my-python-packages = python-packages:
with python-packages; [
# pipx
@ -24,7 +18,7 @@ in {
# experimental-features = ["nix-command" "flakes"];
warn-dirty = false;
auto-optimise-store = true;
trusted-users = ["root" "don"];
trusted-users = [ "root" "don" ];
};
gc = {
automatic = true;
@ -58,26 +52,23 @@ in {
networking = {
networkmanager.enable = true;
enableIPv6 = true;
networkmanager = {wifi = {powersave = true;};};
networkmanager = { wifi = { powersave = true; }; };
useDHCP = false;
firewall = {
enable = true;
trustedInterfaces = ["tailscale0"]; # always allow traffic from your Tailscale network
trustedInterfaces =
[ "tailscale0" ]; # always allow traffic from your Tailscale network
checkReversePath = "loose";
allowedUDPPorts = [config.services.tailscale.port];
allowedTCPPortRanges = [
{
from = 1714;
to = 1764;
}
];
allowedUDPPortRanges = [
{
from = 1714;
to = 1764;
}
];
allowedTCPPorts = [22];
allowedUDPPorts = [ config.services.tailscale.port ];
allowedTCPPortRanges = [{
from = 1714;
to = 1764;
}];
allowedUDPPortRanges = [{
from = 1714;
to = 1764;
}];
allowedTCPPorts = [ 22 ];
};
};
@ -93,7 +84,7 @@ in {
inputMethod = {
enable = true;
type = "fcitx5";
fcitx5.addons = with pkgs; [fcitx5-mozc fcitx5-gtk];
fcitx5.addons = with pkgs; [ fcitx5-mozc fcitx5-gtk ];
};
};
@ -101,38 +92,33 @@ in {
boot = {
# kernelPackages = pkgs.linuxPackages_latest;
kernelPackages = pkgs.linuxPackages_zen;
kernelParams = ["consoleblank=60" "mem_sleep_default=deep"];
kernelParams = [ "consoleblank=60" "mem_sleep_default=deep" ];
# extraModulePackages = [config.boot.kernelPackages.ddcci-driver];
# kernelModules = ["i2c-dev" "ddcci_backlight"];
loader =
if (pkgs.hostPlatform != lib.mkDefault "aarch64-linux")
then {
systemd-boot = {enable = true;};
efi = {
canTouchEfiVariables = true;
efiSysMountPoint = "/boot";
};
}
else {
grub.enable = false;
generic-extlinux-compatible.enable = true;
loader = if (pkgs.hostPlatform != lib.mkDefault "aarch64-linux") then {
systemd-boot = { enable = true; };
efi = {
canTouchEfiVariables = true;
efiSysMountPoint = "/boot";
};
plymouth = {enable = true;};
kernel = {sysctl = {"vm.swappiness" = 10;};};
} else {
grub.enable = false;
generic-extlinux-compatible.enable = true;
};
plymouth = { enable = true; };
kernel = { sysctl = { "vm.swappiness" = 10; }; };
};
security = {
polkit = {enable = true;};
polkit = { enable = true; };
sudo.enable = false;
doas = {
enable = true;
extraRules = [
{
users = ["don"];
keepEnv = true;
noPass = true;
}
];
extraRules = [{
users = [ "don" ];
keepEnv = true;
noPass = true;
}];
};
};
@ -149,15 +135,17 @@ in {
userServices = true;
};
};
bpftune = {enable = true;};
flatpak = {enable = true;};
fstrim = {enable = true;};
fwupd = {enable = true;};
bpftune = { enable = true; };
flatpak = { enable = true; };
fstrim = { enable = true; };
fwupd = { enable = true; };
locate = {
enable = true;
package = pkgs.mlocate;
};
logind = {
lidSwitchDocked = "ignore";
lidSwitchExternalPower = "ignore";
settings = {
Login = {
HandleLidSwitchDocked = "ignore";
@ -165,7 +153,7 @@ in {
};
};
};
nscd = {enableNsncd = true;};
nscd = { enableNsncd = true; };
openssh = {
enable = true;
settings = {
@ -173,34 +161,34 @@ in {
KbdInteractiveAuthentication = false;
};
};
pcscd = {enable = true;};
pcscd = { enable = true; };
pipewire = {
enable = true;
alsa = {
enable = true;
support32Bit = true;
};
pulse = {enable = true;};
pulse = { enable = true; };
};
printing = {
enable = true;
drivers = [pkgs.hplipWithPlugin];
drivers = [ pkgs.hplipWithPlugin ];
};
pulseaudio = {enable = false;};
tailscale = {enable = true;};
pulseaudio = { enable = false; };
tailscale = { enable = true; };
udev = {
extraRules = ''
ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ENV{ID_FS_TYPE}=="ext4", ATTR{../queue/scheduler}="none" '';
};
udisks2 = {enable = true;};
udisks2 = { enable = true; };
};
hardware = {
bluetooth = {enable = true;};
bluetooth = { enable = true; };
sane = {
enable = true;
extraBackends = [pkgs.sane-airscan];
disabledDefaultBackends = ["escl" "v4l"];
extraBackends = [ pkgs.sane-airscan ];
disabledDefaultBackends = [ "escl" "v4l" ];
};
};
security.rtkit.enable = true;
@ -227,7 +215,8 @@ in {
isNormalUser = true;
initialPassword = "changeme";
description = "Don Harper";
extraGroups = ["networkmanager" "wheel" "scanner" "lp" "video" "mlocate" "disk"];
extraGroups =
[ "networkmanager" "wheel" "scanner" "lp" "video" "mlocate" "disk" ];
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki"
];
@ -246,9 +235,9 @@ in {
config = {
allowUnfree = true;
allowUnfreePredicate = true;
permittedInsecurePackages = ["libsoup-2.74.3" "qtwebengine-5.15.19"];
permittedInsecurePackages = [ "libsoup-2.74.3" "qtwebengine-5.15.19" ];
allowInsecurePredicate = pkg:
builtins.elem (lib.getName pkg) ["broadcom-sta"];
builtins.elem (lib.getName pkg) [ "broadcom-sta" ];
};
};
@ -321,10 +310,10 @@ in {
];
programs = {
dconf = {enable = true;};
light = {enable = true;};
mtr = {enable = true;};
kdeconnect = {enable = true;};
dconf = { enable = true; };
light = { enable = true; };
mtr = { enable = true; };
kdeconnect = { enable = true; };
gnupg = {
agent = {
enable = true;
@ -336,14 +325,14 @@ in {
nixpkgs.overlays = [
(final: prev: {
qutebrowser = prev.qutebrowser.override {enableWideVine = true;};
qutebrowser = prev.qutebrowser.override { enableWideVine = true; };
})
(final: super: {
khal = super.khal.overridePythonAttrs (_: {doCheck = false;});
khal = super.khal.overridePythonAttrs (_: { doCheck = false; });
})
];
nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
@ -374,5 +363,6 @@ in {
"x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
"x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
};
environment.sessionVariables.DEFAULT_BROWSER = "${pkgs.qutebrowser}/bin/qutebrowser";
environment.sessionVariables.DEFAULT_BROWSER =
"${pkgs.qutebrowser}/bin/qutebrowser";
}