fixes for flame server

This commit is contained in:
Noah Masur 2025-03-08 01:31:42 +00:00
parent dd95c94b6e
commit 1276bcf19e
No known key found for this signature in database
14 changed files with 20 additions and 31 deletions

View File

@ -11,23 +11,6 @@ rec {
nmasur.settings = {
username = "noah";
fullName = "Noah Masur";
# hostnames =
# let
# baseName = "masu.rs";
# in
# {
# budget = "money.${baseName}";
# git = "git.${baseName}";
# influxdb = "influxdb.${baseName}";
# irc = "irc.${baseName}";
# metrics = "metrics.${baseName}";
# minecraft = "minecraft.${baseName}";
# n8n = "n8n.${baseName}";
# notifications = "ntfy.${baseName}";
# prometheus = "prom.${baseName}";
# secrets = "vault.${baseName}";
# status = "status.${baseName}";
# };
};
nmasur.profiles = {

View File

@ -15,7 +15,7 @@ in
config = lib.mkIf cfg.enable {
home.packages = lib.mkDefault [
home.packages = [
pkgs.pgcli # Postgres client with autocomplete
];

View File

@ -15,7 +15,7 @@ in
config = lib.mkIf cfg.enable {
home.packages = lib.mkDefault [
home.packages = [
# Charm tools

View File

@ -19,7 +19,7 @@ in
wine.enable = lib.mkDefault true;
};
home.packages = lib.mkDefault [
home.packages = [
pkgs.heroic
];

View File

@ -12,7 +12,7 @@ in
options.nmasur.profiles.power-user.enable = lib.mkEnableOption "power user home-manager config";
config = lib.mkIf cfg.enable {
home.packages = lib.mkDefault [
home.packages = [
pkgs.age # Encryption
pkgs.bc # Calculator
pkgs.delta # Fancy diffs

View File

@ -19,10 +19,10 @@ in
homebrew = lib.mkDefault true;
};
homebrew.brews = lib.mkDefault [
homebrew.brews = [
"trash" # Delete files and folders to trash instead of rm
];
homebrew.casks = lib.mkDefault [
homebrew.casks = [
"scroll-reverser" # Different scroll style for mouse vs. trackpad
"notunes" # Don't launch Apple Music with the play button
];

View File

@ -16,7 +16,7 @@ in
nmasur.profiles.base.enable = lib.mkDefault true;
homebrew.casks = lib.mkDefault [
homebrew.casks = [
"keybase" # GUI on Nix not available for macOS
];

View File

@ -16,7 +16,7 @@ in
nmasur.profiles.base.enable = lib.mkDefault true;
homebrew.casks = lib.mkDefault [
homebrew.casks = [
"steam" # Not packaged for Nixon macOS
"epic-games" # Not packaged for Nix
];

View File

@ -24,6 +24,9 @@ in
virtualisation.podman.enable = true;
# Create a shared group for generic services
users.groups.shared = { };
users.users.actualbudget = {
isSystemUser = true;
group = "shared";

View File

@ -50,7 +50,7 @@ in
config = lib.mkIf cfg.enable {
# Force Caddy to 403 if not coming from allowlisted source
nmasur.presets.services.caddy.cidrAllowlist = lib.mkDefault [ "127.0.0.1/32" ];
nmasur.presets.services.caddy.cidrAllowlist = [ "127.0.0.1/32" ];
nmasur.presets.services.caddy.routes = lib.mkBefore [
{
match = [ { not = [ { remote_ip.ranges = cfg.cidrAllowlist; } ]; } ];

View File

@ -44,7 +44,7 @@ in
services.restic.backups = {
default = {
repository = "s3:${cfg.endpoint}/${cfg.s3.bucket}/restic";
repository = "s3:${cfg.s3.endpoint}/${cfg.s3.bucket}/restic";
paths = [ ];
environmentFile = config.secrets.restic-s3-creds.dest;
passwordFile = config.secrets.restic.dest;

View File

@ -31,7 +31,7 @@ in
# Create a home directory for human user
isNormalUser = lib.mkDefault true;
extraGroups = lib.mkDefault [
extraGroups = [
"wheel" # Sudo privileges
];
};

View File

@ -21,7 +21,7 @@ in
# Mouse customization
services.ratbagd.enable = lib.mkDefault true;
environment.systemPackages = lib.mkDefault [
environment.systemPackages = [
pkgs.libratbag # Mouse adjustments
pkgs.piper # Mouse adjustments GUI
pkgs.ddcutil # Monitor brightness control
@ -57,7 +57,7 @@ in
users.users.${username} = {
# Grant main user access to external monitors
extraGroups = lib.mkDefault [ "i2c" ];
extraGroups = [ "i2c" ];
# Automatically create a password to start
hashedPassword = lib.mkDefault (lib.fileContents ../../../../../misc/password.sha512);

View File

@ -16,7 +16,10 @@ in
networking.firewall.allowPing = lib.mkDefault true;
nmasur.presets.services.openssh.enable = lib.mkDefault true;
nmasur.presets.services = {
openssh.enable = lib.mkDefault true;
restic.enable = lib.mkDefault true;
};
# Implement a simple fail2ban service for sshd
services.sshguard.enable = lib.mkDefault true;