Compare commits
4 commits
3ed788ba26
...
6eeb49f93c
Author | SHA1 | Date | |
---|---|---|---|
6eeb49f93c | |||
f86394d5a2 | |||
40a9483bd0 | |||
a044d5707a |
8 changed files with 33 additions and 10 deletions
|
@ -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 = [
|
||||
{
|
||||
|
|
|
@ -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}";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -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;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
@ -36,7 +36,6 @@ in
|
|||
default = "reddit.stahl.sh";
|
||||
};
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
|
|
16
modules/nixos/system/flakeRoot/default.nix
Normal file
16
modules/nixos/system/flakeRoot/default.nix
Normal 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";
|
||||
}
|
|
@ -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 ];
|
||||
};
|
||||
|
|
|
@ -39,7 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
|
|||
env = extraBuildEnv;
|
||||
|
||||
buildPhase = ''
|
||||
export NEXT_PUBLIC_ENTE_ENDPOINT=https://ente-api.monapona.dev
|
||||
yarn build:auth
|
||||
'';
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
namespace,
|
||||
...
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue