treewide: fix deprecations
This commit is contained in:
parent
9f6f4205da
commit
c728f2e205
|
@ -31,8 +31,6 @@ with lib;
|
|||
|
||||
# boot.kernelPackages = lib.mkDefault pkgs.linuxPackages;
|
||||
|
||||
# nixpkgs.config.allowUnfreePredicate = pkg: packageName pkg == "unrar";
|
||||
|
||||
krebs = {
|
||||
enable = true;
|
||||
# dns.providers.lan = "hosts";
|
||||
|
@ -63,12 +61,6 @@ with lib;
|
|||
grep = "grep --color=auto";
|
||||
};
|
||||
|
||||
# nixpkgs.config.packageOverrides = pkgs: {
|
||||
#nano = pkgs.runCommand "empty" {} "mkdir -p $out";
|
||||
# tinc = pkgs.tinc_pre;
|
||||
#};
|
||||
|
||||
|
||||
nix.extraOptions = ''
|
||||
auto-optimise-store = true
|
||||
'';
|
||||
|
|
|
@ -25,9 +25,9 @@ in
|
|||
# services.redshift.enable = true;
|
||||
services.xserver = {
|
||||
enable = true;
|
||||
layout = "us";
|
||||
xkbVariant = "altgr-intl";
|
||||
xkbOptions = "ctrl:nocaps, eurosign:e";
|
||||
xkb.layout = "us";
|
||||
xkb.variant = "altgr-intl";
|
||||
xkb.options = "ctrl:nocaps, eurosign:e";
|
||||
|
||||
# windowManager = {
|
||||
# awesome.enable = true;
|
||||
|
|
|
@ -35,11 +35,11 @@
|
|||
services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.gnome-settings-daemon ];
|
||||
|
||||
services.pipewire.systemWide = lib.mkForce false;
|
||||
environment.etc."pipewire/pipewire.conf.d/pulse-server.conf".text = ''
|
||||
pulse.properties = {
|
||||
server.address = [ "unix:native" "tcp:4713" ]
|
||||
}
|
||||
'';
|
||||
services.pipewire.extraConfig.pipewire."91-pulse-server" = {
|
||||
"pulse.properties" = {
|
||||
"server.address" = [ "unix:native" "tcp:4713" ];
|
||||
};
|
||||
};
|
||||
# disable sleep
|
||||
systemd.targets.sleep.enable = false;
|
||||
systemd.targets.suspend.enable = false;
|
||||
|
|
|
@ -9,7 +9,7 @@ in
|
|||
passwordFile = config.sops.secrets."paperless-admin-pw".path;
|
||||
address = "0";
|
||||
# consumptionDir = "/media/cloud/nextcloud-data/makefu/files/SwiftScan";
|
||||
extraConfig = {
|
||||
settings = {
|
||||
PAPERLESS_DBHOST = "/run/postgresql";
|
||||
#PAPERLESS_REDIS = "redis://127.0.0.1:6379";
|
||||
PAPERLESS_TIKA_ENABLED = "1";
|
||||
|
|
|
@ -68,8 +68,7 @@ in {
|
|||
package = pkgs.mariadb;
|
||||
ensureDatabases = [ "romprdb" ];
|
||||
ensureUsers = [
|
||||
{ ensurePermissions = { "romprdb.*" = "ALL PRIVILEGES"; };
|
||||
name = user; }
|
||||
{ name = "romprdb"; ensureDBOwnership = true; }
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ let
|
|||
logging-interface = config.makefu.server.primary-itf;
|
||||
in {
|
||||
services.grafana.enable = true;
|
||||
services.grafana.addr = "0.0.0.0";
|
||||
services.grafana.settings.server.http_addr = "0.0.0.0";
|
||||
|
||||
services.influxdb.enable = true;
|
||||
systemd.services.influxdb.serviceConfig.LimitNOFILE = 8192;
|
||||
|
|
|
@ -9,15 +9,21 @@ in {
|
|||
services.syncthing = {
|
||||
enable = true;
|
||||
configDir = "/var/lib/syncthing";
|
||||
devices = mk_peers used_peers;
|
||||
key = config.sops.secrets."${config.clanCore.machineName}-syncthing.key".path;
|
||||
cert = config.sops.secrets."${config.clanCore.machineName}-syncthing.cert".path;
|
||||
overrideDevices = true;
|
||||
overrideFolders = true;
|
||||
openDefaultPorts = true;
|
||||
settings = {
|
||||
devices = (mk_peers used_peers) // {
|
||||
makefu-phone.id = "YP57S7C-4U7PTEV-7PNVREJ-574YUTC-XMZ6TH5-P7UL5IJ-VYGW7GV-Z6QYOQR";
|
||||
makefu-ebook.id = "RRNPQ7N-BUGZUKX-EU7VSDJ-Z5BTW33-55DOSF4-RJXWV7W-BL7TUHT-TV7EJQN";
|
||||
gum.id = "463N4HM-LFU3ARM-M7YU6O5-7FAVRIZ-WUOX5FN-C6A3XLZ-UCDUXQ5-2MVXDA6";
|
||||
x.id = "ETMOWBT-XOYB7LJ-J4OKD7U-WHBEAP5-MPAHKXM-O4GGRKM-WERF7R4-MRS7EAU"; # override config for x
|
||||
omo.id = "Y5OTK3S-JOJLAUU-KTBXKUW-M7S5UEQ-MMQPUK2-7CXO5V6-NOUDLKP-PRGAFAK";
|
||||
};
|
||||
key = config.sops.secrets."${config.clanCore.machineName}-syncthing.key".path;
|
||||
cert = config.sops.secrets."${config.clanCore.machineName}-syncthing.cert".path;
|
||||
};
|
||||
};
|
||||
services.syncthing.folders.the_playlist = {
|
||||
path = "/home/lass/tmp/the_playlist";
|
||||
devices = [ "mors" "prism" ];
|
||||
};
|
||||
|
||||
|
||||
boot.kernel.sysctl."fs.inotify.max_user_watches" = 524288;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue