b12f/os
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

nixos: more 24.05 fixes and updates

Browse source
This commit is contained in:
Benjamin Yule Bädorf 2024-06-03 12:30:14 +02:00
parent 561361f771
commit b8a48cd704
Signed by: b12f
GPG key ID: 729956E1124F8F26
5 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
hosts/pie/authelia.nix
View file

@ -55,10 +55,10 @@ in {
"auth.b12f.io" = { "auth.b12f.io" = {
forceSSL = true; forceSSL = true;
useACMEHost = "auth.b12f.io"; useACMEHost = "auth.b12f.io";
locations."/".proxyPass = "http://127.0.0.1:${builtins.toString config.services.authelia.instances.b12f.settings.server.port}"; locations."/".proxyPass = "http://${config.services.authelia.instances.b12f.settings.server.address}";
locations."/".extraConfig = "include /etc/nginx/conf-available/proxy.conf;"; locations."/".extraConfig = "include /etc/nginx/conf-available/proxy.conf;";
locations."/api/verify".proxyPass = "http://127.0.0.1:${builtins.toString config.services.authelia.instances.b12f.settings.server.port}"; locations."/api/verify".proxyPass = "http://${config.services.authelia.instances.b12f.settings.server.address}";
locations."/api/authz".proxyPass = "http://127.0.0.1:${builtins.toString config.services.authelia.instances.b12f.settings.server.port}"; locations."/api/authz".proxyPass = "http://${config.services.authelia.instances.b12f.settings.server.address}";
}; };
}; };
@ -76,8 +76,7 @@ in {
default_2fa_method = "webauthn"; default_2fa_method = "webauthn";
log.level = "debug"; log.level = "debug";
server = { server = {
port = 9092; address = "127.0.0.1:9092";
host = "127.0.0.1";
endpoints.authz.auth-request.implementation = "AuthRequest"; endpoints.authz.auth-request.implementation = "AuthRequest";
}; };
authentication_backend = { authentication_backend = {

4
hosts/pie/configuration.nix
View file

@ -51,6 +51,10 @@ in {
''; '';
}; };
# Ran into this
# https://discourse.nixos.org/t/logrotate-config-fails-due-to-missing-group-30000/28501
services.logrotate.checkConfig = false;
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions
# on your system were taken. It‘s perfectly fine and recommended to leave # on your system were taken. It‘s perfectly fine and recommended to leave

2
hosts/pie/paperless.nix
View file

@ -73,7 +73,7 @@ in {
consumptionDir = consumptionDir; consumptionDir = consumptionDir;
dataDir = dataDir; dataDir = dataDir;
address = "127.0.0.1"; address = "127.0.0.1";
extraConfig = { settings = {
PAPERLESS_OCR_LANGUAGE = "nld+deu"; PAPERLESS_OCR_LANGUAGE = "nld+deu";
PAPERLESS_URL = "https://paperless.b12f.io"; PAPERLESS_URL = "https://paperless.b12f.io";
PAPERLESS_DISABLE_REGULAR_LOGIN = "True"; PAPERLESS_DISABLE_REGULAR_LOGIN = "True";

8
modules/graphical/alacritty.nix
View file

@ -30,9 +30,6 @@
multiplier = 3; multiplier = 3;
}; };
# When true, bold text is drawn using the bright variant of colors.
draw_bold_text_with_bright_colors = true;
font = { font = {
# The normal (roman) font face to use. # The normal (roman) font face to use.
normal = { normal = {
@ -68,7 +65,7 @@
}; };
}; };
key_bindings = [ keyboard.bindings = [
{ {
key = "V"; key = "V";
mods = "Control|Alt"; mods = "Control|Alt";
@ -162,6 +159,9 @@
# Base16 Burn 256 - alacritty color config # Base16 Burn 256 - alacritty color config
# Benjamin Bädorf # Benjamin Bädorf
colors = { colors = {
# When true, bold text is drawn using the bright variant of colors.
draw_bold_text_with_bright_colors = true;
# Default colors # Default colors
primary = { primary = {
background = "0x1a181a"; background = "0x1a181a";

4
modules/graphical/default.nix
View file

@ -6,7 +6,7 @@
}: }:
with lib; let with lib; let
psCfg = config.pub-solar; psCfg = config.pub-solar;
yamlFormat = pkgs.formats.yaml {}; tomlFormat = pkgs.formats.toml {};
sessionVariables = { sessionVariables = {
WLR_RENDERER = WLR_RENDERER =
if psCfg.graphical.wayland.software-renderer.enable if psCfg.graphical.wayland.software-renderer.enable
@ -110,7 +110,7 @@ in {
home-manager.users."${psCfg.user.name}" = { home-manager.users."${psCfg.user.name}" = {
home.file."xinitrc".source = ./.xinitrc; home.file."xinitrc".source = ./.xinitrc;
xdg.configFile."alacritty/alacritty.yml".source = yamlFormat.generate "alacritty.yml" (import ./alacritty.nix); xdg.configFile."alacritty/alacritty.toml".source = tomlFormat.generate "alacritty.toml" (import ./alacritty.nix);
xdg.configFile."xmodmap".source = ./.config/xmodmap; xdg.configFile."xmodmap".source = ./.config/xmodmap;
xdg.configFile."user-dirs.dirs".source = ./.config/user-dirs.dirs; xdg.configFile."user-dirs.dirs".source = ./.config/user-dirs.dirs;
xdg.configFile."user-dirs.locale".source = ./.config/user-dirs.locale; xdg.configFile."user-dirs.locale".source = ./.config/user-dirs.locale;