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

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

@ -1,14 +1,14 @@
{ hostAddress {
, localAddress hostAddress,
, syncthingPort ? 22000 localAddress,
, syncthingLocalAnnouncePort ? 21027 syncthingPort ? 22000,
, autoStart ? false syncthingLocalAnnouncePort ? 21027,
, autoStart ? false,
}: { }: {
config = config = {
{ config config,
, pkgs pkgs,
, ... ...
}: { }: {
system.stateVersion = "20.05"; # Did you read the comment? system.stateVersion = "20.05"; # Did you read the comment?

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

@ -1,19 +1,17 @@
{ hostAddress
, localAddress
, httpPort ? 80
, httpsPort ? 443
, autoStart ? false
,
}:
let
passwords = import ../../variables/passwords.crypt.nix;
in
{ {
config = hostAddress,
{ config localAddress,
, pkgs httpPort ? 80,
, lib 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? system.stateVersion = "22.05"; # Did you read the comment?

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

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

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

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

18
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 # TASK: new device
networking.hostName = "sj-pvehtz0"; # Define your hostname. networking.hostName = "sj-pvehtz0"; # Define your hostname.
# networking.domain = ""; # networking.domain = "";
@ -78,7 +77,8 @@ in
sievePort = 4190; sievePort = 4190;
}; };
webserver = import ../../containers/webserver.nix webserver =
import ../../containers/webserver.nix
{ {
autoStart = true; autoStart = true;

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

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

3
nix/os/devices/167.233.1.14/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 ' <% git ls-remote https://github.com/nixos/nixpkgs nixos-22.11 | awk '{ print $1 }' | tr -d '
' -%>''; ' -%>'';
}; };
in in {
{
inherit nixpkgs; inherit nixpkgs;
nixos = nixpkgs // {suffix = "/nixos";}; nixos = nixpkgs // {suffix = "/nixos";};
"channels-nixos-stable" = nixpkgs; "channels-nixos-stable" = nixpkgs;

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

@ -1,13 +1,12 @@
{ pkgs {
, lib pkgs,
, config lib,
, ... config,
}: ...
let }: let
keys = import ../../../variables/keys.nix; keys = import ../../../variables/keys.nix;
passwords = import ../../../variables/passwords.crypt.nix; passwords = import ../../../variables/passwords.crypt.nix;
in in {
{
# TASK: new device # TASK: new device
networking.hostName = "vmd102066"; # Define your hostname. networking.hostName = "vmd102066"; # Define your hostname.
networking.domain = "contaboserver.net"; networking.domain = "contaboserver.net";

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

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

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

@ -1,7 +1,8 @@
{ config {
, pkgs config,
, lib pkgs,
, ... lib,
...
}: { }: {
nix.settings.trusted-public-keys = [ nix.settings.trusted-public-keys = [
# "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=" # "hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs="

6
nix/overlays/overrides.nix
View file

@ -1,13 +1,11 @@
# This overlay is used for overriding upstream packages. # This overlay is used for overriding upstream packages.
self: super: self: super: let
let
sources = import ../../nix/sources.nix; sources = import ../../nix/sources.nix;
nixpkgs-master = import <nixpkgs-master> {inherit (super) config;}; nixpkgs-master = import <nixpkgs-master> {inherit (super) config;};
nixpkgs-unstable = nixpkgs-unstable =
import <channels-nixos-unstable> {inherit (super) config;}; import <channels-nixos-unstable> {inherit (super) config;};
in in {
{
inherit nixpkgs-master; inherit nixpkgs-master;
inherit nixpkgs-unstable; inherit nixpkgs-unstable;

3
nix/pkgs/default.nix
View file

@ -1,5 +1,4 @@
{ pkgs }: {pkgs}: let
let
in rec { in rec {
nixpkgs-master = import <nixpkgs-master> {}; nixpkgs-master = import <nixpkgs-master> {};