From 8a522c525c93a9ae027b7f65d44386a0b49bb6a2 Mon Sep 17 00:00:00 2001 From: harry123 Date: Thu, 8 May 2025 16:02:47 +0200 Subject: [PATCH] Refactor Nix configurations to update URLs from hypervirtual.world to rougebordeaux.xyz - Updated flake.nix to change Alejandra and other inputs to follow the new repository structure. - Modified uptime-kuma configurations to reflect the new domain for Caddy reverse proxy settings. - Adjusted various multimedia services in Sisyphe to use the new domain for Caddy virtual hosts. - Disabled the Sabnzbd service in Sisyphe and updated its Caddy configuration. - Corrected multiple service configurations in Sisyphe to point to the new domain, including Grafana, Nextcloud, and Synapse Matrix. - Ensured all references to hypervirtual.world are replaced with rougebordeaux.xyz across all relevant files. --- flake.lock | 524 ++---------------- flake.nix | 24 +- hosts/diva/features/uptime-kuma.nix | 4 +- .../goober/features/software/workstation.nix | 2 + hosts/sisyphe/features/caddy.nix | 4 +- .../sisyphe/features/multimedia/arr-suite.nix | 14 +- .../features/multimedia/calibre-web.nix | 6 +- .../sisyphe/features/multimedia/jellyfin.nix | 4 +- hosts/sisyphe/features/multimedia/sabnzbd.nix | 6 +- hosts/sisyphe/features/multimedia/slskd.nix | 6 +- .../features/multimedia/transmission.nix | 3 +- hosts/sisyphe/features/prometheus.nix | 4 +- .../sisyphe/features/services/archivebox.nix | 2 +- hosts/sisyphe/features/services/forgejo.nix | 8 +- hosts/sisyphe/features/services/grafana.nix | 2 +- .../features/services/homelab-dashboard.nix | 40 +- .../sisyphe/features/services/irc-server.nix | 4 +- hosts/sisyphe/features/services/nextcloud.nix | 4 +- .../features/services/synapse-matrix.nix | 8 +- .../sisyphe/features/services/uptime-kuma.nix | 4 +- 20 files changed, 136 insertions(+), 537 deletions(-) diff --git a/flake.lock b/flake.lock index 031c610..6b6097f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,38 +1,15 @@ { "nodes": { - "alejandra": { - "inputs": { - "fenix": "fenix", - "flakeCompat": "flakeCompat", - "nixpkgs": [ - "nixpkgsUnstable" - ] - }, - "locked": { - "lastModified": 1660592437, - "narHash": "sha256-xFumnivtVwu5fFBOrTxrv6fv3geHKF04RGP23EsDVaI=", - "owner": "kamadorueda", - "repo": "alejandra", - "rev": "e7eac49074b70814b542fee987af2987dd0520b5", - "type": "github" - }, - "original": { - "owner": "kamadorueda", - "ref": "3.0.0", - "repo": "alejandra", - "type": "github" - } - }, "catppuccin": { "inputs": { "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1745006048, - "narHash": "sha256-4ONXaEwnyZGPp84d6wjiqoR4xyTWygUobBTcSkILPzU=", + "lastModified": 1746650299, + "narHash": "sha256-4+pxk1KcSH8ww3tgN808nNJ3E7Q8gNWI+U0sesW7mBQ=", "owner": "catppuccin", "repo": "nix", - "rev": "592094a02c4e43a9fa33559ade84d1ca015e8ada", + "rev": "f746600f15b69df05c84e3037749a3be5b1276d1", "type": "github" }, "original": { @@ -41,28 +18,6 @@ "type": "github" } }, - "fenix": { - "inputs": { - "nixpkgs": [ - "alejandra", - "nixpkgs" - ], - "rust-analyzer-src": "rust-analyzer-src" - }, - "locked": { - "lastModified": 1657607339, - "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", - "owner": "nix-community", - "repo": "fenix", - "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "fenix", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -97,15 +52,17 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "neovim-nightly-overlay", + "nixpkgs" + ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -115,92 +72,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "miovim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { - "inputs": { - "nixpkgs-lib": [ - "miovim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738453229, - "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "neovim-nightly-overlay", @@ -221,58 +92,6 @@ "type": "indirect" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flakeCompat": { - "flake": false, - "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -283,14 +102,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1746537231, + "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", "type": "github" }, "original": { @@ -323,8 +139,7 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_4", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_2", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -351,11 +166,11 @@ ] }, "locked": { - "lastModified": 1745033012, - "narHash": "sha256-KjBMsjCzIOWgDqTZMYIriPFmHiQcCb2RhuDh5JF0VVc=", + "lastModified": 1746710194, + "narHash": "sha256-r2zE8+rWZieU05LMKixeU5SsMy9I4truiTPKchTPNaw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae84885d9b6b62dc58ccd300e9ab321a3fd9f9c7", + "rev": "cea975d46d08293eae3ad0d9f16207f1ce2dfc81", "type": "github" }, "original": { @@ -385,73 +200,22 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "miovim", - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "miovim", - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.6", - "repo": "ixx", - "type": "github" - } - }, - "miovim": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2", - "nixvim": "nixvim" - }, - "locked": { - "lastModified": 1741816984, - "narHash": "sha256-veUgTCQ3bCb1/w+4rRdzGxXwUEZKyys/gunMWvWYT4k=", - "ref": "refs/heads/main", - "rev": "bb97adbf0e81cc591c0f67c0b88a476f25a2fe17", - "revCount": 5, - "type": "git", - "url": "https://git.hypervirtual.world/harry123/miovim.git" - }, - "original": { - "type": "git", - "url": "https://git.hypervirtual.world/harry123/miovim.git" - } - }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat", - "flake-parts": "flake-parts_3", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1745044087, - "narHash": "sha256-is3Axl/CPltDo8g2avq1beaeR72V+KeohzsFf4d4u/0=", + "lastModified": 1746693006, + "narHash": "sha256-IztZLDIwNOvJCxqnBmaU7/oEjOBLJZgmLoK0ikQGQkM=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "4f94094e0b09f733f412216f24ae83d5f2dd0298", + "rev": "b969e3c7bfcb7a438382dd6e379788f762094df5", "type": "github" }, "original": { @@ -463,11 +227,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1745018600, - "narHash": "sha256-luXj2Tub5MJhvS+lXp4FVz0MXDB55u/BWuwbpmfGJuk=", + "lastModified": 1746661883, + "narHash": "sha256-kjIDvE1KGhACcvAJGLgzaQDkenH8dN9Hapfc0/b/3bQ=", "owner": "neovim", "repo": "neovim", - "rev": "c67398d31bd9a6e3908b06dc1f8b9a403c992e69", + "rev": "1b8ae4336db86ff95998223cc6bd8e07229d237d", "type": "github" }, "original": { @@ -480,15 +244,14 @@ "inputs": { "nixpkgs": [ "nixpkgsUnstable" - "nixpkgsUnstable" ] }, "locked": { - "lastModified": 1744478979, - "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", + "lastModified": 1746708654, + "narHash": "sha256-GeC99gu5H6+AjBXsn5dOhP4/ApuioGCBkufdmEIWPRs=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "43975d782b418ebf4969e9ccba82466728c2851b", + "rev": "6cb36e8327421c61e5a3bbd08ed63491b616364a", "type": "github" }, "original": { @@ -548,18 +311,15 @@ "inputs": { "nixlib": "nixlib", "nixpkgs": [ - "nixpkgs" + "nixpkgsUnstable" ] }, "locked": { - "lastModified": 1742568034, - "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", "lastModified": 1742568034, "narHash": "sha256-QaMEhcnscfF2MqB7flZr+sLJMMYZPnvqO4NYf9B4G38=", "owner": "nix-community", "repo": "nixos-generators", "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", - "rev": "42ee229088490e3777ed7d1162cb9e9d8c3dbb11", "type": "github" }, "original": { @@ -584,43 +344,13 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1740877520, - "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1740877520, - "narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgsSmall": { "locked": { - "lastModified": 1744917357, - "narHash": "sha256-1Sj8MToixDwakJYNMYBS/PYbg8Oa4CAxreXraMHB5qg=", + "lastModified": 1746662363, + "narHash": "sha256-1LXVNEjo9RXc9IGh711BvgdMhD71+iuUKjhZsq4npgo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1eae3268880484be84199bdb77941c09bb4a97ba", + "rev": "30ece0005f607654dee9b6c2f8bfa1d182a9f301", "type": "github" }, "original": { @@ -632,11 +362,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1746461020, + "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", "type": "github" }, "original": { @@ -648,15 +378,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741310760, - "narHash": "sha256-aizILFrPgq/W53Jw8i0a1h1GZAAKtlYOrG/A5r46gVM=", - "owner": "nixos", + "lastModified": 1746576598, + "narHash": "sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "de0fe301211c267807afd11b12613f5511ff7433", + "rev": "b3582c75c7f21ce0b429898980eddbbf05c68e55", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" @@ -664,43 +394,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1738797219, - "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", + "lastModified": 1746557022, + "narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1da52dd49a127ad74486b135898da2cef8c62665", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1744536153, - "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1744440957, - "narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d", + "rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "type": "github" }, "original": { @@ -710,13 +408,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { - "lastModified": 1744502386, - "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -726,120 +424,35 @@ "type": "github" } }, - "nixvim": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3", - "nuschtosSearch": "nuschtosSearch" - }, - "locked": { - "lastModified": 1741098523, - "narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "03065fd4708bfdf47dd541d655392a60daa25ded", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "miovim", - "miovim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738508923, - "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", - "owner": "NuschtOS", - "repo": "search", - "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, - "nuschtosSearch_2": { - "inputs": { - "flake-utils": "flake-utils_2", - "ixx": "ixx_2", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743683223, - "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=", - "owner": "NuschtOS", - "repo": "search", - "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "root": { "inputs": { - "alejandra": "alejandra", + "alejandra": [ + "nixpkgsUnstable" + ], "catppuccin": "catppuccin", "home-manager": "home-manager", - "miovim": "miovim", - "miovim": "miovim", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nix-secrets": "nix-secrets", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "nixpkgsSmall": "nixpkgsSmall", "nixpkgsUnstable": "nixpkgsUnstable", "sops-nix": "sops-nix", "zen-browser": "zen-browser" } }, - "rust-analyzer-src": { - "flake": false, - "locked": { - "lastModified": 1657557289, - "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=", - "owner": "rust-lang", - "repo": "rust-analyzer", - "rev": "caf23f29144b371035b864a1017dbc32573ad56d", - "type": "github" - }, - "original": { - "owner": "rust-lang", - "ref": "nightly", - "repo": "rust-analyzer", - "type": "github" - } - }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1744669848, - "narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=", + "lastModified": 1746485181, + "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "61154300d945f0b147b30d24ddcafa159148026a", + "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", "type": "github" }, "original": { @@ -848,21 +461,6 @@ "type": "github" } }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -871,11 +469,11 @@ ] }, "locked": { - "lastModified": 1744961264, - "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=", + "lastModified": 1746216483, + "narHash": "sha256-4h3s1L/kKqt3gMDcVfN8/4v2jqHrgLIe4qok4ApH5x4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8d404a69efe76146368885110f29a2ca3700bee6", + "rev": "29ec5026372e0dec56f890e50dbe4f45930320fd", "type": "github" }, "original": { @@ -892,11 +490,11 @@ ] }, "locked": { - "lastModified": 1745040643, - "narHash": "sha256-QAdOWF7bDXkcJTuZ/X014tAUi9bv+DBNU33uDupzQdU=", + "lastModified": 1746685734, + "narHash": "sha256-bA6UKUmA/byQjO5MuyOT62Z4rg36DW4kt7QIqEQTDB0=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a01acea9d26943263e292da9fee58fe0e7824e72", + "rev": "4327bc9352789c7e28bda04696a38a08f10dd716", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9d89693..392edd1 100644 --- a/flake.nix +++ b/flake.nix @@ -12,8 +12,10 @@ inputs.nixpkgs.follows = "nixpkgsUnstable"; }; - alejandra.url = "github:kamadorueda/alejandra/3.0.0"; - alejandra.inputs.nixpkgs.follows = "nixpkgsUnstable"; + alejandra = { + url = "github:kamadorueda/alejandra/3.0.0"; + follows = "nixpkgsUnstable"; + }; nix-secrets = { url = "git+https://git.hypervirtual.world/harry123/nix-secrets.git"; # replace with your own repo @@ -21,14 +23,13 @@ }; /* - nix-secrets-next = { - url = "git+https://git.hypervirtual.world/harry123/nix-secrets-next.git"; - flake = false; - }; + nix-secrets-next = { + url = "git+https://git.rougebordeaux.xyz/harry123/nix-secrets-next.git"; + flake = false; + }; + miovim.url = "git+https://git.rougebordeaux.xyz/harry123/miovim.git"; */ - miovim.url = "git+https://git.hypervirtual.world/harry123/miovim.git"; - nixos-generators = { url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgsUnstable"; @@ -43,8 +44,7 @@ nix-darwin.inputs.nixpkgs.follows = "nixpkgsUnstable"; nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; - - walker.url = "github:abenz1267/walker"; + catppuccin.url = "github:catppuccin/nix"; }; outputs = @@ -59,7 +59,6 @@ nix-darwin, nix-flatpak, home-manager, - miovim, zen-browser, ... }@inputs: @@ -87,8 +86,6 @@ ]; }; - # athena = nixpkgs.lib.nixosSystem {}: - labouse = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ @@ -102,6 +99,7 @@ modules = [ ./hosts/goober/configuration.nix nix-flatpak.nixosModules.nix-flatpak + catppuccin.nixosModules.catppuccin home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/hosts/diva/features/uptime-kuma.nix b/hosts/diva/features/uptime-kuma.nix index a029a66..ba900d1 100644 --- a/hosts/diva/features/uptime-kuma.nix +++ b/hosts/diva/features/uptime-kuma.nix @@ -7,11 +7,11 @@ }; }; - services.caddy.virtualHosts."http://status.hypervirtual.world".extraConfig = '' + services.caddy.virtualHosts."http://status.rougebordeaux.xyz".extraConfig = '' reverse_proxy :4000 ''; - services.caddy.virtualHosts."http://uptime.diva.global.hypervirtual.world".extraConfig = '' + services.caddy.virtualHosts."http://uptime.diva.global.rougebordeaux.xyz.extraConfig = '' reverse_proxy :4000 ''; } diff --git a/hosts/goober/features/software/workstation.nix b/hosts/goober/features/software/workstation.nix index 0daaf1a..3fa4bd2 100644 --- a/hosts/goober/features/software/workstation.nix +++ b/hosts/goober/features/software/workstation.nix @@ -51,6 +51,8 @@ z3 bitwarden kicad + ente-auth + ente-web ]; programs.kdeconnect.enable = true; diff --git a/hosts/sisyphe/features/caddy.nix b/hosts/sisyphe/features/caddy.nix index c3405b2..ec17bb8 100644 --- a/hosts/sisyphe/features/caddy.nix +++ b/hosts/sisyphe/features/caddy.nix @@ -4,11 +4,11 @@ enable = true; virtualHosts = { - "http://fish.hypervirtual.world".extraConfig = '' + "http://fish.rougebordeaux.xyz".extraConfig = '' reverse_proxy :3030 ''; - "http://mc.sisyphe.normandy.hypervirtual.world".extraConfig = '' + "http://mc.sisyphe.normandy.rougebordeaux.xyz".extraConfig = '' reverse_proxy :8443 ''; }; diff --git a/hosts/sisyphe/features/multimedia/arr-suite.nix b/hosts/sisyphe/features/multimedia/arr-suite.nix index 4528d4d..a6a81b3 100644 --- a/hosts/sisyphe/features/multimedia/arr-suite.nix +++ b/hosts/sisyphe/features/multimedia/arr-suite.nix @@ -58,31 +58,31 @@ in */ services.caddy.virtualHosts = { - "http://radarr.sisyphe.normandy.hypervirtual.world".extraConfig = '' + "http://radarr.sisyphe.normandy.rougebordeaux.xyz".extraConfig = '' reverse_proxy :7878 ''; - "http://sonarr.sisyphe.normandy.hypervirtual.world".extraConfig = '' + "http://sonarr.sisyphe.normandy.rougebordeaux.xyz.extraConfig = '' reverse_proxy :8989 ''; - "http://sonarr-anime.sisyphe.normandy.hypervirtual.world".extraConfig = '' + "http://sonarr-anime.sisyphe.normandy.rougebordeaux.xyz.extraConfig = '' reverse_proxy :8999 ''; - "http://prowlarr.sisyphe.normandy.hypervirtual.world".extraConfig = '' + "http://prowlarr.sisyphe.normandy.rougebordeaux.xyz.extraConfig = '' reverse_proxy :9696 ''; - "http://katflix.sisyphe.normandy.hypervirtual.world".extraConfig = '' + "http://katflix.sisyphe.normandy.rougebordeaux.xyz.extraConfig = '' reverse_proxy :5055 ''; - "http://bazarr.sisyphe.normandy.hypervirtual.world".extraConfig = '' + "http://bazarr.sisyphe.normandy.rougebordeaux.xyz.extraConfig = '' reverse_proxy :6767 ''; - "http://bazarr-anime.sisyphe.normandy.hypervirtual.world".extraConfig = '' + "http://bazarr-anime.sisyphe.normandy.rougebordeaux.xyz.extraConfig = '' reverse_proxy :6777 ''; }; diff --git a/hosts/sisyphe/features/multimedia/calibre-web.nix b/hosts/sisyphe/features/multimedia/calibre-web.nix index f8caa9d..dc8ed48 100644 --- a/hosts/sisyphe/features/multimedia/calibre-web.nix +++ b/hosts/sisyphe/features/multimedia/calibre-web.nix @@ -11,7 +11,7 @@ }; }; - services.caddy.virtualHosts."http://books.hypervirtual.world".extraConfig = '' - reverse_proxy :8083 - ''; + services.caddy.virtualHosts."http://books.rougebordeaux.xyz".extraConfig = '' + reverse_proxy :8083 + ''; } diff --git a/hosts/sisyphe/features/multimedia/jellyfin.nix b/hosts/sisyphe/features/multimedia/jellyfin.nix index 7d2a70d..142d4d8 100644 --- a/hosts/sisyphe/features/multimedia/jellyfin.nix +++ b/hosts/sisyphe/features/multimedia/jellyfin.nix @@ -23,11 +23,11 @@ }; services.caddy.virtualHosts = { - "http://jellyfin.sisyphe.normandy.hypervirtual.world".extraConfig = '' + "http://jellyfin.sisyphe.normandy.rougebordeaux.xyz".extraConfig = '' reverse_proxy :8096 ''; - "http://media.hypervirtual.world".extraConfig = '' + "http://media.rougebordeaux.xyz.extraConfig = '' reverse_proxy :8096 ''; }; diff --git a/hosts/sisyphe/features/multimedia/sabnzbd.nix b/hosts/sisyphe/features/multimedia/sabnzbd.nix index 5a275f1..a894151 100644 --- a/hosts/sisyphe/features/multimedia/sabnzbd.nix +++ b/hosts/sisyphe/features/multimedia/sabnzbd.nix @@ -1,11 +1,11 @@ { ... }: { services.sabnzbd = { - enable = true; - openFirewall = true; + enable = false; + openFirewall = false; }; - services.caddy.virtualHosts."http://nzb.sisyphe.normandy.hypervirtual.world".extraConfig = '' + services.caddy.virtualHosts."http://nzb.sisyphe.normandy.rougebordeaux.xyz".extraConfig = '' reverse_proxy 8080 ''; } diff --git a/hosts/sisyphe/features/multimedia/slskd.nix b/hosts/sisyphe/features/multimedia/slskd.nix index c4b6337..6c1c976 100644 --- a/hosts/sisyphe/features/multimedia/slskd.nix +++ b/hosts/sisyphe/features/multimedia/slskd.nix @@ -36,8 +36,8 @@ in }; }; - services.caddy.virtualHosts."http://slskd.sisyphe.normandy.hypervirtual.world".extraConfig = '' - reverse_proxy :5030 - ''; + services.caddy.virtualHosts."http://slskd.sisyphe.normandy.rougebordeaux.xyz".extraConfig = '' + reverse_proxy :5030 + ''; }; } diff --git a/hosts/sisyphe/features/multimedia/transmission.nix b/hosts/sisyphe/features/multimedia/transmission.nix index 13b9e3d..65ceef4 100644 --- a/hosts/sisyphe/features/multimedia/transmission.nix +++ b/hosts/sisyphe/features/multimedia/transmission.nix @@ -45,7 +45,8 @@ in }; }; - services.caddy.virtualHosts."http://transmission.sisyphe.normandy.hypervirtual.world".extraConfig = '' + services.caddy.virtualHosts."http://transmission.sisyphe.normandy.rougebordeaux.xyz".extraConfig = + '' reverse_proxy :9091 ''; }; diff --git a/hosts/sisyphe/features/prometheus.nix b/hosts/sisyphe/features/prometheus.nix index a4af8b9..2b57766 100644 --- a/hosts/sisyphe/features/prometheus.nix +++ b/hosts/sisyphe/features/prometheus.nix @@ -22,7 +22,7 @@ servers = [ { "sisyphe" = { - baseUrl = "http://nzb.sisyphe.normandy.hypervirtual.world"; + baseUrl = "http://nzb.sisyphe.normandy.rougebordeaux.xyz"; apiKeyFile = "/run/secrets/sabnbzd_apikey"; }; } @@ -43,7 +43,7 @@ }; nextcloud = { enable = true; - url = "https://cloud.hypervirtual.world"; + url = "https://cloud.rougebordeaux.xyz"; tokenFile = "/run/secrets/nextcloudTokenFile"; }; }; diff --git a/hosts/sisyphe/features/services/archivebox.nix b/hosts/sisyphe/features/services/archivebox.nix index 98a5665..fe00ce1 100644 --- a/hosts/sisyphe/features/services/archivebox.nix +++ b/hosts/sisyphe/features/services/archivebox.nix @@ -5,7 +5,7 @@ nodejs_23 ]; - services.caddy.virtualHosts."archive.hypervirtual.world".extraConfig = '' + services.caddy.virtualHosts."archive.rougebordeaux.xyz".extraConfig = '' reverse_proxy 15632 ''; diff --git a/hosts/sisyphe/features/services/forgejo.nix b/hosts/sisyphe/features/services/forgejo.nix index 1253392..1011f18 100644 --- a/hosts/sisyphe/features/services/forgejo.nix +++ b/hosts/sisyphe/features/services/forgejo.nix @@ -25,8 +25,8 @@ }; settings = { server = { - DOMAIN = "git.hypervirtual.world"; - ROOT_URL = "https://git.hypervirtual.world"; + DOMAIN = "git.rougebordeaux.xyz"; + ROOT_URL = "https://git.rougebordeaux.xyz"; HTTP_PORT = 3333; }; actions = { @@ -66,7 +66,7 @@ instances.default = { enable = true; name = "monolith"; - url = "https://git.hypervirtual.world"; + url = "https://git.rougebordeaux.xyz"; # Obtaining the path to the runner token file may differ # tokenFile should be in format TOKEN=, since it's EnvironmentFile for systemd tokenFile = config.sops.secrets.forgejo-runner-token.path; @@ -84,7 +84,7 @@ $create --admin --email "`cat ${config.sops.secrets.forgejoInitialMail.path}`" --username you --password "`cat ${config.sops.secrets.forgejoInitialPassword.path}`" &>/dev/null || true ''; - services.caddy.virtualHosts."http://git.hypervirtual.world".extraConfig = '' + services.caddy.virtualHosts."http://git.rougebordeaux.xyz".extraConfig = '' reverse_proxy :3333 ''; } diff --git a/hosts/sisyphe/features/services/grafana.nix b/hosts/sisyphe/features/services/grafana.nix index 39afd7c..f4a27ec 100644 --- a/hosts/sisyphe/features/services/grafana.nix +++ b/hosts/sisyphe/features/services/grafana.nix @@ -9,7 +9,7 @@ }; }; - services.caddy.virtualHosts."http://grafana.sisyphe.normandy.hypervirtual.world".extraConfig = '' + services.caddy.virtualHosts."http://grafana.sisyphe.normandy.rougebordeaux.xyz".extraConfig = '' reverse_proxy :3000 ''; } diff --git a/hosts/sisyphe/features/services/homelab-dashboard.nix b/hosts/sisyphe/features/services/homelab-dashboard.nix index 8f83abe..dfd0a4b 100644 --- a/hosts/sisyphe/features/services/homelab-dashboard.nix +++ b/hosts/sisyphe/features/services/homelab-dashboard.nix @@ -38,11 +38,11 @@ in format = "dotenv"; }; - services.caddy.virtualHosts."http://sisyphe.normandy.hypervirtual.world".extraConfig = '' + services.caddy.virtualHosts."http://sisyphe.normandy.rougebordeaux.xyz".extraConfig = '' reverse_proxy :8082 ''; - services.caddy.virtualHosts."http://home.hypervirtual.world".extraConfig = '' + services.caddy.virtualHosts."http://home.rougebordeaux.xyz.extraConfig = '' reverse_proxy :8082 ''; @@ -97,7 +97,7 @@ in } { "mastodon" = [ - { href = "https://fish.hypervirtual.world"; } + { href = "https://fish.rougebordeaux.xyz; } ]; } { @@ -147,14 +147,14 @@ in "Calibre-web" = { icon = "calibre"; description = "Serveur de livres"; - href = "http://books.hypervirtual.world"; + href = "http://books.rougebordeaux.xyz; }; } { "Freshrss" = { icon = "freshrss"; description = "Récupère les articles"; - href = "http://freshrss.hypervirtual.world"; + href = "http://freshrss.rougebordeaux.xyz; }; } ]; @@ -166,7 +166,7 @@ in "Jellyfin" = { icon = "jellyfin"; description = "Permet de regarder ou écouter du contenu."; - href = "http://media.hypervirtual.world"; + href = "http://media.rougebordeaux.xyz; widget = { type = "jellyfin"; url = "http://${ip}:8096"; @@ -179,7 +179,7 @@ in "Jellyseerr" = { icon = "jellyseerr"; description = "Moteur de recherche de films/séries"; - href = "http://katflix.sisyphe.normandy.hypervirtual.world"; + href = "http://katflix.sisyphe.normandy.rougebordeaux.xyz; widget = { type = "jellyseerr"; @@ -192,14 +192,14 @@ in "slskd" = { icon = "slskd"; description = "Pour télécharger/partager de la musique"; - href = "http://slskd.sisyphe.normandy.hypervirtual.world"; + href = "http://slskd.sisyphe.normandy.rougebordeaux.xyz; }; } { "Prowlarr" = { icon = "prowlarr"; description = "Indexe les différents sites de téléchargement"; - href = "http://prowlarr.sisyphe.normandy.hypervirtual.world"; + href = "http://prowlarr.sisyphe.normandy.rougebordeaux.xyz; widget = { type = "prowlarr"; key = "{{HOMEPAGE_VAR_PROWLARR}}"; @@ -211,7 +211,7 @@ in "Sonarr" = { icon = "sonarr"; description = "Moteur de recherche pour les séries"; - href = "http://sonarr.sisyphe.normandy.hypervirtual.world"; + href = "http://sonarr.sisyphe.normandy.rougebordeaux.xyz; widget = { type = "sonarr"; url = "http://${ip}:8989"; @@ -223,7 +223,7 @@ in "Sonarr anime" = { icon = "sonarr"; description = "Moteur de recherche pour les séries animées"; - href = "http://sonarr-anime.sisyphe.normandy.hypervirtual.world"; + href = "http://sonarr-anime.sisyphe.normandy.rougebordeaux.xyz; widget = { type = "sonarr"; url = "http://${ip}:8999"; @@ -235,7 +235,7 @@ in "Radarr" = { icon = "radarr"; description = "Moteur de recherche pour les films"; - href = "http://radarr.sisyphe.normandy.hypervirtual.world"; + href = "http://radarr.sisyphe.normandy.rougebordeaux.xyz; widget = { type = "radarr"; key = "{{HOMEPAGE_VAR_RADARR}}"; @@ -247,7 +247,7 @@ in "Bazarr" = { icon = "bazarr"; description = "Vérifie les sous titres des films/séries."; - href = "http://bazarr.sisyphe.normandy.hypervirtual.world"; + href = "http://bazarr.sisyphe.normandy.rougebordeaux.xyz; widget = { type = "bazarr"; key = "{{HOMEPAGE_VAR_BAZARR}}"; @@ -259,7 +259,7 @@ in "Bazarr anime" = { icon = "bazarr"; description = "Vérifie les sous titres des séries animées."; - href = "http://bazarr-anime.sisyphe.normandy.hypervirtual.world"; + href = "http://bazarr-anime.sisyphe.normandy.rougebordeaux.xyz; widget = { type = "bazarr"; key = "{{HOMEPAGE_VAR_BAZARRANIME}}"; @@ -272,7 +272,7 @@ in "Transmission" = { icon = "transmission"; description = "s'occupe du téléchargement des fichiers"; - href = "http://transmission.sisyphe.normandy.hypervirtual.world"; + href = "http://transmission.sisyphe.normandy.rougebordeaux.xyz; widget = { type = "transmission"; url = "http://${ip}:9091"; @@ -285,7 +285,7 @@ in "Sabnzbd" = { icon = "sabnzbd"; description = "s'occupe de naviguer sur les réseaux usenet"; - href = "http://nzb.sisyphe.normandy.hypervirtual.world"; + href = "http://nzb.sisyphe.normandy.rougebordeaux.xyz; }; } ]; @@ -296,14 +296,14 @@ in "Nextcloud" = { icon = "nextcloud"; description = "Sauvegarde de données"; - href = "https://cloud.hypervirtual.world"; + href = "https://cloud.rougebordeaux.xyz; }; } { "4get" = { icon = "searx"; description = "Moteur de recherche privé pour remplacer Google."; - href = "https://4get.hypervirtual.world"; + href = "https://4get.rougebordeaux.xyz; }; } ]; @@ -340,7 +340,7 @@ in "Grafana" = { icon = "grafana"; description = "Visualiseur de graphiques"; - href = "http://grafana.sisyphe.normandy.hypervirtual.world"; + href = "http://grafana.sisyphe.normandy.rougebordeaux.xyz; }; } { @@ -354,7 +354,7 @@ in "Uptime Kuma" = { icon = "uptime-kuma"; description = "Surveille l'état des différents services"; - href = "http://uptime.sisyphe.normandy.hypervirtual.world"; + href = "http://uptime.sisyphe.normandy.rougebordeaux.xyz; }; } { diff --git a/hosts/sisyphe/features/services/irc-server.nix b/hosts/sisyphe/features/services/irc-server.nix index d193a33..8137f31 100644 --- a/hosts/sisyphe/features/services/irc-server.nix +++ b/hosts/sisyphe/features/services/irc-server.nix @@ -4,9 +4,9 @@ services.ircdHybrid = { enable = true; - serverName = "irc.hypervirtual.world"; + serverName = "irc.rougebordeaux.xyz"; description = "welcome to the silly kittens hut !! meow:3"; - adminEmail = "admin@hypervirtual.world"; + adminEmail = "admin@rougebordeaux.xyz; }; /**environment.etc = { diff --git a/hosts/sisyphe/features/services/nextcloud.nix b/hosts/sisyphe/features/services/nextcloud.nix index a37407f..870c98e 100644 --- a/hosts/sisyphe/features/services/nextcloud.nix +++ b/hosts/sisyphe/features/services/nextcloud.nix @@ -21,7 +21,7 @@ services.nextcloud = { enable = true; - hostName = "cloud.hypervirtual.world"; + hostName = "cloud.rougebordeaux.xyz"; database.createLocally = true; webserver = "caddy"; configureRedis = true; @@ -46,7 +46,7 @@ "OC\\Preview\\HEIC" ]; - trustedDomains = [ "cloud.hypervirtual.world" ]; + trustedDomains = [ "cloud.rougebordeaux.xyz ]; overwriteprotocol = "https"; log_type = "file"; # temporary fix for https://nixos.org/manual/nixos/stable/#module-services-nextcloud-warning-logreader default_phone_region = "FR"; diff --git a/hosts/sisyphe/features/services/synapse-matrix.nix b/hosts/sisyphe/features/services/synapse-matrix.nix index d5b552a..6e53fbc 100644 --- a/hosts/sisyphe/features/services/synapse-matrix.nix +++ b/hosts/sisyphe/features/services/synapse-matrix.nix @@ -5,10 +5,10 @@ ... }: let - baseUrl = "https://talk.hypervirtual.world"; + baseUrl = "https://talk.rougebordeaux.xyz"; in { - networking.domain = "hypervirtual.world"; + networking.domain = "rougebordeaux.xyz"; sops.secrets.matrix_data = { format = "yaml"; owner = "matrix-synapse"; @@ -18,7 +18,7 @@ in enable = true; settings = { - server_name = "hypervirtual.world"; + server_name = "rougebordeaux.xyz"; public_baseurl = baseUrl; enable_registration = false; enable_metrics = true; @@ -73,7 +73,7 @@ in settings = { homeserver = { address = "http://localhost:8008"; - domain = "hypervirtual.world"; + domain = "rougebordeaux.xyz"; }; appservice = { provisioning.enabled = false; diff --git a/hosts/sisyphe/features/services/uptime-kuma.nix b/hosts/sisyphe/features/services/uptime-kuma.nix index 4f566e6..457a28d 100644 --- a/hosts/sisyphe/features/services/uptime-kuma.nix +++ b/hosts/sisyphe/features/services/uptime-kuma.nix @@ -8,11 +8,11 @@ }; }; - services.caddy.virtualHosts."http://status.hypervirtual.world".extraConfig = '' + services.caddy.virtualHosts."http://status.rougebordeaux.xyz".extraConfig = '' reverse_proxy :4000 ''; - services.caddy.virtualHosts."http://uptime.sisyphe.normandy.hypervirtual.world".extraConfig = '' + services.caddy.virtualHosts."http://uptime.sisyphe.normandy.rougebordeaux.xyz.extraConfig = '' reverse_proxy :4000 '';