makefu/nixos-config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

treewide: fix deprecations

Browse source
This commit is contained in:
makefu 2024-05-31 10:46:10 +02:00
parent 9f6f4205da
commit c728f2e205
No known key found for this signature in database
GPG key ID: 36F7711F3FC0F225
7 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
2configs/default.nix
View file

@ -31,8 +31,6 @@ with lib;
# boot.kernelPackages = lib.mkDefault pkgs.linuxPackages; # boot.kernelPackages = lib.mkDefault pkgs.linuxPackages;
# nixpkgs.config.allowUnfreePredicate = pkg: packageName pkg == "unrar";
krebs = { krebs = {
enable = true; enable = true;
# dns.providers.lan = "hosts"; # dns.providers.lan = "hosts";
@ -63,12 +61,6 @@ with lib;
grep = "grep --color=auto"; grep = "grep --color=auto";
}; };
# nixpkgs.config.packageOverrides = pkgs: {
#nano = pkgs.runCommand "empty" {} "mkdir -p $out";
# tinc = pkgs.tinc_pre;
#};
nix.extraOptions = '' nix.extraOptions = ''
auto-optimise-store = true auto-optimise-store = true
''; '';

6
2configs/gui/base.nix
View file

@ -25,9 +25,9 @@ in
# services.redshift.enable = true; # services.redshift.enable = true;
services.xserver = { services.xserver = {
enable = true; enable = true;
layout = "us"; xkb.layout = "us";
xkbVariant = "altgr-intl"; xkb.variant = "altgr-intl";
xkbOptions = "ctrl:nocaps, eurosign:e"; xkb.options = "ctrl:nocaps, eurosign:e";
# windowManager = { # windowManager = {
# awesome.enable = true; # awesome.enable = true;

10
2configs/gui/wbob-kiosk.nix
View file

@ -35,11 +35,11 @@
services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.gnome-settings-daemon ]; services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.gnome-settings-daemon ];
services.pipewire.systemWide = lib.mkForce false; services.pipewire.systemWide = lib.mkForce false;
environment.etc."pipewire/pipewire.conf.d/pulse-server.conf".text = '' services.pipewire.extraConfig.pipewire."91-pulse-server" = {
pulse.properties = { "pulse.properties" = {
server.address = [ "unix:native" "tcp:4713" ] "server.address" = [ "unix:native" "tcp:4713" ];
} };
''; };
# disable sleep # disable sleep
systemd.targets.sleep.enable = false; systemd.targets.sleep.enable = false;
systemd.targets.suspend.enable = false; systemd.targets.suspend.enable = false;

2
2configs/home/paperless.nix
View file

@ -9,7 +9,7 @@ in
passwordFile = config.sops.secrets."paperless-admin-pw".path; passwordFile = config.sops.secrets."paperless-admin-pw".path;
address = "0"; address = "0";
# consumptionDir = "/media/cloud/nextcloud-data/makefu/files/SwiftScan"; # consumptionDir = "/media/cloud/nextcloud-data/makefu/files/SwiftScan";
extraConfig = { settings = {
PAPERLESS_DBHOST = "/run/postgresql"; PAPERLESS_DBHOST = "/run/postgresql";
#PAPERLESS_REDIS = "redis://127.0.0.1:6379"; #PAPERLESS_REDIS = "redis://127.0.0.1:6379";
PAPERLESS_TIKA_ENABLED = "1"; PAPERLESS_TIKA_ENABLED = "1";

3
2configs/nginx/rompr.nix
View file

@ -68,8 +68,7 @@ in {
package = pkgs.mariadb; package = pkgs.mariadb;
ensureDatabases = [ "romprdb" ]; ensureDatabases = [ "romprdb" ];
ensureUsers = [ ensureUsers = [
{ ensurePermissions = { "romprdb.*" = "ALL PRIVILEGES"; }; { name = "romprdb"; ensureDBOwnership = true; }
name = user; }
]; ];
}; };
} }

2
2configs/stats/server.nix
View file

@ -11,7 +11,7 @@ let
logging-interface = config.makefu.server.primary-itf; logging-interface = config.makefu.server.primary-itf;
in { in {
services.grafana.enable = true; 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; services.influxdb.enable = true;
systemd.services.influxdb.serviceConfig.LimitNOFILE = 8192; systemd.services.influxdb.serviceConfig.LimitNOFILE = 8192;

22
2configs/sync/default.nix
View file

@ -9,15 +9,21 @@ in {
services.syncthing = { services.syncthing = {
enable = true; enable = true;
configDir = "/var/lib/syncthing"; configDir = "/var/lib/syncthing";
devices = mk_peers used_peers; overrideDevices = true;
key = config.sops.secrets."${config.clanCore.machineName}-syncthing.key".path; overrideFolders = true;
cert = config.sops.secrets."${config.clanCore.machineName}-syncthing.cert".path; 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; boot.kernel.sysctl."fs.inotify.max_user_watches" = 524288;
} }