From 585ab2b5aaadec1e71457660e9c922f3df4b1322 Mon Sep 17 00:00:00 2001 From: kity Date: Fri, 11 Apr 2025 23:08:22 +0200 Subject: [PATCH 1/5] fix: infinite recursion because of self import --- shared/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/shared/default.nix b/shared/default.nix index 10e551f..26a9e5a 100644 --- a/shared/default.nix +++ b/shared/default.nix @@ -6,10 +6,6 @@ ... }: { - imports = [ - ../shared - ]; - environment.systemPackages = [ inputs.miovim.packages.${system}.default pkgs.curl From b6cb128b5fa7aa30b19a3943ee775309b20f45b1 Mon Sep 17 00:00:00 2001 From: kity Date: Fri, 11 Apr 2025 23:08:41 +0200 Subject: [PATCH 2/5] preparing stuff --- hosts/sisyphe/features/multimedia/sabnzbd.nix | 20 ++++++++++--------- hosts/sisyphe/features/services/grafana.nix | 6 +++--- .../features/services/homelab-dashboard.nix | 16 ++++----------- .../sisyphe/features/services/uptime-kuma.nix | 13 ++++++------ 4 files changed, 24 insertions(+), 31 deletions(-) diff --git a/hosts/sisyphe/features/multimedia/sabnzbd.nix b/hosts/sisyphe/features/multimedia/sabnzbd.nix index 7b578e4..75a85d3 100644 --- a/hosts/sisyphe/features/multimedia/sabnzbd.nix +++ b/hosts/sisyphe/features/multimedia/sabnzbd.nix @@ -9,14 +9,16 @@ reverse_proxy 8080 ''; - services.prometheus.exporters.sabnzbd = { - enable = true; - servers = [ - { - sisyphe = { + /* + services.prometheus.exporters.sabnzbd = { + enable = true; + servers = [ + { + sisyphe = { - }; - } - ]; - }; + }; + } + ]; + }; + */ } diff --git a/hosts/sisyphe/features/services/grafana.nix b/hosts/sisyphe/features/services/grafana.nix index d7b2f72..39afd7c 100644 --- a/hosts/sisyphe/features/services/grafana.nix +++ b/hosts/sisyphe/features/services/grafana.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { services.grafana = { enable = true; @@ -10,6 +10,6 @@ }; services.caddy.virtualHosts."http://grafana.sisyphe.normandy.hypervirtual.world".extraConfig = '' - reverse_proxy :3000 - ''; + reverse_proxy :3000 + ''; } diff --git a/hosts/sisyphe/features/services/homelab-dashboard.nix b/hosts/sisyphe/features/services/homelab-dashboard.nix index c810a46..a4a64e6 100644 --- a/hosts/sisyphe/features/services/homelab-dashboard.nix +++ b/hosts/sisyphe/features/services/homelab-dashboard.nix @@ -84,12 +84,14 @@ in } ]; - bookmarks = [ { code = [ { "Github" = [ { href = "https://github.com"; } ]; } ]; } ]; + bookmarks = [ + { code = [ { "Github" = [ { href = "https://github.com"; } ]; } ]; } + { social = [ { "Bluesky" = [ { href = "https://bsky.app"; } ]; { "mastodon" = [{ href = "https://fish.hypervirtual.world" }]; } } ]; } + ]; services = [ { "Divertissement" = [ - { "Serveur Minecraft poulet" = { icon = "minecraft"; @@ -236,7 +238,6 @@ in }; } { - "Transmission" = { icon = "transmission"; description = "s'occupe du téléchargement des fichiers"; @@ -278,15 +279,6 @@ in } { "Administration" = [ - /* - { - "Proxmox Backup Server" = { - icon = "proxmox-light"; - description = "Permet de sauvegarder le serveur."; - href = "https://${cfg.proxmoxBSIp}:8007"; - }; - } - */ { "Proxmox VE" = { icon = "proxmox"; diff --git a/hosts/sisyphe/features/services/uptime-kuma.nix b/hosts/sisyphe/features/services/uptime-kuma.nix index 2ed8136..4f566e6 100644 --- a/hosts/sisyphe/features/services/uptime-kuma.nix +++ b/hosts/sisyphe/features/services/uptime-kuma.nix @@ -9,12 +9,11 @@ }; services.caddy.virtualHosts."http://status.hypervirtual.world".extraConfig = '' - reverse_proxy :4000 - ''; - + reverse_proxy :4000 + ''; + services.caddy.virtualHosts."http://uptime.sisyphe.normandy.hypervirtual.world".extraConfig = '' - reverse_proxy :4000 - ''; - - + reverse_proxy :4000 + ''; + } From da776eea733d01f460c2b4cd3d6aa319355e0494 Mon Sep 17 00:00:00 2001 From: kity Date: Fri, 11 Apr 2025 23:09:04 +0200 Subject: [PATCH 3/5] feat: added nix dev tool --- hosts/dadarwin/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hosts/dadarwin/configuration.nix b/hosts/dadarwin/configuration.nix index c115e4d..4a03334 100644 --- a/hosts/dadarwin/configuration.nix +++ b/hosts/dadarwin/configuration.nix @@ -5,8 +5,7 @@ builtins.elem (lib.getName pkg) [ "terraform" ]; - # List packages installed in system profile. To search by name, run: - # $ nix-env -qaP | grep wget + environment.systemPackages = with pkgs; [ neovim kitty @@ -16,6 +15,7 @@ direnv zoxide git-crypt + nil ]; programs.direnv = { From 17e6884e73fc469407bfdcaddc5705d096c43d8d Mon Sep 17 00:00:00 2001 From: kity Date: Fri, 11 Apr 2025 23:18:19 +0200 Subject: [PATCH 4/5] fix: syntax error --- hosts/sisyphe/features/services/homelab-dashboard.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/sisyphe/features/services/homelab-dashboard.nix b/hosts/sisyphe/features/services/homelab-dashboard.nix index a4a64e6..a9c0e96 100644 --- a/hosts/sisyphe/features/services/homelab-dashboard.nix +++ b/hosts/sisyphe/features/services/homelab-dashboard.nix @@ -85,8 +85,9 @@ in ]; bookmarks = [ + { social = [ + { "Bluesky" = [ { href = "https://bsky.app"; } ];} { "mastodon" = [{ href = "https://fish.hypervirtual.world" }]; } ]; } { code = [ { "Github" = [ { href = "https://github.com"; } ]; } ]; } - { social = [ { "Bluesky" = [ { href = "https://bsky.app"; } ]; { "mastodon" = [{ href = "https://fish.hypervirtual.world" }]; } } ]; } ]; services = [ From e8bb4e05865f71215367d744c0f5a5bc2c9e10f5 Mon Sep 17 00:00:00 2001 From: kity Date: Fri, 11 Apr 2025 23:29:09 +0200 Subject: [PATCH 5/5] feat: even more bookmarks --- .../features/services/homelab-dashboard.nix | 36 +++++++++++++++++-- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/hosts/sisyphe/features/services/homelab-dashboard.nix b/hosts/sisyphe/features/services/homelab-dashboard.nix index a9c0e96..8f83abe 100644 --- a/hosts/sisyphe/features/services/homelab-dashboard.nix +++ b/hosts/sisyphe/features/services/homelab-dashboard.nix @@ -85,9 +85,39 @@ in ]; bookmarks = [ - { social = [ - { "Bluesky" = [ { href = "https://bsky.app"; } ];} { "mastodon" = [{ href = "https://fish.hypervirtual.world" }]; } ]; } - { code = [ { "Github" = [ { href = "https://github.com"; } ]; } ]; } + { + social = [ + { + "Bluesky" = [ + { + abbr = "bsky"; + href = "https://bsky.app"; + } + ]; + } + { + "mastodon" = [ + { href = "https://fish.hypervirtual.world"; } + ]; + } + { + "Lemmy" = [ + { href = "https://lemmy.world"; } + ]; + } + ]; + } + { + code = [ + { "Github" = [ { href = "https://github.com"; } ]; } + ]; + } + { + music = [ + { "Deezer" = [ { href = "https://deezer.com"; } ]; } + { "Last.fm" = [ { href = "https://last.fm"; } ]; } + ]; + } ]; services = [