sync
This commit is contained in:
parent
0843a7a737
commit
1a874f68d8
5 changed files with 39 additions and 44 deletions
|
|
@ -18,7 +18,7 @@ in
|
|||
|
||||
(modulesDirectory + /users.nix)
|
||||
(modulesDirectory + /kitchenowl.nix)
|
||||
(modulesDirectory + /radicale.nix)
|
||||
# (modulesDirectory + /radicale.nix)
|
||||
(modulesDirectory + /vaultwarden.nix)
|
||||
(modulesDirectory + /uptime-kuma.nix)
|
||||
(modulesDirectory + /wedding.nix)
|
||||
|
|
@ -51,9 +51,9 @@ in
|
|||
];
|
||||
|
||||
home-manager.users.fw = {
|
||||
imports = [
|
||||
(modulesDirectory + /programs/beets)
|
||||
];
|
||||
# imports = [
|
||||
# (modulesDirectory + /programs/beets)
|
||||
# ];
|
||||
home.username = "fw";
|
||||
home.homeDirectory = "/home/fw";
|
||||
|
||||
|
|
@ -81,7 +81,7 @@ in
|
|||
enable = true;
|
||||
};
|
||||
paperless = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
};
|
||||
kanboard = {
|
||||
enable = true;
|
||||
|
|
@ -96,13 +96,13 @@ in
|
|||
domain = "message.wastring.com";
|
||||
};
|
||||
filebrowser = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
host = "127.0.0.1";
|
||||
port = 8126;
|
||||
domain = "files.wastring.com";
|
||||
};
|
||||
glance = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
host = "127.0.0.1";
|
||||
domain = "home.wastring.com";
|
||||
};
|
||||
|
|
@ -113,34 +113,34 @@ in
|
|||
};
|
||||
|
||||
forgejo = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
};
|
||||
|
||||
actual = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
grafana = {
|
||||
enable = true;
|
||||
host = "127.0.0.1";
|
||||
domain = "grafana.wastring.com";
|
||||
};
|
||||
# grafana = {
|
||||
# enable = true;
|
||||
# host = "127.0.0.1";
|
||||
# domain = "grafana.wastring.com";
|
||||
# };
|
||||
|
||||
headscale = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
prometheus = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
exporters.enable = true;
|
||||
};
|
||||
|
||||
loki = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
};
|
||||
|
||||
alloy = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
configPath = ./alloy-systemd.yaml;
|
||||
};
|
||||
|
||||
|
|
@ -149,6 +149,7 @@ in
|
|||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
|
||||
];
|
||||
require-sigs = false;
|
||||
};
|
||||
|
||||
security.sudo.wheelNeedsPassword = false;
|
||||
|
|
|
|||
|
|
@ -110,14 +110,6 @@ in
|
|||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFpJBGPIfPB1BwSG7aoKqwfccyZSaU7J3xpJ8behMp9N fw@core"
|
||||
];
|
||||
|
||||
services.displayManager.sddm = {
|
||||
enable = true;
|
||||
wayland.enable = true;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
kdePackages.plasma-desktop
|
||||
];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
|
||||
|
|
|
|||
|
|
@ -79,6 +79,8 @@
|
|||
slurp
|
||||
bitwarden-desktop
|
||||
bitwarden-cli
|
||||
lagrange
|
||||
jujutsu
|
||||
|
||||
|
||||
dbeaver-bin
|
||||
|
|
|
|||
|
|
@ -68,27 +68,27 @@ in
|
|||
|
||||
config = mkMerge [
|
||||
(mkIf config.grafana.enable {
|
||||
services.grafana = {
|
||||
enable = true;
|
||||
settings = {
|
||||
server = {
|
||||
domain = config.grafana.domain;
|
||||
http_port = config.grafana.port;
|
||||
http_addr = config.grafana.host;
|
||||
};
|
||||
};
|
||||
};
|
||||
# services.grafana = {
|
||||
# enable = true;
|
||||
# settings = {
|
||||
# server = {
|
||||
# domain = config.grafana.domain;
|
||||
# http_port = config.grafana.port;
|
||||
# http_addr = config.grafana.host;
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
|
||||
# nginx reverse proxy
|
||||
services.nginx.virtualHosts."${config.grafana.domain}" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://${config.grafana.host}:${toString config.grafana.port}";
|
||||
proxyWebsockets = true;
|
||||
extraConfig = "proxy_ssl_server_name on;" + "proxy_pass_header Authorization;";
|
||||
};
|
||||
};
|
||||
# services.nginx.virtualHosts."${config.grafana.domain}" = {
|
||||
# enableACME = true;
|
||||
# forceSSL = true;
|
||||
# locations."/" = {
|
||||
# proxyPass = "http://${config.grafana.host}:${toString config.grafana.port}";
|
||||
# proxyWebsockets = true;
|
||||
# extraConfig = "proxy_ssl_server_name on;" + "proxy_pass_header Authorization;";
|
||||
# };
|
||||
# };
|
||||
})
|
||||
(mkIf config.loki.enable {
|
||||
networking.firewall.allowedTCPPorts = [ 3100 ];
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ in
|
|||
passwordFile = config.sops.secrets.github_password.path;
|
||||
registry = "https://ghcr.io";
|
||||
};
|
||||
image = "ghcr.io/fwastring/wedding:74a8cfe49568f1e0ffebb51f3f5d1178c527a907";
|
||||
image = "ghcr.io/fwastring/wedding:6de68dab52d1675283b8766d401088c9c541b170";
|
||||
ports = [ "127.0.0.1:8083:8080" ];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue