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 27c6c4f9fa
237 changed files with 5440 additions and 5214 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,11 +2,9 @@
config,
pkgs,
repoFlake,
nodeFlake,
repoFlakeInputs',
packages',
...
}: {
}:
{
imports = [
repoFlake.inputs.sops-nix.nixosModules.sops
@ -30,7 +28,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;

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

@ -1,5 +1,12 @@
{...}: {
_: {
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"
];
}

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

@ -1,10 +1,5 @@
{ pkgs, nodeName, ... }:
{
config,
pkgs,
lib,
nodeName,
...
}: {
networking.hostName = builtins.elemAt (builtins.split "\\." nodeName) 0; # Define your hostname.
networking.domain = builtins.elemAt (builtins.split "(^[^\\.]+\.)" nodeName) 2;
@ -15,11 +10,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;
})
]
)
);
}
]
);
}