mirror of
https://git.gay/xqtc/nixos-config
synced 2024-11-22 10:20:33 +01:00
ricing; conduit conf
This commit is contained in:
parent
23e3f3551f
commit
16c8b38669
|
@ -81,7 +81,11 @@ window#waybar {
|
||||||
#battery.bat2,
|
#battery.bat2,
|
||||||
#battery.bat3,
|
#battery.bat3,
|
||||||
#cpu,
|
#cpu,
|
||||||
|
#disk,
|
||||||
|
#disk.HDD1,
|
||||||
|
#disk.HDD2,
|
||||||
#memory,
|
#memory,
|
||||||
|
#keyboard-state,
|
||||||
#temperature,
|
#temperature,
|
||||||
#network,
|
#network,
|
||||||
#pulseaudio,
|
#pulseaudio,
|
||||||
|
|
|
@ -26,16 +26,54 @@
|
||||||
layer = "top";
|
layer = "top";
|
||||||
position = "top";
|
position = "top";
|
||||||
height = 30;
|
height = 30;
|
||||||
# modules-left = ["wlr/workspaces"];
|
modules-left = ["hyprland/workspaces" "keyboard-state"];
|
||||||
#modules-center = [ "hyprland/window" ];
|
modules-center = ["cpu" "memory" "disk" "disk#HDD1" "disk#HDD2" "network" ];
|
||||||
modules-center = ["hyprland/workspaces" "tray" "network" "battery" "battery#bat2" "battery#bat3" "clock"];
|
modules-right = ["tray" "battery" "battery#bat2" "battery#bat3" "clock"];
|
||||||
"tray" = {"icon-size" = 21;};
|
"tray" = {"icon-size" = 21;};
|
||||||
"network" = {
|
"network" = {
|
||||||
|
"interval" = 3;
|
||||||
"format-wifi" = "NET: {essid} ({signalStrength}%) ";
|
"format-wifi" = "NET: {essid} ({signalStrength}%) ";
|
||||||
"format-ethernet" = "{ifname} ";
|
"format-ethernet" = "NET: {ipaddr}/{cidr} {bandwidthUpBits} {bandwidthDownBits} ";
|
||||||
"format-disconnected" = "";
|
"format-disconnected" = "";
|
||||||
"max-length" = 50;
|
"max-length" = 50;
|
||||||
};
|
};
|
||||||
|
"keyboard-state" = {
|
||||||
|
"numlock" = true;
|
||||||
|
"capslock" = true;
|
||||||
|
"format" = {
|
||||||
|
"numlock" = "N {icon}";
|
||||||
|
"capslock" = "C {icon}";
|
||||||
|
};
|
||||||
|
"format-icons" = {
|
||||||
|
"locked" = "";
|
||||||
|
"unlocked" = "";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
"cpu" = {
|
||||||
|
"interval" = 1;
|
||||||
|
"format" = "{}% ";
|
||||||
|
"max-length" = 10;
|
||||||
|
};
|
||||||
|
"disk" = {
|
||||||
|
"interval" = 10;
|
||||||
|
"format" = " {percentage_free}% {path}";
|
||||||
|
"path" = "/";
|
||||||
|
};
|
||||||
|
"disk#HDD1" = {
|
||||||
|
"interval" = 10;
|
||||||
|
"format" = " {percentage_free}% {path}";
|
||||||
|
"path" = "/mnt/HDD1/";
|
||||||
|
};
|
||||||
|
"disk#HDD2" = {
|
||||||
|
"interval" = 10;
|
||||||
|
"format" = " {percentage_free}% {path}";
|
||||||
|
"path" = "/mnt/HDD2/";
|
||||||
|
};
|
||||||
|
"memory" = {
|
||||||
|
"interval" = 2;
|
||||||
|
"format" = "{used:0.1f}G/{total:0.1f}G ";
|
||||||
|
};
|
||||||
"battery" = {
|
"battery" = {
|
||||||
"bat" = "BAT0";
|
"bat" = "BAT0";
|
||||||
"interval" = 10;
|
"interval" = 10;
|
||||||
|
|
|
@ -146,7 +146,6 @@
|
||||||
|
|
||||||
services.blueman.enable = true;
|
services.blueman.enable = true;
|
||||||
|
|
||||||
|
|
||||||
# Enable touchpad support (enabled default in most desktopManager).
|
# Enable touchpad support (enabled default in most desktopManager).
|
||||||
services.xserver.libinput.enable = true;
|
services.xserver.libinput.enable = true;
|
||||||
|
|
||||||
|
|
|
@ -13,8 +13,14 @@
|
||||||
allow_encryption = true;
|
allow_encryption = true;
|
||||||
allow_registration = false;
|
allow_registration = false;
|
||||||
max_request_size = 20000000;
|
max_request_size = 20000000;
|
||||||
|
address = "::1";
|
||||||
port = 6167;
|
port = 6167;
|
||||||
database_backend = "sqlite";
|
database_backend = "sqlite";
|
||||||
|
turn_uris = [
|
||||||
|
"turn:staticauth.openrelay.metered.ca:80?transport=udp"
|
||||||
|
"turn:staticauth.openrelay.metered.ca:80?transport=tcp"
|
||||||
|
];
|
||||||
|
turn_secret = "openrelayprojectsecret";
|
||||||
};
|
};
|
||||||
extraEnvironment = {
|
extraEnvironment = {
|
||||||
CONDUIT_MAX_CONCURRENT_REQUESTS = "100";
|
CONDUIT_MAX_CONCURRENT_REQUESTS = "100";
|
||||||
|
|
|
@ -15,7 +15,7 @@ with lib; {
|
||||||
./fail2ban.nix
|
./fail2ban.nix
|
||||||
./lanrarari.nix
|
./lanrarari.nix
|
||||||
# ./hydra.nix
|
# ./hydra.nix
|
||||||
# ./conduit.nix
|
./conduit.nix
|
||||||
./uptime.nix
|
./uptime.nix
|
||||||
./networking.nix
|
./networking.nix
|
||||||
./git.nix
|
./git.nix
|
||||||
|
@ -45,11 +45,11 @@ with lib; {
|
||||||
file_server
|
file_server
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
"matrix.heroin.trade" = {
|
# "matrix.heroin.trade" = {
|
||||||
extraConfig = ''
|
# extraConfig = ''
|
||||||
reverse_proxy /_matrix/* 127.0.0.1:${builtins.toString config.services.matrix-conduit.settings.global.port}
|
# reverse_proxy /_matrix/* 127.0.0.1:${builtins.toString config.services.matrix-conduit.settings.global.port}
|
||||||
'';
|
# '';
|
||||||
};
|
# };
|
||||||
"hydra.heroin.trade" = {
|
"hydra.heroin.trade" = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
reverse_proxy http://localhost:${builtins.toString config.services.hydra.port}
|
reverse_proxy http://localhost:${builtins.toString config.services.hydra.port}
|
||||||
|
@ -130,10 +130,10 @@ with lib; {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
"marie.software" = {
|
"marie.software" = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
root * /var/www/marie-website/
|
root * /var/www/marie-website/
|
||||||
file_server
|
file_server
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
"servers" = {
|
"servers" = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
|
|
2
justfile
2
justfile
|
@ -30,7 +30,7 @@ beleth:
|
||||||
website:
|
website:
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -euxo pipefail
|
set -euxo pipefail
|
||||||
ssh {{beleth-user-host}} "cd && cd nixos-config && git pull && cd && sh build_website.sh";
|
ssh {{beleth-user-host}} "cd && cd nixos-config && git pull && cd && cd /var/www/website/ && git pull && cd && sh build_website.sh";
|
||||||
exit
|
exit
|
||||||
|
|
||||||
update:
|
update:
|
||||||
|
|
Loading…
Reference in a new issue