From ab4a870d0fbbb904eb773e685ed872e32b9f1224 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Sun, 19 May 2024 00:20:54 +0200 Subject: [PATCH] cleanup of chungus files --- flake.nix | 1 - nixos/components/gui/taskwarrior.nix | 2 +- nixos/components/network/tinc/private.nix | 3 -- nixos/homes/palo/packages/packages.nix | 2 - .../chungus => legacy}/hass-wifi.nix | 0 nixos/{machines/chungus => legacy}/kiosk.nix | 0 .../chungus => legacy}/sync-torrent.nix | 0 .../{machines/chungus => legacy}/trilium.nix | 0 nixos/machines/chungus/cache.nix | 14 ------- nixos/machines/chungus/configuration.nix | 40 +++++-------------- nixos/machines/chungus/docker-registry.nix | 3 -- .../chungus/{atuin.nix => service-atuin.nix} | 0 .../{paperless.nix => service-paperless.nix} | 0 .../chungus/{ => telemetry}/grafana.nix | 0 nixos/machines/sterni/configuration.nix | 5 --- nixos/machines/sterni/packages.nix | 2 - nixos/machines/sterni/trilium.nix | 19 --------- 17 files changed, 12 insertions(+), 79 deletions(-) rename nixos/{machines/chungus => legacy}/hass-wifi.nix (100%) rename nixos/{machines/chungus => legacy}/kiosk.nix (100%) rename nixos/{machines/chungus => legacy}/sync-torrent.nix (100%) rename nixos/{machines/chungus => legacy}/trilium.nix (100%) delete mode 100644 nixos/machines/chungus/cache.nix delete mode 100644 nixos/machines/chungus/docker-registry.nix rename nixos/machines/chungus/{atuin.nix => service-atuin.nix} (100%) rename nixos/machines/chungus/{paperless.nix => service-paperless.nix} (100%) rename nixos/machines/chungus/{ => telemetry}/grafana.nix (100%) delete mode 100644 nixos/machines/sterni/trilium.nix diff --git a/flake.nix b/flake.nix index 09dbb9c..d9a814f 100644 --- a/flake.nix +++ b/flake.nix @@ -152,7 +152,6 @@ legacy_2305 = nixpkgs-legacy_2105 { inherit system; }; polygon-art = polygon-art.packages.${system}; landingpage = landingpage.packages.${system}.plain; - trilium-server = nixpkgs-unstable.legacyPackages.${system}.trilium-server; kmonad = kmonad.packages.${system}.kmonad; tasksh = taskshell.packages.${system}.tasksh; overviewer = overviewer.packages.${system}.overviewer; diff --git a/nixos/components/gui/taskwarrior.nix b/nixos/components/gui/taskwarrior.nix index c458244..1e5d370 100644 --- a/nixos/components/gui/taskwarrior.nix +++ b/nixos/components/gui/taskwarrior.nix @@ -63,7 +63,7 @@ in ${pkgs.khal}/bin/ikhal '') - # todo : before deleting this, put it in trilium + # todo : before deleting this, put it in logseq (python3Packages.bugwarrior.overrideAttrs (old: { version = "develop"; src = pkgs.fetchFromGitHub { diff --git a/nixos/components/network/tinc/private.nix b/nixos/components/network/tinc/private.nix index d920fa2..4eefe5d 100644 --- a/nixos/components/network/tinc/private.nix +++ b/nixos/components/network/tinc/private.nix @@ -50,11 +50,8 @@ let "minio.chungus" = hosts.chungus; "sync.chungus" = hosts.chungus; "tdarr.chungus" = hosts.chungus; - "trilium.chungus" = hosts.chungus; "tts.chungus" = hosts.chungus; "paperless.chungus" = hosts.chungus; - # cream - "trilium.cream" = hosts.cream; }; network = "private"; in diff --git a/nixos/homes/palo/packages/packages.nix b/nixos/homes/palo/packages/packages.nix index 3d0b165..b812365 100644 --- a/nixos/homes/palo/packages/packages.nix +++ b/nixos/homes/palo/packages/packages.nix @@ -40,8 +40,6 @@ with lib; bitwarden rbw - unstable.trilium-desktop # old (use logseq now) - nginx-config-formatter unstable.yt-dlp diff --git a/nixos/machines/chungus/hass-wifi.nix b/nixos/legacy/hass-wifi.nix similarity index 100% rename from nixos/machines/chungus/hass-wifi.nix rename to nixos/legacy/hass-wifi.nix diff --git a/nixos/machines/chungus/kiosk.nix b/nixos/legacy/kiosk.nix similarity index 100% rename from nixos/machines/chungus/kiosk.nix rename to nixos/legacy/kiosk.nix diff --git a/nixos/machines/chungus/sync-torrent.nix b/nixos/legacy/sync-torrent.nix similarity index 100% rename from nixos/machines/chungus/sync-torrent.nix rename to nixos/legacy/sync-torrent.nix diff --git a/nixos/machines/chungus/trilium.nix b/nixos/legacy/trilium.nix similarity index 100% rename from nixos/machines/chungus/trilium.nix rename to nixos/legacy/trilium.nix diff --git a/nixos/machines/chungus/cache.nix b/nixos/machines/chungus/cache.nix deleted file mode 100644 index 76e2b00..0000000 --- a/nixos/machines/chungus/cache.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ ... }: -{ - # port 5000 already in use. - services.nix-serve = { - enable = false; - - # needed if i want to trust my own build packages and dirivations - # nix-store --generate-binary-cache-key key-name secret-key-file public-key-file - # secretKeyFile = sops.nixServeSecretKeyFile.path - - }; - - -} diff --git a/nixos/machines/chungus/configuration.nix b/nixos/machines/chungus/configuration.nix index fb917a1..cd1c312 100644 --- a/nixos/machines/chungus/configuration.nix +++ b/nixos/machines/chungus/configuration.nix @@ -12,58 +12,40 @@ ./packages.nix - ./network-wireguard.nix - ./network-tinc.nix ./network-tinc-retiolum.nix # make sure no service is open for this vpn! + ./network-tinc.nix + ./network-wireguard.nix - ./hass.nix - ./hass-zigbee2mqtt.nix ./hass-mqtt.nix - #./hass-wifi.nix + ./hass-zigbee2mqtt.nix + ./hass.nix - #./mail-fetcher.nix - - #./borg.nix ./taskwarrior-autotag.nix - ./media-share.nix ./media-audiobookshelf.nix - ./media-jellyfin.nix - ./media-youtube.nix ./media-castget.nix ./media-curl.nix + ./media-jellyfin.nix + ./media-share.nix ./media-syncthing.nix + ./media-youtube.nix - # logging - ./grafana.nix - + ./telemetry/grafana.nix ./telemetry/telegraf-smart.nix ./telemetry/telegraf.nix #./telemetry/opentelemetry-hass.nix ./telemetry/prometheus.nix ./telemetry/loki.nix - #./home-display.nix - ./sync-rbackup.nix - ./sync-torrent.nix ./sync-script.nix ./sync-syncoid.nix + ./service-atuin.nix + ./service-paperless.nix + ./services-forgejo.nix ./services-s3.nix ./services-vault.nix - ./services-forgejo.nix - - #./kiosk.nix - ./trilium.nix - ./atuin.nix - - ./cache.nix - - - ./docker-registry.nix - - ./paperless.nix ]; diff --git a/nixos/machines/chungus/docker-registry.nix b/nixos/machines/chungus/docker-registry.nix deleted file mode 100644 index b27ab69..0000000 --- a/nixos/machines/chungus/docker-registry.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - services.dockerRegistry.enable = true; -} diff --git a/nixos/machines/chungus/atuin.nix b/nixos/machines/chungus/service-atuin.nix similarity index 100% rename from nixos/machines/chungus/atuin.nix rename to nixos/machines/chungus/service-atuin.nix diff --git a/nixos/machines/chungus/paperless.nix b/nixos/machines/chungus/service-paperless.nix similarity index 100% rename from nixos/machines/chungus/paperless.nix rename to nixos/machines/chungus/service-paperless.nix diff --git a/nixos/machines/chungus/grafana.nix b/nixos/machines/chungus/telemetry/grafana.nix similarity index 100% rename from nixos/machines/chungus/grafana.nix rename to nixos/machines/chungus/telemetry/grafana.nix diff --git a/nixos/machines/sterni/configuration.nix b/nixos/machines/sterni/configuration.nix index da206d5..6fbae14 100644 --- a/nixos/machines/sterni/configuration.nix +++ b/nixos/machines/sterni/configuration.nix @@ -9,11 +9,6 @@ ./packages.nix ./syncthing.nix ./tinc.nix - # ./trilium.nix - - #./wifi-access-point.nix - #./wireshark.nix - #./qemu.nix ./wireguard.nix ]; diff --git a/nixos/machines/sterni/packages.nix b/nixos/machines/sterni/packages.nix index d178e65..377b6e4 100644 --- a/nixos/machines/sterni/packages.nix +++ b/nixos/machines/sterni/packages.nix @@ -87,8 +87,6 @@ in bitwarden - unstable.trilium-desktop - ]; home-manager.users.mainUser = { diff --git a/nixos/machines/sterni/trilium.nix b/nixos/machines/sterni/trilium.nix deleted file mode 100644 index db99e2d..0000000 --- a/nixos/machines/sterni/trilium.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, pkgs, ... }: -{ - - services.trilium-server = { - enable = true; - instanceName = config.networking.hostName; - host = "10.23.42.27"; - nginx = { - enable = true; - hostName = "trilium.${config.networking.hostName}.private"; - }; - }; - - services.nginx.virtualHosts."${config.services.trilium-server.nginx.hostName}".extraConfig = '' - allow ${config.tinc.private.subnet}; - deny all; - ''; - -}