diff --git a/config/services/default.nix b/config/services/default.nix
index 2e72e95..6df5466 100644
--- a/config/services/default.nix
+++ b/config/services/default.nix
@@ -4,10 +4,9 @@
./atuin.nix
./containers.nix
./freshrss.nix
- # ./gitea
./gitlab
./invidious.nix
- ./libreddit.nix
+ ./nextcloud.nix
./nginx.nix
./postgres.nix
./wakapi.nix
diff --git a/config/services/gitea/customizations/templates/custom/extra_links_footer.tmpl b/config/services/gitea/customizations/templates/custom/extra_links_footer.tmpl
deleted file mode 100644
index 5567455..0000000
--- a/config/services/gitea/customizations/templates/custom/extra_links_footer.tmpl
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- GitHub
-
diff --git a/config/services/gitea/customizations/templates/custom/header.tmpl b/config/services/gitea/customizations/templates/custom/header.tmpl
deleted file mode 100644
index 78cb48e..0000000
--- a/config/services/gitea/customizations/templates/custom/header.tmpl
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/config/services/gitea/customizations/templates/home.tmpl b/config/services/gitea/customizations/templates/home.tmpl
deleted file mode 100644
index be23567..0000000
--- a/config/services/gitea/customizations/templates/home.tmpl
+++ /dev/null
@@ -1,17 +0,0 @@
-{{template "base/head" .}}
-
-
-
-
-
-
-
-
-
-
-{{template "base/footer" .}}
diff --git a/config/services/gitea/default.nix b/config/services/gitea/default.nix
deleted file mode 100644
index 56e3266..0000000
--- a/config/services/gitea/default.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{
- config,
- lib,
- inputs,
- pkgs,
- ...
-}: {
- # swap out Gitea stable for unstable
- disabledModules = [
- "services/misc/gitea.nix"
- "services/continuous-integration/gitea-actions-runner.nix"
- ];
- imports = [
- "${inputs.nixpkgs-unstable}/nixos/modules/services/misc/gitea.nix"
- "${inputs.nixpkgs-unstable}/nixos/modules/services/continuous-integration/gitea-actions-runner.nix"
- ];
- services.gitea.package = pkgs.unstable.gitea;
- services.gitea-actions-runner.package = pkgs.unstable.gitea-actions-runner;
-
- age.secrets."services/gitea/password-database".owner = "gitea";
-
- networking.firewall.allowedTCPPorts = [22];
-
- services.elasticsearch.enable = true;
-
- services.gitea = {
- enable = true;
-
- appName = "winston's gitea";
-
- database = {
- type = "postgres";
- passwordFile = config.age.secrets."services/gitea/password-database".path;
- };
-
- lfs.enable = true;
-
- settings = {
- actions.ENABLED = true;
-
- indexer = with config.services.elasticsearch; let
- indexer = "elasticsearch";
- conn = "http://${listenAddress}:${toString port}";
- in {
- REPO_INDEXER_ENABLED = true;
- REPO_INDEXER_CONN_STR = conn;
- REPO_INDEXER_TYPE = indexer;
- ISSUE_INDEXER_CONN_STR = conn;
- ISSUE_INDEXER_TYPE = indexer;
- };
-
- repository.ENABLE_PUSH_CREATE_USER = true;
-
- server = rec {
- DOMAIN = "git.winston.sh";
- HTTP_ADDR = "127.0.0.1";
- HTTP_PORT = 12492;
- ROOT_URL = "https://${DOMAIN}/";
- };
-
- service.DISABLE_REGISTRATION = true;
-
- session = {
- COOKIE_SECURE = true;
- SAME_SITE = "strict";
- };
-
- "ui.meta" = {
- AUTHOR = "nekowinston";
- DESCRIPTION = "winston's gitea instance";
- };
-
- other = {
- SHOW_FOOTER_VERSION = false;
- SHOW_FOOTER_TEMPLATE_LOAD_TIME = false;
- SHOW_FOOTER_BRANDING = false;
- };
- };
- };
-
- services.gitea-actions-runner.instances.main = {
- enable = false;
- name = "main";
- url = config.services.gitea.settings.server.ROOT_URL;
- tokenFile = config.age.secrets."services/gitea/runner-token".path;
- labels = ["ubuntu-latest:docker://ghcr.io/catthehacker/ubuntu:act-latest"];
- settings.container = {
- network = "host";
- options = "--add-host=gitea.winston.sh:host-gateway";
- };
- };
-
- systemd.services.gitea.preStart = let
- inherit (config.services.gitea) stateDir;
- in
- lib.mkAfter ''
- chmod u+w -R ${stateDir}/custom/**/*
- # apply customizations
- cp -Rf ${./customizations}/* ${stateDir}/custom
- chmod u-w -R ${stateDir}/custom/**/*
- '';
-
- services.nginx.virtualHosts.${config.services.gitea.settings.server.DOMAIN} = {
- forceSSL = true;
- enableACME = false;
- useACMEHost = "winston.sh";
-
- locations."/" = with config.services.gitea.settings.server; {
- extraConfig = "client_max_body_size 512M;";
- proxyPass = "http://${HTTP_ADDR}:${toString HTTP_PORT}";
- };
- };
-}
diff --git a/config/services/invidious.nix b/config/services/invidious.nix
index acaf0cd..0501549 100644
--- a/config/services/invidious.nix
+++ b/config/services/invidious.nix
@@ -16,6 +16,7 @@
settings = {
external_port = lib.mkForce 443;
+ db.user = "invidious";
enable_user_notifications = false;
popular_enabled = false;
statistics_enabled = true;
diff --git a/config/services/libreddit.nix b/config/services/libreddit.nix
deleted file mode 100644
index ba43ad5..0000000
--- a/config/services/libreddit.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- config,
- pkgs,
- ...
-}: {
- services.libreddit = {
- enable = true;
- package = pkgs.unstable.libreddit;
- address = "127.0.0.1";
- port = 12380;
- };
-
- services.nginx.virtualHosts."lr.winston.sh" = {
- forceSSL = true;
- enableACME = false;
- useACMEHost = "winston.sh";
-
- locations."/" = with config.services.libreddit; {
- proxyPass = "http://${address}:${toString port}";
- };
- };
-}
diff --git a/config/services/nextcloud.nix b/config/services/nextcloud.nix
new file mode 100644
index 0000000..0967ef4
--- /dev/null
+++ b/config/services/nextcloud.nix
@@ -0,0 +1 @@
+{}
diff --git a/flake.lock b/flake.lock
index 963b249..d171fb2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1718371084,
- "narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=",
+ "lastModified": 1723293904,
+ "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
"owner": "ryantm",
"repo": "agenix",
- "rev": "3a56735779db467538fb2e577eda28a9daacaca6",
+ "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
"type": "github"
},
"original": {
@@ -30,11 +30,11 @@
]
},
"locked": {
- "lastModified": 1717285511,
- "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+ "lastModified": 1722555600,
+ "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
+ "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
"type": "github"
},
"original": {
@@ -89,16 +89,16 @@
]
},
"locked": {
- "lastModified": 1717476296,
- "narHash": "sha256-ScHe38Tr+TxGURC17kby4mIIxOG3aJvZWXzPM79UnEk=",
+ "lastModified": 1720042825,
+ "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "095ef64aa3b2ab4a4f1bf07f29997e21e3a5576a",
+ "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
"type": "github"
},
"original": {
"owner": "nix-community",
- "ref": "release-23.11",
+ "ref": "release-24.05",
"repo": "home-manager",
"type": "github"
}
@@ -110,11 +110,11 @@
]
},
"locked": {
- "lastModified": 1719111455,
- "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=",
+ "lastModified": 1723352546,
+ "narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6",
+ "rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06",
"type": "github"
},
"original": {
@@ -145,27 +145,27 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1718811006,
- "narHash": "sha256-0Y8IrGhRmBmT7HHXlxxepg2t8j1X90++qRN3lukGaIk=",
+ "lastModified": 1723282977,
+ "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "03d771e513ce90147b65fe922d87d3a0356fc125",
+ "rev": "a781ff33ae258bbcfd4ed6e673860c3e923bf2cc",
"type": "github"
},
"original": {
"owner": "nixos",
- "ref": "nixos-23.11",
+ "ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1719075281,
- "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
+ "lastModified": 1723175592,
+ "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
+ "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b",
"type": "github"
},
"original": {
@@ -187,11 +187,11 @@
]
},
"locked": {
- "lastModified": 1718879355,
- "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=",
+ "lastModified": 1723202784,
+ "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
- "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a",
+ "rev": "c7012d0c18567c889b948781bc74a501e92275d1",
"type": "github"
},
"original": {
@@ -274,11 +274,11 @@
"steam-fetcher": "steam-fetcher"
},
"locked": {
- "lastModified": 1715833534,
- "narHash": "sha256-ZsbjxO/F2bcn3mm0FkPJmWgu8z2XY05V4VeJ39k1Ksw=",
+ "lastModified": 1722314839,
+ "narHash": "sha256-1MXH5i7VRkeknzmkSjsPiCZnUGqMuoVKFgCiy5xkGjQ=",
"owner": "aidalgol",
"repo": "valheim-server-flake",
- "rev": "871aac4adedb5089d94bb0fb0dbf7ba27217297f",
+ "rev": "f73a87e197b1ba8eb8b79c67cd48146b3ef44290",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 8df1e65..c109193 100644
--- a/flake.nix
+++ b/flake.nix
@@ -83,10 +83,10 @@
};
inputs = {
- nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
+ nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = {
- url = "github:nix-community/home-manager/release-23.11";
+ url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs";
};
nix-index-database = {
@@ -113,7 +113,6 @@
pre-commit-hooks = {
url = "github:cachix/pre-commit-hooks.nix";
inputs.flake-compat.follows = "";
- inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs-unstable";
inputs.nixpkgs-stable.follows = "nixpkgs";
};