mirror of
https://git.gay/xqtc/nixos-config
synced 2024-11-22 04:20:33 +01:00
idk conduit und ricing und caddyfile
This commit is contained in:
parent
ef54cb23bf
commit
870755f79b
|
@ -94,7 +94,7 @@
|
|||
lib,
|
||||
...
|
||||
}: {
|
||||
services.proxmox-ve.enable = true;
|
||||
services.proxmox-ve.enable = false;
|
||||
nixpkgs.overlays = [
|
||||
proxmox-nixos.overlays.${system}
|
||||
];
|
||||
|
|
|
@ -19,10 +19,10 @@ exec-once = waybar & swww init & mako & kwalletd6 & nextcloud
|
|||
|
||||
# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
|
||||
input {
|
||||
kb_layout = us
|
||||
kb_layout = us,de
|
||||
kb_variant =
|
||||
kb_model =
|
||||
kb_options =
|
||||
kb_options = grp:win_space_toggle
|
||||
kb_rules =
|
||||
|
||||
follow_mouse = 1
|
||||
|
|
|
@ -12,15 +12,15 @@
|
|||
};
|
||||
|
||||
cursor = {
|
||||
blink = "yes";
|
||||
blink = "yes";
|
||||
};
|
||||
|
||||
mouse = {
|
||||
hide-when-typing = "yes";
|
||||
hide-when-typing = "yes";
|
||||
};
|
||||
|
||||
colors = {
|
||||
alpha = 0.8;
|
||||
alpha = 0.8;
|
||||
foreground = "cdd6f4";
|
||||
background = "1e1e2e";
|
||||
|
||||
|
|
|
@ -15,60 +15,64 @@
|
|||
extraConfig = builtins.readFile ../config-files/hyprland.conf;
|
||||
};
|
||||
|
||||
programs.waybar = /* lib.mkIf (pkgs.system == "x86_64-linux") */ {
|
||||
enable = true;
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
position = "top";
|
||||
height = 30;
|
||||
# modules-left = ["wlr/workspaces"];
|
||||
#modules-center = [ "hyprland/window" ];
|
||||
modules-center = ["hyprland/workspaces" "tray" "network" "battery" "battery#bat2" "battery#bat3" "clock"];
|
||||
"tray" = {"icon-size" = 21;};
|
||||
"network" = {
|
||||
"format-wifi" = "NET: {essid} ({signalStrength}%) ";
|
||||
"format-ethernet" = "{ifname} ";
|
||||
"format-disconnected" = "";
|
||||
"max-length" = 50;
|
||||
};
|
||||
"battery" = {
|
||||
"bat" = "BAT0";
|
||||
"interval" = 10;
|
||||
"states" = {
|
||||
"warning" = 30;
|
||||
"critical" = 15;
|
||||
programs.waybar =
|
||||
/*
|
||||
lib.mkIf (pkgs.system == "x86_64-linux")
|
||||
*/
|
||||
{
|
||||
enable = true;
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
position = "top";
|
||||
height = 30;
|
||||
# modules-left = ["wlr/workspaces"];
|
||||
#modules-center = [ "hyprland/window" ];
|
||||
modules-center = ["hyprland/workspaces" "tray" "network" "battery" "battery#bat2" "battery#bat3" "clock"];
|
||||
"tray" = {"icon-size" = 21;};
|
||||
"network" = {
|
||||
"format-wifi" = "NET: {essid} ({signalStrength}%) ";
|
||||
"format-ethernet" = "{ifname} ";
|
||||
"format-disconnected" = "";
|
||||
"max-length" = 50;
|
||||
};
|
||||
"format" = " BAT IN: {capacity}%";
|
||||
#"format-icons" = ''["", "", "", "", ""]'';
|
||||
"max-length" = 25;
|
||||
};
|
||||
"battery#bat2" = {
|
||||
"bat" = "BAT1";
|
||||
"interval" = 10;
|
||||
"states" = {
|
||||
"warning" = 30;
|
||||
"critical" = 15;
|
||||
"battery" = {
|
||||
"bat" = "BAT0";
|
||||
"interval" = 10;
|
||||
"states" = {
|
||||
"warning" = 30;
|
||||
"critical" = 15;
|
||||
};
|
||||
"format" = " BAT IN: {capacity}%";
|
||||
#"format-icons" = ''["", "", "", "", ""]'';
|
||||
"max-length" = 25;
|
||||
};
|
||||
"format" = " BAT EX: {capacity}%";
|
||||
#"format-icons" = ''["", "", "", "", ""]'';
|
||||
"max-length" = 25;
|
||||
};
|
||||
"battery#bat3" = {
|
||||
"bat" = "macsmc-battery";
|
||||
"interval" = 10;
|
||||
"states" = {
|
||||
"warning" = 30;
|
||||
"critical" = 15;
|
||||
"battery#bat2" = {
|
||||
"bat" = "BAT1";
|
||||
"interval" = 10;
|
||||
"states" = {
|
||||
"warning" = 30;
|
||||
"critical" = 15;
|
||||
};
|
||||
"format" = " BAT EX: {capacity}%";
|
||||
#"format-icons" = ''["", "", "", "", ""]'';
|
||||
"max-length" = 25;
|
||||
};
|
||||
"battery#bat3" = {
|
||||
"bat" = "macsmc-battery";
|
||||
"interval" = 10;
|
||||
"states" = {
|
||||
"warning" = 30;
|
||||
"critical" = 15;
|
||||
};
|
||||
"format" = " BAT: {capacity}%";
|
||||
#"format-icons" = ''["", "", "", "", ""]'';
|
||||
"max-length" = 25;
|
||||
};
|
||||
"format" = " BAT: {capacity}%";
|
||||
#"format-icons" = ''["", "", "", "", ""]'';
|
||||
"max-length" = 25;
|
||||
};
|
||||
};
|
||||
style = builtins.readFile ../config-files/waybar-mocha.css;
|
||||
};
|
||||
style = builtins.readFile ../config-files/waybar-mocha.css;
|
||||
};
|
||||
|
||||
services.mako = {
|
||||
enable = true;
|
||||
|
|
26
hosts/x86_64-linux/beleth/conduit.nix
Normal file
26
hosts/x86_64-linux/beleth/conduit.nix
Normal file
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
services.matrix-conduit = {
|
||||
enable = true;
|
||||
settings = {
|
||||
global = {
|
||||
server_name = "matrix.heroin.trade";
|
||||
allow_federation = true;
|
||||
allow_encryption = true;
|
||||
allow_registration = false;
|
||||
max_request_size = 20000000;
|
||||
port = 6167;
|
||||
database_backend = "sqlite";
|
||||
};
|
||||
extraEnvironment = {
|
||||
CONDUIT_MAX_CONCURRENT_REQUESTS = "100";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [config.services.matrix-conduit.settings.global.port];
|
||||
}
|
|
@ -15,6 +15,7 @@ with lib; {
|
|||
./fail2ban.nix
|
||||
./lanrarari.nix
|
||||
# ./hydra.nix
|
||||
./conduit.nix
|
||||
./uptime.nix
|
||||
./networking.nix
|
||||
./git.nix
|
||||
|
@ -44,6 +45,11 @@ with lib; {
|
|||
file_server
|
||||
'';
|
||||
};
|
||||
"matrix.heroin.trade" = {
|
||||
extraConfig = ''
|
||||
reverse_proxy /_matrix/* 127.0.0.1:${builtins.toString config.services.matrix-conduit.settings.global.port}
|
||||
'';
|
||||
};
|
||||
"hydra.heroin.trade" = {
|
||||
extraConfig = ''
|
||||
reverse_proxy http://localhost:${builtins.toString config.services.hydra.port}
|
||||
|
@ -123,6 +129,12 @@ with lib; {
|
|||
reverse_proxy http://127.0.0.1:8085
|
||||
'';
|
||||
};
|
||||
"marie.software" = {
|
||||
extraConfig = ''
|
||||
root * /var/www/marie-website/
|
||||
file_server
|
||||
'';
|
||||
};
|
||||
"servers" = {
|
||||
extraConfig = ''
|
||||
metrics
|
||||
|
@ -169,6 +181,18 @@ with lib; {
|
|||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJYa+LoHGGvu12iBufUcr3GD8tsq4LuJdwLjaDkTr0SL xqtc@lilith"
|
||||
];
|
||||
};
|
||||
|
||||
users.users.marie = {
|
||||
isNormalUser = true;
|
||||
packages = with pkgs; [
|
||||
git
|
||||
wget
|
||||
];
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN0mGd4YS4f3Wy+a4PBXbie42C5Qo4H0uWsN7joaK27h marie@titania"
|
||||
];
|
||||
};
|
||||
|
||||
users.users.root.openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJTLJqIVwnqFO64rnc66d234TFOdFXpDS9fJUA4/f4in xqtc@alastor"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN7UkcmSVo+SeB5Obevz3mf3UHruYxn0UHUzoOs2gDBy xqtc@asmodeus"
|
||||
|
|
|
@ -11,16 +11,16 @@
|
|||
# networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
|
||||
networking = {
|
||||
# bridges = {
|
||||
# vmbr0 = {
|
||||
# interfaces = [ "enp0s31f6" ];
|
||||
# };
|
||||
# };
|
||||
# bridges = {
|
||||
# vmbr0 = {
|
||||
# interfaces = [ "enp0s31f6" ];
|
||||
# };
|
||||
# };
|
||||
# useDhCP = lib.mkDefault true;
|
||||
interfaces = {
|
||||
# vmbr0 = {
|
||||
# useDHCP = lib.mkDefault true;
|
||||
# };
|
||||
# vmbr0 = {
|
||||
# useDHCP = lib.mkDefault true;
|
||||
# };
|
||||
enp0s31f6 = {
|
||||
ipv4 = {
|
||||
addresses = [
|
||||
|
|
Loading…
Reference in a new issue