steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

feat: introduce treefmt and fmt all

Browse source
This commit is contained in:
steveej 2024-11-15 10:17:56 +01:00
parent 80250b0179
commit 5d5282a914
213 changed files with 4967 additions and 4423 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nix/os/profiles/common/configuration.nix
View file

@ -6,7 +6,8 @@
repoFlakeInputs',
packages',
...
}: {
}:
{
imports = [
repoFlake.inputs.sops-nix.nixosModules.sops
@ -30,7 +31,10 @@
boot.tmp.useTmpfs = true;
# Workaround for nm-pptp to enforce module load
boot.kernelModules = ["nf_conntrack_proto_gre" "nf_conntrack_pptp"];
boot.kernelModules = [
"nf_conntrack_proto_gre"
"nf_conntrack_pptp"
];
nixpkgs.config = {
allowBroken = false;

12
nix/os/profiles/common/hw.nix
View file

@ -1,5 +1,13 @@
{...}: {
{ ... }:
{
hardware.trackpoint.emulateWheel = true;
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" "cryptd"];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"usb_storage"
"sd_mod"
"rtsx_pci_sdmmc"
"cryptd"
];
}

9
nix/os/profiles/common/system.nix
View file

@ -4,7 +4,8 @@
lib,
nodeName,
...
}: {
}:
{
networking.hostName = builtins.elemAt (builtins.split "\\." nodeName) 0; # Define your hostname.
networking.domain = builtins.elemAt (builtins.split "(^[^\\.]+\.)" nodeName) 2;
@ -15,11 +16,13 @@
'';
# Fonts, I18N, Date ...
fonts.packages = [pkgs.corefonts];
fonts.packages = [ pkgs.corefonts ];
console.font = "lat9w-16";
i18n = {defaultLocale = "en_US.UTF-8";};
i18n = {
defaultLocale = "en_US.UTF-8";
};
time.timeZone = "Etc/UTC";
services.gpm.enable = true;

90
nix/os/profiles/common/user.nix
View file

@ -3,7 +3,8 @@
pkgs,
lib,
...
}: let
}:
let
keys = import ../../../variables/keys.nix;
inherit
(import ../../lib/default.nix {
@ -16,7 +17,8 @@
inherit (lib) types;
cfg = config.users.commonUsers;
in {
in
{
options.users.commonUsers = {
enable = lib.mkOption {
default = true;
@ -39,57 +41,53 @@ in {
type = types.str;
};
};
config = lib.mkIf cfg.enable (lib.mkMerge [
(lib.mkIf (cfg.installPassword == "") {
sops.secrets.sharedUsers-root = {
sopsFile = ../../../../secrets/shared-users.yaml;
neededForUsers = true;
format = "yaml";
};
config = lib.mkIf cfg.enable (
lib.mkMerge [
(lib.mkIf (cfg.installPassword == "") {
sops.secrets.sharedUsers-root = {
sopsFile = ../../../../secrets/shared-users.yaml;
neededForUsers = true;
format = "yaml";
};
sops.secrets.sharedUsers-steveej = lib.mkIf cfg.enableNonRoot {
sopsFile = ../../../../secrets/shared-users.yaml;
neededForUsers = true;
format = "yaml";
};
sops.secrets.sharedUsers-steveej = lib.mkIf cfg.enableNonRoot {
sopsFile = ../../../../secrets/shared-users.yaml;
neededForUsers = true;
format = "yaml";
};
sops.secrets.sharedSshKeys-steveej = lib.mkIf cfg.enableNonRoot {
sopsFile = ../../../../secrets/shared-users.yaml;
# neededForUsers = true;
format = "yaml";
};
})
sops.secrets.sharedSshKeys-steveej = lib.mkIf cfg.enableNonRoot {
sopsFile = ../../../../secrets/shared-users.yaml;
# neededForUsers = true;
format = "yaml";
};
})
{
users.mutableUsers = cfg.installPassword != "";
{
users.mutableUsers = cfg.installPassword != "";
users.users.root = lib.mkMerge [
{
openssh.authorizedKeys.keys = keys.users.steveej.openssh;
}
users.users.root = lib.mkMerge [
{ openssh.authorizedKeys.keys = keys.users.steveej.openssh; }
(lib.mkIf (cfg.installPassword != "") {
password = cfg.installPassword;
})
(lib.mkIf (cfg.installPassword != "") { password = cfg.installPassword; })
(lib.mkIf (cfg.installPassword == "") {
hashedPasswordFile = cfg.rootPasswordFile;
})
];
(lib.mkIf (cfg.installPassword == "") { hashedPasswordFile = cfg.rootPasswordFile; })
];
users.users.steveej = lib.mkIf cfg.enableNonRoot (mkUser (lib.mkMerge [
{
uid = 1000;
}
users.users.steveej = lib.mkIf cfg.enableNonRoot (
mkUser (
lib.mkMerge [
{ uid = 1000; }
(lib.mkIf (cfg.installPassword != "") {
password = cfg.installPassword;
})
(lib.mkIf (cfg.installPassword != "") { password = cfg.installPassword; })
(lib.mkIf (cfg.installPassword == "") {
hashedPasswordFile = config.sops.secrets.sharedUsers-steveej.path;
})
]));
}
]);
(lib.mkIf (cfg.installPassword == "") {
hashedPasswordFile = config.sops.secrets.sharedUsers-steveej.path;
})
]
)
);
}
]
);
}

13
nix/os/profiles/containers/configuration.nix
View file

@ -3,26 +3,23 @@
pkgs,
lib,
...
}: {
}:
{
networking.useHostResolvConf = false;
networking.firewall.enable = true;
networking.nftables.enable = true;
networking.nftables.flushRuleset = true;
networking.nameservers = lib.mkForce [hostAddress];
networking.nameservers = lib.mkForce [ hostAddress ];
environment.systemPackages = [
pkgs.dnsutils
];
environment.systemPackages = [ pkgs.dnsutils ];
imports = [
{
# keep DNS set up to a minimum: only query the container host
services.resolved.enable = lib.mkForce false;
networking.nameservers = [
hostAddress
];
networking.nameservers = [ hostAddress ];
}
../../snippets/nix-settings.nix
# ../../modules/ddclient-ovh.nix

12
nix/os/profiles/graphical-gnome-xorg.nix
View file

@ -1,8 +1,5 @@
{ pkgs, lib, ... }:
{
pkgs,
lib,
...
}: {
services.xserver = {
enable = true;
libinput.enable = true;
@ -98,8 +95,11 @@
support32Bit = true;
};
services.dbus.packages = with pkgs; [dconf];
services.dbus.packages = with pkgs; [ dconf ];
# More Services
environment.systemPackages = [pkgs.gnome.adwaita-icon-theme pkgs.gnomeExtensions.appindicator];
environment.systemPackages = [
pkgs.gnome.adwaita-icon-theme
pkgs.gnomeExtensions.appindicator
];
}

7
nix/os/profiles/graphical/boot.nix
View file

@ -1,5 +1,4 @@
{config, ...}: {
boot.extraModulePackages = [
config.boot.kernelPackages.v4l2loopback
];
{ config, ... }:
{
boot.extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
}

9
nix/os/profiles/graphical/configuration.nix
View file

@ -1,3 +1,8 @@
{pkgs, ...}: {
imports = [./boot.nix ./system.nix ./hw.nix];
{ pkgs, ... }:
{
imports = [
./boot.nix
./system.nix
./hw.nix
];
}

3
nix/os/profiles/graphical/hw.nix
View file

@ -1,3 +1,4 @@
{...}: {
{ ... }:
{
hardware.enableAllFirmware = true;
}

20
nix/os/profiles/graphical/system.nix
View file

@ -1,11 +1,6 @@
{ pkgs, lib, ... }:
{
pkgs,
lib,
...
}: {
imports = [
../../snippets/bluetooth.nix
];
imports = [ ../../snippets/bluetooth.nix ];
networking.networkmanager = {
enable = true;
@ -26,7 +21,11 @@
services.pcscd.enable = true;
hardware.opengl.enable = true;
services.udev.packages = [pkgs.libu2f-host pkgs.yubikey-personalization pkgs.android-udev-rules];
services.udev.packages = [
pkgs.libu2f-host
pkgs.yubikey-personalization
pkgs.android-udev-rules
];
services.udev.extraRules = ''
# OnePlusOne
ATTR{idVendor}=="05c6", ATTR{idProduct}=="6764", SYMLINK+="libmtp-%k", MODE="660", GROUP="audio", ENV{ID_MTP_DEVICE}="1", ENV{ID_MEDIA_PLAYER}="1", TAG+="uaccess"
@ -53,6 +52,9 @@
services.printing = {
enable = true;
drivers = with pkgs; [mfcl3770cdwlpr mfcl3770cdwcupswrapper];
drivers = with pkgs; [
mfcl3770cdwlpr
mfcl3770cdwcupswrapper
];
};
}

48
nix/os/profiles/install-medium/iso/iso.nix
View file

@ -5,25 +5,26 @@
pkgs,
lib,
...
}: let
}:
let
nixos-init-script = ''
#!${pkgs.stdenv.shell}
export HOME=/root
export PATH=${
pkgs.lib.makeBinPath [
config.nix.package
pkgs.systemd
pkgs.gnugrep
pkgs.gnused
config.system.build.nixos-rebuild
config.system.build.nixos-install
pkgs.utillinux
pkgs.e2fsprogs
pkgs.coreutils
pkgs.hdparm
]
}:$PATH
pkgs.lib.makeBinPath [
config.nix.package
pkgs.systemd
pkgs.gnugrep
pkgs.gnused
config.system.build.nixos-rebuild
config.system.build.nixos-install
pkgs.utillinux
pkgs.e2fsprogs
pkgs.coreutils
pkgs.hdparm
]
}:$PATH
export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
set -xe
@ -61,7 +62,8 @@
nixos-install
reboot
'';
in {
in
{
imports = [
<nixpkgs/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix>
@ -70,13 +72,11 @@ in {
# <nixpkgs/nixos/modules/installer/cd-dvd/channel.nix>
];
isoImage.isoName =
lib.mkForce
"${config.isoImage.isoBaseName}-${pkgs.stdenv.hostPlatform.system}.iso";
isoImage.isoName = lib.mkForce "${config.isoImage.isoBaseName}-${pkgs.stdenv.hostPlatform.system}.iso";
boot.loader.timeout = lib.mkForce 0;
boot.postBootCommands = "";
environment.systemPackages = [];
environment.systemPackages = [ ];
users.users.root = {
openssh.authorizedKeys.keys = [
@ -85,18 +85,18 @@ in {
};
services.gpm.enable = true;
systemd.services.sshd.wantedBy = lib.mkForce ["multi-user.target"];
systemd.services.sshd.wantedBy = lib.mkForce [ "multi-user.target" ];
systemd.services.nixos-init = {
script = nixos-init-script;
path = with pkgs; [];
path = with pkgs; [ ];
description = "Initialize /dev/vda from configuration.nix found at /dev/vdb";
enable = true;
wantedBy = ["multi-user.target"];
after = ["multi-user.target"];
requires = ["network-online.target"];
wantedBy = [ "multi-user.target" ];
after = [ "multi-user.target" ];
requires = [ "network-online.target" ];
restartIfChanged = false;
unitConfig.X-StopOnRemoval = false;

5
nix/os/profiles/removable-medium/boot.nix
View file

@ -1,5 +1,6 @@
{lib, ...}: {
{ lib, ... }:
{
boot.loader.grub.efiInstallAsRemovable = lib.mkForce true;
boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
boot.extraModulePackages = [];
boot.extraModulePackages = [ ];
}

3
nix/os/profiles/removable-medium/configuration.nix
View file

@ -1,4 +1,5 @@
{...}: {
{ ... }:
{
imports = [
../../modules/opinionatedDisk.nix

3
nix/os/profiles/removable-medium/hw.nix
View file

@ -1,4 +1,5 @@
{...}: {
{ ... }:
{
hardware.opinionatedDisk.enable = true;
hardware.enableAllFirmware = true;
}

3
nix/os/profiles/removable-medium/pkg.nix
View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
home-manager.users.steveej = import ../../../home-manager/configuration/graphical-removable.nix {
inherit pkgs;
};

10
nix/os/profiles/removable-medium/system.nix
View file

@ -3,11 +3,15 @@
lib,
pkgs,
...
}: let
in {
}:
let
in
{
services.illum.enable = true;
services.printing = {enable = false;};
services.printing = {
enable = false;
};
services.spice-vdagentd.enable = true;
services.qemuGuest.enable = true;