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

nix fmt

Browse source
This commit is contained in:
steveej 2023-03-21 13:38:22 +01:00
parent 0777ef46aa
commit 6befc79c8e
14 changed files with 189 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

24
nix/os/containers/syncthing.nix
View file

@ -1,18 +1,18 @@
{ hostAddress
, localAddress
, syncthingPort ? 22000
, syncthingLocalAnnouncePort ? 21027
, autoStart ? false
,
{
hostAddress,
localAddress,
syncthingPort ? 22000,
syncthingLocalAnnouncePort ? 21027,
autoStart ? false,
}: {
config =
{ config
, pkgs
, ...
config = {
config,
pkgs,
...
}: {
system.stateVersion = "20.05"; # Did you read the comment?
imports = [ ../profiles/containers/configuration.nix ];
imports = [../profiles/containers/configuration.nix];
networking.firewall.enable = true;
networking.firewall.allowedTCPPorts = [
@ -36,7 +36,7 @@
};
};
extraFlags = [ "--resolv-conf=bind-host" ];
extraFlags = ["--resolv-conf=bind-host"];
privateNetwork = true;
forwardPorts = [

34
nix/os/containers/webserver.nix
View file

@ -1,23 +1,21 @@
{ hostAddress
, localAddress
, httpPort ? 80
, httpsPort ? 443
, autoStart ? false
,
}:
let
passwords = import ../../variables/passwords.crypt.nix;
in
{
config =
{ config
, pkgs
, lib
, ...
hostAddress,
localAddress,
httpPort ? 80,
httpsPort ? 443,
autoStart ? false,
}: let
passwords = import ../../variables/passwords.crypt.nix;
in {
config = {
config,
pkgs,
lib,
...
}: {
system.stateVersion = "22.05"; # Did you read the comment?
imports = [ ../profiles/containers/configuration.nix ];
imports = [../profiles/containers/configuration.nix];
networking.firewall.enable = false;
@ -57,7 +55,7 @@ in
enableACME = true;
locations."/hedgedoc/" = { proxyPass = "http://[::1]:3000/"; };
locations."/hedgedoc/" = {proxyPass = "http://[::1]:3000/";};
locations."/hedgedoc/socket.io/" = {
proxyPass = "http://[::1]:3000/socket.io/";
@ -115,7 +113,7 @@ in
};
};
extraFlags = [ "--resolv-conf=bind-host" ];
extraFlags = ["--resolv-conf=bind-host"];
privateNetwork = true;
forwardPorts = [

4
nix/os/devices/167.233.1.14/configuration.nix
View file

@ -1,5 +1,5 @@
{ ... }: {
disabledModules = [ ];
{...}: {
disabledModules = [];
imports = [
../../profiles/common/configuration.nix
../../modules/opinionatedDisk.nix

6
nix/os/devices/167.233.1.14/hw.nix
View file

@ -1,5 +1,4 @@
{ ... }:
let
{...}: let
stage1Modules = [
"virtio_balloon"
"virtio_scsi"
@ -15,8 +14,7 @@ let
"pata_acpi"
"ata_generic"
];
in
{
in {
hardware.opinionatedDisk = {
enable = true;
encrypted = false;

12
nix/os/devices/167.233.1.14/pkg.nix
View file

@ -1,14 +1,16 @@
{ config
, pkgs
, lib
, ...
{
config,
pkgs,
lib,
...
}: {
nixpkgs.config.packageOverrides = pkgs:
with pkgs; {
nixPath =
(import ../../../default.nix {
versionsPath = ./versions.nix;
}).nixPath;
})
.nixPath;
};
home-manager.users.steveej = import ../../../home-manager/configuration/text-minimal.nix {
inherit pkgs;

28
nix/os/devices/167.233.1.14/system.nix
View file

@ -1,12 +1,11 @@
{ pkgs
, lib
, config
, ...
}:
let
keys = import ../../../variables/keys.nix;
in
{
pkgs,
lib,
config,
...
}: let
keys = import ../../../variables/keys.nix;
in {
# TASK: new device
networking.hostName = "sj-pvehtz0"; # Define your hostname.
# networking.domain = "";
@ -31,7 +30,7 @@ in
"prefixLength" = 29;
}
];
ipv6.addresses = [ ];
ipv6.addresses = [];
};
networking.defaultGateway = {
@ -44,11 +43,11 @@ in
interface = "eth0";
};
networking.nameservers = [ "1.1.1.1" ];
networking.nameservers = ["1.1.1.1"];
networking.nat = {
enable = true;
internalInterfaces = [ "ve-+" ];
internalInterfaces = ["ve-+"];
externalInterface = "eth0";
};
@ -56,12 +55,12 @@ in
# services.kubernetes.roles = ["master" "node"];
# virtualization
virtualisation = { docker.enable = true; };
virtualisation = {docker.enable = true;};
services.spice-vdagentd.enable = true;
services.qemuGuest.enable = true;
nix.gc = { automatic = true; };
nix.gc = {automatic = true;};
# networking.useHostResolvConf = true;
@ -78,7 +77,8 @@ in
sievePort = 4190;
};
webserver = import ../../containers/webserver.nix
webserver =
import ../../containers/webserver.nix
{
autoStart = true;

5
nix/os/devices/167.233.1.14/versions.nix
View file

@ -5,10 +5,9 @@ let
rev = ''
a7cc81913bb3cd1ef05ed0ece048b773e1839e51'';
};
in
{
in {
inherit nixpkgs;
nixos = nixpkgs // { suffix = "/nixos"; };
nixos = nixpkgs // {suffix = "/nixos";};
"channels-nixos-stable" = nixpkgs;
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";

5
nix/os/devices/167.233.1.14/versions.tmpl.nix
View file

@ -6,10 +6,9 @@ let
<% git ls-remote https://github.com/nixos/nixpkgs nixos-22.11 | awk '{ print $1 }' | tr -d '
' -%>'';
};
in
{
in {
inherit nixpkgs;
nixos = nixpkgs // { suffix = "/nixos"; };
nixos = nixpkgs // {suffix = "/nixos";};
"channels-nixos-stable" = nixpkgs;
"channels-nixos-unstable" = {
url = "https://github.com/NixOS/nixpkgs/";

31
nix/os/devices/vmd102066.contaboserver.net/system.nix
View file

@ -1,13 +1,12 @@
{ pkgs
, lib
, config
, ...
}:
let
{
pkgs,
lib,
config,
...
}: let
keys = import ../../../variables/keys.nix;
passwords = import ../../../variables/passwords.crypt.nix;
in
{
in {
# TASK: new device
networking.hostName = "vmd102066"; # Define your hostname.
networking.domain = "contaboserver.net";
@ -41,7 +40,7 @@ in
networking.nat = {
enable = true;
internalInterfaces = [ "ve-+" ];
internalInterfaces = ["ve-+"];
externalInterface = "eth0";
};
@ -49,7 +48,7 @@ in
# services.kubernetes.roles = ["master" "node"];
# virtualization
virtualisation = { docker.enable = true; };
virtualisation = {docker.enable = true;};
services.spice-vdagentd.enable = true;
services.qemuGuest.enable = true;
@ -57,18 +56,18 @@ in
systemd.services."sshd-status" = {
enable = true;
description = "sshd-status service";
path = [ pkgs.systemd ];
path = [pkgs.systemd];
script = ''
systemctl status sshd | grep -i tasks
'';
};
systemd.services.sshd.serviceConfig = { TasksMax = 32; };
systemd.services.sshd.serviceConfig = {TasksMax = 32;};
systemd.timers."sshd-status" = {
description = "Timer to trigger sshd-status periodically";
enable = true;
wantedBy = [ "timer.target" "multi-user.target" ];
wantedBy = ["timer.target" "multi-user.target"];
timerConfig = {
OnActiveSec = "5s";
OnUnitActiveSec = "5s";
@ -77,11 +76,11 @@ in
};
};
nix.gc = { automatic = true; };
nix.gc = {automatic = true;};
boot.initrd.network = {
enable = true;
udhcpc.extraArgs = [ "-x hostname:${config.networking.hostName}" ];
udhcpc.extraArgs = ["-x hostname:${config.networking.hostName}"];
ssh = {
enable = true;
@ -110,7 +109,7 @@ in
inherit config;
hostAddress = "192.168.100.16";
localAddress = "192.168.100.17";
subvolumes = [ "mailserver" "webserver" "backup" "syncthing" ];
subvolumes = ["mailserver" "webserver" "backup" "syncthing"];
};
bkpTarget = import ../../containers/backup-target.nix {

3
nix/os/devices/vmd102066.contaboserver.net/versions.nix
View file

@ -5,8 +5,7 @@ let
rev = ''
a7cc81913bb3cd1ef05ed0ece048b773e1839e51'';
};
in
{
in {
inherit nixpkgs;
"channels-nixos-stable" = nixpkgs;
"nixpkgs-master" = {

3
nix/os/devices/vmd102066.contaboserver.net/versions.tmpl.nix
View file

@ -6,8 +6,7 @@ let
<% git ls-remote https://github.com/nixos/nixpkgs nixos-22.11 | awk '{ print $1 }' | tr -d '
' -%>'';
};
in
{
in {
inherit nixpkgs;
"channels-nixos-stable" = nixpkgs;
"nixpkgs-master" = {

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

@ -1,7 +1,8 @@
{ config
, pkgs
, lib
, ...
{
config,
pkgs,
lib,
...
}: {
nix.settings.trusted-public-keys = [
# "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs="
@ -27,14 +28,14 @@
}
'';
environment.variables = { NIX_PATH = lib.mkForce pkgs.nixPath; };
environment.variables = {NIX_PATH = lib.mkForce pkgs.nixPath;};
# Fonts, I18N, Date ...
fonts.fonts = [ pkgs.corefonts ];
fonts.fonts = [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;
@ -67,6 +68,6 @@
programs.zsh.enable = true;
users.defaultUserShell = pkgs.zsh;
environment.pathsToLink = [ "/share/zsh" ];
environment.pathsToLink = ["/share/zsh"];
programs.fuse.userAllowOther = true;
}

12
nix/overlays/overrides.nix
View file

@ -1,20 +1,18 @@
# This overlay is used for overriding upstream packages.
self: super:
let
self: super: let
sources = import ../../nix/sources.nix;
nixpkgs-master = import <nixpkgs-master> { inherit (super) config; };
nixpkgs-master = import <nixpkgs-master> {inherit (super) config;};
nixpkgs-unstable =
import <channels-nixos-unstable> { inherit (super) config; };
in
{
import <channels-nixos-unstable> {inherit (super) config;};
in {
inherit nixpkgs-master;
inherit nixpkgs-unstable;
# alacritty = nixpkgs-master.alacritty;
alacritty = super.stdenv.mkDerivation {
name = "alacritty-custom";
buildInputs = [ super.makeWrapper ];
buildInputs = [super.makeWrapper];
phases = "installPhase";
installPhase = ''
makeWrapper ${super.alacritty}/bin/alacritty $out/bin/alacritty \

13
nix/pkgs/default.nix
View file

@ -1,7 +1,6 @@
{ pkgs }:
let
{pkgs}: let
in rec {
nixpkgs-master = import <nixpkgs-master> { };
nixpkgs-master = import <nixpkgs-master> {};
busyboxStatic = pkgs.busybox.override {
enableStatic = true;
@ -11,10 +10,10 @@ in rec {
CONFIG_INSTALL_APPLET_SYMLINKS n
'';
};
dropbearStatic = pkgs.dropbear.override { enableStatic = true; };
dropbearStatic = pkgs.dropbear.override {enableStatic = true;};
duplicacy = pkgs.callPackage ../pkgs/duplicacy { };
mfcl3770cdw = pkgs.callPackage ../pkgs/mfcl3770cdw.nix { };
duplicacy = pkgs.callPackage ../pkgs/duplicacy {};
mfcl3770cdw = pkgs.callPackage ../pkgs/mfcl3770cdw.nix {};
staruml = pkgs.callPackage ../pkgs/staruml.nix {
inherit (pkgs.gnome2) GConf;
libgcrypt = pkgs.libgcrypt_1_5;
@ -46,5 +45,5 @@ in rec {
pyaml
]
++ [ pkgs.pypi2nix pkgs.libffi ]);
++ [pkgs.pypi2nix pkgs.libffi]);
}