fix collabora partially

This commit is contained in:
mjallen18
2024-07-04 09:50:41 -05:00
parent 9bbe5272f9
commit 5d7f37168c
4 changed files with 67 additions and 20 deletions

View File

@@ -125,13 +125,22 @@ in
];
};
systemd.services.fix-wifi = {
path = [ pkgs.bash pkgs.networkmanager pkgs.kmod ];
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
Type="oneshot";
ExecStart = [ "${resetNetworkScript}/bin/reset-network" ];
systemd.services = {
fix-wifi = {
path = [ pkgs.bash pkgs.networkmanager pkgs.kmod ];
wantedBy = [ "multi-user.target" ];
after = [ "network.target" ];
serviceConfig = {
Type="oneshot";
ExecStart = [ "${resetNetworkScript}/bin/reset-network" ];
};
};
rsync-home = {
path = [ pkgs.bash pkgs.rsync ];
script = ''
rsync -rtpogv --progress --ignore-existing --exclude={'/home/matt/Games/*', '/home/matt/1TB/*'} -lHzs /home/matt /media/nas/backup/desktop-nix/home
'';
};
};
@@ -166,12 +175,14 @@ in
clinfo
efibootmgr
gparted
grsync
kmod
lact
nano
os-prober
papirus-icon-theme
pciutils
rsync
sbctl
vim
vulkan-tools
@@ -204,17 +215,17 @@ in
};
services = {
borgbackup.jobs.home-matt = {
paths = "/home/matt";
encryption.mode = "none";
# environment.BORG_RSH = "ssh -i /home/matt/.ssh/id_ed25519";
repo = "/media/nas/backup/desktop-nix/home";
compression = "auto,zstd";
exclude = [
"/home/matt/Games"
"/home/matt/1TB"
];
};
# borgbackup.jobs.home-matt = {
# paths = "/home/matt";
# encryption.mode = "none";
# # environment.BORG_RSH = "ssh -i /home/matt/.ssh/id_ed25519";
# repo = "/media/nas/backup/desktop-nix/home";
# compression = "auto,zstd";
# exclude = [
# "/home/matt/Games"
# "/home/matt/1TB"
# ];
# };
ratbagd.enable = true;
};

View File

@@ -69,12 +69,12 @@ in
baseUrl = "https://mealie.mjallen.dev";
maxConcurrency = "4";
maxWorkers = "4";
allowSignup = "true";
allowSignup = "false";
};
nextcloud = {
enable = true;
httpPort = "9980";
httpPort = "9981";
httpsPort = "9443";
};

View File

@@ -23,6 +23,12 @@ in
PUID = cfg.puid;
PGID = cfg.pgid;
TZ = cfg.timeZone;
username = cfg.username;
password = cfg.password;
DONT_GEN_SSL_CERT = cfg.dontGenSslCert;
server_name = cfg.serverName;
dictionaries = cfg.dictionaries;
extra_params = cfg.extraParams;
};
};
};

View File

@@ -38,5 +38,35 @@ with lib;
type = types.str;
default = "America/Chicago";
};
username = mkOption {
type = types.str;
default = "mjallen";
};
password = mkOption {
type = types.str;
default = "BogieDudie1";
};
dontGenSslCert = mkOption {
type = types.str;
default = "1";
};
serverName = mkOption {
type = types.str;
default = "office.mjallen.dev";
};
dictionaries = mkOption {
type = types.str;
default = "de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru";
};
extraParams = mkOption {
type = types.str;
default = "--o:ssl.enable=false --o:net.post_allow.host=10.0.1.18";
};
};
}