diff --git a/flake.nix b/flake.nix index 581d289..7c361d2 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ till = { imports = [ - ./home/minimal.nix + ./home/profiles/minimal.nix ./users/till/home.nix ]; }; @@ -42,6 +42,18 @@ }; }; } + { + + # firefox-addons.config.allowUnfreePredicate = pkg: + # builtins.elem (nixpkgs.lib.getName pkg) [ + # "tampermonkey" + # ]; + + nixpkgs.config.allowUnfreePredicate = pkg: + builtins.elem (nixpkgs.lib.getName pkg) [ + "outline" + ]; + } ]; }; diff --git a/hosts/arielle/default.nix b/hosts/arielle/default.nix index 0503bda..390e4e3 100644 --- a/hosts/arielle/default.nix +++ b/hosts/arielle/default.nix @@ -6,8 +6,8 @@ imports = [ ./hardware-configuration.nix - ../system - ../system/web-server - ../system/mail-server + ../../system + ../../system/web-server + ../../system/mail-server ]; } diff --git a/system/mail-server/dkim.nix b/system/mail-server/dkim.nix index 32394a9..9f4bf19 100644 --- a/system/mail-server/dkim.nix +++ b/system/mail-server/dkim.nix @@ -10,5 +10,5 @@ users.users.postfix.extraGroups = [ "opendkim" ]; - services.postfix.config.smtpd_milters = [ "unix:/run/opendkim/opendkim.sock" ]; + services.postfix.settings.main.smtpd_milters = [ "unix:/run/opendkim/opendkim.sock" ]; } diff --git a/system/web-server/default.nix b/system/web-server/default.nix index 2138020..e1f836e 100644 --- a/system/web-server/default.nix +++ b/system/web-server/default.nix @@ -11,6 +11,5 @@ # ./ksh.nix ./ksh-map.nix - ./oopsidenfiy.nix ]; } diff --git a/system/web-server/oopsidentify.nix b/system/web-server/oopsidentify.nix deleted file mode 100644 index adfff42..0000000 --- a/system/web-server/oopsidentify.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ config, pkgs, ... }: - -{ - services.nginx.virtualHosts."oops.t9e.me" = { - forceSSL = true; - enableACME = true; - root = "/var/www/oopsidentify/dist"; - }; -}