diff options
Diffstat (limited to 'nix/modules')
| -rw-r--r-- | nix/modules/conduit.nix | 2 | ||||
| -rw-r--r-- | nix/modules/home/default.nix | 3 | ||||
| -rw-r--r-- | nix/modules/home/zsh.nix | 4 | ||||
| -rw-r--r-- | nix/modules/nginx.nix | 8 | ||||
| -rw-r--r-- | nix/modules/secrets.nix | 4 | ||||
| -rw-r--r-- | nix/modules/vars.nix | 2 |
6 files changed, 14 insertions, 9 deletions
diff --git a/nix/modules/conduit.nix b/nix/modules/conduit.nix index 954e5fc..623cb7f 100644 --- a/nix/modules/conduit.nix +++ b/nix/modules/conduit.nix @@ -4,7 +4,7 @@ enable = lib.mkDefault config.monorepo.profiles.server.enable; # random comment settings.global = { - server_name = "matrix.ret2pop.net"; + server_name = "matrix.${config.monorepo.vars.remoteHost}"; address = "0.0.0.0"; port = 6167; }; diff --git a/nix/modules/home/default.nix b/nix/modules/home/default.nix index 06c43dc..d2277da 100644 --- a/nix/modules/home/default.nix +++ b/nix/modules/home/default.nix @@ -96,7 +96,7 @@ ]) else []) ++ (if config.monorepo.profiles.lang-python.enable then (with pkgs; [ - poetry + poetry python3 python312Packages.jedi ]) else []) @@ -122,6 +122,7 @@ nil nixd nixfmt-rfc-style + nix-prefetch-scripts ]) else []) ++ (if config.monorepo.profiles.crypto.enable then (with pkgs; [ diff --git a/nix/modules/home/zsh.nix b/nix/modules/home/zsh.nix index 0c5bced..263cc58 100644 --- a/nix/modules/home/zsh.nix +++ b/nix/modules/home/zsh.nix @@ -27,9 +27,9 @@ rb = "sudo nixos-rebuild switch --flake .#continuity"; rba = "sudo nixos-rebuild switch --flake .#affinity"; nfu = "cd ~/monorepo/nix && git add . && git commit -m \"new flake lock\" && nix flake update"; - usync = "rsync -azvP --chmod=\"Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r\" ~/website_html/ root@nullring.xyz:/usr/share/nginx/ret2pop/"; + usync = "rsync -azvP --chmod=\"Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r\" ~/website_html/ root@${config.monorepo.vars.remoteHost}:/var/www/ret2pop-website/"; usite - = "cd ~/src/publish-org-roam-ui && bash local.sh && rm -rf ~/website_html/graph_view; cp -r ~/src/publish-org-roam-ui/out ~/website_html/graph_view && rsync -azvP --chmod=\"Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r\" ~/website_html/ root@${config.monorepo.vars.remoteHost}:/usr/share/nginx/ret2pop/"; + = "cd ~/src/publish-org-roam-ui && bash local.sh && rm -rf ~/website_html/graph_view; cp -r ~/src/publish-org-roam-ui/out ~/website_html/graph_view && rsync -azvP --chmod=\"Du=rwx,Dg=rx,Do=rx,Fu=rw,Fg=r,Fo=r\" ~/website_html/ root@${config.monorepo.vars.remoteHost}:/var/www/ret2pop-website/"; sai = "eval \"$(ssh-agent -s)\" && ssh-add ~/.ssh/id_ed25519 && ssh-add -l"; i3 = "exec ${pkgs.i3-gaps}/bin/i3"; }; diff --git a/nix/modules/nginx.nix b/nix/modules/nginx.nix index af2d42f..a3906e2 100644 --- a/nix/modules/nginx.nix +++ b/nix/modules/nginx.nix @@ -16,11 +16,11 @@ gitweb = { enable = true; - virtualHost = "ret2pop.net"; + virtualHost = "${config.monorepo.vars.remoteHost}"; }; virtualHosts = { - "matrix.ret2pop.net" = { + "matrix.${config.monorepo.vars.remoteHost}" = { enableACME = true; forceSSL = true; listen = [ @@ -57,8 +57,8 @@ merge_slashes off; ''; }; - "ret2pop.net" = { - serverName = "ret2pop.net"; + "${config.monorepo.vars.remoteHost}" = { + serverName = "${config.monorepo.vars.remoteHost}"; root = "/var/www/ret2pop-website/"; addSSL = true; enableACME = true; diff --git a/nix/modules/secrets.nix b/nix/modules/secrets.nix index 29e8c4c..d7a229f 100644 --- a/nix/modules/secrets.nix +++ b/nix/modules/secrets.nix @@ -9,6 +9,10 @@ format = "yaml"; path = "${config.sops.defaultSymlinkPath}/mail"; }; + secrets.cloudflare-dns = { + format = "yaml"; + path = "${config.sops.defaultSymlinkPath}/cloudflare-dns"; + }; secrets.digikey = { format = "yaml"; path = "${config.sops.defaultSymlinkPath}/digikey"; diff --git a/nix/modules/vars.nix b/nix/modules/vars.nix index 5d22584..6ee1cc0 100644 --- a/nix/modules/vars.nix +++ b/nix/modules/vars.nix @@ -24,7 +24,7 @@ remoteHost = lib.mkOption { type = lib.types.str; - default = "nullring.xyz"; + default = "ret2pop.net"; example = "example.com"; description = "Address to push to and pull from for website and git repos"; }; |