diff --git a/defaults.nix b/defaults.nix index 4060d26..5bf48fe 100644 --- a/defaults.nix +++ b/defaults.nix @@ -90,6 +90,7 @@ in { unzip vim wget + xclip yubikey-manager yubikey-personalization ]; diff --git a/hosts/france/selby-forum.nix b/hosts/france/selby-forum.nix index 422103e..d856386 100644 --- a/hosts/france/selby-forum.nix +++ b/hosts/france/selby-forum.nix @@ -42,17 +42,17 @@ in { environment.etc = { "selby-forum/config-defaults.php" = { uid = config.users.users.nginx.uid; - mode = "0400"; + mode = "0600"; source = ./forum-config/config-defaults.php; }; "selby-forum/constants.php" = { uid = config.users.users.nginx.uid; - mode = "0400"; + mode = "0600"; source = ./forum-config/constants.php; }; "selby-forum/config.php" = { uid = config.users.users.nginx.uid; - mode = "0400"; + mode = "0600"; text = import ./forum-config/config.php.nix { config = { database-host = "127.0.0.1:${mariadb-port}"; @@ -108,6 +108,12 @@ in { phpOptions = '' memory_limit = 500M + file_uploads = On + allow_url_fopen = On + short_open_tag = On + upload_max_filesize = 100M + max_execution_time = 360 + date.timezone = America/Winnipeg ''; }; }; diff --git a/packages/local.nix b/packages/local.nix index b61b741..b047daa 100644 --- a/packages/local.nix +++ b/packages/local.nix @@ -158,8 +158,8 @@ in { doom-emacs-config = pkgs.fetchgit { url = "https://git.fudo.org/niten/doom-emacs.git"; - rev = "ecf6d3e1701dfbf984cc5842df564c53f59c73fc"; - sha256 = "0n4hwp2pdr9dgcm9fsq98ql3k834vf876p1bl98cnd98aj9my1b6"; + rev = "90c3ef3a0797dfbd710498e43a40d0e062615709"; + sha256 = "03a1nad7w7l5l6q2ajyd4scj5qw9kijbkv8b9f686qzqajc5iawy"; }; vanilla-forum = import ./vanilla-forum.nix { pkgs = pkgs; }; diff --git a/packages/vanilla-forum.nix b/packages/vanilla-forum.nix index 302bb19..bcab13c 100644 --- a/packages/vanilla-forum.nix +++ b/packages/vanilla-forum.nix @@ -16,10 +16,6 @@ in pkgs.stdenv.mkDerivation { nativeBuildInputs = with pkgs; [ unzip ]; - # unpackPhase = '' - # ${pkgs.unzip}/bin/unzip $src - # ''; - installPhase = '' mkdir $out cp -aR -t $out applications bootstrap.php dist js library locales plugins resources themes uploads vendor diff --git a/users/root.nix b/users/root.nix index 4a7c463..c31816f 100644 --- a/users/root.nix +++ b/users/root.nix @@ -15,20 +15,29 @@ in { services.gpg-agent.enable = true; - home.file = { - ".doom.d" = { - source = pkgs.doom-emacs-config; - recursive = true; - onChange = "${pkgs.doomEmacsInit}/bin/doom-emacs-init.sh"; - }; + home = { + file = { + ".doom.d" = { + source = pkgs.doom-emacs-config; + recursive = true; + onChange = "${pkgs.doomEmacsInit}/bin/doom-emacs-init.sh"; + }; - ".k5login" = { - source = pkgs.writeText "niten-k5login" '' + ".k5login" = { + source = pkgs.writeText "niten-k5login" '' niten@FUDO.ORG niten/root@FUDO.ORG niten@INFORMIS.LAND niten/root@INFORMIS.LAND ''; + }; + }; + + sessionVariables = { + EDITOR = "emacsclient -t"; + ALTERNATE_EDITOR = ""; + + HISTCONTROL = "ignoredups:ignorespace"; }; }; }