ahuston-0/nix-dotfiles
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Feature/rfc 0166 fmt (#113)

Browse Source 
* change formatter to nixfmt-rfc-style

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>

* Add rfc-style fmt'ing

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>

---------

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
Alice Huston
2024-03-03 18:06:28 -05:00
committed by GitHub
parent e732499201
commit 1a8a2fa394
19 changed files with 492 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
systems/configuration.nix
View File

@ -1,4 +1,10 @@
{ lib, pkgs, config, ... }: {
{
lib,
pkgs,
config,
...
}:
{
security.auditd.enable = true;
nixpkgs.config.allowUnfree = true;
i18n = {
@ -8,7 +14,9 @@
boot = {
default = true;
kernel.sysctl = { "net.ipv6.conf.ens3.accept_ra" = 1; };
kernel.sysctl = {
"net.ipv6.conf.ens3.accept_ra" = 1;
};
};
home-manager = {
@ -146,14 +154,35 @@
nix-ld = {
enable = true;
libraries = with pkgs; [ acl attr bzip2 curl glib libglvnd libmysqlclient libsodium libssh libxml2 openssl stdenv.cc.cc systemd util-linux xz zlib zstd ];
libraries = with pkgs; [
acl
attr
bzip2
curl
glib
libglvnd
libmysqlclient
libsodium
libssh
libxml2
openssl
stdenv.cc.cc
systemd
util-linux
xz
zlib
zstd
];
};
};
nix = {
diffSystem = true;
settings = {
experimental-features = [ "nix-command" "flakes" ];
experimental-features = [
"nix-command"
"flakes"
];
keep-outputs = true;
builders-use-substitutes = true;
connect-timeout = 20;

13
systems/jeeves-jr/configuration.nix
View File

@ -1,4 +1,5 @@
{pkgs, ...}: {
{ pkgs, ... }:
{
time.timeZone = "America/New_York";
console.keyMap = "us";
networking = {
@ -7,7 +8,7 @@
};
boot = {
zfs.extraPools = ["Main"];
zfs.extraPools = [ "Main" ];
filesystem = "zfs";
useSystemdBoot = true;
};
@ -21,7 +22,7 @@
daemon."settings" = {
experimental = true;
data-root = "/var/lib/docker";
exec-opts = ["native.cgroupdriver=systemd"];
exec-opts = [ "native.cgroupdriver=systemd" ];
log-opts = {
max-size = "10m";
max-file = "5";
@ -36,7 +37,7 @@
};
environment = {
systemPackages = with pkgs; [docker-compose];
systemPackages = with pkgs; [ docker-compose ];
etc = {
# Creates /etc/lynis/custom.prf
"lynis/custom.prf" = {
@ -60,7 +61,7 @@
services = {
nfs.server.enable = true;
openssh.ports = [352];
openssh.ports = [ 352 ];
smartd.enable = true;
@ -80,7 +81,7 @@
zerotierone = {
enable = true;
joinNetworks = ["e4da7455b2ae64ca"];
joinNetworks = [ "e4da7455b2ae64ca" ];
};
};

8
systems/jeeves-jr/default.nix
View File

@ -1 +1,7 @@
{...}: {users = ["alice" "richie"];}
{ ... }:
{
users = [
"alice"
"richie"
];
}

24
systems/jeeves-jr/hardware.nix
View File

@ -3,21 +3,27 @@
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
}:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
networking.useDHCP = lib.mkDefault true;
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
swapDevices = [{device = "/dev/disk/by-uuid/9d4ef549-d426-489d-8332-0a49589c6aed";}];
swapDevices = [ { device = "/dev/disk/by-uuid/9d4ef549-d426-489d-8332-0a49589c6aed"; } ];
boot = {
kernelModules = ["kvm-amd"];
extraModulePackages = [];
kernelModules = [ "kvm-amd" ];
extraModulePackages = [ ];
initrd = {
kernelModules = [];
availableKernelModules = ["xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod"];
kernelModules = [ ];
availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usbhid"
"usb_storage"
"sd_mod"
];
};
};

49
systems/palatine-hill/configuration.nix
View File

@ -1,7 +1,9 @@
{ config, pkgs, ... }: {
{ config, pkgs, ... }:
{
time.timeZone = "America/New_York";
console.keyMap = "us";
systemd.services.hydra-notify.serviceConfig.EnvironmentFile = config.sops.secrets."hydra/environment".path;
systemd.services.hydra-notify.serviceConfig.EnvironmentFile =
config.sops.secrets."hydra/environment".path;
programs.git.lfs.enable = false;
networking = {
hostId = "dc2f9781";
@ -9,9 +11,7 @@
};
nixpkgs.config.packageOverrides = pkgs: {
vaapiIntel = pkgs.vaapiIntel.override {
enableHybridCodec = true;
};
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
};
boot = {
@ -19,7 +19,10 @@
loader.grub.device = "/dev/sda";
filesystem = "zfs";
useSystemdBoot = true;
kernelParams = [ "i915.force_probe=56a5" "i915.enable_guc=2" ];
kernelParams = [
"i915.force_probe=56a5"
"i915.enable_guc=2"
];
kernel.sysctl = {
"vm.overcommit_memory" = 1;
"vm.swappiness" = 10;
@ -33,23 +36,25 @@
builders-use-substitutes = true
'';
buildMachines = [{
hostName = "localhost";
maxJobs = 2;
protocol = "ssh-ng";
speedFactor = 2;
systems = [
"x86_64-linux"
"aarch64-linux"
];
buildMachines = [
{
hostName = "localhost";
maxJobs = 2;
protocol = "ssh-ng";
speedFactor = 2;
systems = [
"x86_64-linux"
"aarch64-linux"
];
supportedFeatures = [
"kvm"
"nixos-test"
"big-parallel"
"benchmark"
];
}];
supportedFeatures = [
"kvm"
"nixos-test"
"big-parallel"
"benchmark"
];
}
];
};
hardware = {

8
systems/palatine-hill/default.nix
View File

@ -1 +1,7 @@
{ ... }: { users = [ "alice" "richie" ]; }
{ ... }:
{
users = [
"alice"
"richie"
];
}

13
systems/palatine-hill/hardware.nix
View File

@ -1,13 +1,16 @@
{ config, lib, modulesPath, ... }:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
config,
lib,
modulesPath,
...
}:
{
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
networking.useDHCP = lib.mkDefault true;
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
swapDevices = [{ device = "/dev/disk/by-uuid/2b01e592-2297-4eb1-854b-17a63f1d4cf6"; }];
swapDevices = [ { device = "/dev/disk/by-uuid/2b01e592-2297-4eb1-854b-17a63f1d4cf6"; } ];
boot = {
kernelModules = [ "kvm-amd" ];
extraModulePackages = [ ];

3
systems/programs.nix
View File

@ -1,4 +1,5 @@
{ pkgs, ... }: {
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
bat
btop