no nixondroid + deploy hugo
This commit is contained in:
14
flake.nix
14
flake.nix
@@ -31,6 +31,7 @@
|
|||||||
user = "nx2";
|
user = "nx2";
|
||||||
domain = "nx2.site";
|
domain = "nx2.site";
|
||||||
home = "/home/${user}/";
|
home = "/home/${user}/";
|
||||||
|
webroot = "/var/lib/hugo/nx2site/public";
|
||||||
};
|
};
|
||||||
|
|
||||||
pkgs = (import nixpkgs { inherit system config; }) // {
|
pkgs = (import nixpkgs { inherit system config; }) // {
|
||||||
@@ -38,13 +39,6 @@
|
|||||||
latest = import nixpkgs-latest { inherit system config; };
|
latest = import nixpkgs-latest { inherit system config; };
|
||||||
version = "25.05";
|
version = "25.05";
|
||||||
};
|
};
|
||||||
pkgs64 = let
|
|
||||||
system = "aarch64-linux";
|
|
||||||
in import nixpkgs { inherit system config; } // {
|
|
||||||
unstable = import nixpkgs-unstable { inherit system config; };
|
|
||||||
latest = import nixpkgs-latest { inherit system config; };
|
|
||||||
version = "24.05";
|
|
||||||
};
|
|
||||||
|
|
||||||
nvidia-base = import ./flake-modules/nvidia.nix;
|
nvidia-base = import ./flake-modules/nvidia.nix;
|
||||||
secrets = import ./git-crypt/secrets.nix;
|
secrets = import ./git-crypt/secrets.nix;
|
||||||
@@ -69,10 +63,6 @@
|
|||||||
NxACE = make-nixos-system "NxACE" { enable = false; };
|
NxACE = make-nixos-system "NxACE" { enable = false; };
|
||||||
NxWSL = make-nixos-wsl-system "NxWSL";
|
NxWSL = make-nixos-wsl-system "NxWSL";
|
||||||
};
|
};
|
||||||
nixOnDroidConfigurations.default = nix-on-droid.lib.nixOnDroidConfiguration {
|
|
||||||
pkgs = pkgs64;
|
|
||||||
modules = [ ./nix-on-droid.nix ];
|
|
||||||
};
|
|
||||||
|
|
||||||
homeConfigurations = let
|
homeConfigurations = let
|
||||||
make-home-configuration = host: user: nvidia-settings: home-manager.lib.homeManagerConfiguration {
|
make-home-configuration = host: user: nvidia-settings: home-manager.lib.homeManagerConfiguration {
|
||||||
@@ -94,8 +84,6 @@
|
|||||||
"${hyper-base.user}@NxNORTH" = make-home-configuration "NxNORTH" hyper-base.user { enable = true; prime = false; };
|
"${hyper-base.user}@NxNORTH" = make-home-configuration "NxNORTH" hyper-base.user { enable = true; prime = false; };
|
||||||
"${hyper-base.user}@NxACE" = make-home-configuration "NxACE" hyper-base.user { enable = false; };
|
"${hyper-base.user}@NxACE" = make-home-configuration "NxACE" hyper-base.user { enable = false; };
|
||||||
|
|
||||||
"${hyper-base.user}@NxS23U" = make-shell-configuration "NxS23U" hyper-base.user;
|
|
||||||
|
|
||||||
"${hyper-base.user}@NxWSL" = make-shell-configuration "NxWSL" hyper-base.user;
|
"${hyper-base.user}@NxWSL" = make-shell-configuration "NxWSL" hyper-base.user;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, hyper, ... }:
|
||||||
{
|
{
|
||||||
home.packages = [
|
home.packages = [
|
||||||
(pkgs.writeShellApplication {
|
(pkgs.writeShellApplication {
|
||||||
name = "nx_backup";
|
name = "nx_backup";
|
||||||
runtimeInputs = [ ];
|
runtimeInputs = [ ];
|
||||||
text = let
|
text = let
|
||||||
web-root = "/var/nginx/webroot";
|
web-root = hyper.webroot;
|
||||||
gitea-backup = "/var/backup/gitea";
|
gitea-backup = "/var/backup/gitea";
|
||||||
postgres-backup = "/var/backup/postgresql";
|
postgres-backup = "/var/backup/postgresql";
|
||||||
in /* bash */ ''
|
in /* bash */ ''
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
acceptTerms = true;
|
acceptTerms = true;
|
||||||
defaults = {
|
defaults = {
|
||||||
email = "acme@${hyper.domain}";
|
email = "acme@${hyper.domain}";
|
||||||
webroot = "/var/nginx/webroot";
|
webroot = config.services.nginx.virtualHosts."${hyper.domain}".root;
|
||||||
group = "nginx";
|
group = "nginx";
|
||||||
};
|
};
|
||||||
certs = {
|
certs = {
|
||||||
@@ -77,22 +77,24 @@
|
|||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
"${hyper.domain}" = vh // {
|
"${hyper.domain}" = vh // {
|
||||||
root = "/var/nginx/webroot";
|
# root = "/var/nginx/webroot";
|
||||||
|
root = "/var/lib/hugo/nx2site/public";
|
||||||
default = true;
|
default = true;
|
||||||
listen = dl;
|
listen = dl;
|
||||||
locations = {
|
locations = {
|
||||||
"/" = {
|
"/" = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
index index.html;
|
index index.html;
|
||||||
if ($request_uri ~ ^/(.*)\.html(\?|$)) {
|
|
||||||
return 301 /$1;
|
|
||||||
}
|
|
||||||
try_files $uri $uri.html $uri/ /404.html =404;
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
"~^(/ba)$" = { return = "301 /BA.pdf"; };
|
"~^(/ba)$" = { return = "301 /BA.pdf"; };
|
||||||
"/.well-known/matrix/client" = { return = "502"; };
|
"/.well-known/matrix/client" = { return = "502"; };
|
||||||
"/.well-known/matrix/server" = { return = "502"; };
|
"/.well-known/matrix/server" = { return = "502"; };
|
||||||
|
"/phone" = { return = "301 /en/cards/phone"; };
|
||||||
|
"/about-me" = { return = "301 /en/slides/about-me"; };
|
||||||
|
"/about-this-site" = { return = "301 /en/slides/about-this-site"; };
|
||||||
|
"/gpg" = { return = "301 /en/cards/gpg"; };
|
||||||
|
"/contact" = { return = "301 /en/cards/contact"; };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"matrix.${hyper.domain}" = {
|
"matrix.${hyper.domain}" = {
|
||||||
@@ -121,7 +123,7 @@
|
|||||||
};
|
};
|
||||||
"sync.${hyper.domain}" = vh // {
|
"sync.${hyper.domain}" = vh // {
|
||||||
listen = dl;
|
listen = dl;
|
||||||
locations = { "/" = { proxyPass = "http://127.0.0.1:11434"; }; };
|
locations = { "/" = { proxyPass = "http://127.0.0.1:8384"; }; };
|
||||||
};
|
};
|
||||||
# "git.${hyper.domain}" = vh // {
|
# "git.${hyper.domain}" = vh // {
|
||||||
# listen = dl;
|
# listen = dl;
|
||||||
@@ -157,8 +159,9 @@
|
|||||||
proxyWebsockets = true;
|
proxyWebsockets = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
"wip.${hyper.domain}" = vh // {
|
"old.${hyper.domain}" = vh // {
|
||||||
listen = dl;
|
listen = dl;
|
||||||
|
root = "/var/nginx/webroot";
|
||||||
};
|
};
|
||||||
"dev.${hyper.domain}" = vh // {
|
"dev.${hyper.domain}" = vh // {
|
||||||
listen = dl;
|
listen = dl;
|
||||||
|
|||||||
Reference in New Issue
Block a user