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,9 +1,4 @@
{
pkgs,
inputs,
osConfig,
...
}: {
{ pkgs, inputs, osConfig, ... }: {
imports = [
./aerc.nix
./bash.nix
@ -119,7 +114,8 @@
programs.keychain = {
enable = true;
enableBashIntegration = true;
keys = "id_aur id_dsa id_ed25519 git C7E41C9F79C846984163693FCCD8E76F07EA701B";
keys =
"id_aur id_dsa id_ed25519 git C7E41C9F79C846984163693FCCD8E76F07EA701B";
};
home.file.".links/links.cfg".source = files/links.cfg;
xdg.configFile."nix/nix.conf".text = ''

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{ inputs, outputs, lib, config, pkgs, ... }: {
imports = [
./hardware-configuration.nix
# ../disko/mmcblk.nix
@ -18,7 +11,5 @@
gui.enable = true;
kmscon.enable = true;
};
wm = {
sway.enable = true;
};
wm = { sway.enable = true; };
}

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{ inputs, outputs, lib, config, pkgs, ... }: {
imports = [
inputs.nixos-hardware.nixosModules.google-pixelbook
./hardware-configuration.nix
@ -24,7 +17,5 @@
auto-cpufreq.enable = true;
gnome-calendar.enable = true;
};
wm = {
sway.enable = true;
};
wm = { sway.enable = true; };
}

View file

@ -1,9 +1,4 @@
{
inputs,
config,
pkgs,
...
}: {
{ inputs, config, pkgs, ... }: {
imports = [
./hardware-configuration.nix
inputs.nixos-hardware.nixosModules.common-cpu-intel
@ -20,7 +15,5 @@
kmscon.enable = true;
auto-cpufreq.enable = true;
};
wm = {
sway.enable = true;
};
wm = { sway.enable = true; };
}

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{ inputs, outputs, lib, config, pkgs, ... }: {
imports = [
inputs.nixos-hardware.nixosModules.google-pixelbook
./hardware-configuration.nix
@ -21,7 +14,5 @@
kmscon.enable = true;
auto-cpufreq.enable = true;
};
wm = {
sway.enable = true;
};
wm = { sway.enable = true; };
}

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{ inputs, outputs, lib, config, pkgs, ... }: {
imports = [
inputs.nixos-hardware.nixosModules.framework-amd-ai-300-series
./hardware-configuration.nix
@ -27,7 +20,5 @@
gnome-calendar.enable = true;
};
primary.enable = true;
wm = {
sway.enable = true;
};
wm = { sway.enable = true; };
}

View file

@ -10,10 +10,6 @@
networking.hostName = "pocket2";
variables.swayScale = "1.7";
roles = {
gui.enable = true;
};
wm = {
sway.enable = true;
};
roles = { gui.enable = true; };
wm = { sway.enable = true; };
}

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{ inputs, outputs, lib, config, pkgs, ... }: {
imports = [
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x260
inputs.nixos-hardware.nixosModules.common-pc-laptop
@ -24,7 +17,5 @@
auto-cpufreq.enable = true;
gnome-calendar.enable = true;
};
wm = {
sway.enable = true;
};
wm = { sway.enable = true; };
}

View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{ inputs, outputs, lib, config, pkgs, ... }: {
imports = [
./hardware-configuration.nix
# ../disko/mmcblk.nix

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
@ -62,21 +56,18 @@ in {
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 = [
{
allowedTCPPortRanges = [{
from = 1714;
to = 1764;
}
];
allowedUDPPortRanges = [
{
}];
allowedUDPPortRanges = [{
from = 1714;
to = 1764;
}
];
}];
allowedTCPPorts = [ 22 ];
};
};
@ -104,16 +95,13 @@ in {
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 {
loader = if (pkgs.hostPlatform != lib.mkDefault "aarch64-linux") then {
systemd-boot = { enable = true; };
efi = {
canTouchEfiVariables = true;
efiSysMountPoint = "/boot";
};
}
else {
} else {
grub.enable = false;
generic-extlinux-compatible.enable = true;
};
@ -126,13 +114,11 @@ in {
sudo.enable = false;
doas = {
enable = true;
extraRules = [
{
extraRules = [{
users = [ "don" ];
keepEnv = true;
noPass = true;
}
];
}];
};
};
@ -158,6 +144,8 @@ in {
package = pkgs.mlocate;
};
logind = {
lidSwitchDocked = "ignore";
lidSwitchExternalPower = "ignore";
settings = {
Login = {
HandleLidSwitchDocked = "ignore";
@ -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"
];
@ -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";
}

View file

@ -1,11 +1,6 @@
{
pkgs,
lib,
config,
...
}:
with lib; let
cfg = config.primary;
{ pkgs, lib, config, ... }:
with lib;
let cfg = config.primary;
in {
options.primary = { enable = mkEnableOption "is primary host"; };
config = mkIf cfg.enable {
@ -17,7 +12,8 @@ in {
unitConfig = { Type = "simple"; };
serviceConfig = {
Type = "oneshot";
Environment = "PATH=/run/current-system/sw/bin:/etc/profiles/per-user/don/bin:/home/don/bin";
Environment =
"PATH=/run/current-system/sw/bin:/etc/profiles/per-user/don/bin:/home/don/bin";
ExecStart = "/home/don/bin/do_agenda";
};
};
@ -26,7 +22,8 @@ in {
unitConfig = { Type = "simple"; };
serviceConfig = {
Type = "oneshot";
Environment = "PATH=/run/current-system/sw/bin:/etc/profiles/per-user/don/bin:/home/don/bin";
Environment =
"PATH=/run/current-system/sw/bin:/etc/profiles/per-user/don/bin:/home/don/bin";
ExecStart = "/home/don/bin/do_agenda_tomorrow";
};
};
@ -35,7 +32,8 @@ in {
unitConfig = { Type = "simple"; };
serviceConfig = {
Type = "oneshot";
Environment = "PATH=/run/current-system/sw/bin:/etc/profiles/per-user/don/bin:/home/don/bin";
Environment =
"PATH=/run/current-system/sw/bin:/etc/profiles/per-user/don/bin:/home/don/bin";
ExecStart = "/home/don/bin/gosleep";
};
};

View file

@ -1,8 +1,5 @@
{
pkgs,
lib,
...
}: let
{ pkgs, lib, ... }:
let
readlink = "${pkgs.coreutils}/bin/readlink";
notify-send = "${pkgs.libnotify}/bin/notify-send";
in {
@ -31,7 +28,8 @@ in {
wantedBy = [ "lock.target" ];
serviceConfig = {
Type = "forking";
Environment = "PATH=/run/current-system/sw/bin:/etc/profiles/per-user/don/bin:/home/don/bin";
Environment =
"PATH=/run/current-system/sw/bin:/etc/profiles/per-user/don/bin:/home/don/bin";
ExecStart = "/home/don/bin/lock.sh -m";
Restart = "on-failure";
RestartSec = 0;
@ -55,7 +53,8 @@ in {
unitConfig = { Type = "simple"; };
serviceConfig = {
Type = "oneshot";
Environment = "PATH=/run/current-system/sw/bin:/etc/profiles/per-user/don/bin:/home/don/bin";
Environment =
"PATH=/run/current-system/sw/bin:/etc/profiles/per-user/don/bin:/home/don/bin";
ExecStart = "/home/don/bin/check-nic";
};
};