diff --git a/flake.lock b/flake.lock index eb26412..c5f2642 100644 --- a/flake.lock +++ b/flake.lock @@ -631,11 +631,11 @@ ] }, "locked": { - "lastModified": 1712645849, - "narHash": "sha256-67v20E0gH7nvAaMsah2oRIocnxGO25fATUyzQHIywxQ=", + "lastModified": 1712730572, + "narHash": "sha256-rAVvdP77rEmgobvSgybqPAcHefv5dCXPH/ge6Ds+JtU=", "owner": "nix-community", "repo": "home-manager", - "rev": "40a99619da804a78a0b166e5c6911108c059c3a8", + "rev": "18f89ef74f0d48635488ccd6a5e30dc9d48a3a87", "type": "github" }, "original": { @@ -771,11 +771,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1712566108, - "narHash": "sha256-c9nT2ZODGqobISP41kUwCQ84Srwg7a/1TmPFQuol2/8=", + "lastModified": 1712739139, + "narHash": "sha256-I8fw3ot29H9TXClIJHmPfQXaq2dEXHs2VmZeMEw7sb4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1e3b3a35b7083f4152f5a516798cf9b21e686465", + "rev": "805adee81c82efbe50cac7398c4de05769488ed9", "type": "github" }, "original": { @@ -940,11 +940,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1712608508, + "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", "type": "github" }, "original": { @@ -1084,11 +1084,11 @@ }, "nur": { "locked": { - "lastModified": 1712671839, - "narHash": "sha256-LjehUc4gAnqGckdck5ul+nWJKAjTodS/Nd+PuO3sIaM=", + "lastModified": 1712753744, + "narHash": "sha256-gmw5cWa/+K78CDkx1o5RlwPPgYTRaIhoF5bI4LI6HuQ=", "owner": "nix-community", "repo": "NUR", - "rev": "7d17d2fa5094e28ddd369ced837f44073b436662", + "rev": "72a299e9362607acd61c99c1858d0b4d1e6d2aef", "type": "github" }, "original": { diff --git a/hmModules/btop/default.nix b/hmModules/btop/default.nix index dda9306..370fbd2 100644 --- a/hmModules/btop/default.nix +++ b/hmModules/btop/default.nix @@ -1,6 +1,10 @@ -{ +{config, ...}: { programs.btop = { enable = true; - settings.update_ms = 100; + settings = { + update_ms = 100; + theme_background = false; + color_theme = "${config.programs.btop.package}/share/btop/themes/dracula.theme"; + }; }; } diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index f67ddbe..2f239f4 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -27,7 +27,6 @@ programs.ssh = { enable = true; controlMaster = "auto"; - controlPersist = "10m"; }; # programs.starship = { diff --git a/hmModules/wezterm/default.nix b/hmModules/wezterm/default.nix index 09d066d..b6ad88b 100644 --- a/hmModules/wezterm/default.nix +++ b/hmModules/wezterm/default.nix @@ -3,6 +3,7 @@ enable = true; extraConfig = '' return { + enable_wayland = false; -- https://github.com/wez/wezterm/issues/4483 font = wezterm.font_with_fallback { { family = 'Iosevka Comfy', diff --git a/hosts/default.nix b/hosts/default.nix index cfc2d6f..3459702 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -160,7 +160,7 @@ vpnExtra = { oneplus6t = { ip = "10.100.0.4"; - publicKey = "O6/tKaA8Hs7OEqi15hV4RwviR6vyCTMYv6ZlhsI+tnI="; + publicKey = "cXHPaJXeA/JB7DKlZXR86zYcz1OEVPMOvAmDhBQF91E="; }; }; }; diff --git a/hosts/kirk/default.nix b/hosts/kirk/default.nix index 7f33db6..896a801 100644 --- a/hosts/kirk/default.nix +++ b/hosts/kirk/default.nix @@ -30,6 +30,7 @@ "greetd" "syncthing" "mount-rock5b" + "adb" ] ++ [ ./disko.nix diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index 2505601..5e71aa6 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -39,6 +39,7 @@ # "macos-ventura" # "sunshine" "mount-rock5b" + "adb" ] ++ [ ./disko.nix diff --git a/hosts/sisko/default.nix b/hosts/sisko/default.nix index 545b115..c4d5702 100644 --- a/hosts/sisko/default.nix +++ b/hosts/sisko/default.nix @@ -26,6 +26,7 @@ "minio" # "matrix" "forgejo" + # "jellyfin" ] ++ [ ./disko.nix diff --git a/modules/cloudflare-dyndns/default.nix b/modules/cloudflare-dyndns/default.nix index 4b8e74a..a0f8443 100644 --- a/modules/cloudflare-dyndns/default.nix +++ b/modules/cloudflare-dyndns/default.nix @@ -14,6 +14,7 @@ "cache.aciceri.dev" "matrix.aciceri.dev" "syncv3.matrix.aciceri.dev" + "jellyfin.aciceri.dev" ]; apiTokenFile = config.age.secrets.cloudflare-dyndns-api-token.path; }; diff --git a/modules/forgejo/default.nix b/modules/forgejo/default.nix index 7c7b13b..8a1f821 100644 --- a/modules/forgejo/default.nix +++ b/modules/forgejo/default.nix @@ -5,7 +5,6 @@ }: { services.forgejo = { enable = true; - stateDir = "/mnt/hd/forgejo"; settings = { DEFAULT = { RUN_MODE = "prod"; # set to prod for better logs (worse performance) diff --git a/modules/jellyfin/default.nix b/modules/jellyfin/default.nix new file mode 100644 index 0000000..1615176 --- /dev/null +++ b/modules/jellyfin/default.nix @@ -0,0 +1,7 @@ +{ + services.jellyfin = { + enable = true; + }; + + users.users.jellyfin.extraGroups = ["transmission"]; +} diff --git a/modules/rock5b-proxy/default.nix b/modules/rock5b-proxy/default.nix index 5ffb526..38416f0 100644 --- a/modules/rock5b-proxy/default.nix +++ b/modules/rock5b-proxy/default.nix @@ -35,6 +35,13 @@ proxyPass = "http://localhost:${builtins.toString config.services.invidious.port}"; }; }; + # "jellyfin.aciceri.dev" = { + # forceSSL = true; + # enableACME = true; + # locations."/" = { + # proxyPass = "http://localhost:8096"; + # }; + # }; # "sevenofnix.aciceri.dev" = { # forceSSL = true; # enableACME = true; diff --git a/modules/syncthing/default.nix b/modules/syncthing/default.nix index 5fdd878..d7597c5 100644 --- a/modules/syncthing/default.nix +++ b/modules/syncthing/default.nix @@ -29,6 +29,12 @@ "tcp://kirk.fleet" ]; }; + onplus6t = { + id = "76BJ2ZE-FPFDWUZ-3UZIENZ-TS6YBGG-EZSF6UE-GLHRBQ2-KTHTRMI-3JWNRAT"; + addresses = [ + "tcp://oneplus6t.fleet" + ]; + }; }; folders = { org = { @@ -39,7 +45,7 @@ kirk = "/home/${config.ccr.username}/org"; } .${config.networking.hostName}; - devices = ["picard" "sisko" "kirk"]; + devices = ["picard" "sisko" "kirk" "onplus6t"]; }; sync = { path = diff --git a/modules/transmission/default.nix b/modules/transmission/default.nix index 72070ed..79f12b3 100644 --- a/modules/transmission/default.nix +++ b/modules/transmission/default.nix @@ -21,8 +21,10 @@ upload-slots-per-torrent = 1000; - alt-speed-up = 300000; # 300MB/s - alt-speed-down = 500000; # 500MB/s + speed-limit-up = 10000; + speed-limit-down = 10000; + alt-speed-up = 20000; + alt-speed-down = 20000; alt-speed-time-enabled = true; alt-speed-time-begin = 540; # 9AM, minutes after midnight alt-speed-time-end = 1380; # 11PM diff --git a/modules/wireguard-client/default.nix b/modules/wireguard-client/default.nix index e02a34a..9a93f17 100644 --- a/modules/wireguard-client/default.nix +++ b/modules/wireguard-client/default.nix @@ -6,6 +6,7 @@ imports = [../wireguard-common]; networking.wireguard.interfaces.wg0 = { + mtu = 1200; ips = ["${vpn.${config.networking.hostName}.ip}/32"]; peers = [ {