From 1f17d5e6690cef68c0aed434371e429ea2117c02 Mon Sep 17 00:00:00 2001 From: James Walker Date: Thu, 27 Apr 2023 11:05:10 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=BD=EF=B8=8F=20update=20deprecated=20c?= =?UTF-8?q?onfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 54 ++++++++++++++++---------------- hosts/socrates/configuration.nix | 2 +- modules/gitea/default.nix | 22 +++++++------ 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index 4fda97a..9109ccf 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1681154394, - "narHash": "sha256-avnu1K9AuouygBiwVKuDp6emiTET43az3rcpv0ctLjc=", + "lastModified": 1682009832, + "narHash": "sha256-QdNOeFE7sI+0ddqVfn9vQDCUs7OdxhJ7evo9sdyP82Y=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "025912529dd0b31dead95519e944ea05f1ad56f2", + "rev": "a1ee4d333b092bc055655fb06229eb3013755812", "type": "github" }, "original": { @@ -126,11 +126,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1674127017, - "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=", + "lastModified": 1682063650, + "narHash": "sha256-VaDHh2z6xlnTHaONlNVHP7qEMcK5rZ8Js3sT6mKb2XY=", "owner": "serokell", "repo": "deploy-rs", - "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77", + "rev": "c2ea4e642dc50fd44b537e9860ec95867af30d39", "type": "github" }, "original": { @@ -151,11 +151,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1681818540, - "narHash": "sha256-cokgv9kZM+rQtTI45x3z8WuCO4atL0UNtQWICc+v1WM=", + "lastModified": 1682528621, + "narHash": "sha256-wUckX7unxsx50t1vnoEPxY6SqNhUVGvbhrQmZlK9BQM=", "owner": "cachix", "repo": "devenv", - "rev": "c67a0fcf40a384f955d21494cb6d72a562cf82cf", + "rev": "47eb4d1f12a9209913a485f9df945c2a404a918a", "type": "github" }, "original": { @@ -663,11 +663,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1681852391, - "narHash": "sha256-0wGjrFTmYyjS9jE6MdgjcOEKvWjFkKcRpOtSXso99JI=", + "lastModified": 1682535786, + "narHash": "sha256-NH2a8yB8V25cglvcHDrvaTLvohzMgGLLZ4vnXQn4vOw=", "owner": "nix-community", "repo": "home-manager", - "rev": "aa03c8a429902dbaf15b3395f8cefc5a4b83f7f7", + "rev": "d82c9af8175878a461a0fdf914e67cc446664570", "type": "github" }, "original": { @@ -993,11 +993,11 @@ ] }, "locked": { - "lastModified": 1681464810, - "narHash": "sha256-G7AD9qMvD7lU+5K7tTZpUMXvQa0kFR5KKY9y/okcX+w=", + "lastModified": 1682332772, + "narHash": "sha256-GMoWhChQdeNM2FFqVbEZgBABSdi/+JgSP6v+jUz5b24=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "5ad9f98194cfe7aa990929fb8cae28c500da7620", + "rev": "d774aeedc0685e5871be1e1ee0511900deeb21c2", "type": "github" }, "original": { @@ -1168,11 +1168,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1681613598, - "narHash": "sha256-Ogkoma0ytYcDoMR2N7CZFABPo+i0NNo26dPngru9tPc=", + "lastModified": 1682173319, + "narHash": "sha256-tPhOpJJ+wrWIusvGgIB2+x6ILfDkEgQMX0BTtM5vd/4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1040ce5f652b586da95dfd80d48a745e107b9eac", + "rev": "ee7ec1c71adc47d2e3c2d5eb0d6b8fbbd42a8d1c", "type": "github" }, "original": { @@ -1279,11 +1279,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1681465517, - "narHash": "sha256-EasJh15/jcJNAHtq2SGbiADRXteURAnQbj1NqBoKkzU=", + "lastModified": 1681920287, + "narHash": "sha256-+/d6XQQfhhXVfqfLROJoqj3TuG38CAeoT6jO1g9r1k0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "abe7316dd51a313ce528972b104f4f04f56eefc4", + "rev": "645bc49f34fa8eff95479f0345ff57e55b53437e", "type": "github" }, "original": { @@ -1295,11 +1295,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1681753173, - "narHash": "sha256-MrGmzZWLUqh2VstoikKLFFIELXm/lsf/G9U9zR96VD4=", + "lastModified": 1682535835, + "narHash": "sha256-DrCcsZId29H+mr7yviOfCZeJOnJ51MIWLX3qSwwSpLI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0a4206a51b386e5cda731e8ac78d76ad924c7125", + "rev": "d12fa94d29856187b1c80db4edf4588df986d217", "type": "github" }, "original": { @@ -1394,11 +1394,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1681821695, - "narHash": "sha256-uwyBGo/9IALi97AfMuzkJroQQhV6hkybaZVdw6pRNG4=", + "lastModified": 1682539132, + "narHash": "sha256-djX/Vp1snR1XHyk400HKCfwWVoLBE8uiQalTXMH7Kj0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5698b06b0731a2c15ff8c2351644427f8ad33993", + "rev": "4a330ead6a990365c9bb48f30523ac048fb6d8ae", "type": "github" }, "original": { diff --git a/hosts/socrates/configuration.nix b/hosts/socrates/configuration.nix index cbb2d5c..cac903f 100644 --- a/hosts/socrates/configuration.nix +++ b/hosts/socrates/configuration.nix @@ -20,7 +20,7 @@ nixpkgs.overlays = [ (import ../../overlays) ]; - boot.cleanTmpDir = true; + boot.tmp.cleanOnBoot = true; # Set your time zone. time.timeZone = "America/Toronto"; diff --git a/modules/gitea/default.nix b/modules/gitea/default.nix index f06d926..3a31ed4 100644 --- a/modules/gitea/default.nix +++ b/modules/gitea/default.nix @@ -16,20 +16,22 @@ in gitea = { enable = true; user = "git"; - domain = "walkah.dev"; appName = "walkah forge"; - rootUrl = "https://walkah.dev/"; - httpAddress = "0.0.0.0"; - httpPort = 8003; lfs.enable = true; settings = { - log.LEVEL = "Error"; - other.SHOW_FOOTER_VERSION = false; - repository.DEFAULT_BRANCH = "main"; - server.SSH_DOMAIN = "git.walkah.dev"; - service.DISABLE_REGISTRATION = true; - session.COOKIE_SECURE = true; + log = { LEVEL = "Error"; }; + other = { SHOW_FOOTER_VERSION = false; }; + repository = { DEFAULT_BRANCH = "main"; }; + server = { + DOMAIN = "walkah.dev"; + HTTP_ADDR = "0.0.0.0"; + HTTP_PORT = 8003; + ROOT_URL = "https://walkah.dev/"; + SSH_DOMAIN = "git.walkah.dev"; + }; + service = { DISABLE_REGISTRATION = true; }; + session = { COOKIE_SECURE = true; }; }; dump.enable = false;