don/NixOS-Configs
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Activity

task | reformatted with nixfmt

Browse source
This commit is contained in:
Don Harper 2024-12-13 11:50:29 -06:00
parent e3fea64660
commit c3a0a0847f
119 changed files with 1010 additions and 2135 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hosts/smaug/colmena.nix
View file

@ -1,16 +1,7 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
imports = [
./default.nix
];
{ inputs, outputs, lib, config, pkgs, ... }: {
imports = [ ./default.nix ];
deployment = {
tags = ["workstation" "intel"];
tags = [ "workstation" "intel" ];
allowLocalDeployment = true;
};
}

9
hosts/smaug/default.nix
View file

@ -1,11 +1,4 @@
{
inputs,
outputs,
lib,
config,
pkgs,
...
}: {
{ inputs, outputs, lib, config, pkgs, ... }: {
imports = [
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x260
./hardware-configuration.nix

28
hosts/smaug/hardware-configuration.nix
View file

@ -1,21 +1,14 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
config,
lib,
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
{ config, lib, pkgs, modulesPath, ... }: {
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.kernelModules = ["dm-snapshot"];
boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [];
boot.initrd.availableKernelModules =
[ "xhci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ "dm-snapshot" ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/c871ca4a-fb86-4631-b3bd-105931c5f373";
@ -25,10 +18,10 @@
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/55CA-7FD8";
fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
options = [ "fmask=0022" "dmask=0022" ];
};
swapDevices = [];
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
@ -39,5 +32,6 @@
# networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
}

82
hosts/smaug/podman.nix
View file

@ -1,9 +1,5 @@
# Auto-generated using compose2nix v0.1.6.
{
pkgs,
lib,
...
}: {
{ pkgs, lib, ... }: {
# Runtime
virtualisation.podman = {
enable = true;
@ -25,31 +21,16 @@
MARIADB_RANDOM_ROOT_PASSWORD = "true";
MARIADB_USER = "speedy";
};
volumes = [
"/home/don/docker/speedtest-db:/var/lib/mysql:rw"
];
volumes = [ "/home/don/docker/speedtest-db:/var/lib/mysql:rw" ];
log-driver = "journald";
extraOptions = [
"--network-alias=db"
"--network=speedtest-default"
];
extraOptions = [ "--network-alias=db" "--network=speedtest-default" ];
};
systemd.services."podman-speedtest-db" = {
serviceConfig = {
Restart = lib.mkOverride 500 "always";
};
after = [
"podman-network-speedtest-default.service"
];
requires = [
"podman-network-speedtest-default.service"
];
partOf = [
"podman-compose-speedtest-root.target"
];
wantedBy = [
"podman-compose-speedtest-root.target"
];
serviceConfig = { Restart = lib.mkOverride 500 "always"; };
after = [ "podman-network-speedtest-default.service" ];
requires = [ "podman-network-speedtest-default.service" ];
partOf = [ "podman-compose-speedtest-root.target" ];
wantedBy = [ "podman-compose-speedtest-root.target" ];
};
virtualisation.oci-containers.containers."speedtest-tracker" = {
image = "ghcr.io/alexjustesen/speedtest-tracker:latest";
@ -69,40 +50,23 @@
"/home/don/docker/speedtest/config:/config:rw"
"/home/don/docker/speedtest/web:/etc/ssl/web:rw"
];
ports = [
"8080:80/tcp"
"8443:443/tcp"
];
dependsOn = [
"speedtest-db"
];
ports = [ "8080:80/tcp" "8443:443/tcp" ];
dependsOn = [ "speedtest-db" ];
log-driver = "journald";
extraOptions = [
"--network-alias=speedtest-tracker"
"--network=speedtest-default"
];
extraOptions =
[ "--network-alias=speedtest-tracker" "--network=speedtest-default" ];
};
systemd.services."podman-speedtest-tracker" = {
serviceConfig = {
Restart = lib.mkOverride 500 "always";
};
after = [
"podman-network-speedtest-default.service"
];
requires = [
"podman-network-speedtest-default.service"
];
partOf = [
"podman-compose-speedtest-root.target"
];
wantedBy = [
"podman-compose-speedtest-root.target"
];
serviceConfig = { Restart = lib.mkOverride 500 "always"; };
after = [ "podman-network-speedtest-default.service" ];
requires = [ "podman-network-speedtest-default.service" ];
partOf = [ "podman-compose-speedtest-root.target" ];
wantedBy = [ "podman-compose-speedtest-root.target" ];
};
# Networks
systemd.services."podman-network-speedtest-default" = {
path = [pkgs.podman];
path = [ pkgs.podman ];
serviceConfig = {
Type = "oneshot";
RemainAfterExit = true;
@ -111,17 +75,15 @@
script = ''
podman network inspect speedtest-default || podman network create speedtest-default --opt isolate=true
'';
partOf = ["podman-compose-speedtest-root.target"];
wantedBy = ["podman-compose-speedtest-root.target"];
partOf = [ "podman-compose-speedtest-root.target" ];
wantedBy = [ "podman-compose-speedtest-root.target" ];
};
# Root service
# When started, this will automatically create all resources and start
# the containers. When stopped, this will teardown all resources.
systemd.targets."podman-compose-speedtest-root" = {
unitConfig = {
Description = "Root target generated by compose2nix.";
};
wantedBy = ["multi-user.target"];
unitConfig = { Description = "Root target generated by compose2nix."; };
wantedBy = [ "multi-user.target" ];
};
}