From 9216212d127cc3a28bd6d4311cb9bc8a917763d0 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 16 Mar 2023 22:29:24 +0100 Subject: [PATCH] remove lots of folders default.nix be gone --- hosts/noximilien/default.nix | 72 +++++++++---------- profiles/web/docs/nixpkgs.nix | 6 +- .../default.nix => censordodge.nix} | 0 .../services/{cinny/default.nix => cinny.nix} | 0 .../{convos/default.nix => convos.nix} | 0 .../{cryptpad/default.nix => cryptpad.nix} | 0 .../{element/default.nix => element.nix} | 0 .../{flexget/default.nix => flexget.nix} | 0 .../{galene/default.nix => galene.nix} | 0 .../services/{gitea/default.nix => gitea.nix} | 0 .../{graphana/default.nix => graphana.nix} | 0 .../{hedgedoc/default.nix => hedgedoc.nix} | 0 .../default.nix => home-assistant.nix} | 0 .../services/{hydra/default.nix => hydra.nix} | 0 .../{invidious/default.nix => invidious.nix} | 0 .../{jellyfin/default.nix => jellyfin.nix} | 0 .../default.nix => jitsi-meet.nix} | 0 .../{libreddit/default.nix => libreddit.nix} | 0 .../default.nix => matrix-synapse.nix} | 0 .../default.nix => mattermost.nix} | 0 .../{navidrome/default.nix => navidrome.nix} | 0 .../{netdata/default.nix => netdata.nix} | 0 .../{nitter/default.nix => nitter.nix} | 0 .../{ntopng/default.nix => ntopng.nix} | 0 .../default.nix => openspeedtest.nix} | 0 .../{owncast/default.nix => owncast.nix} | 0 .../{paperless/default.nix => paperless.nix} | 0 .../{polaris/default.nix => polaris.nix} | 0 .../{resilio/default.nix => resilio.nix} | 0 .../{roundcube/default.nix => roundcube.nix} | 0 .../{shlink/default.nix => shlink.nix} | 0 .../default.nix => sourcegraph.nix} | 0 .../{thelounge/default.nix => thelounge.nix} | 0 .../default.nix => vaultwarden.nix} | 0 .../default.nix => webdav-zotero.nix} | 0 .../default.nix => linktree-pbsds.nix} | 0 .../default.nix => refleksjon-no.nix} | 0 .../default.nix => roroslyd-no.nix} | 0 users/pbsds/home/default.nix | 2 +- 39 files changed, 40 insertions(+), 40 deletions(-) rename profiles/web/services/{censordodge/default.nix => censordodge.nix} (100%) rename profiles/web/services/{cinny/default.nix => cinny.nix} (100%) rename profiles/web/services/{convos/default.nix => convos.nix} (100%) rename profiles/web/services/{cryptpad/default.nix => cryptpad.nix} (100%) rename profiles/web/services/{element/default.nix => element.nix} (100%) rename profiles/web/services/{flexget/default.nix => flexget.nix} (100%) rename profiles/web/services/{galene/default.nix => galene.nix} (100%) rename profiles/web/services/{gitea/default.nix => gitea.nix} (100%) rename profiles/web/services/{graphana/default.nix => graphana.nix} (100%) rename profiles/web/services/{hedgedoc/default.nix => hedgedoc.nix} (100%) rename profiles/web/services/{home-assistant/default.nix => home-assistant.nix} (100%) rename profiles/web/services/{hydra/default.nix => hydra.nix} (100%) rename profiles/web/services/{invidious/default.nix => invidious.nix} (100%) rename profiles/web/services/{jellyfin/default.nix => jellyfin.nix} (100%) rename profiles/web/services/{jitsi-meet/default.nix => jitsi-meet.nix} (100%) rename profiles/web/services/{libreddit/default.nix => libreddit.nix} (100%) rename profiles/web/services/{matrix-synapse/default.nix => matrix-synapse.nix} (100%) rename profiles/web/services/{mattermost/default.nix => mattermost.nix} (100%) rename profiles/web/services/{navidrome/default.nix => navidrome.nix} (100%) rename profiles/web/services/{netdata/default.nix => netdata.nix} (100%) rename profiles/web/services/{nitter/default.nix => nitter.nix} (100%) rename profiles/web/services/{ntopng/default.nix => ntopng.nix} (100%) rename profiles/web/services/{openspeedtest/default.nix => openspeedtest.nix} (100%) rename profiles/web/services/{owncast/default.nix => owncast.nix} (100%) rename profiles/web/services/{paperless/default.nix => paperless.nix} (100%) rename profiles/web/services/{polaris/default.nix => polaris.nix} (100%) rename profiles/web/services/{resilio/default.nix => resilio.nix} (100%) rename profiles/web/services/{roundcube/default.nix => roundcube.nix} (100%) rename profiles/web/services/{shlink/default.nix => shlink.nix} (100%) rename profiles/web/services/{sourcegraph/default.nix => sourcegraph.nix} (100%) rename profiles/web/services/{thelounge/default.nix => thelounge.nix} (100%) rename profiles/web/services/{vaultwarden/default.nix => vaultwarden.nix} (100%) rename profiles/web/services/{webdav-zotero/default.nix => webdav-zotero.nix} (100%) rename profiles/web/sites/{linktree-pbsds/default.nix => linktree-pbsds.nix} (100%) rename profiles/web/sites/{refleksjon-no/default.nix => refleksjon-no.nix} (100%) rename profiles/web/sites/{roroslyd-no/default.nix => roroslyd-no.nix} (100%) diff --git a/hosts/noximilien/default.nix b/hosts/noximilien/default.nix index 6f851ab..c83cfbf 100644 --- a/hosts/noximilien/default.nix +++ b/hosts/noximilien/default.nix @@ -23,40 +23,40 @@ ../../profiles/web # enables nginx+acme, defines mkDomain ../../profiles/web/index - ../../profiles/web/services/cinny - ../../profiles/web/services/element - ../../profiles/web/services/flexget - ../../profiles/web/services/gitea - ../../profiles/web/services/hydra - ../../profiles/web/services/invidious - ../../profiles/web/services/jellyfin - ../../profiles/web/services/libreddit - ../../profiles/web/services/mattermost - ../../profiles/web/services/navidrome - ../../profiles/web/services/netdata - ../../profiles/web/services/nitter - ../../profiles/web/services/ntopng - ../../profiles/web/services/owncast - ../../profiles/web/services/paperless - ../../profiles/web/services/polaris - ../../profiles/web/services/resilio - ../../profiles/web/services/roundcube - ../../profiles/web/services/thelounge - ../../profiles/web/services/vaultwarden - ../../profiles/web/services/webdav-zotero - #../../profiles/web/services/convos - #../../profiles/web/services/cryptpad - #../../profiles/web/services/galene - #../../profiles/web/services/graphana - #../../profiles/web/services/hedgedoc - #../../profiles/web/services/home-assistant - #../../profiles/web/services/jitsi-meet + ../../profiles/web/services/cinny.nix + ../../profiles/web/services/element.nix + ../../profiles/web/services/flexget.nix + ../../profiles/web/services/gitea.nix + ../../profiles/web/services/hydra.nix + ../../profiles/web/services/invidious.nix + ../../profiles/web/services/jellyfin.nix + ../../profiles/web/services/libreddit.nix + ../../profiles/web/services/mattermost.nix + ../../profiles/web/services/navidrome.nix + ../../profiles/web/services/netdata.nix + ../../profiles/web/services/nitter.nix + ../../profiles/web/services/ntopng.nix + ../../profiles/web/services/owncast.nix + ../../profiles/web/services/paperless.nix + ../../profiles/web/services/polaris.nix + ../../profiles/web/services/resilio.nix + ../../profiles/web/services/roundcube.nix + ../../profiles/web/services/thelounge.nix + ../../profiles/web/services/vaultwarden.nix + ../../profiles/web/services/webdav-zotero.nix + #../../profiles/web/services/convos.nix + #../../profiles/web/services/cryptpad.nix + #../../profiles/web/services/galene.nix + #../../profiles/web/services/graphana.nix + #../../profiles/web/services/hedgedoc.nix + #../../profiles/web/services/home-assistant.nix + #../../profiles/web/services/jitsi-meet.nix #../../profiles/web/services/kukkee - #../../profiles/web/services/matrix-synapse - #../../profiles/web/services/shlink - #../../profiles/web/services/sourcegraph - #../../profiles/web/services/censordodge - #../../profiles/web/services/openspeedtest + #../../profiles/web/services/matrix-synapse.nix + #../../profiles/web/services/shlink.nix + #../../profiles/web/services/sourcegraph.nix + #../../profiles/web/services/censordodge.nix + #../../profiles/web/services/openspeedtest.nix ../../profiles/web/docs ../../profiles/web/docs/pdoc.nix @@ -67,9 +67,9 @@ ../../profiles/web/docs/programs.nix ../../profiles/web/docs/yagcd.nix - ../../profiles/web/sites/linktree-pbsds - ../../profiles/web/sites/refleksjon-no - ../../profiles/web/sites/roroslyd-no + ../../profiles/web/sites/linktree-pbsds.nix + ../../profiles/web/sites/refleksjon-no.nix + ../../profiles/web/sites/roroslyd-no.nix #../../profiles/web/services/trivial-gradios diff --git a/profiles/web/docs/nixpkgs.nix b/profiles/web/docs/nixpkgs.nix index 384e450..0c9b917 100644 --- a/profiles/web/docs/nixpkgs.nix +++ b/profiles/web/docs/nixpkgs.nix @@ -9,18 +9,18 @@ in { dirname = "nix-manual"; path = "${pkgs.nix.doc}/share/doc/nix/manual"; - desc = "Officia nixpkgs manual"; + desc = "Official nixpkgs manual"; } { dirname = "nixpkgs-manual"; basename= "manual.html"; path = "${nixpkgs-manual}/share/doc/nixpkgs"; - desc = "Officia nixpkgs manual"; + desc = "Official nixpkgs manual"; } { dirname = "nixos-manual"; path = "${nixos-manual}/share/doc/nixos"; - desc = "Officia Nixos manual"; + desc = "Official Nixos manual"; } ]; } diff --git a/profiles/web/services/censordodge/default.nix b/profiles/web/services/censordodge.nix similarity index 100% rename from profiles/web/services/censordodge/default.nix rename to profiles/web/services/censordodge.nix diff --git a/profiles/web/services/cinny/default.nix b/profiles/web/services/cinny.nix similarity index 100% rename from profiles/web/services/cinny/default.nix rename to profiles/web/services/cinny.nix diff --git a/profiles/web/services/convos/default.nix b/profiles/web/services/convos.nix similarity index 100% rename from profiles/web/services/convos/default.nix rename to profiles/web/services/convos.nix diff --git a/profiles/web/services/cryptpad/default.nix b/profiles/web/services/cryptpad.nix similarity index 100% rename from profiles/web/services/cryptpad/default.nix rename to profiles/web/services/cryptpad.nix diff --git a/profiles/web/services/element/default.nix b/profiles/web/services/element.nix similarity index 100% rename from profiles/web/services/element/default.nix rename to profiles/web/services/element.nix diff --git a/profiles/web/services/flexget/default.nix b/profiles/web/services/flexget.nix similarity index 100% rename from profiles/web/services/flexget/default.nix rename to profiles/web/services/flexget.nix diff --git a/profiles/web/services/galene/default.nix b/profiles/web/services/galene.nix similarity index 100% rename from profiles/web/services/galene/default.nix rename to profiles/web/services/galene.nix diff --git a/profiles/web/services/gitea/default.nix b/profiles/web/services/gitea.nix similarity index 100% rename from profiles/web/services/gitea/default.nix rename to profiles/web/services/gitea.nix diff --git a/profiles/web/services/graphana/default.nix b/profiles/web/services/graphana.nix similarity index 100% rename from profiles/web/services/graphana/default.nix rename to profiles/web/services/graphana.nix diff --git a/profiles/web/services/hedgedoc/default.nix b/profiles/web/services/hedgedoc.nix similarity index 100% rename from profiles/web/services/hedgedoc/default.nix rename to profiles/web/services/hedgedoc.nix diff --git a/profiles/web/services/home-assistant/default.nix b/profiles/web/services/home-assistant.nix similarity index 100% rename from profiles/web/services/home-assistant/default.nix rename to profiles/web/services/home-assistant.nix diff --git a/profiles/web/services/hydra/default.nix b/profiles/web/services/hydra.nix similarity index 100% rename from profiles/web/services/hydra/default.nix rename to profiles/web/services/hydra.nix diff --git a/profiles/web/services/invidious/default.nix b/profiles/web/services/invidious.nix similarity index 100% rename from profiles/web/services/invidious/default.nix rename to profiles/web/services/invidious.nix diff --git a/profiles/web/services/jellyfin/default.nix b/profiles/web/services/jellyfin.nix similarity index 100% rename from profiles/web/services/jellyfin/default.nix rename to profiles/web/services/jellyfin.nix diff --git a/profiles/web/services/jitsi-meet/default.nix b/profiles/web/services/jitsi-meet.nix similarity index 100% rename from profiles/web/services/jitsi-meet/default.nix rename to profiles/web/services/jitsi-meet.nix diff --git a/profiles/web/services/libreddit/default.nix b/profiles/web/services/libreddit.nix similarity index 100% rename from profiles/web/services/libreddit/default.nix rename to profiles/web/services/libreddit.nix diff --git a/profiles/web/services/matrix-synapse/default.nix b/profiles/web/services/matrix-synapse.nix similarity index 100% rename from profiles/web/services/matrix-synapse/default.nix rename to profiles/web/services/matrix-synapse.nix diff --git a/profiles/web/services/mattermost/default.nix b/profiles/web/services/mattermost.nix similarity index 100% rename from profiles/web/services/mattermost/default.nix rename to profiles/web/services/mattermost.nix diff --git a/profiles/web/services/navidrome/default.nix b/profiles/web/services/navidrome.nix similarity index 100% rename from profiles/web/services/navidrome/default.nix rename to profiles/web/services/navidrome.nix diff --git a/profiles/web/services/netdata/default.nix b/profiles/web/services/netdata.nix similarity index 100% rename from profiles/web/services/netdata/default.nix rename to profiles/web/services/netdata.nix diff --git a/profiles/web/services/nitter/default.nix b/profiles/web/services/nitter.nix similarity index 100% rename from profiles/web/services/nitter/default.nix rename to profiles/web/services/nitter.nix diff --git a/profiles/web/services/ntopng/default.nix b/profiles/web/services/ntopng.nix similarity index 100% rename from profiles/web/services/ntopng/default.nix rename to profiles/web/services/ntopng.nix diff --git a/profiles/web/services/openspeedtest/default.nix b/profiles/web/services/openspeedtest.nix similarity index 100% rename from profiles/web/services/openspeedtest/default.nix rename to profiles/web/services/openspeedtest.nix diff --git a/profiles/web/services/owncast/default.nix b/profiles/web/services/owncast.nix similarity index 100% rename from profiles/web/services/owncast/default.nix rename to profiles/web/services/owncast.nix diff --git a/profiles/web/services/paperless/default.nix b/profiles/web/services/paperless.nix similarity index 100% rename from profiles/web/services/paperless/default.nix rename to profiles/web/services/paperless.nix diff --git a/profiles/web/services/polaris/default.nix b/profiles/web/services/polaris.nix similarity index 100% rename from profiles/web/services/polaris/default.nix rename to profiles/web/services/polaris.nix diff --git a/profiles/web/services/resilio/default.nix b/profiles/web/services/resilio.nix similarity index 100% rename from profiles/web/services/resilio/default.nix rename to profiles/web/services/resilio.nix diff --git a/profiles/web/services/roundcube/default.nix b/profiles/web/services/roundcube.nix similarity index 100% rename from profiles/web/services/roundcube/default.nix rename to profiles/web/services/roundcube.nix diff --git a/profiles/web/services/shlink/default.nix b/profiles/web/services/shlink.nix similarity index 100% rename from profiles/web/services/shlink/default.nix rename to profiles/web/services/shlink.nix diff --git a/profiles/web/services/sourcegraph/default.nix b/profiles/web/services/sourcegraph.nix similarity index 100% rename from profiles/web/services/sourcegraph/default.nix rename to profiles/web/services/sourcegraph.nix diff --git a/profiles/web/services/thelounge/default.nix b/profiles/web/services/thelounge.nix similarity index 100% rename from profiles/web/services/thelounge/default.nix rename to profiles/web/services/thelounge.nix diff --git a/profiles/web/services/vaultwarden/default.nix b/profiles/web/services/vaultwarden.nix similarity index 100% rename from profiles/web/services/vaultwarden/default.nix rename to profiles/web/services/vaultwarden.nix diff --git a/profiles/web/services/webdav-zotero/default.nix b/profiles/web/services/webdav-zotero.nix similarity index 100% rename from profiles/web/services/webdav-zotero/default.nix rename to profiles/web/services/webdav-zotero.nix diff --git a/profiles/web/sites/linktree-pbsds/default.nix b/profiles/web/sites/linktree-pbsds.nix similarity index 100% rename from profiles/web/sites/linktree-pbsds/default.nix rename to profiles/web/sites/linktree-pbsds.nix diff --git a/profiles/web/sites/refleksjon-no/default.nix b/profiles/web/sites/refleksjon-no.nix similarity index 100% rename from profiles/web/sites/refleksjon-no/default.nix rename to profiles/web/sites/refleksjon-no.nix diff --git a/profiles/web/sites/roroslyd-no/default.nix b/profiles/web/sites/roroslyd-no.nix similarity index 100% rename from profiles/web/sites/roroslyd-no/default.nix rename to profiles/web/sites/roroslyd-no.nix diff --git a/users/pbsds/home/default.nix b/users/pbsds/home/default.nix index 3be85d3..2424990 100644 --- a/users/pbsds/home/default.nix +++ b/users/pbsds/home/default.nix @@ -17,7 +17,7 @@ # TODO: add remote-exec once packaged programs.bash.initExtra = '' # remote-exec - if command -v remote >/dev/null && remote-quick >/dev/null; then + if command -v remote >/dev/null && command -v remote-quick >/dev/null; then complete -F _command remote complete -F _command remote-quick fi