diff options
Diffstat (limited to 'hostnix')
| -rw-r--r-- | hostnix/elmo/Makefile | 2 | ||||
| -rw-r--r-- | hostnix/elmo/configuration.nix | 10 | ||||
| -rw-r--r-- | hostnix/elmo/media.nix | 2 | ||||
| -rw-r--r-- | hostnix/elmo/privacy-frontends.nix | 52 |
4 files changed, 12 insertions, 54 deletions
diff --git a/hostnix/elmo/Makefile b/hostnix/elmo/Makefile index 237587a..3d33a3d 100644 --- a/hostnix/elmo/Makefile +++ b/hostnix/elmo/Makefile @@ -1,5 +1,5 @@ push: - rsync --rsync-path='sudo rsync' *.nix elmo:/etc/nixos/ + rsync -r --rsync-path='sudo rsync' --exclude Makefile . elmo:/etc/nixos/ switch: push ssh elmo sudo nixos-rebuild switch diff --git a/hostnix/elmo/configuration.nix b/hostnix/elmo/configuration.nix index 3b53722..af4466d 100644 --- a/hostnix/elmo/configuration.nix +++ b/hostnix/elmo/configuration.nix @@ -49,7 +49,10 @@ unzip ]; - programs.vim.defaultEditor = true; + programs.vim = { + enable = true; + defaultEditor = true; + }; programs.nano.enable = false; services.envfs.enable = true; @@ -67,7 +70,10 @@ localuser = null; # silence warning }; - services.postgresql.enable = true; + services.postgresql = { + enable = true; + package = pkgs.postgresql_15; + }; services.nginx = { enable = true; diff --git a/hostnix/elmo/media.nix b/hostnix/elmo/media.nix index 7ef80b2..783f0f3 100644 --- a/hostnix/elmo/media.nix +++ b/hostnix/elmo/media.nix @@ -17,7 +17,7 @@ intel-vaapi-driver = pkgs.intel-vaapi-driver.override { enableHybridCodec = true; }; }; - hardware.opengl = { + hardware.graphics = { enable = true; # Haswell seems too old to be supported by intel-media-driver (iHD). While # QSV is apparently implemented for intel-vaapi-driver (i965) by diff --git a/hostnix/elmo/privacy-frontends.nix b/hostnix/elmo/privacy-frontends.nix index 14a4971..ad90c32 100644 --- a/hostnix/elmo/privacy-frontends.nix +++ b/hostnix/elmo/privacy-frontends.nix @@ -1,65 +1,17 @@ { pkgs, ... }: { - nixpkgs.config.packageOverrides = pkgs: { - redlib = pkgs.redlib.overrideAttrs (oldAttrs: rec { - # https://github.com/NixOS/nixpkgs/blob/5eac22df8e2b0d1512db0c8979db844547bcc740/pkgs/by-name/re/redlib/package.nix - version = "0.35.1-unstable-2024-11-01"; - src = pkgs.fetchFromGitHub { - owner = "redlib-org"; - repo = "redlib"; - rev = "f03bdcf472d32d51a1093528071dc329b348379d"; - hash = "sha256-fbk0m20NpaUCWvH/l9hfmx+VKw4U3pkTkXdAeHL7bHs="; - }; - cargoDeps = oldAttrs.cargoDeps.overrideAttrs (_: { - inherit src; - outputHash = "sha256-giFf0GEiUgkTrv99psPYguU6DDj/Qje9x+fEED4C6cE="; - }); - checkFlags = [ - # All these test try to connect to Reddit. - # utils.rs - "--skip=test_fetching_subreddit_quarantined" - "--skip=test_fetching_nsfw_subreddit" - "--skip=test_fetching_ws" - - # client.rs - "--skip=test_obfuscated_share_link" - "--skip=test_share_link_strip_json" - "--skip=test_localization_popular" - "--skip=test_private_sub" - "--skip=test_banned_sub" - "--skip=test_gated_sub" - - # subreddit.rs - "--skip=test_fetching_subreddit" - "--skip=test_gated_and_quarantined" - - # user.rs - "--skip=test_fetching_user" - - # These try to connect to the oauth client - # oauth.rs - "--skip=test_oauth_client" - "--skip=test_oauth_client_refresh" - "--skip=test_oauth_token_exists" - "--skip=test_oauth_headers_len" - ]; - }); - }; - - services.libreddit = { + services.redlib = { enable = true; - package = pkgs.redlib; address = "[::1]"; port = 7682; }; - systemd.services.libreddit = { + systemd.services.redlib = { environment = { REDLIB_DEFAULT_SHOW_NSFW = "on"; REDLIB_DEFAULT_USE_HLS = "on"; REDLIB_DEFAULT_WIDE = "on"; - REDLIB_PUSHSHIFT_FRONTEND = "www.reveddit.com"; REDLIB_ROBOTS_DISABLE_INDEXING = "on"; }; }; |