diff --git a/flake.lock b/flake.lock index b10fff6..6c38971 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1769832488, - "narHash": "sha256-mYNFYj3Ed7l6MbuFIMd9ahlyNuav5X8q9siKwVkPxUQ=", + "lastModified": 1769819491, + "narHash": "sha256-hMr47pVjBGd9Jk0zlKL66GWBlS6E50Mp4sW0OBvneSk=", "ref": "refs/heads/main", - "rev": "efdedb23b8becfdaf7b43b431007fc369bae318d", - "revCount": 77, + "rev": "c0f53e00c1888ff9bd92055f0bdc3fe9f218d387", + "revCount": 57, "type": "git", "url": "https://forge.imbored.dev/emileclarkb/dobutterfliescry.net" }, diff --git a/homes/me/default.nix b/homes/me/default.nix index 2c4e918..a6e5745 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -130,12 +130,6 @@ TERM = "linux"; }; }; - clocktown = { - hostname = "clocktown.dobutterfliescry.net"; - user = "root"; - port = 22; - identityFile = "~/.ssh/id_clocktown"; - }; subspace = { hostname = "imbored.dev"; user = "subspace"; diff --git a/hosts/hyrule/services/nginx.nix b/hosts/hyrule/services/nginx.nix index 945724e..a923245 100644 --- a/hosts/hyrule/services/nginx.nix +++ b/hosts/hyrule/services/nginx.nix @@ -44,6 +44,16 @@ 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 = { @@ -61,6 +71,18 @@ } // 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; @@ -76,7 +98,8 @@ "vault.imbored.dev" = vault; # Route "forge" subdomain to forgejo # TODO: use `forgejo.settings.server.ENABLE_ACME` instead? - "forge.dobutterfliescry.net" = forge; + "forge.imbored.dev" = forge; + # "forge.dobutterfliescry.net" = forge; }; }; } diff --git a/hosts/lolcathost/default.nix b/hosts/lolcathost/default.nix index 997eb05..4119d78 100755 --- a/hosts/lolcathost/default.nix +++ b/hosts/lolcathost/default.nix @@ -263,10 +263,8 @@ 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: @@ -282,6 +280,8 @@ in { # Systems Emulation qemu # Fellice Bellard's Quick Emulator + # GNU Utils + gnumake # Binaries binutils strace @@ -297,8 +297,6 @@ in { gcc clang clang-tools - gnumake - cmake # Rust cargo