Compare commits

...

2 Commits

Author SHA1 Message Date
jolheiser e594526fc2
fix: update nix
Signed-off-by: jolheiser <john.olheiser@gmail.com>
2024-03-19 13:07:50 -05:00
jolheiser 91f0f09344
feat: vikunja
Signed-off-by: jolheiser <john.olheiser@gmail.com>
2024-03-19 12:18:47 -05:00
10 changed files with 26 additions and 21 deletions

View File

@ -4,3 +4,5 @@ machines/common/cifs.nix:
- age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7
machines/dragonwell/dex.nix:
- age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7
machines/dragonwell/vikunja.nix:
- age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7

1
.gitattributes vendored
View File

@ -2,3 +2,4 @@
apps/gui/firefox/work.nix filter=git-age diff=git-age
machines/common/cifs.nix filter=git-age diff=git-age
machines/dragonwell/dex.nix filter=git-age diff=git-age
machines/dragonwell/vikunja.nix filter=git-age diff=git-age

View File

@ -281,11 +281,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1706925685,
"narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=",
"lastModified": 1710827359,
"narHash": "sha256-/KY8hffTh9SN/tTcDn/FrEiYwTXnU8NKnr4D7/stmmA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "79a13f1437e149dc7be2d1290c74d378dad60814",
"rev": "5710127d9693421e78cca4f74fac2db6d67162b1",
"type": "github"
},
"original": {

View File

@ -43,7 +43,7 @@
nix = {
gc.automatic = true;
package = pkgs.nixVersions.nix_2_15;
package = pkgs.nixVersions.stable;
settings = {
trusted-users = ["@sudo" "@wheel" "jolheiser"];
experimental-features = ["flakes" "nix-command" "repl-flake"];

View File

@ -1,4 +1,8 @@
{pkgs, ...}: {
{
pkgs,
config,
...
}: {
services.caddy = {
enable = true;
virtualHosts = {
@ -43,21 +47,18 @@
</body></html>`
'';
};
"git.jolheiser.com" = {
extraConfig = ''
"git.jolheiser.com".extraConfig = ''
reverse_proxy localhost:8449
'';
};
"social.jolheiser.com" = {
extraConfig = ''
"social.jolheiser.com".extraConfig = ''
reverse_proxy localhost:4686
'';
};
"auth.jolheiser.com" = {
extraConfig = ''
"auth.jolheiser.com".extraConfig = ''
reverse_proxy localhost:2884
'';
};
"todo.jolheiser.com".extraConfig = ''
reverse_proxy localhost:8636
'';
};
};
}

View File

@ -2,7 +2,7 @@ let
username = "jolheiser";
key = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfKqCWtDlS3tgvfT6hQN+ii8UtabIZ+ZNmYN+bLwIa8PHOEW5MbfaqXSlhKkSi4+7SfQDCHphw0SMfhsQ4qMEcoywZ+4niDgKlQEVkl+S/VGbLuPe92NRStkyreZBLPr3Rh7ScNlGHcmHmoV9v7725fMnsMmabGVhpGO84PwNHOfJyv2tx2h6LxFbAV8S44UQu2lc8YLWCK2UvKuRnBerBXLnDQThUUX8UuCFzb786gQzD5XDU0MENbByxiy0XdVGAC+tFXEiSIgFZlFbFYyShgdTP9MzX2MOglEi+ae+1UIFncraW7ptUey7qHFJylpHWWWvE+GTwsg2G50i0FvFj jolheiser@jolheiser'';
in {
imports = [./caddy.nix ./dex.nix ./golink.nix ./gotosocial.nix ./restic.nix ./ugit.nix ./hardware.nix];
imports = [./caddy.nix ./dex.nix ./golink.nix ./gotosocial.nix ./restic.nix ./ugit.nix ./vikunja.nix ./hardware.nix];
boot.tmp.cleanOnBoot = true;
zramSwap.enable = true;

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -26,4 +26,5 @@ in {
"personal/restic-repo.age".publicKeys = [jolheiser dragonwell];
"personal/dex.age".publicKeys = [jolheiser dragonwell];
"personal/dex-tailscale.age".publicKeys = [jolheiser dragonwell];
"personal/dex-vikunja.age".publicKeys = [jolheiser dragonwell];
}