diff --git a/flake.lock b/flake.lock index 87be1c7..459f21f 100644 --- a/flake.lock +++ b/flake.lock @@ -158,16 +158,16 @@ }, "nixstable": { "locked": { - "lastModified": 1682600000, - "narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=", + "lastModified": 1685094109, + "narHash": "sha256-u+awry81RAVV+fJBCZt+GKWsISSLJKUNbVwKccHeaPU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0", + "rev": "551a52bfdd02e7b75be5faf9b42f864112d88654", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-22.05", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 0491756..c89eae0 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ description = "Greg's machines!"; inputs = { - nixstable.url = "github:nixos/nixpkgs/nixos-22.05"; + nixstable.url = "github:nixos/nixpkgs/nixos-23.05"; nixunstable.url = "github:nixos/nixpkgs/nixos-unstable"; agenix.url = "github:ryantm/agenix"; flake-utils.url = "github:numtide/flake-utils"; diff --git a/hosts/linode/default.nix b/hosts/linode/default.nix index fe846a6..8273b98 100644 --- a/hosts/linode/default.nix +++ b/hosts/linode/default.nix @@ -8,6 +8,7 @@ ./nextcloud.nix ./nginx.nix ./postgres.nix + ./rei.nix ./synapse.nix ]; greg.home = false; diff --git a/hosts/linode/git.nix b/hosts/linode/git.nix index 235cf55..804271c 100644 --- a/hosts/linode/git.nix +++ b/hosts/linode/git.nix @@ -23,26 +23,27 @@ in { services.gitea = rec { enable = true; appName = "Greg's Sources"; - cookieSecure = true; database = { type = "postgres"; user = "gitea"; }; - disableRegistration = true; - domain = srcDomain; dump = { enable = true; type = "tar.xz"; }; - httpPort = 3001; - log = { - level = "Info"; + settings = { + server = rec { + ROOT_URL = "https://${DOMAIN}/"; + DOMAIN = srcDomain; + }; + service.DISABLE_REGISTRATION = pkgs.lib.mkForce true; + session.COOKIE_SECURE = pkgs.lib.mkForce true; + log.level = "Info"; }; - rootUrl = "https://${domain}/"; }; greg.proxies."${srcDomain}" = { - target = "http://localhost:${toString config.services.gitea.httpPort}"; + target = "http://localhost:${toString config.services.gitea.settings.server.HTTP_PORT}"; ssl = true; genAliases = false; }; diff --git a/hosts/linode/nextcloud.nix b/hosts/linode/nextcloud.nix index 143485a..e257606 100644 --- a/hosts/linode/nextcloud.nix +++ b/hosts/linode/nextcloud.nix @@ -6,9 +6,10 @@ services.nextcloud = { enable = true; - package = pkgs.nextcloud24; + package = pkgs.nextcloud26; appstoreEnable = true; hostName = "next.${config.networking.domain}"; + enableBrokenCiphersForSSE = false; https = true; config = { adminpassFile = config.age.secrets.nextcloudadmin.path; diff --git a/hosts/linode/postgres.nix b/hosts/linode/postgres.nix index 497edd1..31a710f 100644 --- a/hosts/linode/postgres.nix +++ b/hosts/linode/postgres.nix @@ -53,10 +53,8 @@ root root postgres postgresLog = { enable = true; files = "/var/lib/postgresql/*/log/*.log"; - extraConfig = (lib.strings.concatStringsSep "\n" [ - "compress" - "compresscmd=${pkgs.xz}/bin/xz" - ]); + compress = true; + compresscmd = "${pkgs.xz}/bin/xz"; }; }; }; diff --git a/hosts/linode/rei.nix b/hosts/linode/rei.nix new file mode 100644 index 0000000..24e5a26 --- /dev/null +++ b/hosts/linode/rei.nix @@ -0,0 +1,15 @@ +{ ... }: +{ + services = { + odoo = { + enable = true; + domain = "doublel.thehellings.com"; + settings.options = { + db_host = "localhost"; + db_port = "5432"; + db_user = "odoo"; + dbfilter = "^doublel.*$"; + }; + }; + }; +} diff --git a/modules-all/default.nix b/modules-all/default.nix index 73c0ef3..7e64ddd 100644 --- a/modules-all/default.nix +++ b/modules-all/default.nix @@ -32,7 +32,12 @@ }; }; - nixpkgs.config.allowUnfree = true; + nixpkgs.config = { + allowUnfree = true; + permittedInsecurePackages = [ + "qtwebkit-5.212.0-alpha4" + ]; + }; # Base packages that need to be in all my hosts environment.systemPackages = with pkgs; [ diff --git a/overlays/default.nix b/overlays/default.nix index ce5becf..8af1cf8 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -50,8 +50,7 @@ let }); in rec { - #gitea = super.unstable.gitea; - + #python3 = self.unstable.python3; gregpy = myPython; my-py-addons = rec {