nya
This commit is contained in:
parent
0c1cbedf1c
commit
2509c31642
59
flake.lock
59
flake.lock
|
@ -52,12 +52,47 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-compat_3": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1650374568,
|
||||||
|
"narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "b4a34015c698c7793d592d66adbab377907a2be8",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"gitlab_artifacts_sync": {
|
||||||
|
"inputs": {
|
||||||
|
"flake-compat": "flake-compat_2",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs-unstable"
|
||||||
|
],
|
||||||
|
"utils": "utils_2"
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1660318049,
|
||||||
|
"narHash": "sha256-v/43l/g3CY7McRbRvLZsYYKPueD/PFCCbLheI+wJWkg=",
|
||||||
|
"path": "/home/chaos/Projects/gitlab_artifacts_sync",
|
||||||
|
"type": "path"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"path": "/home/chaos/Projects/gitlab_artifacts_sync",
|
||||||
|
"type": "path"
|
||||||
|
}
|
||||||
|
},
|
||||||
"home-manager-unstable": {
|
"home-manager-unstable": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs-unstable"
|
"nixpkgs-unstable"
|
||||||
],
|
],
|
||||||
"utils": "utils_2"
|
"utils": "utils_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1659484873,
|
"lastModified": 1659484873,
|
||||||
|
@ -75,11 +110,11 @@
|
||||||
},
|
},
|
||||||
"musicutil": {
|
"musicutil": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_2",
|
"flake-compat": "flake-compat_3",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs-unstable"
|
"nixpkgs-unstable"
|
||||||
],
|
],
|
||||||
"utils": "utils_3"
|
"utils": "utils_4"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1650728466,
|
"lastModified": 1650728466,
|
||||||
|
@ -167,6 +202,7 @@
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"deploy-rs": "deploy-rs",
|
"deploy-rs": "deploy-rs",
|
||||||
|
"gitlab_artifacts_sync": "gitlab_artifacts_sync",
|
||||||
"home-manager-unstable": "home-manager-unstable",
|
"home-manager-unstable": "home-manager-unstable",
|
||||||
"musicutil": "musicutil",
|
"musicutil": "musicutil",
|
||||||
"nix-darwin-unstable": "nix-darwin-unstable",
|
"nix-darwin-unstable": "nix-darwin-unstable",
|
||||||
|
@ -190,6 +226,21 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"utils_2": {
|
"utils_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1659877975,
|
||||||
|
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"utils_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1653893745,
|
"lastModified": 1653893745,
|
||||||
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
|
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
|
||||||
|
@ -204,7 +255,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"utils_3": {
|
"utils_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1649676176,
|
"lastModified": 1649676176,
|
||||||
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
|
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
|
||||||
|
|
|
@ -16,6 +16,10 @@
|
||||||
|
|
||||||
musicutil.url = "gitlab:ChaotiCryptidz/musicutil";
|
musicutil.url = "gitlab:ChaotiCryptidz/musicutil";
|
||||||
musicutil.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
musicutil.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
|
|
||||||
|
gitlab_artifacts_sync.url =
|
||||||
|
"path:/home/chaos/Projects/gitlab_artifacts_sync";
|
||||||
|
gitlab_artifacts_sync.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { ... }@inputs: import ./outputs.nix inputs;
|
outputs = { ... }@inputs: import ./outputs.nix inputs;
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
{ config, pkgs, ... }: { home.packages = with pkgs; [ restic ]; }
|
{ config, pkgs, ... }: { home.packages = with pkgs; [ restic ]; }
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
hosts.hetzner-vm.services.mpd
|
hosts.hetzner-vm.services.mpd
|
||||||
hosts.hetzner-vm.services.storage-sftp
|
hosts.hetzner-vm.services.storage-sftp
|
||||||
hosts.hetzner-vm.services.mail
|
hosts.hetzner-vm.services.mail
|
||||||
|
hosts.hetzner-vm.services.gitlab-static-sites
|
||||||
#hosts.hetzner-vm.services.misskey
|
#hosts.hetzner-vm.services.misskey
|
||||||
|
|
||||||
(modulesPath + "/profiles/qemu-guest.nix")
|
(modulesPath + "/profiles/qemu-guest.nix")
|
||||||
|
|
21
hosts/hetzner-vm/services/gitlab-static-sites.nix
Normal file
21
hosts/hetzner-vm/services/gitlab-static-sites.nix
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
{ ... }: {
|
||||||
|
services.gitlab_artifacts_sync = {
|
||||||
|
enable = true;
|
||||||
|
credentialsEnvironmentFile = "/secrets/gitlab-env";
|
||||||
|
repos = [
|
||||||
|
{
|
||||||
|
repoName = "ChaotiCryptidz/VaultUI";
|
||||||
|
domain = "vaultui.owo.monster";
|
||||||
|
domainOptions = { withTryFiles = true; };
|
||||||
|
}
|
||||||
|
{
|
||||||
|
repoName = "ChaotiCryptidz/music_library_website";
|
||||||
|
domain = "musiclibrary.owo.monster";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
repoName = "ChaotiCryptidz/food";
|
||||||
|
domain = "food.owo.monster";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
}
|
|
@ -2,7 +2,7 @@
|
||||||
fqdn = "mail.owo.monster";
|
fqdn = "mail.owo.monster";
|
||||||
domains = [ "owo.monster" "kitteh.pw" ];
|
domains = [ "owo.monster" "kitteh.pw" ];
|
||||||
|
|
||||||
debug_mode = true;
|
debug_mode = false;
|
||||||
|
|
||||||
ssl_config = {
|
ssl_config = {
|
||||||
cert = "/var/lib/acme/${fqdn}/fullchain.pem";
|
cert = "/var/lib/acme/${fqdn}/fullchain.pem";
|
||||||
|
|
|
@ -23,9 +23,11 @@ let
|
||||||
mail_config.dkim_directory
|
mail_config.dkim_directory
|
||||||
"/var/lib/redis-rspamd"
|
"/var/lib/redis-rspamd"
|
||||||
];
|
];
|
||||||
backupPrepareCommand = "${(pkgs.writeShellScriptBin "backupPrepareCommand" ''
|
backupPrepareCommand = "${
|
||||||
systemctl start postgresqlBackup --wait
|
(pkgs.writeShellScriptBin "backupPrepareCommand" ''
|
||||||
'')}/bin/backupPrepareCommand";
|
systemctl start postgresqlBackup --wait
|
||||||
|
'')
|
||||||
|
}/bin/backupPrepareCommand";
|
||||||
|
|
||||||
timerConfig = {
|
timerConfig = {
|
||||||
OnBootSec = "1m";
|
OnBootSec = "1m";
|
||||||
|
|
|
@ -86,7 +86,6 @@ in {
|
||||||
home.apps.rclone
|
home.apps.rclone
|
||||||
home.apps.restic
|
home.apps.restic
|
||||||
|
|
||||||
|
|
||||||
home.programming.editors.vscode
|
home.programming.editors.vscode
|
||||||
home.programming.languages.go
|
home.programming.languages.go
|
||||||
home.programming.languages.nix
|
home.programming.languages.nix
|
||||||
|
|
|
@ -15,6 +15,7 @@ let
|
||||||
# NO_INLINE
|
# NO_INLINE
|
||||||
tree.impure.profiles.base
|
tree.impure.profiles.base
|
||||||
inputs.home-manager-unstable.nixosModules.home-manager
|
inputs.home-manager-unstable.nixosModules.home-manager
|
||||||
|
inputs.gitlab_artifacts_sync.nixosModule
|
||||||
];
|
];
|
||||||
|
|
||||||
nixosUnstableSystem = nixpkgs-unstable.lib.nixosSystem;
|
nixosUnstableSystem = nixpkgs-unstable.lib.nixosSystem;
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
overlays = [
|
overlays = [
|
||||||
(import ../../overlay)
|
(import ../../overlay)
|
||||||
inputs.musicutil.overlay
|
inputs.musicutil.overlay
|
||||||
|
inputs.gitlab_artifacts_sync.overlay
|
||||||
inputs.deploy-rs.overlay
|
inputs.deploy-rs.overlay
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue