1
0
Fork 0

Compare commits

...

4 commits

Author SHA1 Message Date
6eeb49f93c
fix(all): nixfmt 2025-05-31 17:57:35 +02:00
f86394d5a2
update(services): update to use flakeRoot for paths 2025-05-31 17:55:58 +02:00
40a9483bd0
update(fish): update fish to use flakeRoot path 2025-05-31 17:55:09 +02:00
a044d5707a
fix(ente-auth): remove build flag from ente-web-auth package
Move the build flag from the package to the module, that way everyone
can just define their own URL in the module.
2025-05-31 17:54:25 +02:00
8 changed files with 33 additions and 10 deletions

View file

@ -9,6 +9,7 @@ let
inherit (lib) mkEnableOption mkIf;
cfg = config.${namespace}.cli-apps.fish;
flakeRoot = "/home/philipp/Documents/nix-config";
in
{
options.${namespace}.cli-apps.fish = {
@ -19,11 +20,11 @@ in
programs.fish = {
enable = true;
shellAliases = {
nix-dns = "nixos-rebuild switch --flake .#dns --target-host dns-1 --use-remote-sudo && nixos-rebuild switch --flake .#dns --target-host dns-2 --use-remote-sudo";
nix-blarm = "nixos-rebuild switch --flake .#blarm --target-host blarm --use-remote-sudo";
nix-dns = "nixos-rebuild switch --flake ${flakeRoot}/.#dns --target-host dns-1 --use-remote-sudo && nixos-rebuild switch --flake ${flakeRoot}/.#dns --target-host dns-2 --use-remote-sudo";
nix-blarm = "nixos-rebuild switch --flake ${flakeRoot}/.#blarm --target-host blarm --use-remote-sudo";
cd = "z";
ls = "exa";
l = "exa --icons";
ls = "exa --icons";
l = "exa";
};
plugins = [
{

View file

@ -19,7 +19,7 @@ in
enable = true;
clean.enable = true;
clean.extraArgs = "--keep-since 4d --keep 3";
flake = "${config.home-manager.users.philipp.home.homeDirectory}/Documents/nix-config";
flake = "${config.flakeRoot}";
};
};

View file

@ -9,6 +9,13 @@ with lib;
with lib.${namespace};
let
cfg = config.${namespace}.services.ente-auth;
enteApp = cfg.package.override {
extraBuildEnv = {
NEXT_PUBLIC_ENTE_ENDPOINT = "https://ente-api.monapona.dev";
NEXT_TELEMETRY_DISABLED = "1";
};
};
in
{
options.${namespace}.services.ente-auth = {
@ -49,7 +56,7 @@ in
forceSSL = true;
useACMEHost = "stahl.sh";
locations."/" = {
root = "${cfg.package}";
root = enteApp;
};
};
};

View file

@ -36,7 +36,6 @@ in
default = "reddit.stahl.sh";
};
};
};
config = mkIf cfg.enable {

View file

@ -0,0 +1,16 @@
{
config,
lib,
namespace,
...
}:
with lib;
with lib.${namespace};
{
options.flakeRoot = mkOption {
type = types.str;
description = "Path to the flake root directory.";
};
config.flakeRoot = "${config.users.users.philipp.home}/Documents/nix-config";
}

View file

@ -72,8 +72,8 @@ in
hostname = "invidious-db";
volumes = [
"postgresdata:/var/lib/postgresql/data"
"/home/philipp/nix-config/modules/nixos/virtualisation/podman/invidious/config/sql:/config/sql"
"/home/philipp/nix-config/modules/nixos/virtualisation/podman/invidious/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh"
"${config.flakeRoot}/modules/nixos/virtualisation/podman/invidious/config/sql:/config/sql"
"${config.flakeRoot}/modules/nixos/virtualisation/podman/invidious/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh"
];
environmentFiles = [ /run/secrets/invidious-db ];
};

View file

@ -39,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
env = extraBuildEnv;
buildPhase = ''
export NEXT_PUBLIC_ENTE_ENDPOINT=https://ente-api.monapona.dev
yarn build:auth
'';

View file

@ -1,5 +1,6 @@
{
lib,
pkgs,
modulesPath,
namespace,
...