Compare commits

..

No commits in common. "43327a567e597b92caee6bfce5737a335dcbb46f" and "9b77159110324a3e4f8d4ec9077dfc377c1e209c" have entirely different histories.

12 changed files with 38 additions and 37 deletions

View file

@ -1 +1 @@
/nix/store/30f0pr8v6hd0qy799gvjx6vw1zha8v8w-pre-commit-config.json /nix/store/gr5dfsr20jqrim8w0lbhicgdnpwwwhs2-pre-commit-config.json

View file

@ -14,7 +14,6 @@
"emanote", "emanote",
"Ewanick", "Ewanick",
"fancytypist", "fancytypist",
"forgejo",
"ghcid", "ghcid",
"gitea", "gitea",
"gnused", "gnused",
@ -28,7 +27,6 @@
"jitsi", "jitsi",
"jquery", "jquery",
"keymap", "keymap",
"lemmy",
"longview", "longview",
"maths", "maths",
"mdformat", "mdformat",

8
flake.lock generated
View file

@ -79,16 +79,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1767325753, "lastModified": 1767364772,
"narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=", "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "64049ca74d63e971b627b5f3178d95642e61cedd", "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.11", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View file

@ -2,7 +2,7 @@
description = "Flake.parts System flake for Linode NixOS server"; description = "Flake.parts System flake for Linode NixOS server";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
git-hooks-nix.url = "github:cachix/git-hooks.nix"; git-hooks-nix.url = "github:cachix/git-hooks.nix";

View file

@ -7,10 +7,9 @@
./ewanick.com.nix ./ewanick.com.nix
./git.ewanick.com.nix ./git.ewanick.com.nix
# ./paperless.ewanick.com.nix
./fancytypist.com.nix ./fancytypist.com.nix
# ./paperless.ewanick.com.nix
]; ];
# when in doubt, clear away the certs with # when in doubt, clear away the certs with

View file

@ -1,8 +1,8 @@
{pkgs, ...}: let {pkgs, ...}: let
description = "A future blog powered running solely on Markdown files.";
PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/ewanick.com"; PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/ewanick.com";
PORT = "5567";
HOST = "localhost"; HOST = "localhost";
PORT = 5567; emanote-version = "1.2.0";
in { in {
services.caddy = { services.caddy = {
enable = true; enable = true;
@ -10,9 +10,24 @@ in {
"ewanick.com" = { "ewanick.com" = {
serverAliases = ["www.ewanick.com"]; serverAliases = ["www.ewanick.com"];
extraConfig = '' extraConfig = ''
reverse_proxy ${HOST}:${toString PORT} reverse_proxy ${HOST}:${PORT}
''; '';
}; };
}; };
}; };
systemd.services = {
ewanick-site = {
enable = true;
description = "A blog powered by Emanote running solely on Markdown files.";
path = with pkgs; [
nix
git
];
script = ''
cd ${PROJECT_ROOT}
nix run github:srid/emanote/${emanote-version} -- run --port ${PORT} --host ${HOST}
'';
};
};
} }

View file

@ -13,5 +13,4 @@ See what I'm currently tinkering with at:\
<https://git.ewanick.com/bill> <https://git.ewanick.com/bill>
:::{.photoframe-center} :::{.photoframe-center}
!\[[profile.jpg]\] !\[[profile.jpg]\]

View file

@ -26,6 +26,12 @@ in {
''; '';
}; };
"helpme.fancytypist.ca" = {
extraConfig = ''
respond "Welcome to only other subdomain...helpme!"
'';
};
"osds.fancytypist.dev" = { "osds.fancytypist.dev" = {
serverAliases = ["osds.fancytypist.dev"]; serverAliases = ["osds.fancytypist.dev"];
extraConfig = '' extraConfig = ''
@ -49,13 +55,4 @@ in {
''; '';
}; };
}; };
services.lemmy = {
enable = true;
settings = {
hostname = "helpme.fancytypist.ca";
database.createLocally = true;
};
caddy.enable = true;
};
} }

View file

@ -2,9 +2,9 @@
baseUrl = "git.ewanick.com"; baseUrl = "git.ewanick.com";
PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/git.ewanick.com"; PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/git.ewanick.com";
in { in {
services.forgejo = { services.gitea = {
enable = true; enable = true;
database.type = "postgres"; appName = "Bill's Gitea server, hosted on Linode using NixOS";
lfs.enable = true; lfs.enable = true;
settings = { settings = {
server = { server = {
@ -12,7 +12,6 @@ in {
ROOT_URL = "https://${baseUrl}/"; ROOT_URL = "https://${baseUrl}/";
HTTP_PORT = 3000; HTTP_PORT = 3000;
}; };
DEFAULT.APP_NAME = "Bill's Forgejo server, hosted on Linode using NixOS";
service.DISABLE_REGISTRATION = true; service.DISABLE_REGISTRATION = true;
actions = { actions = {
@ -23,7 +22,6 @@ in {
}; };
services.gitea-actions-runner = { services.gitea-actions-runner = {
package = pkgs.forgejo-runner;
instances.default = { instances.default = {
enable = true; enable = true;
name = "linode-nixos"; name = "linode-nixos";

8
run.sh
View file

@ -1,6 +1,6 @@
#! /usr/bin/env nix-shell #! /usr/bin/env nix-shell
#! nix-shell -i bash -p bash #! nix-shell -i bash -p bash
sudo \ sudo nixos-rebuild \
nixos-rebuild switch \ --option eval-cache false \
--option eval-cache false \ --flake /workspace/deployed-nixos-server-and-apps \
--flake /workspace/deployed-nixos-server-and-apps#linode-nixos switch

View file

@ -139,5 +139,5 @@
# this value at the release version of the first install of this system. # this value at the release version of the first install of this system.
# Before changing this value read the documentation for this option # Before changing this value read the documentation for this option
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.stateVersion = "25.11"; # Did you read the comment? system.stateVersion = "23.05"; # Did you read the comment?
} }

View file

@ -1,5 +0,0 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p bash
nixos-rebuild build \
--option eval-cache false \
--flake /workspace/deployed-nixos-server-and-apps#linode-nixos