This commit is contained in:
+17
-10
@@ -38,6 +38,15 @@ in
|
||||
enable = mkDefault true;
|
||||
wheelNeedsPassword = mkDefault false;
|
||||
};
|
||||
|
||||
# TODO: Add this to fix login
|
||||
# pam = {
|
||||
# services = {
|
||||
# kmscon.rules. = mkIf config.services.kmscon.config.libseat {
|
||||
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
};
|
||||
|
||||
nix = {
|
||||
@@ -157,16 +166,14 @@ in
|
||||
};
|
||||
|
||||
services = {
|
||||
kmscon = {
|
||||
# As it turns out, kmscon hasn't been updated in years and has some bugs...
|
||||
# TODO: Remove if-else when 26.11 releases
|
||||
kmscon = if (config.system.nixos.release == "26.06:u-26.11") then {
|
||||
enable = mkDefault false;
|
||||
hwRender = mkDefault true;
|
||||
extraOptions = "--verbose";
|
||||
extraConfig =
|
||||
''
|
||||
font-name=SauceCodePro Nerd Font Mono
|
||||
'';
|
||||
};
|
||||
config = {
|
||||
hwaccel = config.hardware.graphics.enable;
|
||||
font-name = "SauceCodePro Nerd Font Mono";
|
||||
};
|
||||
} else { };
|
||||
getty.greetingLine = mkDefault' ''<<< Welcome to ${config.system.nixos.distroName} ${config.system.nixos.label} (\m) - \l >>>'';
|
||||
|
||||
openssh = {
|
||||
@@ -247,7 +254,7 @@ in
|
||||
};
|
||||
}
|
||||
(mkIf config.services.kmscon.enable {
|
||||
fonts.fonts = with pkgs; [
|
||||
fonts.packages = with pkgs; [
|
||||
nerd-fonts.sauce-code-pro
|
||||
];
|
||||
})
|
||||
|
||||
@@ -44,8 +44,7 @@ in
|
||||
swaylock-plugin
|
||||
];
|
||||
services = {
|
||||
# TODO: Remove if-else when 26.05 releases
|
||||
resolved = if (config.system.nixos.release == "25.11:u-26.05") then {
|
||||
resolved = {
|
||||
settings.Resolve = {
|
||||
FallbackDNS = mkOverride 99 (
|
||||
"1.1.1.1#cloudflare-dns.com 8.8.8.8#dns.google " +
|
||||
@@ -54,7 +53,7 @@ in
|
||||
"2606:4700:4700::1001#cloudflare-dns.com 2001:4860:4860::8844#dns.google" );
|
||||
LLMNR = "resolve";
|
||||
};
|
||||
} else { };
|
||||
};
|
||||
|
||||
pipewire = {
|
||||
enable = true;
|
||||
|
||||
@@ -13,21 +13,13 @@ in
|
||||
};
|
||||
|
||||
services.resolved = {
|
||||
# Explicitly unset fallback DNS (Nix module will not allow for a blank config)
|
||||
# TODO: Remove if-else when 26.05 releases
|
||||
} // (if config.system.nixos.release == "25.11:u-25.11" then {
|
||||
domains = [ config.networking.domain ];
|
||||
extraConfig = ''
|
||||
FallbackDNS=
|
||||
Cache=no-negative
|
||||
'';
|
||||
} else {
|
||||
settings.Resolve = {
|
||||
Domains = [ config.networking.domain ];
|
||||
# Explicitly unset fallback DNS (Nix module will not allow for a blank config)
|
||||
FallbackDNS = "";
|
||||
Cache = "no-negative";
|
||||
};
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
(mkIf config.my.build.isDevVM {
|
||||
|
||||
@@ -165,7 +165,7 @@ let
|
||||
|
||||
extraSettingsOpt = with lib.types; mkOpt' (nullOr str) null "Path to extra settings (e.g. for secrets).";
|
||||
baseAuthSettings = pkgs.writeText "pdns.conf" (settingsToLines cfg.auth.settings);
|
||||
baseRecursorSettings = (pkgs.formats.yaml { }).generate "pdns-recursor.yaml" config.services.pdns-recursor.yaml-settings;
|
||||
baseRecursorSettings = (pkgs.formats.yaml { }).generate "pdns-recursor.yaml" config.services.pdns-recursor.settings;
|
||||
generateSettings = type: base: dst: if (cfg."${type}".extraSettingsFile != null) then ''
|
||||
oldUmask="$(umask)"
|
||||
umask 006
|
||||
|
||||
@@ -11,9 +11,7 @@ in
|
||||
config = mkIf cfg.enable {
|
||||
services = {
|
||||
getty.autologinUser = mkDefault uname;
|
||||
kmscon.autologinUser = mkDefault uname;
|
||||
# TODO: Update to Setings.Resolve.LLMNR when 26.05 releases
|
||||
resolved.llmnr = mkDefault "false";
|
||||
resolved.settings.Resolve.LLMNR = mkDefault "false";
|
||||
};
|
||||
systemd = {
|
||||
timers = {
|
||||
|
||||
@@ -336,13 +336,13 @@ in
|
||||
(persistSimpleSvc "jackett")
|
||||
(persistSimpleSvc "radarr")
|
||||
(persistSimpleSvc "sonarr")
|
||||
(mkIf config.services.jellyseerr.enable {
|
||||
(mkIf config.services.seerr.enable {
|
||||
my.tmproot.persistence.config.directories = [
|
||||
{
|
||||
directory = "/var/lib/jellyseerr";
|
||||
directory = "/var/lib/seerr";
|
||||
mode = "0750";
|
||||
user = "jellyseerr";
|
||||
group = "jellyseerr";
|
||||
user = "seerr";
|
||||
group = "seerr";
|
||||
}
|
||||
];
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user