From bf1595d374c94ef1f5971baef79a400295551a83 Mon Sep 17 00:00:00 2001 From: Lukas Wurzinger Date: Fri, 30 May 2025 23:22:03 +0200 Subject: [PATCH] stuff --- README.md | 20 ++++++++++---------- flake.nix | 21 ++++++++++++++++++--- hosts/vessel/README.md | 8 ++++---- 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index e49996b..7d3f85d 100644 --- a/README.md +++ b/README.md @@ -4,19 +4,19 @@ This is my cobbled together NixOS configuration. There are many like it, but thi ## Structure -* common: Sane defaults that make sense to use for every host. -* modules: Regular NixOS modules. -* profiles: Higher-level NixOS modules that conform to different roles that a host may have. -* packages: Packages that I couldn't fit anywhere else. -* secrets: Agenix secrets. -* hosts: Hosts exposed in `nixosConfigurations`. -* pubkeys.nix: Nix expression with all my SSH public keys, used for OpenSSH, Agenix and Restic. -* lib.nix: Nixpkgs' lib with some extra functionality. +- common: Sane defaults that make sense to use for every host. +- modules: Regular NixOS modules. +- profiles: Higher-level NixOS modules that conform to different roles that a host may have. +- packages: Packages that I couldn't fit anywhere else. +- secrets: Agenix secrets. +- hosts: Hosts exposed in `nixosConfigurations`. +- pubkeys.nix: Nix expression with all my SSH public keys, used for OpenSSH, Agenix and Restic. +- lib.nix: Nixpkgs' lib with some extra functionality. ## Ports -* 80X0: Public HTTP services that are proxied through nginx -* 40X0: Syncthing instances (4000 being the system instance, subsequent ones are for individual users) +- 80X0: Public HTTP services that are proxied through nginx +- 40X0: Syncthing instances (4000 being the system instance, subsequent ones are for individual users) ## Installation diff --git a/flake.nix b/flake.nix index 2ee8ccd..23271ff 100644 --- a/flake.nix +++ b/flake.nix @@ -60,9 +60,24 @@ treefmt = { projectRootFile = "flake.nix"; - programs.nixfmt = { - enable = true; - package = pkgs.nixfmt-rfc-style; + settings.global.excludes = [ + "LICENSE" + "*.age" + ".envrc" + ]; + + programs = { + nixfmt = { + enable = true; + package = pkgs.nixfmt-rfc-style; + }; + + shfmt = { + enable = true; + indent_size = 2; + }; + + mdformat.enable = true; }; }; diff --git a/hosts/vessel/README.md b/hosts/vessel/README.md index 8ca9d42..de59b81 100644 --- a/hosts/vessel/README.md +++ b/hosts/vessel/README.md @@ -2,7 +2,7 @@ ## File systems -* Main: White, 1TB, for the system and home directories -* Vault: Black, 2TB, primary for all data -* Void: Green, 1TB, for throwaway data -* Sync: Red, 2TB, synced from the vault +- Main: White, 1TB, for the system and home directories +- Vault: Black, 2TB, primary for all data +- Void: Green, 1TB, for throwaway data +- Sync: Red, 2TB, synced from the vault