sam
/
nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new postgres connection dbui

This commit is contained in:
Sam 2024-10-14 09:48:33 +01:00
parent 89141ff555
commit 6f4187b95e
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.lock
View File

@ -427,11 +427,11 @@
}, },
"nix-secrets": { "nix-secrets": {
"locked": { "locked": {
"lastModified": 1728676183, "lastModified": 1728846526,
"narHash": "sha256-zs7GE1hB5Jyjf+me5V6g9OkK+cHqRJeDe1BuTYHLVFs=", "narHash": "sha256-QgLj9RmR8wXCSNxQu4yJpUWG3fs74+RwkBzbTet/7nQ=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "25feeaad694df4e737e365fcee5f0783be94d3e9", "rev": "0a6c9a51bec90e47a577a7229f0519bdd8f0a914",
"revCount": 185, "revCount": 186,
"type": "git", "type": "git",
"url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git" "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git"
}, },

9
hosts/common/users/sam/default.nix
View File

@ -3,6 +3,7 @@
inputs, inputs,
config, config,
lib, lib,
configVars,
... ...
}: let }: let
hostname = config.networking.hostName; hostname = config.networking.hostName;
@ -10,6 +11,8 @@
sopsHashedPasswordFile = lib.optionalString (lib.hasAttr "sops-nix" inputs) config.sops.secrets."passwords/sam".path; sopsHashedPasswordFile = lib.optionalString (lib.hasAttr "sops-nix" inputs) config.sops.secrets."passwords/sam".path;
secretsDirectory = builtins.toString inputs.nix-secrets; secretsDirectory = builtins.toString inputs.nix-secrets;
secretsFile = "${secretsDirectory}/secrets.yaml"; secretsFile = "${secretsDirectory}/secrets.yaml";
baseddataPostgresIp = configVars.networking.addresses.postgres.ip;
baseddataPostgresPort = configVars.networking.addresses.postgres.port;
username = "sam"; username = "sam";
in { in {
users.users.${username} = { users.users.${username} = {
@ -55,6 +58,8 @@ in {
"software/postgres/bitcoin/password" = {}; "software/postgres/bitcoin/password" = {};
"software/postgres/bitcoin/ip" = {}; "software/postgres/bitcoin/ip" = {};
"software/postgres/bitcoin/username" = {}; "software/postgres/bitcoin/username" = {};
"software/postgres/baseddata/user_password" = {};
"software/postgres/baseddata/user_username" = {};
"software/zotero/username" = {}; "software/zotero/username" = {};
"software/zotero/password" = {}; "software/zotero/password" = {};
"software/zotero/guid" = {}; "software/zotero/guid" = {};
@ -85,6 +90,10 @@ in {
{ {
"url": "postgresql://${config.sops.placeholder."software/postgres/bitcoin/username"}:${config.sops.placeholder."software/postgres/bitcoin/password"}@${config.sops.placeholder."software/postgres/bitcoin/ip"}/bitcoin", "url": "postgresql://${config.sops.placeholder."software/postgres/bitcoin/username"}:${config.sops.placeholder."software/postgres/bitcoin/password"}@${config.sops.placeholder."software/postgres/bitcoin/ip"}/bitcoin",
"name": "bitcoin" "name": "bitcoin"
},
{
"url": "postgresql://${config.sops.placeholder."software/postgres/baseddata/user_username"}:${config.sops.placeholder."software/postgres/baseddata/user_password"}@${baseddataPostgresIp}/baseddata",
"name": "baseddata"
} }
] ]
''; '';

1
hosts/semita/default.nix
View File

@ -137,6 +137,7 @@ in {
programs.nix-ld.libraries = with pkgs; [ programs.nix-ld.libraries = with pkgs; [
zlib # numpy zlib # numpy
libgcc # sqlalchemy libgcc # sqlalchemy
expat # pyosmium
# that's where the shared libs go, you can find which one you need using # that's where the shared libs go, you can find which one you need using
# nix-locate --top-level libstdc++.so.6 (replace this with your lib) # nix-locate --top-level libstdc++.so.6 (replace this with your lib)
# ^ this requires `nix-index` pkg # ^ this requires `nix-index` pkg