Compare commits

..

3 commits

4 changed files with 15 additions and 30 deletions

8
flake.lock generated
View file

@ -40,11 +40,11 @@
]
},
"locked": {
"lastModified": 1769819491,
"narHash": "sha256-hMr47pVjBGd9Jk0zlKL66GWBlS6E50Mp4sW0OBvneSk=",
"lastModified": 1769832488,
"narHash": "sha256-mYNFYj3Ed7l6MbuFIMd9ahlyNuav5X8q9siKwVkPxUQ=",
"ref": "refs/heads/main",
"rev": "c0f53e00c1888ff9bd92055f0bdc3fe9f218d387",
"revCount": 57,
"rev": "efdedb23b8becfdaf7b43b431007fc369bae318d",
"revCount": 77,
"type": "git",
"url": "https://forge.imbored.dev/emileclarkb/dobutterfliescry.net"
},

View file

@ -130,6 +130,12 @@
TERM = "linux";
};
};
clocktown = {
hostname = "clocktown.dobutterfliescry.net";
user = "root";
port = 22;
identityFile = "~/.ssh/id_clocktown";
};
subspace = {
hostname = "imbored.dev";
user = "subspace";

View file

@ -44,16 +44,6 @@
enableACME = true;
# kTLS = true; # offload TLS to the linux kernel
};
website =
{
default = true;
addSSL = true; # not strictly enforced <3
root = "/var/www/imbored";
# extraConfig = ''
# error_page 404 /custom_404.html;
# '';
}
// std;
vault =
{
@ -71,18 +61,6 @@
}
// std;
in {
# XXX: TODO: imbored.dev and dobutterfliescry.net can't
# XXX: TODO: be active at the same time??? why??
# "imbored.dev" =
# {
# default = true;
# addSSL = true; # not strictly enforced <3
# root = "/var/www/imbored";
# # extraConfig = ''
# # error_page 404 /custom_404.html;
# # '';
# }
# // std;
"dobutterfliescry.net" =
{
default = true;
@ -98,8 +76,7 @@
"vault.imbored.dev" = vault;
# Route "forge" subdomain to forgejo
# TODO: use `forgejo.settings.server.ENABLE_ACME` instead?
"forge.imbored.dev" = forge;
# "forge.dobutterfliescry.net" = forge;
"forge.dobutterfliescry.net" = forge;
};
};
}

View file

@ -263,8 +263,10 @@ in {
wl-clipboard # clipboard for wayland
hyprpicker # color picker
hyprshot # screenshot utility
wl-screenrec # screen recording utility
qbittorrent # torrenting
signal-desktop
video-trimmer
(callPackage ../sddm-theme-corners.nix {}).sddm-theme-corners
# dependencies for my sddm theme:
@ -280,8 +282,6 @@ in {
# Systems Emulation
qemu # Fellice Bellard's Quick Emulator
# GNU Utils
gnumake
# Binaries
binutils
strace
@ -297,6 +297,8 @@ in {
gcc
clang
clang-tools
gnumake
cmake
# Rust
cargo