diff --git a/home/autumn/sysconfs/hoardfrost.nix b/home/autumn/sysconfs/hoardfrost.nix index bd2e2d8..706b10d 100644 --- a/home/autumn/sysconfs/hoardfrost.nix +++ b/home/autumn/sysconfs/hoardfrost.nix @@ -12,8 +12,8 @@ oh-my-zsh ]; }; - imports = [../../packages/rust-motd/rust-motd.kdl]; - xdg.configFile."starship.toml".source = ./packages/starship/starship.toml; + xdg.configFile."starship.toml".source = ../../packages/starship/starship.toml; + xdg.configFile."rust-motd/rust-motd.kdl".source = ../../packages/rust-motd/rust-motd.kdl; # programs.bash.initExtra = [ # "zsh" # "starship init zsh" diff --git a/system/packages/rust-motd/rust-motd.nix b/system/packages/rust-motd/rust-motd.nix index 538c6a6..06e6616 100644 --- a/system/packages/rust-motd/rust-motd.nix +++ b/system/packages/rust-motd/rust-motd.nix @@ -3,55 +3,56 @@ environment.systemPackages = with pkgs; [figlet]; programs.rust-motd = { enable = true; - # order = [ - # "global" - # "banner" - # "weather" - # "uptime" - # "last_login" - # "memory" - # "service_status" - # "filesystems" - # "load_avg" - # ]; - # settings = { - # global = { - # version = "1.0"; - # }; - # banner = { - # color = "blue"; - # command = "hostname | figlet -f sblood"; - # }; - # weather = { - # loc = "Denver,Colorado"; - # style = "full"; - # }; - # service_status = { - # samba = "samba-wsdd.service"; - # openssh = "sshd.service"; - # mealie = "podman-postgres-mealie.service"; - # stirling = "podman-stirling-pdf.service"; - # tbrowser = "podman-torrent-browser.service"; - # seas = "podman-transmission-openvpn.service"; - # tailscale = "tailscaled.service"; - # firewall = "firewall.service"; - # endlessh = "endlessh.service"; - # }; - # uptime = { - # prefix = "up"; - # }; - # memory = { - # swap_pos = "beside"; - # }; - # last_login = { - # autumn = 2; - # }; - # filesystems = { - # root = "/"; - # }; - # load_avg = { - # format = "Load (1, 5, 15 min.): {one:.02}, {five:.02}, {fifteen:.02}"; - # }; - # }; + order = [ + "global" + "banner" + "weather" + "uptime" + "last_login" + "memory" + "service_status" + "filesystems" + "load_avg" + ]; + settings = { + global = { + version = "1.0"; + }; + banner = { + color = "blue"; + command = "hostname | figlet -f sblood"; + }; + weather = { + loc = "America,Denver"; + style = "full"; + }; + service_status = { + samba = "samba-wsdd.service"; + openssh = "sshd.service"; + mealie = "podman-mealie.service"; + mealiedb = "podman-postgres.service"; + stirling = "podman-stirling-pdf.service"; + tbrowser = "podman-torrent-browser.service"; + seas = "podman-transmission-openvpn.service"; + tailscale = "tailscaled.service"; + firewall = "firewall.service"; + endlessh = "endlessh.service"; + }; + uptime = { + prefix = "up"; + }; + memory = { + swap_pos = "none"; + }; + last_login = { + autumn = 2; + }; + filesystems = { + root = "/"; + }; + load_avg = { + format = "Load (1, 5, 15 min.): {one:.02}, {five:.02}, {fifteen:.02}"; + }; + }; }; } diff --git a/system/services/containerization/mealie-2.nix b/system/services/containerization/mealie-2.nix index 596d8b0..137e1c0 100644 --- a/system/services/containerization/mealie-2.nix +++ b/system/services/containerization/mealie-2.nix @@ -17,10 +17,10 @@ "POSTGRES_SERVER" = "postgres"; "POSTGRES_USER" = "mealie"; "PUID" = "1000"; - "TZ" = "America/Anchorage"; + "TZ" = "America/Denver"; }; volumes = [ - "mealieio_mealie-data:/app/data:rw" + "mealie-data:/app/data:rw" ]; ports = [ "9925:9000/tcp" @@ -63,7 +63,7 @@ "POSTGRES_USER" = "mealie"; }; volumes = [ - "mealieio_mealie-pgdata:/var/lib/postgresql/data:rw" + "mealie-pgdata:/var/lib/postgresql/data:rw" ]; log-driver = "journald"; extraOptions = [