diff --git a/flake.lock b/flake.lock index c731bcf..c5f2642 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1707830867, - "narHash": "sha256-PAdwm5QqdlwIqGrfzzvzZubM+FXtilekQ/FA0cI49/o=", + "lastModified": 1712079060, + "narHash": "sha256-/JdiT9t+zzjChc5qQiF+jhrVhRt8figYH29rZO7pFe4=", "owner": "ryantm", "repo": "agenix", - "rev": "8cb01a0e717311680e0cbca06a76cbceba6f3ed6", + "rev": "1381a759b205dff7a6818733118d02253340fd5e", "type": "github" }, "original": { @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1710336635, - "narHash": "sha256-tEc3mD8LNujcm94BigiJZTGulCCGOhpXoNebQGzezLA=", + "lastModified": 1712572393, + "narHash": "sha256-1rh9Avt4prjMhFl4roOxeoA2wrmHQ+4AdETD57Pb6mo=", "ref": "refs/heads/master", - "rev": "845e682dc294373370efd5b6db99c48a65070a89", - "revCount": 165, + "rev": "c5bdfd91071fb06261c90655ac56ab61a09aa38c", + "revCount": 169, "type": "git", "url": "https://git.aciceri.dev/aciceri/emacs.git" }, @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1710724748, - "narHash": "sha256-aXlifKr6Brg0SBUBgRNEBaZf3JLUeGhM9BX2gam+vvo=", + "lastModified": 1712612224, + "narHash": "sha256-Tv4C8OSPVmm4LbpJGLFSODyvJy6DqrisEGPCQdNVOeY=", "owner": "nix-community", "repo": "disko", - "rev": "c09c3a9639690f94ddff44c3dd25c85602e5aeb2", + "rev": "79eab0e82cb126bf4ac170f44af82479f0895ab5", "type": "github" }, "original": { @@ -102,11 +102,11 @@ "pyproject-nix": "pyproject-nix" }, "locked": { - "lastModified": 1710760530, - "narHash": "sha256-hrDlPwwL8S86y3UviIZFEe0uqi7+dRSRA/xPGbVVgcg=", + "lastModified": 1712643040, + "narHash": "sha256-4vkxrZnHulJ8r6lewSr7oHjy0le66CxBRSgGr8WR3qg=", "owner": "nix-community", "repo": "dream2nix", - "rev": "f017de2de4b78aef8e9d37d1c7ffd61b200c2858", + "rev": "400032c6303f82b07a09c9784ab5569a51544987", "type": "github" }, "original": { @@ -218,16 +218,16 @@ "extra-package-nix-ts-mode": { "flake": false, "locked": { - "lastModified": 1694965545, - "narHash": "sha256-HijDb+2ojDk1Evv/KEIrZ/xW+QXz6IJoUllniTsE3hs=", - "owner": "aciceri", + "lastModified": 1705596103, + "narHash": "sha256-jEUmhfLE7cFan4/PF4qBiEOLsjM3Q4iSDTlM+0CYwZg=", + "owner": "antifuchs", "repo": "nix-ts-mode", - "rev": "8da9a76cd014d56ee734553a32c9e006e375bce4", + "rev": "0ef4e663add03d026a1804f57ac7d5453a635b15", "type": "github" }, "original": { - "owner": "aciceri", - "ref": "improved", + "owner": "antifuchs", + "ref": "improve-indented-string-indentation", "repo": "nix-ts-mode", "type": "github" } @@ -458,11 +458,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -476,11 +476,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -497,11 +497,11 @@ ] }, "locked": { - "lastModified": 1703887061, - "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { @@ -533,11 +533,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1710524333, - "narHash": "sha256-AyAeq3iUL8sthxiGNAoGd9+WiXOEfh6D7hJSTelLZQs=", + "lastModified": 1710779311, + "narHash": "sha256-fDN18WvX4hhlLUdnpSgu/DhfJCjlSTTmk+O0uQntfag=", "owner": "hercules-ci", "repo": "hercules-ci-agent", - "rev": "c3841d842cbe6bf7024b26bb40e44e82bd042273", + "rev": "9a031b7c8e376cb46ffcf56aba2350dc6b1dac5b", "type": "github" }, "original": { @@ -631,11 +631,11 @@ ] }, "locked": { - "lastModified": 1710714957, - "narHash": "sha256-eZCxuF58YWgaJMMRrn8oRkwRhxooe5kBS/s2wRVr9PA=", + "lastModified": 1712730572, + "narHash": "sha256-rAVvdP77rEmgobvSgybqPAcHefv5dCXPH/ge6Ds+JtU=", "owner": "nix-community", "repo": "home-manager", - "rev": "7b3fca5adcf6c709874a8f2e0c364fe9c58db989", + "rev": "18f89ef74f0d48635488ccd6a5e30dc9d48a3a87", "type": "github" }, "original": { @@ -732,11 +732,11 @@ ] }, "locked": { - "lastModified": 1710717205, - "narHash": "sha256-Wf3gHh5uV6W1TV/A8X8QJf99a5ypDSugY4sNtdJDe0A=", + "lastModified": 1711763326, + "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "bcc8afd06e237df060c85bad6af7128e05fd61a3", + "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", "type": "github" }, "original": { @@ -771,11 +771,11 @@ }, "nixosHardware": { "locked": { - "lastModified": 1710622004, - "narHash": "sha256-6zR642tXcZzzk3C8BHxlCrR0yh8z8zMXLiuXpWDIpX0=", + "lastModified": 1712739139, + "narHash": "sha256-I8fw3ot29H9TXClIJHmPfQXaq2dEXHs2VmZeMEw7sb4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "968952f950a59dee9ed1e8799dda38c6dfa1bad3", + "rev": "805adee81c82efbe50cac7398c4de05769488ed9", "type": "github" }, "original": { @@ -837,11 +837,11 @@ "nixpkgs-lib_2": { "locked": { "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -924,11 +924,11 @@ }, "nixpkgsStable": { "locked": { - "lastModified": 1710695816, - "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "lastModified": 1712588820, + "narHash": "sha256-y31s5idk3jMJMAVE4Ud9AdI7HT3CgTAeMTJ0StqKN7Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "rev": "d272ca50d1f7424fbfcd1e6f1c9e01d92f6da167", "type": "github" }, "original": { @@ -940,11 +940,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1710631334, - "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "lastModified": 1712608508, + "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6", "type": "github" }, "original": { @@ -1004,11 +1004,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1710669607, - "narHash": "sha256-kNj0Ka1/rkQRcigYTa1c5B6IcFuxDgM3s9jYuKUhxyM=", + "lastModified": 1712482522, + "narHash": "sha256-Ai/xNgZpbwGcw0TSXwEPwwbPi8Iu906sB9M9z3o6UgA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6af7e814afb3b62171eee1edc31989ee61528d25", + "rev": "efe8ce06ca261f370d672def5b1e0be300c726e1", "type": "github" }, "original": { @@ -1084,11 +1084,11 @@ }, "nur": { "locked": { - "lastModified": 1710758009, - "narHash": "sha256-E60fc4liidYWo+0FKGwDFndhcmV40ZNwfDbROTwaInA=", + "lastModified": 1712753744, + "narHash": "sha256-gmw5cWa/+K78CDkx1o5RlwPPgYTRaIhoF5bI4LI6HuQ=", "owner": "nix-community", "repo": "NUR", - "rev": "fc4f9acb61749a12a7ff7ac4020142b121a5dd25", + "rev": "72a299e9362607acd61c99c1858d0b4d1e6d2aef", "type": "github" }, "original": { @@ -1142,11 +1142,11 @@ ] }, "locked": { - "lastModified": 1708018599, - "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "lastModified": 1712579741, + "narHash": "sha256-igpsH+pa6yFwYOdah3cFciCk8gw+ytniG9quf5f/q84=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "rev": "70f504012f0a132ac33e56988e1028d88a48855c", "type": "github" }, "original": { @@ -1377,11 +1377,11 @@ ] }, "locked": { - "lastModified": 1710278050, - "narHash": "sha256-Oc6BP7soXqb8itlHI8UKkdf3V9GeJpa1S39SR5+HJys=", + "lastModified": 1711963903, + "narHash": "sha256-N3QDhoaX+paWXHbEXZapqd1r95mdshxToGowtjtYkGI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "35791f76524086ab4b785a33e4abbedfda64bd22", + "rev": "49dc4a92b02b8e68798abd99184f228243b6e3ac", "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 = [ {