diff --git a/configuration.nix b/configuration.nix index 89900eb..42268b0 100644 --- a/configuration.nix +++ b/configuration.nix @@ -244,10 +244,11 @@ rootUrl = "https://${hostname}/git/"; user = "git"; database.user = "git"; - log.level = "Error"; - cookieSecure = true; - disableRegistration = false; settings = { + session.COOKIE_SECURE = true; + log.LEVEL = "Error"; + service.DISABLE_REGISTRATION = false; + # increase cookie expiration time security.LOGIN_REMEMBER_DAYS = 365; @@ -476,17 +477,15 @@ }; }; - nix = { - useSandbox = true; + nix.settings = { # Can connect to the Nix daemon # and upload/run code as root! - trustedUsers = [ "builder" "rnhmjoj" ]; + trusted-users = [ "builder" "rnhmjoj" ]; # Use at most half the cores - buildCores = 8; - extraOptions = '' - # Always keep at least 256MiB free - min-free = 268435456 - ''; + cores = 8; + max-jobs = 16; + # Always keep at least 256MiB free + min-free = 268435456; }; environment.sessionVariables = { diff --git a/email.nix b/email.nix index 3e36778..7baf089 100644 --- a/email.nix +++ b/email.nix @@ -3,8 +3,8 @@ { imports = [ (builtins.fetchTarball { - url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-22.05/nixos-mailserver-nixos-22.05.tar.gz"; - sha256 = "0csx2i8p7gbis0n5aqpm57z5f9cd8n9yabq04bg1h4mkfcf7mpl6"; + url = "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/archive/nixos-22.11/nixos-mailserver-nixos-22.11.tar.gz"; + sha256 = "1h1r4x2ffqwyk0ql6kjvcpg1bdiimyzhrsvn49702fsgzpx57fhd"; }) ]; @@ -16,10 +16,7 @@ messageSizeLimit = 78643200; # ~50MiB of base64 binary loginAccounts = config.secrets.emailAccounts; - - extraVirtualAliases = { - "abuse@eurofusion.eu" = "rnhmjoj@eurofusion.eu"; - }; + extraVirtualAliases = config.secrets.emailAliases; # store state under /var mailDirectory = "/var/lib/mail"; diff --git a/hardware.nix b/hardware.nix index d13a000..137df38 100644 --- a/hardware.nix +++ b/hardware.nix @@ -31,7 +31,6 @@ fsType = "ext4"; }; - nix.maxJobs = lib.mkDefault 16; powerManagement.cpuFreqGovernor = "ondemand"; services.apcupsd = { diff --git a/packages.nix b/packages.nix index a9c6704..ed827af 100644 --- a/packages.nix +++ b/packages.nix @@ -8,11 +8,6 @@ roomId = "!FsUSHSNMPMVTFFcvJo:maxwell.ydns.eu"; authToken = config.secrets.passwords.matrix; }; - haskellPackages = super.haskellPackages.extend (hself: hsuper: - { namecoin-update = hself.callCabal2nix "namecoin-update" (builtins.fetchTarball { - url = "https://hackage.haskell.org/package/namecoin-update-0.2.3.0/namecoin-update-0.2.3.0.tar.gz"; - }) {}; - }); }); environment.systemPackages = with pkgs; [ diff --git a/secrets/default.nix b/secrets/default.nix index dbd414d..2112cad 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -1,66 +1,69 @@ -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 -xuuQttvsg4hCNnahET6mpQ== +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