Compare commits

..

No commits in common. "ae22ff5fb02c2b446898b4d0758b786d500f8e46" and "6bf791ffd49dd88706e1e0722cd6e42631c8bb45" have entirely different histories.

11 changed files with 3 additions and 79 deletions

View File

@ -17,7 +17,7 @@ in {
set -x WEBKIT_DISABLE_COMPOSITING_MODE 1
set -x TERMINAL kitty
set -x EDITOR nvim
set -x VISUAL zeditor
set -x VISUAL zed
set -x XDG_DATA_HOME $HOME/.local/share
set -x FZF_CTRL_R_OPTS "
--preview='bat --color=always -n {}'

View File

@ -19,7 +19,7 @@ in {
$env.WEBKIT_DISABLE_COMPOSITING_MODE = "1"
$env.TERMINAL = "kitty"
$env.EDITOR = "nvim"
$env.VISUAL = "zeditor"
$env.VISUAL = "zed"
$env.FZF_DEFAULT_COMMAND = "fd --type f --exclude .git --follow --hidden"
$env.FZF_DEFAULT_OPTS = "--preview='bat --color=always -n {}' --bind 'ctrl-/:toggle-preview' --header 'Press CTRL-Y to copy command into clipboard' --bind 'ctrl-/:toggle-preview' --bind 'ctrl-y:execute-silent(echo -n {2..} | wl-copy)+abort' --color bg:#282a36,bg+:#44475a,fg:#f8f8f2,fg+:#f8f8f2,header:#6272a4,hl:#bd93f9,hl+:#bd93f9,info:#ffb86c,marker:#ff79c6,pointer:#ff79c6,prompt:#50fa7b,spinner:#ffb86c"
$env.XDG_DATA_HOME = $"($env.HOME)/.local/share"

View File

@ -13,7 +13,6 @@ in {
config = mkIf cfg.enable {
home.packages = with pkgs; [
bruno
filezilla
insomnia
];

View File

@ -54,7 +54,6 @@
extraConfig = {
core.excludesfile = "~/.gitignore_global";
init.defaultBranch = "master";
pull.rebase = false;
};
};

View File

@ -31,14 +31,6 @@
hetzner-s3-az-intern-access-key = {
file = ../../secrets/hetzner-s3-az-intern-access-key.age;
};
zammad-pw = {
file = ../../secrets/zammad-pw.age;
owner = "zammad";
};
zammad-secret = {
file = ../../secrets/zammad-secret.age;
owner = "zammad";
};
};
};
}

View File

@ -9,6 +9,5 @@
./postgres.nix
./traefik.nix
./vaultwarden.nix
./zammad.nix
];
}

View File

@ -44,7 +44,6 @@
local n8n n8n scram-sha-256
local outline outline scram-sha-256
local vaultwarden vaultwarden scram-sha-256
local zammad zammad scram-sha-256
# Localhost connections (IPv4 and IPv6)
host all postgres 127.0.0.1/32 scram-sha-256
@ -59,9 +58,6 @@
host vaultwarden vaultwarden 127.0.0.1/32 scram-sha-256
host vaultwarden vaultwarden ::1/128 scram-sha-256
host zammad zammad 127.0.0.1/32 scram-sha-256
host zammad zammad ::1/128 scram-sha-256
# Podman network connections for Baserow
host baserow baserow 10.89.0.0/24 scram-sha-256
host kestra kestra 10.89.0.0/24 scram-sha-256
@ -76,7 +72,7 @@
services.postgresqlBackup = {
enable = true;
startAt = "03:10:00";
databases = ["baserow" "kestra" "librechat_rag" "n8n" "outline" "vaultwarden" "zammad"];
databases = ["baserow" "kestra" "librechat_rag" "n8n" "outline" "vaultwarden"];
};
services.pgadmin = {
enable = true;

View File

@ -1,34 +0,0 @@
{config, ...}:{
services = {
zammad = {
enable = true;
openPorts = false;
port = 3034;
secretKeyBaseFile = "${config.age.secrets.zammad-secret.path}";
database = {
createLocally = false;
port = 5432;
host = "127.0.0.1";
passwordFile = "${config.age.secrets.zammad-pw.path}";
};
};
};
# Traefik configuration specific to littlelink
services.traefik.dynamicConfigOptions.http = {
services.zammad.loadBalancer.servers = [
{
url = "http://localhost:3034/";
}
];
routers.zammad = {
rule = "Host(`help.az-gruppe.com`)";
tls = {
certResolver = "ionos";
};
service = "zammad";
entrypoints = "websecure";
};
};
}

View File

@ -21,6 +21,4 @@ in {
"secrets/pgadmin-pw.age".publicKeys = systems ++ users;
"secrets/vaultwarden-env.age".publicKeys = systems ++ users;
"secrets/vaultwarden-db.age".publicKeys = systems ++ users;
"secrets/zammad-pw.age".publicKeys = systems ++ users;
"secrets/zammad-secret.age".publicKeys = systems ++ users;
}

View File

@ -1,11 +0,0 @@
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpoVnNlZyBEZTVj
RmV1ODV4bWJlV2lWN2pod290M0tSbTRKZzZwUHFYRVNjWlRHK21vCnNaL3Axc29T
MlVCT2RFS2hZRjlWdVN2dWFrS2ozU3UzbzhkVHNkT3FnS3MKLT4gc3NoLWVkMjU1
MTkgQ1NNeWhnIFFTSVBOUExXUWlkK3hvVVVIWDUvbWZKYytjTktEQlYySDYvcGdt
MWd0bVkKSmdLNmZocDJzR1IzbUY5UnIwYi9QNW9SVnpuTzBuRlhnZEVzektzd2t0
YwotPiA8ci1ncmVhc2Ugd3opclF1IG52IDhmITZPdFAKZU1VWmpIYnNlVmtKYTZR
c29USmhEelN4ZWE4b3RqRkoxOG1UL3NTWFdhWVNkWFlVOHJ4dkF3Ci0tLSBjdkVY
Qng2c3hFcnFwY25laE44dHpEUVRvL1ZSYkVNUnY4bllNbzlmL2VvChj2mK4ic7/9
moMEsJIKG/PZz0kHDzDnmHAEyYTEpShixmnj2tl9k9UxTMZG8lVj
-----END AGE ENCRYPTED FILE-----

View File

@ -1,14 +0,0 @@
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFpoVnNlZyBPbVJt
b28xdkl3Z0laRVg2eU9MZjJLUms1QVpvZkw4SWhoRm5JTTllS2dBCkVTK3NPYjZq
NVdiRmVhWXZXUUVIcEZVWTZLekVDdnBFUDViU0tha3ZRSVUKLT4gc3NoLWVkMjU1
MTkgQ1NNeWhnIG9ic05MZi9XWHBPWmtQTzZVdmU1ekYyNExKeXg3VDAxbHNpRjgw
UlhyeDQKZ1ErOGw1ZFl0N3dTNmozRzZzazlWWnY5bCsrNVhnZzBsLzZsNlFLVmJR
NAotPiBlOSomL0k/YS1ncmVhc2UgKzs8XmZlMmcgR18KaHlBbzFuelVKc3IvTzE2
QWZkYmQyamZLMElVRlA1NkI5OTVvcDdEWUhVTmpZV2Z6RWtVSTcyM1JBcWNnM3Fq
bQprNWVlZ1EKLS0tIFZpbCtrY3dLNFdpZ3didHF1cndrNzllOVE3Ykk3eWl4cGRY
NDhTaE1vb2sKA8yVrMv119ZAbidadw1qJxKSnmz/EChZV5OEDxcSuCGMd04mxi98
/n4oD9KUFaDztmG+wTqjeaUGNwNl3peq/OgRXSZJtCgqlXtteG7tYX9enrztQnzV
jmw8rY/1IJ0SZ6PSM7tsWg6ePvbiWNrxlVvZDmc0bCXZ7CvCRoZPf7oTV0JukLwY
BcUk6LUYfenE0H+uuD1jRm3MJnF4UawKY/c=
-----END AGE ENCRYPTED FILE-----