sorceress
/
nix-infra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup / reformat

This commit is contained in:
Agatha Lovelace 2024-11-22 17:26:16 +01:00
parent 0d1378aa0d
commit b30f9a4f46
Signed by: sorceress
GPG Key ID: 01D0B3AB10CED4F8
10 changed files with 242 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/default.nix
View File

@ -30,10 +30,12 @@
dogdns dogdns
du-dust du-dust
git git
headscale
imagemagick imagemagick
jq jq
killall killall
mtr mtr
nmap
openssl openssl
rsync rsync
sqlite-interactive sqlite-interactive
@ -41,6 +43,8 @@
xclip xclip
]; ];
services.tailscale.enable = true;
# 🥺 # 🥺
# security.please.enable = true; # security.please.enable = true;
} }

41
common/fragments/graphical/barebones.nix Normal file
View File

@ -0,0 +1,41 @@
{ pkgs, ... }:
{
# Config for client devices, but not necessarily a full desktop environment.
imports = [
../restic.nix
../yubikey.nix
];
# User packages
users.users.agatha.packages = with pkgs; [
android-tools
broot
colmena
exiftool
ffmpeg
flac
hyperfine
just
magic-wormhole
neofetch
nil
pfetch
pridefetch
rink
sshfs
unstable.rustmission
whois
wireguard-tools
yt-dlp
];
home-manager.users.agatha = {
programs.direnv.enable = true;
home.sessionVariables = {
"DIRENV_LOG_FORMAT" = "";
};
programs.ssh.enable = true;
};
}

111
common/fragments/graphical/default.nix
View File

@ -1,6 +1,12 @@
{ pkgs, config, lib, ... }: { {
pkgs,
config,
lib,
...
}:
{
imports = [ imports = [
../restic.nix ./barebones.nix
./audio.nix ./audio.nix
./bspwm.nix ./bspwm.nix
./clipboard.nix ./clipboard.nix
@ -22,26 +28,19 @@
(final: prev: { (final: prev: {
pads = final.callPackage ../../../common/pkgs/pads.nix { }; pads = final.callPackage ../../../common/pkgs/pads.nix { };
bspm = final.callPackage ../../../common/pkgs/bspm.nix { }; bspm = final.callPackage ../../../common/pkgs/bspm.nix { };
polybar-scripts = polybar-scripts = final.callPackage ../../../common/pkgs/polybar-scripts.nix { };
final.callPackage ../../../common/pkgs/polybar-scripts.nix { };
}) })
]; ];
# User packages # User packages
users.users.agatha.packages = with pkgs; [ users.users.agatha.packages = with pkgs; [
android-tools
blueberry blueberry
brightnessctl brightnessctl
broot
bspm bspm
cider cider
colmena
darktable darktable
dino dino
element-desktop element-desktop
exiftool
ffmpeg
flac
flameshot flameshot
gimp gimp
glib glib
@ -52,32 +51,19 @@
gnome.gnome-disk-utility gnome.gnome-disk-utility
gnome.gnome-font-viewer gnome.gnome-font-viewer
gnome.nautilus gnome.nautilus
hyperfine
just
magic-wormhole
mpv mpv
mumble mumble
neofetch
nil
nitrogen nitrogen
nmap
obs-studio obs-studio
obsidian obsidian
pfetch
polybar-scripts polybar-scripts
pridefetch
prismlauncher prismlauncher
rink
rofi-calc rofi-calc
rofimoji rofimoji
speechd speechd
sshfs
tdesktop tdesktop
whois
wireguard-tools
xdg-utils xdg-utils
xdotool xdotool
yt-dlp
yubioath-flutter yubioath-flutter
]; ];
@ -100,20 +86,22 @@
enable = true; enable = true;
displayManager = { displayManager = {
gdm.enable = true; gdm.enable = true;
# gdm.wayland = true;
sessionPackages = [ pkgs.sway ]; sessionPackages = [ pkgs.sway ];
session = [{ session = [
{
manage = "window"; manage = "window";
name = "bspwm"; name = "bspwm";
start = let cfg = config.home-manager.users.agatha; start =
in '' let
${cfg.services.sxhkd.package}/bin/sxhkd ${ cfg = config.home-manager.users.agatha;
toString cfg.services.sxhkd.extraOptions in
} & ''
${cfg.services.sxhkd.package}/bin/sxhkd ${toString cfg.services.sxhkd.extraOptions} &
${cfg.xsession.windowManager.bspwm.package}/bin/bspwm -c ${cfg.xdg.configHome}/bspwm/bspwmrc ${cfg.xsession.windowManager.bspwm.package}/bin/bspwm -c ${cfg.xdg.configHome}/bspwm/bspwmrc
''; '';
}]; }
];
}; };
# Layout overrides # Layout overrides
layout = lib.mkForce "eu,de(qwerty),ua,ru"; layout = lib.mkForce "eu,de(qwerty),ua,ru";
@ -150,51 +138,6 @@
<Multi_key> <p><l> : "🥺" <Multi_key> <p><l> : "🥺"
<Multi_key> <m><s> : "/html <span data-mx-spoiler=\"\"></span>" <Multi_key> <m><s> : "/html <span data-mx-spoiler=\"\"></span>"
''; '';
programs.direnv.enable = true;
home.sessionVariables = { "DIRENV_LOG_FORMAT" = ""; };
programs.ssh.enable = true;
programs.ssh.matchBlocks = {
"bloodletting" = { hostname = "technogothic.net"; };
"backups" = {
match = ''originalhost backups exec "ip r | rg 10.21.0.0/16"'';
hostname = "10.20.1.2";
user = "agatha";
identityFile = [ "~/.ssh/id_ed25519" ];
};
"work" = {
match = ''originalhost work exec "ip r | rg 10.21.0.0/16"'';
hostname = "10.21.221.6";
forwardX11 = true;
forwardX11Trusted = true;
forwardAgent = true;
extraOptions."TCPKeepAlive" = "yes";
};
"ritual" = {
match = ''originalhost ritual exec "ip r | rg 10.21.0.0/16"'';
hostname = "10.21.221.60";
};
"watchtower" = {
match = ''originalhost watchtower exec "ip r | rg 10.21.0.0/16"'';
hostname = "10.21.220.205";
};
};
xdg.desktopEntries.element-work = {
name = "Element @ Work";
icon = "im.riot.Riot";
exec = "${pkgs.element-desktop}/bin/element-desktop --profile=work";
categories = [ "Network" "InstantMessaging" "Chat" "VideoConference" ];
mimeType = [ "x-scheme-handler/element" ];
settings.StartupWMClass = "element";
settings.Keywords =
"Matrix;matrix.org;chat;irc;communications;talk;riot;vector;";
};
}; };
services.gvfs.enable = true; services.gvfs.enable = true;
@ -224,7 +167,12 @@
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
fonts.fontDir.enable = true; fonts.fontDir.enable = true;
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
(nerdfonts.override { fonts = [ "DaddyTimeMono" "NerdFontsSymbolsOnly" ]; }) (nerdfonts.override {
fonts = [
"DaddyTimeMono"
"NerdFontsSymbolsOnly"
];
})
cantarell-fonts cantarell-fonts
cm_unicode cm_unicode
corefonts corefonts
@ -254,13 +202,14 @@
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;
settings = { General = { Disable = "Headset"; }; }; settings = {
General = {
Disable = "Headset";
};
};
}; };
# Virtual Camera config # Virtual Camera config
boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
boot.kernelModules = [ "v4l2loopback" ]; boot.kernelModules = [ "v4l2loopback" ];
# Fix Wireguard NetworkManager connections
networking.firewall.checkReversePath = "loose";
} }

15
common/fragments/minecraft.nix
View File

@ -1,4 +1,9 @@
{ pkgs, config, lib, ... }: {
pkgs,
config,
lib,
...
}:
let let
rsyncSSHKeys = config.users.users.agatha.openssh.authorizedKeys.keys; rsyncSSHKeys = config.users.users.agatha.openssh.authorizedKeys.keys;
@ -32,7 +37,8 @@ let
allow-flight = true; allow-flight = true;
max-tick-time = 2 * 60 * 1000; max-tick-time = 2 * 60 * 1000;
}; };
in { in
{
services.modded-minecraft-servers = { services.modded-minecraft-servers = {
eula = true; eula = true;
@ -71,7 +77,10 @@ in {
}; };
}; };
systemd.services.mc-e2e.path = with pkgs; [ getconf gawk ]; systemd.services.mc-e2e.path = with pkgs; [
getconf
gawk
];
users.users.agatha.packages = with pkgs; [ mcrcon ]; users.users.agatha.packages = with pkgs; [ mcrcon ];
} }

76
flake.lock
View File

@ -67,18 +67,12 @@
} }
}, },
"crane": { "crane": {
"inputs": {
"nixpkgs": [
"helix",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1709610799, "lastModified": 1727974419,
"narHash": "sha256-5jfLQx0U9hXbi2skYMGodDJkIgffrjIOgMRjZqms2QE=", "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "81c393c776d5379c030607866afef6406ca1be57", "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -139,11 +133,11 @@
"systems": "systems_4" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1709126324, "lastModified": 1726560853,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605", "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -204,7 +198,7 @@
"inputs": { "inputs": {
"naersk": "naersk_2", "naersk": "naersk_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
], ],
"utils": "utils_3" "utils": "utils_3"
}, },
@ -232,11 +226,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1725452565, "lastModified": 1729690460,
"narHash": "sha256-kxduxKvEBSEhoxYHQbMCbxHT0t14kRF4zT6ZmWaqH6M=", "narHash": "sha256-x8qkGujBPuOefXPyjcaB8Ot0IYkQBy6O2ZYb8NrnB3k=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "41db5d735eae03be9a69b1136844dac642484ed8", "rev": "101a74bf6edbbfdf9b0628a0bdbbc307ebe10ff2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -252,11 +246,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720042825, "lastModified": 1726989464,
"narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -468,11 +462,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725544312, "lastModified": 1730070491,
"narHash": "sha256-ETyDNLOF5YvFO2lVlKttXgdHTqSGdp9ZCRRCjv2gaoM=", "narHash": "sha256-+RYCbdU6l4E4pr40++lrdhdE3gNC/BR54AL7xWG/YRU=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "a55b3f1ab41bb6d5025ebeebb4da5fd240b9b3b3", "rev": "5c0c6aaa797d6ccbb6cdab14de0248135735709d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -497,11 +491,11 @@
}, },
"nixpkgs-darwin": { "nixpkgs-darwin": {
"locked": { "locked": {
"lastModified": 1725140114, "lastModified": 1730091932,
"narHash": "sha256-tlRqsd84YFI7dL8Lz/Sm+M9Bm+Mh7kUs+5ArJbZsuy8=", "narHash": "sha256-Xg1O6tAHBK8EVHMLylYFlpRmqtG/deKqTfI9atLRLE0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4927f77b7a68615ce99678086cd3dcd0eda34fdd", "rev": "9b9516e15a60ce6633efccb02d703f6eca973228",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -529,17 +523,18 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1725369773, "lastModified": 1729980323,
"narHash": "sha256-gT+rUDbw+TQuszQEzMUJWTW7QYtccZ5xxWmKOSrPvEw=", "narHash": "sha256-eWPRZAlhf446bKSmzw6x7RWEE4IuZgAp8NW3eXZwRAY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8b4061fd60ccc3b3f44b73faa7c983eacf7a6f7b", "rev": "86e78d3d2084ff87688da662cf78c2af085d8e73",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"ref": "nixpkgs-unstable", "ref": "nixpkgs-unstable",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
@ -588,17 +583,18 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1725407940, "lastModified": 1729973466,
"narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-24.05",
"type": "indirect" "repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs_6": { "nixpkgs_6": {
@ -638,21 +634,17 @@
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"flake-utils": [
"helix",
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"helix", "helix",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1709604635, "lastModified": 1728268235,
"narHash": "sha256-le4fwmWmjGRYWwkho0Gr7mnnZndOOe4XGbLw68OvF40=", "narHash": "sha256-lJMFnMO4maJuNO6PQ5fZesrTmglze3UFTTBuKGwR1Nw=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "e86c0fb5d3a22a5f30d7f64ecad88643fe26449d", "rev": "25685cc2c7054efc31351c172ae77b21814f2d42",
"type": "github" "type": "github"
}, },
"original": { "original": {

41
flake.nix
View File

@ -1,7 +1,7 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin"; nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin";
lix-module = { lix-module = {
@ -49,7 +49,7 @@
frq-friend = { frq-friend = {
url = "git+https://git.xenua.me/xenua/fedi-frq-friend"; url = "git+https://git.xenua.me/xenua/fedi-frq-friend";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs";
}; };
helix = { helix = {
@ -66,6 +66,7 @@
{ {
nixpkgs, nixpkgs,
nixpkgs-unstable, nixpkgs-unstable,
nixpkgs-darwin,
lix-module, lix-module,
home-manager, home-manager,
nix-darwin, nix-darwin,
@ -81,7 +82,7 @@
... ...
}: }:
let let
overlays = system: config: [ mkOverlays = system: config: [
(final: prev: { (final: prev: {
helix = helix =
let let
@ -106,6 +107,7 @@
unstable = import nixpkgs-unstable { inherit system config; }; unstable = import nixpkgs-unstable { inherit system config; };
}) })
colmena.overlay colmena.overlay
lix-module.overlays.default
]; ];
mkDesktop = hostname: { mkDesktop = hostname: {
imports = [ imports = [
@ -113,7 +115,6 @@
./common/linux-specific.nix ./common/linux-specific.nix
./hosts/${hostname}/configuration.nix ./hosts/${hostname}/configuration.nix
./common/options.nix ./common/options.nix
lix-module.nixosModules.default
(import "${home-manager}/nixos") (import "${home-manager}/nixos")
url-eater.nixosModules.default url-eater.nixosModules.default
colorpickle.nixosModules.default colorpickle.nixosModules.default
@ -154,7 +155,7 @@
nixpkgs = import nixpkgs rec { nixpkgs = import nixpkgs rec {
system = "x86_64-linux"; system = "x86_64-linux";
config.allowUnfree = true; config.allowUnfree = true;
overlays = overlays system config; overlays = mkOverlays system config;
}; };
}; };
@ -163,14 +164,13 @@
./common ./common
./common/linux-specific.nix ./common/linux-specific.nix
./hosts/bloodletting/configuration.nix ./hosts/bloodletting/configuration.nix
lix-module.nixosModules.default
(import "${home-manager}/nixos") (import "${home-manager}/nixos")
mms.module mms.module
]; ];
deployment = { deployment = {
targetUser = "root"; targetUser = "root";
targetHost = "bloodletting"; targetHost = "technogothic.net";
tags = [ "prod" ]; tags = [ "prod" ];
@ -220,7 +220,6 @@
./common ./common
./common/linux-specific.nix ./common/linux-specific.nix
./hosts/watchtower/configuration.nix ./hosts/watchtower/configuration.nix
lix-module.nixosModules.default
(import "${home-manager}/nixos") (import "${home-manager}/nixos")
]; ];
@ -236,22 +235,23 @@
tears = mkDesktop "tears"; tears = mkDesktop "tears";
}; };
darwinConfigurations."Agathas-Mac-mini" = nix-darwin.lib.darwinSystem { darwinConfigurations."Agathas-Mac-mini" = nix-darwin.lib.darwinSystem {
pkgs = import nixpkgs-darwin rec {
system = "aarch64-darwin";
config.allowUnfree = true;
overlays = mkOverlays system config;
};
modules = [ modules = [
./common ./common
./hosts/Agathas-Mac-mini/configuration.nix ./hosts/Agathas-Mac-mini/configuration.nix
lix-module.nixosModules.default
(import "${home-manager}/nix-darwin") (import "${home-manager}/nix-darwin")
(
{ config, ... }:
{
nixpkgs.overlays = overlays nixpkgs.system config;
}
)
]; ];
}; };
devShells."x86_64-linux".default = devShells =
let let
pkgs = import nixpkgs { system = "x86_64-linux"; }; patchedColmena =
system:
let
pkgs = import nixpkgs { inherit system; };
in in
pkgs.mkShell { pkgs.mkShell {
buildInputs = [ buildInputs = [
@ -260,5 +260,10 @@
'') '')
]; ];
}; };
in
{
"x86_64-linux".default = patchedColmena "x86_64-linux";
"aarch64-darwin".default = patchedColmena "aarch64-darwin";
};
}; };
} }

78
hosts/bloodletting/configuration.nix
View File

@ -1,4 +1,10 @@
{ config, pkgs, lib, ... }: { {
config,
pkgs,
lib,
...
}:
{
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
../../common/fragments/bin.nix ../../common/fragments/bin.nix
@ -23,8 +29,7 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
bin = final.callPackage ../../common/pkgs/bin.nix { }; bin = final.callPackage ../../common/pkgs/bin.nix { };
agatha-mastodon = agatha-mastodon = final.callPackage ../../common/pkgs/mastodon/default.nix { };
final.callPackage ../../common/pkgs/mastodon/default.nix { };
}) })
]; ];
@ -39,15 +44,19 @@
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.interfaces.ens20 = { networking.interfaces.ens20 = {
ipv4.addresses = [{ ipv4.addresses = [
{
address = "91.198.192.199"; address = "91.198.192.199";
prefixLength = 27; prefixLength = 27;
}]; }
];
ipv6.addresses = [{ ipv6.addresses = [
{
address = "2001:67c:b54:1::6"; address = "2001:67c:b54:1::6";
prefixLength = 64; prefixLength = 64;
}]; }
];
}; };
networking.defaultGateway = { networking.defaultGateway = {
@ -62,11 +71,20 @@
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall = { networking.firewall = {
allowedTCPPorts = [ 20 21 22 80 443 990 ]; allowedTCPPorts = [
allowedTCPPortRanges = [{ 20
21
22
80
443
990
];
allowedTCPPortRanges = [
{
from = 40000; from = 40000;
to = 40200; to = 40200;
}]; }
];
trustedInterfaces = [ "podman0" ]; trustedInterfaces = [ "podman0" ];
}; };
@ -76,7 +94,7 @@
dockerCompat = true; dockerCompat = true;
defaultNetwork.settings.dns_enabled = true; defaultNetwork.settings.dns_enabled = true;
}; };
oci-containers = { backend = "podman"; }; oci-containers.backend = "podman";
}; };
# SSL/TLS Certificates # SSL/TLS Certificates
@ -85,13 +103,20 @@
security.acme.certs."technogothic.net" = { security.acme.certs."technogothic.net" = {
domain = "*.technogothic.net"; domain = "*.technogothic.net";
extraDomainNames = [ "technogothic.net" "*.argent.technogothic.net" ]; extraDomainNames = [
"technogothic.net"
"*.argent.technogothic.net"
];
dnsProvider = "hurricane"; dnsProvider = "hurricane";
credentialsFile = "/var/lib/secrets/hurricane-tokens"; credentialsFile = "/var/lib/secrets/hurricane-tokens";
group = "nginx"; group = "nginx";
}; };
security.acme.defaults.reloadServices = [ "nginx" "vsftpd" "prosody" ]; security.acme.defaults.reloadServices = [
"nginx"
"vsftpd"
"prosody"
];
systemd.services.nginx.serviceConfig.ProtectHome = "read-only"; systemd.services.nginx.serviceConfig.ProtectHome = "read-only";
# Nginx # Nginx
@ -108,10 +133,14 @@
upstreams = { upstreams = {
"backend-mastodon-streaming" = { "backend-mastodon-streaming" = {
servers = builtins.listToAttrs (map (i: { servers = builtins.listToAttrs (
map (i: {
name = "unix:/run/mastodon-streaming/streaming-${toString i}.socket"; name = "unix:/run/mastodon-streaming/streaming-${toString i}.socket";
value = { fail_timeout = "0"; }; value = {
}) (lib.range 1 config.services.mastodon.streamingProcesses)); fail_timeout = "0";
};
}) (lib.range 1 config.services.mastodon.streamingProcesses)
);
extraConfig = '' extraConfig = ''
least_conn; least_conn;
''; '';
@ -125,7 +154,9 @@
serverAliases = [ "agatha.technogothic.net" ]; serverAliases = [ "agatha.technogothic.net" ];
locations."=/cv.pdf" = { alias = "/home/ftp/cv.pdf"; }; locations."=/cv.pdf" = {
alias = "/home/ftp/cv.pdf";
};
locations."=/.well-known/host-meta" = { locations."=/.well-known/host-meta" = {
return = "301 https://fv.technogothic.net$request_uri"; return = "301 https://fv.technogothic.net$request_uri";
@ -168,9 +199,7 @@
locations."/" = { locations."/" = {
proxyPass = "http://localhost:6162"; proxyPass = "http://localhost:6162";
proxyWebsockets = true; proxyWebsockets = true;
extraConfig = "client_max_body_size ${ extraConfig = "client_max_body_size ${toString config.services.bin.textUploadLimit}M;";
toString config.services.bin.textUploadLimit
}M;";
}; };
}; };
@ -180,7 +209,9 @@
root = "/home/ftp"; root = "/home/ftp";
locations."/" = { extraConfig = "autoindex on;"; }; locations."/" = {
extraConfig = "autoindex on;";
};
}; };
virtualHosts."fv.technogothic.net" = { virtualHosts."fv.technogothic.net" = {
@ -191,7 +222,9 @@
locations."/system/".alias = "/var/lib/mastodon/public-system/"; locations."/system/".alias = "/var/lib/mastodon/public-system/";
locations."/" = { tryFiles = "$uri @proxy"; }; locations."/" = {
tryFiles = "$uri @proxy";
};
locations."@proxy" = { locations."@proxy" = {
proxyPass = "http://unix:/run/mastodon-web/web.socket"; proxyPass = "http://unix:/run/mastodon-web/web.socket";
@ -234,4 +267,3 @@
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.11"; # Did you read the comment? system.stateVersion = "22.11"; # Did you read the comment?
} }

20
hosts/ritual/configuration.nix
View File

@ -14,7 +14,9 @@
boot.loader.systemd-boot.configurationLimit = 5; boot.loader.systemd-boot.configurationLimit = 5;
# Setup keyfile # Setup keyfile
boot.initrd.secrets = { "/crypto_keyfile.bin" = null; }; boot.initrd.secrets = {
"/crypto_keyfile.bin" = null;
};
networking.hostName = "ritual"; networking.hostName = "ritual";
@ -27,7 +29,7 @@
dockerCompat = true; dockerCompat = true;
defaultNetwork.settings.dns_enabled = true; defaultNetwork.settings.dns_enabled = true;
}; };
oci-containers = { backend = "podman"; }; oci-containers.backend = "podman";
}; };
# Don't suspend when closed and plugged into power # Don't suspend when closed and plugged into power
@ -35,7 +37,18 @@
home-manager.users.agatha = { home-manager.users.agatha = {
xsession.windowManager.bspwm = { xsession.windowManager.bspwm = {
monitors = { eDP-1 = [ "I" "II" "III" "IV" "V" "VI" "VII" "VIII" ]; }; monitors = {
eDP-1 = [
"I"
"II"
"III"
"IV"
"V"
"VI"
"VII"
"VIII"
];
};
rules = { rules = {
"Element".desktop = "II"; "Element".desktop = "II";
"TelegramDesktop".desktop = "III"; "TelegramDesktop".desktop = "III";
@ -68,4 +81,3 @@
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "22.11"; # Did you read the comment? system.stateVersion = "22.11"; # Did you read the comment?
} }

48
hosts/tears/configuration.nix
View File

@ -14,7 +14,9 @@
boot.loader.systemd-boot.configurationLimit = 3; boot.loader.systemd-boot.configurationLimit = 3;
# Setup keyfile # Setup keyfile
boot.initrd.secrets = { "/crypto_keyfile.bin" = null; }; boot.initrd.secrets = {
"/crypto_keyfile.bin" = null;
};
networking.hostName = "tears"; networking.hostName = "tears";
@ -27,47 +29,13 @@
dockerCompat = true; dockerCompat = true;
defaultNetwork.settings.dns_enabled = true; defaultNetwork.settings.dns_enabled = true;
}; };
oci-containers = { backend = "podman"; }; oci-containers.backend = "podman";
}; };
home-manager.users.agatha = { # Needed for remote builds
xsession.windowManager.bspwm = { users.users.root.openssh.authorizedKeys.keys = [
monitors = { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGCsAQfMx1X+8HEa88x+l3KdJPFAzXg0vL0l/pm56/ZR nix-builder"
DP-1 = [ "I" "II" "III" "IV" "V" ]; ];
HDMI-1 = [ "VI" "VII" "VIII" "IX" "X" ];
};
extraConfigEarly =
"xrandr --output HDMI-1 --mode 1920x1080 --rate 144 --dpi 92 --output DP-1 --mode 1920x1080 --rate 144 --dpi 92 --left-of HDMI-1";
rules = {
"Element".desktop = "I";
"TelegramDesktop".desktop = "II";
"dino".desktop = "II";
"Cider".desktop = "III";
"Geary".desktop = "IV";
"firefox" = {
desktop = "VI";
state = "tiled";
follow = false;
};
};
};
services.polybar = {
script = ''
polybar left &
polybar right &'';
settings."bar/right" = {
monitor = "\${env:MONITOR:HDMI-1}";
modules.right =
"filesystem battery pulseaudio xkeyboard memory cpu powermenu";
};
settings."bar/left".monitor = "\${env:MONITOR:DP-1}";
};
};
environment.graphical.theme.name = "bridge";
services.syncthing.dataDir = "/mnt/hdd/syncthing";
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions

5
hosts/watchtower/configuration.nix
View File

@ -16,6 +16,7 @@
# Enable networking # Enable networking
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
systemd.services.NetworkManager-wait-online.enable = false;
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall = { networking.firewall = {
@ -33,9 +34,7 @@
dockerCompat = true; dockerCompat = true;
defaultNetwork.settings.dns_enabled = true; defaultNetwork.settings.dns_enabled = true;
}; };
oci-containers = { oci-containers.backend = "podman";
backend = "podman";
};
}; };
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default