From b57cf3ae96d104136f8e160f993a610778f772e2 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 21 Sep 2024 23:56:32 +0200 Subject: [PATCH] fix --- justfile | 2 +- profiles/desktop/gnome/default.nix | 2 ++ profiles/http/default.nix | 2 +- profiles/http/index/default.nix | 2 +- profiles/http/services/cinny.nix | 3 +++ 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/justfile b/justfile index 6976aca..f1a8428 100644 --- a/justfile +++ b/justfile @@ -28,7 +28,7 @@ update: | gum choose --no-limit --height=15 \ | xargs nix flake update --commit-lock-file -build hostname=`if test -z "$IS_REMOTE_ENV"; then just _a_host; else echo; fi`: +build hostname=`if test -z "${IS_REMOTE_ENV:-}"; then just _a_host; else echo; fi`: nixos-rebuild build --accept-flake-config --show-trace --flake .#"{{hostname}}" build-no-remote-builders hostname=`if test -z "$IS_REMOTE_ENV"; then just _a_host; else echo; fi`: diff --git a/profiles/desktop/gnome/default.nix b/profiles/desktop/gnome/default.nix index 6d4503b..f27a1bf 100644 --- a/profiles/desktop/gnome/default.nix +++ b/profiles/desktop/gnome/default.nix @@ -27,6 +27,8 @@ ffmpegthumbnailer libheif # HEIF thumbnails gnomeExtensions.appindicator + + desktop-file-utils # update-desktop-database ]; # an attempt to make nautilus discover new files, but it proved to be a freebsd-linux incompatiblity diff --git a/profiles/http/default.nix b/profiles/http/default.nix index 729663c..0c2bdb3 100644 --- a/profiles/http/default.nix +++ b/profiles/http/default.nix @@ -8,7 +8,7 @@ in #(lib.mapAttrsToList (domain: vhost: [ domain ] ++ vhost.serverAliases)) (lib.mapAttrsToList (domain: vhost: [ domain ])) lib.flatten - (builtins.filter (domain: domain != "")) + (builtins.filter (domain: domain != "" && domain != "_")) (lib.sort (x: y: x${getName domain}.${getDomain domain}${getDesc domain}''; + mkRow = domain: ''${getName domain}.${getDomain domain}${getDesc domain}''; in pkgs.writeTextDir "index.html" '' diff --git a/profiles/http/services/cinny.nix b/profiles/http/services/cinny.nix index 52bfa3b..1823d3e 100644 --- a/profiles/http/services/cinny.nix +++ b/profiles/http/services/cinny.nix @@ -1,4 +1,7 @@ { config, pkgs, lib, mkDomain, ... }: + +lib.mkIf pkgs.unstable.cinny.meta.available # no CVE's thank you + { # Cinny # Yet another Matrix client for the web