Compare commits
19 commits
c02f57276c
...
15438eec10
| Author | SHA1 | Date | |
|---|---|---|---|
| 15438eec10 | |||
731e2118a5
|
|||
|
53eea2bced
|
|||
|
867c475918
|
|||
|
934120a952
|
|||
| a1c1373fc5 | |||
|
173f1d32ad
|
|||
|
145a7214b2
|
|||
|
57f04d95db
|
|||
|
ae0468bf73
|
|||
|
d9349d5317
|
|||
|
458c00e499
|
|||
|
c9ef45c958
|
|||
|
ae7d2a3974
|
|||
|
9fb2c6e365
|
|||
|
fe54c2d5ba
|
|||
|
fc8c1560e3
|
|||
|
3e1ee94dc9
|
|||
|
3c9a69063f
|
15 changed files with 50 additions and 20 deletions
24
flake.lock
generated
24
flake.lock
generated
|
|
@ -631,11 +631,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712645849,
|
"lastModified": 1712730572,
|
||||||
"narHash": "sha256-67v20E0gH7nvAaMsah2oRIocnxGO25fATUyzQHIywxQ=",
|
"narHash": "sha256-rAVvdP77rEmgobvSgybqPAcHefv5dCXPH/ge6Ds+JtU=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "40a99619da804a78a0b166e5c6911108c059c3a8",
|
"rev": "18f89ef74f0d48635488ccd6a5e30dc9d48a3a87",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -771,11 +771,11 @@
|
||||||
},
|
},
|
||||||
"nixosHardware": {
|
"nixosHardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712566108,
|
"lastModified": 1712739139,
|
||||||
"narHash": "sha256-c9nT2ZODGqobISP41kUwCQ84Srwg7a/1TmPFQuol2/8=",
|
"narHash": "sha256-I8fw3ot29H9TXClIJHmPfQXaq2dEXHs2VmZeMEw7sb4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "1e3b3a35b7083f4152f5a516798cf9b21e686465",
|
"rev": "805adee81c82efbe50cac7398c4de05769488ed9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -940,11 +940,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgsUnstable": {
|
"nixpkgsUnstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712439257,
|
"lastModified": 1712608508,
|
||||||
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
|
"narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
|
"rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -1084,11 +1084,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1712671839,
|
"lastModified": 1712753744,
|
||||||
"narHash": "sha256-LjehUc4gAnqGckdck5ul+nWJKAjTodS/Nd+PuO3sIaM=",
|
"narHash": "sha256-gmw5cWa/+K78CDkx1o5RlwPPgYTRaIhoF5bI4LI6HuQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "NUR",
|
"repo": "NUR",
|
||||||
"rev": "7d17d2fa5094e28ddd369ced837f44073b436662",
|
"rev": "72a299e9362607acd61c99c1858d0b4d1e6d2aef",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,10 @@
|
||||||
{
|
{config, ...}: {
|
||||||
programs.btop = {
|
programs.btop = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.update_ms = 100;
|
settings = {
|
||||||
|
update_ms = 100;
|
||||||
|
theme_background = false;
|
||||||
|
color_theme = "${config.programs.btop.package}/share/btop/themes/dracula.theme";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,6 @@
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
controlMaster = "auto";
|
controlMaster = "auto";
|
||||||
controlPersist = "10m";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# programs.starship = {
|
# programs.starship = {
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
return {
|
return {
|
||||||
|
enable_wayland = false; -- https://github.com/wez/wezterm/issues/4483
|
||||||
font = wezterm.font_with_fallback {
|
font = wezterm.font_with_fallback {
|
||||||
{
|
{
|
||||||
family = 'Iosevka Comfy',
|
family = 'Iosevka Comfy',
|
||||||
|
|
|
||||||
|
|
@ -160,7 +160,7 @@
|
||||||
vpnExtra = {
|
vpnExtra = {
|
||||||
oneplus6t = {
|
oneplus6t = {
|
||||||
ip = "10.100.0.4";
|
ip = "10.100.0.4";
|
||||||
publicKey = "O6/tKaA8Hs7OEqi15hV4RwviR6vyCTMYv6ZlhsI+tnI=";
|
publicKey = "cXHPaJXeA/JB7DKlZXR86zYcz1OEVPMOvAmDhBQF91E=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,7 @@
|
||||||
"greetd"
|
"greetd"
|
||||||
"syncthing"
|
"syncthing"
|
||||||
"mount-rock5b"
|
"mount-rock5b"
|
||||||
|
"adb"
|
||||||
]
|
]
|
||||||
++ [
|
++ [
|
||||||
./disko.nix
|
./disko.nix
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,7 @@
|
||||||
# "macos-ventura"
|
# "macos-ventura"
|
||||||
# "sunshine"
|
# "sunshine"
|
||||||
"mount-rock5b"
|
"mount-rock5b"
|
||||||
|
"adb"
|
||||||
]
|
]
|
||||||
++ [
|
++ [
|
||||||
./disko.nix
|
./disko.nix
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@
|
||||||
"minio"
|
"minio"
|
||||||
# "matrix"
|
# "matrix"
|
||||||
"forgejo"
|
"forgejo"
|
||||||
|
# "jellyfin"
|
||||||
]
|
]
|
||||||
++ [
|
++ [
|
||||||
./disko.nix
|
./disko.nix
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,7 @@
|
||||||
"cache.aciceri.dev"
|
"cache.aciceri.dev"
|
||||||
"matrix.aciceri.dev"
|
"matrix.aciceri.dev"
|
||||||
"syncv3.matrix.aciceri.dev"
|
"syncv3.matrix.aciceri.dev"
|
||||||
|
"jellyfin.aciceri.dev"
|
||||||
];
|
];
|
||||||
apiTokenFile = config.age.secrets.cloudflare-dyndns-api-token.path;
|
apiTokenFile = config.age.secrets.cloudflare-dyndns-api-token.path;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@
|
||||||
}: {
|
}: {
|
||||||
services.forgejo = {
|
services.forgejo = {
|
||||||
enable = true;
|
enable = true;
|
||||||
stateDir = "/mnt/hd/forgejo";
|
|
||||||
settings = {
|
settings = {
|
||||||
DEFAULT = {
|
DEFAULT = {
|
||||||
RUN_MODE = "prod"; # set to prod for better logs (worse performance)
|
RUN_MODE = "prod"; # set to prod for better logs (worse performance)
|
||||||
|
|
|
||||||
7
modules/jellyfin/default.nix
Normal file
7
modules/jellyfin/default.nix
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
{
|
||||||
|
services.jellyfin = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
users.users.jellyfin.extraGroups = ["transmission"];
|
||||||
|
}
|
||||||
|
|
@ -35,6 +35,13 @@
|
||||||
proxyPass = "http://localhost:${builtins.toString config.services.invidious.port}";
|
proxyPass = "http://localhost:${builtins.toString config.services.invidious.port}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
# "jellyfin.aciceri.dev" = {
|
||||||
|
# forceSSL = true;
|
||||||
|
# enableACME = true;
|
||||||
|
# locations."/" = {
|
||||||
|
# proxyPass = "http://localhost:8096";
|
||||||
|
# };
|
||||||
|
# };
|
||||||
# "sevenofnix.aciceri.dev" = {
|
# "sevenofnix.aciceri.dev" = {
|
||||||
# forceSSL = true;
|
# forceSSL = true;
|
||||||
# enableACME = true;
|
# enableACME = true;
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,12 @@
|
||||||
"tcp://kirk.fleet"
|
"tcp://kirk.fleet"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
onplus6t = {
|
||||||
|
id = "76BJ2ZE-FPFDWUZ-3UZIENZ-TS6YBGG-EZSF6UE-GLHRBQ2-KTHTRMI-3JWNRAT";
|
||||||
|
addresses = [
|
||||||
|
"tcp://oneplus6t.fleet"
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
folders = {
|
folders = {
|
||||||
org = {
|
org = {
|
||||||
|
|
@ -39,7 +45,7 @@
|
||||||
kirk = "/home/${config.ccr.username}/org";
|
kirk = "/home/${config.ccr.username}/org";
|
||||||
}
|
}
|
||||||
.${config.networking.hostName};
|
.${config.networking.hostName};
|
||||||
devices = ["picard" "sisko" "kirk"];
|
devices = ["picard" "sisko" "kirk" "onplus6t"];
|
||||||
};
|
};
|
||||||
sync = {
|
sync = {
|
||||||
path =
|
path =
|
||||||
|
|
|
||||||
|
|
@ -21,8 +21,10 @@
|
||||||
|
|
||||||
upload-slots-per-torrent = 1000;
|
upload-slots-per-torrent = 1000;
|
||||||
|
|
||||||
alt-speed-up = 300000; # 300MB/s
|
speed-limit-up = 10000;
|
||||||
alt-speed-down = 500000; # 500MB/s
|
speed-limit-down = 10000;
|
||||||
|
alt-speed-up = 20000;
|
||||||
|
alt-speed-down = 20000;
|
||||||
alt-speed-time-enabled = true;
|
alt-speed-time-enabled = true;
|
||||||
alt-speed-time-begin = 540; # 9AM, minutes after midnight
|
alt-speed-time-begin = 540; # 9AM, minutes after midnight
|
||||||
alt-speed-time-end = 1380; # 11PM
|
alt-speed-time-end = 1380; # 11PM
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@
|
||||||
imports = [../wireguard-common];
|
imports = [../wireguard-common];
|
||||||
|
|
||||||
networking.wireguard.interfaces.wg0 = {
|
networking.wireguard.interfaces.wg0 = {
|
||||||
|
mtu = 1200;
|
||||||
ips = ["${vpn.${config.networking.hostName}.ip}/32"];
|
ips = ["${vpn.${config.networking.hostName}.ip}/32"];
|
||||||
peers = [
|
peers = [
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue