diff --git a/flake.lock b/flake.lock index 7e93897..fc7e4a4 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1753260820, - "narHash": "sha256-hh7QESW339Wp0YqgcFIFL66JPN8SV3j2zdGShfQH+Fw=", + "lastModified": 1754418797, + "narHash": "sha256-8UP/nu75GyNcdKW3FD/mRxhs5zWlRIpAQo8wgm9rVQE=", "owner": "catppuccin", "repo": "nix", - "rev": "227c41fd57210559a05720bece5453369d7abe0f", + "rev": "9bdf7f5fb308409495523ea21bec5484b75b2492", "type": "github" }, "original": { @@ -37,11 +37,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -114,11 +114,11 @@ ] }, "locked": { - "lastModified": 1753121425, - "narHash": "sha256-TVcTNvOeWWk1DXljFxVRp+E0tzG1LhrVjOGGoMHuXio=", + "lastModified": 1754420989, + "narHash": "sha256-3e4wHzNwTMg7GaeLH9A091DMaO9AfFxUjpfqbddCUeo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "644e0fc48951a860279da645ba77fe4a6e814c5e", + "rev": "7f38f25a44023a21a504bd3fd9d4f41c4a39f55c", "type": "github" }, "original": { @@ -227,11 +227,11 @@ ] }, "locked": { - "lastModified": 1750779888, - "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", + "lastModified": 1754416808, + "narHash": "sha256-c6yg0EQ9xVESx6HGDOCMcyRSjaTpNJP10ef+6fRcofA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", + "rev": "9c52372878df6911f9afc1e2a1391f55e4dfc864", "type": "github" }, "original": { @@ -291,11 +291,11 @@ ] }, "locked": { - "lastModified": 1753181343, - "narHash": "sha256-CLQfNtUqirNVSYoW/kYbvL4PeeNasmZonaPnjO3+1YQ=", + "lastModified": 1754457347, + "narHash": "sha256-QN9yZ1L5EmR16NNM+hNNzMjARk+FPjUeSE/ds4Kms0E=", "owner": "nix-community", "repo": "home-manager", - "rev": "0cdfcdbb525b77b951c889b6131047bc374f48fe", + "rev": "ad5d2b4aa770fdc74c80fd682fee0b00a8ad7991", "type": "github" }, "original": { @@ -358,11 +358,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1753239105, - "narHash": "sha256-b6kNz4HI/K/XANrGbBLwE4e0c9DsJ+PkKfAPpZMX1mE=", - "rev": "8a2d25054ddff44dd8878154b702365eb1966a78", + "lastModified": 1754416151, + "narHash": "sha256-H/SM37tCftT1gPWUmPv3q+FIwBoVf7JnxzRjZSeDPEw=", + "rev": "7e8b44d718a69364f7bfd58f463c345a555c2cfc", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/8a2d25054ddff44dd8878154b702365eb1966a78.tar.gz?rev=8a2d25054ddff44dd8878154b702365eb1966a78" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/7e8b44d718a69364f7bfd58f463c345a555c2cfc.tar.gz" }, "original": { "type": "tarball", @@ -399,11 +399,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1753263647, - "narHash": "sha256-/ppK3tT5cpZqouENpdaUMDmOYW7OZF21s+ZeCCZ4wgU=", + "lastModified": 1753435585, + "narHash": "sha256-RP5gyJlkvZYE67ZFh92X/Y43KiAoe6PENEVLolNriYM=", "ref": "refs/heads/main", - "rev": "33c593fd25cb4eeaf00023416c81ad9958c7ee75", - "revCount": 26, + "rev": "05ad03cb362b42b9c6e463864a90fbeea06c93ba", + "revCount": 27, "type": "git", "url": "https://git.rougebordeaux.xyz/misschloe/miovim.git" }, @@ -420,11 +420,11 @@ ] }, "locked": { - "lastModified": 1753392240, - "narHash": "sha256-4U0ABI8mT/C4mySei6nlkvsvr62dA+5BdTSEFrZkMlM=", + "lastModified": 1754439168, + "narHash": "sha256-NcwRidwb/ask65LE86os4RkhyoPQo5sLu0sJs/NboK4=", "owner": "moonlight-mod", "repo": "moonlight", - "rev": "7248b01a141412f7cc0b4224eead0f90443780aa", + "rev": "66b81b113afd6654a88c9adb7edb7fe92839fe84", "type": "github" }, "original": { @@ -465,11 +465,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1753258173, - "narHash": "sha256-a7ri+24SEelYz1P1VyO2joZrXQgWhc4g6Iy5i/YROI0=", + "lastModified": 1754471276, + "narHash": "sha256-OrgCULwvrBKnns8lzX2124pXzAAoi7jeLHi134yNC+I=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "5c2f79eef3dbe9522b6e79fb7f1d99dd593e478a", + "rev": "6ec3826060fb1110a2ea1ff9aff32e476adb2d0a", "type": "github" }, "original": { @@ -481,11 +481,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1753225057, - "narHash": "sha256-/Z6FyO4cZ9SGa8X7l7MmEXoKlZWCXgv65qZ9HYbuDvw=", + "lastModified": 1754426054, + "narHash": "sha256-3clYVRl9XbRZXnPtMU2QuSo4FsUQvPOZCML5J2b9YHc=", "owner": "neovim", "repo": "neovim", - "rev": "1685c44dd463217db01643a97163420ed9f5b177", + "rev": "820fb89172b7d21faa6c3714a58c97308d9e67e3", "type": "github" }, "original": { @@ -584,11 +584,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { @@ -615,11 +615,11 @@ }, "nixpkgsSmall": { "locked": { - "lastModified": 1753208034, - "narHash": "sha256-w24+7Iu031O5iAcWY+exrtRkc60Q9Q3qs+LqhBxQiTg=", + "lastModified": 1754386664, + "narHash": "sha256-Zu8TCY5niHj5dSnbez1gJy8A+rF5bxu0yTrpvhpB6vc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3f7a24d6c01fc1875650ff6f7849126910fe9369", + "rev": "c0b2405c1d88328e059119fb5576206f0e137e3b", "type": "github" }, "original": { @@ -631,11 +631,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1752950548, - "narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", + "lastModified": 1754214453, + "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c87b95e25065c028d31a94f06a62927d18763fdf", + "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", "type": "github" }, "original": { @@ -679,11 +679,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1753151930, - "narHash": "sha256-XSQy6wRKHhRe//iVY5lS/ZpI/Jn6crWI8fQzl647wCg=", + "lastModified": 1754340878, + "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "83e677f31c84212343f4cc553bab85c2efcad60a", + "rev": "cab778239e705082fe97bb4990e0d24c50924c04", "type": "github" }, "original": { @@ -695,11 +695,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1753115646, - "narHash": "sha256-yLuz5cz5Z+sn8DRAfNkrd2Z1cV6DaYO9JMrEz4KZo/c=", + "lastModified": 1754292888, + "narHash": "sha256-1ziydHSiDuSnaiPzCQh1mRFBsM2d2yRX9I+5OPGEmIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "92c2e04a475523e723c67ef872d8037379073681", + "rev": "ce01daebf8489ba97bd1609d185ea276efdeb121", "type": "github" }, "original": { @@ -727,11 +727,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1750605355, - "narHash": "sha256-xT8cPLTxlktxI9vSdoBlAVK7dXgd8IK59j7ZwzkkhnI=", + "lastModified": 1753934836, + "narHash": "sha256-G06FmIBj0I5bMW1Q8hAEIl5N7IHMK7+Ta4KA+BmneDA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3078b9a9e75f1790e6d6ef9955fdc6a2d1740cc6", + "rev": "8679b16e11becd487b45d568358ddf9d5640d860", "type": "github" }, "original": { @@ -819,11 +819,11 @@ ] }, "locked": { - "lastModified": 1750646674, - "narHash": "sha256-gHg6QUjMi1ObrocQUAoEhhbIfop14UNae4QDSHoKsRU=", + "lastModified": 1753930086, + "narHash": "sha256-Os6Ta5zamfAllmQNlvkbGZLHn06zJy3hVXRk+Dy2yMo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "65162ae665154e0eddb395166bd4956358981dd0", + "rev": "17b672c10c1798696a516cb879edbc2ebd0f58a4", "type": "github" }, "original": { @@ -837,11 +837,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1752544651, - "narHash": "sha256-GllP7cmQu7zLZTs9z0J2gIL42IZHa9CBEXwBY9szT0U=", + "lastModified": 1754328224, + "narHash": "sha256-glPK8DF329/dXtosV7YSzRlF4n35WDjaVwdOMEoEXHA=", "owner": "Mic92", "repo": "sops-nix", - "rev": "2c8def626f54708a9c38a5861866660395bb3461", + "rev": "49021900e69812ba7ddb9e40f9170218a7eca9f4", "type": "github" }, "original": { @@ -857,11 +857,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1750693076, - "narHash": "sha256-+sdV7NFueCeBLrsl7lrqzlG5tPNqDe/zlcIb8TYxQl8=", + "lastModified": 1754041947, + "narHash": "sha256-KzuedC2yJU56sRBeMlndPuXK6UWHxSUtgAmJ/+Gww6I=", "owner": "LGFae", "repo": "swww", - "rev": "805a355da574fed46e664606660e2499f02e2174", + "rev": "63d71f2b8c6d1533b5fef748dfc490dd461e343c", "type": "github" }, "original": { @@ -938,11 +938,11 @@ ] }, "locked": { - "lastModified": 1753006367, - "narHash": "sha256-tzbhc4XttkyEhswByk5R38l+ztN9UDbnj0cTcP6Hp9A=", + "lastModified": 1754061284, + "narHash": "sha256-ONcNxdSiPyJ9qavMPJYAXDNBzYobHRxw0WbT38lKbwU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "421b56313c65a0815a52b424777f55acf0b56ddf", + "rev": "58bd4da459f0a39e506847109a2a5cfceb837796", "type": "github" }, "original": { @@ -959,11 +959,11 @@ ] }, "locked": { - "lastModified": 1753069499, - "narHash": "sha256-YtgY0ueqKNrBma4Euu8WH23BhUkBujirJDMDE1KujnU=", + "lastModified": 1754458246, + "narHash": "sha256-6fvYurXcdg+AC7IBoLEgRIU3GXMaAaVwnteKk9OKBBM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "c64b94235ae24e3b9e01a08f0331d8bb0e5b037a", + "rev": "f806c5bfd831b8f9333b31f45b85b711025ba3de", "type": "github" }, "original": { diff --git a/hosts/shawarma/configuration.nix b/hosts/shawarma/configuration.nix new file mode 100644 index 0000000..9e87c73 --- /dev/null +++ b/hosts/shawarma/configuration.nix @@ -0,0 +1,4 @@ +{ username }: +{ + users.users."${username}" = { }; +} diff --git a/hosts/sisyphe/configuration.nix b/hosts/sisyphe/configuration.nix index 34f999a..8d21641 100644 --- a/hosts/sisyphe/configuration.nix +++ b/hosts/sisyphe/configuration.nix @@ -43,6 +43,7 @@ in "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHjz5MUSmc1ahtUJWuvzG7PHH432nx6a0Nj2zfxt3oTP geekcat@protonmail.com" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP9Yp7TbDhYJ27Sh+LcPXT569bMVwbFrkE4zksfU84l+ harry123@goober" ]; + shell = pkgs.zsh; }; security.sudo.wheelNeedsPassword = false; diff --git a/hosts/sisyphe/features/multimedia/arr-suite.nix b/hosts/sisyphe/features/multimedia/arr-suite.nix index 6512fcb..9131e41 100644 --- a/hosts/sisyphe/features/multimedia/arr-suite.nix +++ b/hosts/sisyphe/features/multimedia/arr-suite.nix @@ -16,53 +16,52 @@ in bazarr ]; + services.sonarr = { + enable = true; + openFirewall = true; + }; + + services.radarr = { + enable = true; + group = "multimedia"; + openFirewall = true; + }; + + services.prowlarr = { + enable = true; + openFirewall = true; + }; + + services.jellyseerr = { + openFirewall = true; + enable = true; + }; + + services.bazarr = { + enable = true; + openFirewall = true; + }; /* - services.sonarr = { - enable = true; - openFirewall = true; - }; + #TODO: create duplicated instances of Sonarr. + systemd.services."sonarrAnime" = { + enable = true; + description = "Duplicated Sonarr instance, for animes"; + after = [ + "syslog.target" + "network.target" + ]; - services.radarr = { - enable = true; - group = "multimedia"; - openFirewall = true; - }; - - services.prowlarr = { - enable = true; - openFirewall = true; - }; - - services.jellyseerr = { - openFirewall = true; - enable = true; - }; - - services.bazarr = { - enable = true; - openFirewall = true; - }; - /* - #TODO: create duplicated instances of Sonarr. - systemd.services."sonarrAnime" = { - enable = true; - description = "Duplicated Sonarr instance, for animes"; - after = [ - "syslog.target" - "network.target" - ]; - - path = [ pkgs.sonarr ]; - serviceConfig = { - Type = "simple"; - User = "sonarr"; - ExecStart = "${pkgs.sonarr}/bin/Sonarr -nobrowser -data=/var/lib/sonarrAnime"; - TimeoutStopSec = "20"; - KillMode = "process"; - Restart = "on-failure"; - }; - wantedBy = [ "multi-user.target" ]; + path = [ pkgs.sonarr ]; + serviceConfig = { + Type = "simple"; + User = "sonarr"; + ExecStart = "${pkgs.sonarr}/bin/Sonarr -nobrowser -data=/var/lib/sonarrAnime"; + TimeoutStopSec = "20"; + KillMode = "process"; + Restart = "on-failure"; }; + wantedBy = [ "multi-user.target" ]; + }; */ services.caddy.virtualHosts = { diff --git a/hosts/sisyphe/features/multimedia/default.nix b/hosts/sisyphe/features/multimedia/default.nix index a98d770..e8e6078 100644 --- a/hosts/sisyphe/features/multimedia/default.nix +++ b/hosts/sisyphe/features/multimedia/default.nix @@ -1,6 +1,6 @@ { imports = [ - # ./arr-suite.nix + ./arr-suite.nix ./calibre-web.nix ./slskd.nix # ./sabnzbd.nix diff --git a/hosts/sisyphe/features/services/akkoma.nix b/hosts/sisyphe/features/services/akkoma.nix index b1df32f..19a293c 100644 --- a/hosts/sisyphe/features/services/akkoma.nix +++ b/hosts/sisyphe/features/services/akkoma.nix @@ -25,7 +25,7 @@ let } ''; akkoma-overlay = self: super: { - akkoma = super.akkkoma.overrideAttrs (old: { + akkoma = super.akkoma.overrideAttrs (old: { postPatch = '' cp ${pkgs.writeText "styles.json" styles} $out/priv/static/themes cp ${./akkoma/terms-of-services.html} $out/priv/static/terms-of-service.html