Changed prompt and updated desktop
This commit is contained in:
parent
0c40e0f66d
commit
4b77350f91
7 changed files with 110 additions and 71 deletions
|
@ -12,10 +12,30 @@
|
|||
sha256 = "0dbnir6jbwjpjalz14snzd3cgdysgcs3raznsijd6savad3qhijc";
|
||||
};
|
||||
}
|
||||
{
|
||||
name = "autopair";
|
||||
src = pkgs.fishPlugins.autopair.src;
|
||||
}
|
||||
{
|
||||
name = "tide";
|
||||
src = pkgs.fishPlugins.tide.src;
|
||||
}
|
||||
{
|
||||
name = "fzf";
|
||||
src = pkgs.fishPlugins.fzf.src;
|
||||
}
|
||||
{
|
||||
name = "done";
|
||||
src = pkgs.fishPlugins.done.src;
|
||||
}
|
||||
{
|
||||
name = "sponge";
|
||||
src = pkgs.fishPlugins.sponge.src;
|
||||
}
|
||||
{
|
||||
name = "grc";
|
||||
src = pkgs.fishPlugins.grc.src;
|
||||
}
|
||||
name = "grc";
|
||||
src = pkgs.fishPlugins.grc.src;
|
||||
}
|
||||
];
|
||||
shellAbbrs = {
|
||||
homec="nvim ~/nix/config/home.nix";
|
||||
|
@ -23,6 +43,7 @@
|
|||
};
|
||||
interactiveShellInit = ''
|
||||
${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
|
||||
set fish_greeting # Disable greeting
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
@ -5,6 +5,8 @@ networking.firewall = {
|
|||
};
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
user = "nginx";
|
||||
group = "nginx";
|
||||
|
||||
# Use recommended settings
|
||||
recommendedGzipSettings = true;
|
||||
|
@ -13,60 +15,6 @@ networking.firewall = {
|
|||
recommendedTlsSettings = true;
|
||||
|
||||
virtualHosts = {
|
||||
"git.wastring.com" = {
|
||||
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
|
||||
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://172.17.0.1:3009";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
"cal.wastring.com" = {
|
||||
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
|
||||
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://172.17.0.1:5232";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
"warden.wastring.com" = {
|
||||
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
|
||||
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://172.17.0.1:8083";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
"home.wastring.com" = {
|
||||
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
|
||||
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://172.17.0.1:8085";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
"search.wastring.com" = {
|
||||
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
|
||||
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://172.17.0.1:8060";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
"docs.wastring.com" = {
|
||||
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
|
||||
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://172.17.0.1:8003";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
"bilder.wastring.com" = {
|
||||
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
|
||||
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
|
||||
|
@ -76,15 +24,69 @@ networking.firewall = {
|
|||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
"wastring.com" = {
|
||||
sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
|
||||
sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
|
||||
forceSSL = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://172.17.0.1:8085";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
# "git.wastring.com" = {
|
||||
# sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
|
||||
# sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
|
||||
# forceSSL = true;
|
||||
# locations."/" = {
|
||||
# proxyPass = "http://172.17.0.1:3009";
|
||||
# proxyWebsockets = true;
|
||||
# };
|
||||
# };
|
||||
# "cal.wastring.com" = {
|
||||
# sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
|
||||
# sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
|
||||
# forceSSL = true;
|
||||
# locations."/" = {
|
||||
# proxyPass = "http://172.17.0.1:5232";
|
||||
# proxyWebsockets = true;
|
||||
# };
|
||||
# };
|
||||
# "warden.wastring.com" = {
|
||||
# sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
|
||||
# sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
|
||||
# forceSSL = true;
|
||||
# locations."/" = {
|
||||
# proxyPass = "http://172.17.0.1:8083";
|
||||
# proxyWebsockets = true;
|
||||
# };
|
||||
# };
|
||||
# "home.wastring.com" = {
|
||||
# sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
|
||||
# sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
|
||||
# forceSSL = true;
|
||||
# locations."/" = {
|
||||
# proxyPass = "http://172.17.0.1:8085";
|
||||
# proxyWebsockets = true;
|
||||
# };
|
||||
# };
|
||||
# "search.wastring.com" = {
|
||||
# sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
|
||||
# sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
|
||||
# forceSSL = true;
|
||||
# locations."/" = {
|
||||
# proxyPass = "http://172.17.0.1:8060";
|
||||
# proxyWebsockets = true;
|
||||
# };
|
||||
# };
|
||||
# "docs.wastring.com" = {
|
||||
# sslCertificateKey = "/certs/.lego/certificates/wastring.com.key";
|
||||
# sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
|
||||
# forceSSL = true;
|
||||
# locations."/" = {
|
||||
# proxyPass = "http://172.17.0.1:8003";
|
||||
# proxyWebsockets = true;
|
||||
# };
|
||||
# };
|
||||
# "wastring.com" = {
|
||||
# sslCertificateKey = "/home/fw/.lego/certificates/wastring.com.key";
|
||||
# sslCertificate = "/certs/.lego/certificates/wastring.com.crt";
|
||||
# forceSSL = true;
|
||||
# locations."/" = {
|
||||
# proxyPass = "http://172.17.0.1:2283";
|
||||
# proxyWebsockets = true;
|
||||
# };
|
||||
# };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue