format
This commit is contained in:
parent
e7f3e1ba7c
commit
8131132c49
12 changed files with 28 additions and 43 deletions
|
|
@ -29,10 +29,10 @@ in {
|
||||||
fsType = "ext4";
|
fsType = "ext4";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" =
|
fileSystems."/boot" = {
|
||||||
{ device = "/dev/disk/by-uuid/D8AA-8602";
|
device = "/dev/disk/by-uuid/D8AA-8602";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/mnt/disk1" = {
|
fileSystems."/mnt/disk1" = {
|
||||||
device = "/dev/disk/by-uuid/caba0b6c-00d2-495a-8c04-67ea584f1a63";
|
device = "/dev/disk/by-uuid/caba0b6c-00d2-495a-8c04-67ea584f1a63";
|
||||||
|
|
@ -86,7 +86,7 @@ in {
|
||||||
networking.useDHCP = lib.mkDefault true;
|
networking.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.eth0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.eth0.useDHCP = lib.mkDefault true;
|
||||||
# networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
|
# networking.interfaces.tailscale0.useDHCP = lib.mkDefault true;
|
||||||
networking.firewall.allowedTCPPorts = [ 53 80 443 ];
|
networking.firewall.allowedTCPPorts = [53 80 443];
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
|
@ -188,7 +188,6 @@ in {
|
||||||
domain = "monitor.tristans.cloud";
|
domain = "monitor.tristans.cloud";
|
||||||
http_port = 3001; # forgejo and grafana default to 3000
|
http_port = 3001; # forgejo and grafana default to 3000
|
||||||
};
|
};
|
||||||
|
|
||||||
services.forgejo.settings.server.DOMAIN = "git.tristans.cloud";
|
|
||||||
|
|
||||||
|
services.forgejo.settings.server.DOMAIN = "git.tristans.cloud";
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -99,5 +99,4 @@ in {
|
||||||
];
|
];
|
||||||
|
|
||||||
services.tlp.enable = true;
|
services.tlp.enable = true;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,7 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}: {
|
||||||
{
|
|
||||||
imports = [
|
imports = [
|
||||||
./programs/neovim/.
|
./programs/neovim/.
|
||||||
./programs/helix.nix
|
./programs/helix.nix
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ in {
|
||||||
items="$(rbw list)"
|
items="$(rbw list)"
|
||||||
echo "$items" | ${my-deps.menu} | xargs -I_ rbw get --field username _ \
|
echo "$items" | ${my-deps.menu} | xargs -I_ rbw get --field username _ \
|
||||||
| awk '{print $2}' | wl-copy -n
|
| awk '{print $2}' | wl-copy -n
|
||||||
'';
|
'';
|
||||||
hotkeys = [
|
hotkeys = [
|
||||||
{
|
{
|
||||||
modifier = "${modifier}_CONTROL";
|
modifier = "${modifier}_CONTROL";
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,7 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}: {
|
||||||
{
|
|
||||||
imports = [
|
imports = [
|
||||||
./modules/terminal.nix
|
./modules/terminal.nix
|
||||||
./modules/scripts.nix
|
./modules/scripts.nix
|
||||||
|
|
@ -55,5 +54,4 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
services.gnome-keyring.enable = true;
|
services.gnome-keyring.enable = true;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -111,5 +111,4 @@ in {
|
||||||
};
|
};
|
||||||
|
|
||||||
services.prometheus.exporters.node.enable = true;
|
services.prometheus.exporters.node.enable = true;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
{config, ...}:
|
{config, ...}: let
|
||||||
let
|
|
||||||
cfg = config.services.forgejo;
|
cfg = config.services.forgejo;
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
services.forgejo = {
|
services.forgejo = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dump.enable = true;
|
dump.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
{config, ...}:
|
{config, ...}: let
|
||||||
let
|
|
||||||
cfg = config.services.grafana;
|
cfg = config.services.grafana;
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
services.grafana = {
|
services.grafana = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,4 @@
|
||||||
{config,...}:
|
{config, ...}: {
|
||||||
{
|
|
||||||
services.mpd = {
|
services.mpd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
network.listenAddress = "0.0.0.0";
|
network.listenAddress = "0.0.0.0";
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,7 @@ let
|
||||||
add_header Access-Control-Allow-Origin *;
|
add_header Access-Control-Allow-Origin *;
|
||||||
return 200 '${builtins.toJSON data}';
|
return 200 '${builtins.toJSON data}';
|
||||||
'';
|
'';
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
services.matrix-synapse = {
|
services.matrix-synapse = {
|
||||||
enable = false; # using podman for the moment
|
enable = false; # using podman for the moment
|
||||||
};
|
};
|
||||||
|
|
@ -20,26 +19,26 @@ in
|
||||||
locations."= /.well-known/matrix/client".extraConfig = mkWellKnown {
|
locations."= /.well-known/matrix/client".extraConfig = mkWellKnown {
|
||||||
"m.homeserver".base_url = "https://${fqdn}";
|
"m.homeserver".base_url = "https://${fqdn}";
|
||||||
"org.matrix.msc3575.proxy"."url" = "https://${fqdn}";
|
"org.matrix.msc3575.proxy"."url" = "https://${fqdn}";
|
||||||
};
|
};
|
||||||
locations."= /.well-known/matrix/support".extraConfig = mkWellKnown {
|
locations."= /.well-known/matrix/support".extraConfig = mkWellKnown {
|
||||||
admins = [{
|
admins = [
|
||||||
matrix_id = "@tristan:tristans.cloud";
|
{
|
||||||
email_address = "tristan@tristans.cloud";
|
matrix_id = "@tristan:tristans.cloud";
|
||||||
role = "admin";
|
email_address = "tristan@tristans.cloud";
|
||||||
}];
|
role = "admin";
|
||||||
};
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
locations."/_matrix".proxyPass = "http://localhost:8008";
|
locations."/_matrix".proxyPass = "http://localhost:8008";
|
||||||
locations."/_synapse/client".proxyPass = "http://localhost:8008";
|
locations."/_synapse/client".proxyPass = "http://localhost:8008";
|
||||||
locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass =
|
locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://localhost:8009";
|
||||||
"http://localhost:8009";
|
|
||||||
};
|
};
|
||||||
${fqdn} = {
|
${fqdn} = {
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
locations."/_matrix".proxyPass = "http://localhost:8008";
|
locations."/_matrix".proxyPass = "http://localhost:8008";
|
||||||
locations."/_synapse/client".proxyPass = "http://localhost:8008";
|
locations."/_synapse/client".proxyPass = "http://localhost:8008";
|
||||||
locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass =
|
locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://localhost:8009";
|
||||||
"http://localhost:8009";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,7 @@
|
||||||
{config, ...}:
|
{config, ...}: let
|
||||||
let
|
|
||||||
cfg = config.services.vaultwarden;
|
cfg = config.services.vaultwarden;
|
||||||
domain = "vault.tristans.cloud";
|
domain = "vault.tristans.cloud";
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
services.vaultwarden = {
|
services.vaultwarden = {
|
||||||
enable = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -79,5 +79,4 @@ in {
|
||||||
nerdfonts
|
nerdfonts
|
||||||
interalia
|
interalia
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue