Moved vscodium definition.

added caddyfile plugin to vscodium.
used nixfmt.
This commit is contained in:
Ittihadyya 2024-11-22 14:34:14 +02:00
parent 91c0a203fc
commit 7bbf371287
12 changed files with 123 additions and 91 deletions

View file

@ -70,19 +70,7 @@
terminator = { terminator = {
enable = true; enable = true;
}; };
vscode = {
enable = true;
package = pkgs.vscodium;
mutableExtensionsDir = false;
extensions = with pkgs.vscode-extensions; [
rust-lang.rust-analyzer
tuttieee.emacs-mcx
tamasfe.even-better-toml
vadimcn.vscode-lldb
jnoortheen.nix-ide
mkhl.direnv
];
};
}; };
} }
) )

View file

@ -8,7 +8,8 @@
}) })
]; ];
sucrose.modules = [ sucrose.modules = [
/* ({ /*
({
virtualisation.docker = { virtualisation.docker = {
enable = true; enable = true;
storageDriver = "btrfs"; storageDriver = "btrfs";
@ -18,7 +19,8 @@
data-root = "/home/emv/docker-data-root/"; data-root = "/home/emv/docker-data-root/";
}; };
}; };
})*/ })
*/
( (
{ pkgs, ... }: { pkgs, ... }:
{ {

View file

@ -15,6 +15,27 @@
}; };
} }
]; ];
personal.home_modules = [
(
{ pkgs, ... }:
{
programs.vscode = {
enable = true;
package = pkgs.vscodium;
mutableExtensionsDir = false;
extensions = with pkgs.vscode-extensions; [
rust-lang.rust-analyzer
tuttieee.emacs-mcx
tamasfe.even-better-toml
vadimcn.vscode-lldb
jnoortheen.nix-ide
mkhl.direnv
matthewpi.caddyfile-support
];
};
}
)
];
personal.modules = [ personal.modules = [
( (
{ pkgs, ... }: { pkgs, ... }:

View file

@ -16,7 +16,10 @@
]; ];
fructose.modules = [ fructose.modules = [
{ {
services.openssh.ports = [ 22 222 ]; services.openssh.ports = [
22
222
];
} }
]; ];
personal.home_modules = [ personal.home_modules = [

View file

@ -39,11 +39,14 @@
} }
]; ];
/*sucrose.modules = [ /*
sucrose.modules = [
{ {
services.tailscale.extraSetFlags = [ services.tailscale.extraSetFlags = [
"--advertise-exit-node" "--advertise-exit-node"
]; ];
} }
];*/ # this is not needed, currently -e ];
*/
# this is not needed, currently -e
} }

View file

@ -179,7 +179,8 @@ in
secretKeyFile = config.sops.secrets.binary-cache-secret.path; secretKeyFile = config.sops.secrets.binary-cache-secret.path;
}; };
/* systemd.timers."auto-update-rebuild" = { /*
systemd.timers."auto-update-rebuild" = {
wantedBy = [ "timers.target" ]; wantedBy = [ "timers.target" ];
timerConfig = { timerConfig = {
OnBootSec = "5m"; OnBootSec = "5m";
@ -211,7 +212,8 @@ in
RestartSec = "15m"; RestartSec = "15m";
Type = "oneshot"; Type = "oneshot";
}; };
};*/ };
*/
} }
) )
garbage-collection-module garbage-collection-module

View file

@ -25,7 +25,8 @@
type = "tar.gz"; type = "tar.gz";
}; };
settings = { # this directly drops stuff in the forgejo app.ini settings = {
# this directly drops stuff in the forgejo app.ini
server = { server = {
DOMAIN = "git.collective-conciousness.monster"; DOMAIN = "git.collective-conciousness.monster";
PROTOCOL = "http"; PROTOCOL = "http";

View file

@ -1,6 +1,13 @@
{ {
glucose.modules = [ glucose.modules = [
({pkgs, config, lib, ...}: { (
{
pkgs,
config,
lib,
...
}:
{
services.murmur = { services.murmur = {
enable = true; enable = true;
@ -16,6 +23,7 @@
registerUrl = "https://mumble.collective-conciousness.monster"; registerUrl = "https://mumble.collective-conciousness.monster";
registerHostname = "mumble.collective-conciousness.mosnter"; # i vaguely know what the difference between these two are but it is a bit strange, i guess. registerHostname = "mumble.collective-conciousness.mosnter"; # i vaguely know what the difference between these two are but it is a bit strange, i guess.
}; };
}) }
)
]; ];
} }

View file

@ -48,14 +48,17 @@
''; '';
} }
) )
({config, ...}:{ (
{ config, ... }:
{
sops.secrets.murmur_login_password = { }; sops.secrets.murmur_login_password = { };
sops.secrets.murmur_welcome_message = { }; sops.secrets.murmur_welcome_message = { };
sops.templates."murmur.env.secrets.yaml".content = '' sops.templates."murmur.env.secrets.yaml".content = ''
MURMUR_LOGIN_PASSWORD="${config.sops.placeholder."murmur_login_password"}" MURMUR_LOGIN_PASSWORD="${config.sops.placeholder."murmur_login_password"}"
MURMUR_WELCOME_MESSAGE="${config.sops.placeholder."murmur_welcome_message"}" MURMUR_WELCOME_MESSAGE="${config.sops.placeholder."murmur_welcome_message"}"
''; '';
}) }
)
]; ];
fructose.modules = [ fructose.modules = [
( (
@ -68,7 +71,8 @@
} }
) )
( (
{config, ...}: { { config, ... }:
{
sops.secrets.postgresdb_admin_password = { }; sops.secrets.postgresdb_admin_password = { };
sops.secrets.forgejo_db_pass = { }; sops.secrets.forgejo_db_pass = { };
sops.templates."postgresdb.env.secrets.yaml".content = '' sops.templates."postgresdb.env.secrets.yaml".content = ''