diff --git a/flake.lock b/flake.lock index fe2eca3..586c440 100755 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1704498488, - "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", + "lastModified": 1692720545, + "narHash": "sha256-DQDremUH7lRxiZEIVh6C6kQusuPe1vUKtiVl29nmP0E=", "owner": "nix-community", "repo": "home-manager", - "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", + "rev": "8eb8c212e50e2fd95af5849585a2eb819add0a1e", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1703961334, - "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", + "lastModified": 1692447944, + "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", + "rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d", "type": "github" }, "original": { @@ -36,11 +36,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1704194953, - "narHash": "sha256-RtDKd8Mynhe5CFnVT8s0/0yqtWFMM9LmCzXv/YKxnq4=", + "lastModified": 1691654369, + "narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bd645e8668ec6612439a9ee7e71f7eac4099d4f6", + "rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", "type": "github" }, "original": { diff --git a/modules/services/forgejo.nix b/modules/services/forgejo.nix index babc2bd..71e8f02 100755 --- a/modules/services/forgejo.nix +++ b/modules/services/forgejo.nix @@ -95,9 +95,9 @@ in { systemd.services.gitea = { preStart = mkAfter '' - rm -rf ${config.services.gitea.customDir}/public/assets - mkdir -p ${config.services.gitea.customDir}/public/assets - ln -sf ${theme} ${config.services.gitea.customDir}/public/assets/css + rm -rf ${config.services.gitea.stateDir}/custom/public + mkdir -p ${config.services.gitea.stateDir}/custom/public + ln -sf ${theme} ${config.services.gitea.stateDir}/custom/public/css ''; }; }; diff --git a/modules/services/postgres.nix b/modules/services/postgres.nix index 2038cee..00291b2 100755 --- a/modules/services/postgres.nix +++ b/modules/services/postgres.nix @@ -14,9 +14,6 @@ in { config = mkIf cfg.enable { services.postgresql = { enable = true; - # this is set to v14 because im too lazy to migrate data directories - # plz change - package = pkgs.postgresql_14; }; }; } diff --git a/readme.md b/readme.md index bdb6e81..e3914d9 100755 --- a/readme.md +++ b/readme.md @@ -4,9 +4,9 @@ Nix Flake dotfiles used on my server. ## Todo +* Make it so our secrets consist upon reboot (currently just our wifi password, have to set every reboot) (maybe with [Agenix](https://github.com/ryantm/agenix) + [Age](https://github.com/FiloSottile/age)?) * Migrate our openresty/nginx modules and our gitea themes to actual packages * Maybe make it so that SSH auth works in gitea (open some ports) (it's really annoying typing in password all the time) -* Fail2Ban ## Development