diff options
| author | Kjetil Orbekk <kj@orbekk.com> | 2022-05-31 18:41:21 -0400 |
|---|---|---|
| committer | Kjetil Orbekk <kj@orbekk.com> | 2022-05-31 18:41:21 -0400 |
| commit | bb6123cb78d16302d95d7fee9c452135770ddbc5 (patch) | |
| tree | a19d2b5618f735e18eed60af90aa086ff00396b2 | |
| parent | ee88a3fbd5479d71e2ea9edd7ee162f699e574e1 (diff) | |
Remove old config
| -rw-r--r-- | config/linoquotes.nix | 3 | ||||
| -rw-r--r-- | config/orbekk-pkgs.nix | 12 | ||||
| -rw-r--r-- | config/systemhttpd.nix | 2 | ||||
| -rw-r--r-- | config/web-server.nix | 2 |
4 files changed, 0 insertions, 19 deletions
diff --git a/config/linoquotes.nix b/config/linoquotes.nix index 6f96489..d778979 100644 --- a/config/linoquotes.nix +++ b/config/linoquotes.nix @@ -4,9 +4,6 @@ let linoquotes-gamma = pkgs.callPackage /opt/linoquotes-gamma/default.nix {}; in { - # My hydra isn't working at the moment. - # imports = [ ./orbekk-pkgs.nix ]; - networking.firewall.allowedTCPPorts = [ port ]; systemd.services.linoquotes = { diff --git a/config/orbekk-pkgs.nix b/config/orbekk-pkgs.nix deleted file mode 100644 index 0c81eb7..0000000 --- a/config/orbekk-pkgs.nix +++ /dev/null @@ -1,12 +0,0 @@ -# Requires something like this in nixPath: -# "orbekk=https://hydra.orbekk.com/project/orbekk-projects/channel/latest/nixexprs.tar.bz2" -{ config, lib, pkgs, ... }: -let - stablePkgs = import <nixpkgs-stable> {}; -in -{ - nixpkgs.config.packageOverrides = pkgs: { - # Broken in nixos-unstable - matrix-synapse = stablePkgs.matrix-synapse; - }; -} diff --git a/config/systemhttpd.nix b/config/systemhttpd.nix index a358717..3dcdb92 100644 --- a/config/systemhttpd.nix +++ b/config/systemhttpd.nix @@ -3,8 +3,6 @@ let port = (import ../data/aliases.nix).services.systemhttpd.port; in { - imports = [ ./orbekk-pkgs.nix ]; - systemd.services.systemhttpd = { description = "Web frontend for systemd"; after = [ "networking.target" ]; diff --git a/config/web-server.nix b/config/web-server.nix index 7838076..302dcbd 100644 --- a/config/web-server.nix +++ b/config/web-server.nix @@ -4,8 +4,6 @@ let mpdweb_loc = (import ../data/aliases.nix).services.mpdweb; pjournal_loc = (import ../data/aliases.nix).services.pjournal; in { - imports = [ ./orbekk-pkgs.nix ]; - security.acme.acceptTerms = true; security.acme.defaults.email = "kj@orbekk.com"; |