diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e2755be..459e8a5 120000 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1 +1 @@ -/nix/store/30f0pr8v6hd0qy799gvjx6vw1zha8v8w-pre-commit-config.json \ No newline at end of file +/nix/store/gr5dfsr20jqrim8w0lbhicgdnpwwwhs2-pre-commit-config.json \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 64d45fa..8d7b269 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,7 +14,6 @@ "emanote", "Ewanick", "fancytypist", - "forgejo", "ghcid", "gitea", "gnused", @@ -28,7 +27,6 @@ "jitsi", "jquery", "keymap", - "lemmy", "longview", "maths", "mdformat", diff --git a/flake.lock b/flake.lock index 559a94e..dec88d9 100644 --- a/flake.lock +++ b/flake.lock @@ -79,16 +79,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1767325753, - "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64049ca74d63e971b627b5f3178d95642e61cedd", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 490df78..d4389f7 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Flake.parts System flake for Linode NixOS server"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; git-hooks-nix.url = "github:cachix/git-hooks.nix"; diff --git a/nixos-apps/default.nix b/nixos-apps/default.nix index 55f17e6..8091cf4 100644 --- a/nixos-apps/default.nix +++ b/nixos-apps/default.nix @@ -7,10 +7,9 @@ ./ewanick.com.nix ./git.ewanick.com.nix + # ./paperless.ewanick.com.nix ./fancytypist.com.nix - - # ./paperless.ewanick.com.nix ]; # when in doubt, clear away the certs with diff --git a/nixos-apps/ewanick.com.nix b/nixos-apps/ewanick.com.nix index f743538..37ade7c 100644 --- a/nixos-apps/ewanick.com.nix +++ b/nixos-apps/ewanick.com.nix @@ -1,8 +1,8 @@ {pkgs, ...}: let - description = "A future blog powered running solely on Markdown files."; PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/ewanick.com"; + PORT = "5567"; HOST = "localhost"; - PORT = 5567; + emanote-version = "1.2.0"; in { services.caddy = { enable = true; @@ -10,9 +10,24 @@ in { "ewanick.com" = { serverAliases = ["www.ewanick.com"]; 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} + ''; + }; + }; } diff --git a/nixos-apps/ewanick.com/index.md b/nixos-apps/ewanick.com/index.md index 79a6491..4338efa 100644 --- a/nixos-apps/ewanick.com/index.md +++ b/nixos-apps/ewanick.com/index.md @@ -13,5 +13,4 @@ See what I'm currently tinkering with at:\ :::{.photoframe-center} - !\[[profile.jpg]\] diff --git a/nixos-apps/fancytypist.com.nix b/nixos-apps/fancytypist.com.nix index eed7ebd..7f409f7 100644 --- a/nixos-apps/fancytypist.com.nix +++ b/nixos-apps/fancytypist.com.nix @@ -26,6 +26,12 @@ in { ''; }; + "helpme.fancytypist.ca" = { + extraConfig = '' + respond "Welcome to only other subdomain...helpme!" + ''; + }; + "osds.fancytypist.dev" = { serverAliases = ["osds.fancytypist.dev"]; extraConfig = '' @@ -49,13 +55,4 @@ in { ''; }; }; - - services.lemmy = { - enable = true; - settings = { - hostname = "helpme.fancytypist.ca"; - database.createLocally = true; - }; - caddy.enable = true; - }; } diff --git a/nixos-apps/git.ewanick.com.nix b/nixos-apps/git.ewanick.com.nix index 8dce372..c91a73c 100644 --- a/nixos-apps/git.ewanick.com.nix +++ b/nixos-apps/git.ewanick.com.nix @@ -2,9 +2,9 @@ baseUrl = "git.ewanick.com"; PROJECT_ROOT = "/workspace/deployed-nixos-server-and-apps/nixos-apps/git.ewanick.com"; in { - services.forgejo = { + services.gitea = { enable = true; - database.type = "postgres"; + appName = "Bill's Gitea server, hosted on Linode using NixOS"; lfs.enable = true; settings = { server = { @@ -12,7 +12,6 @@ in { ROOT_URL = "https://${baseUrl}/"; HTTP_PORT = 3000; }; - DEFAULT.APP_NAME = "Bill's Forgejo server, hosted on Linode using NixOS"; service.DISABLE_REGISTRATION = true; actions = { @@ -23,7 +22,6 @@ in { }; services.gitea-actions-runner = { - package = pkgs.forgejo-runner; instances.default = { enable = true; name = "linode-nixos"; diff --git a/run.sh b/run.sh index 920deaf..cf324c4 100755 --- a/run.sh +++ b/run.sh @@ -1,6 +1,6 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p bash -sudo \ - nixos-rebuild switch \ - --option eval-cache false \ - --flake /workspace/deployed-nixos-server-and-apps#linode-nixos +sudo nixos-rebuild \ + --option eval-cache false \ + --flake /workspace/deployed-nixos-server-and-apps \ + switch diff --git a/server-config/configuration.nix b/server-config/configuration.nix index 54ab20f..7ea12fa 100644 --- a/server-config/configuration.nix +++ b/server-config/configuration.nix @@ -139,5 +139,5 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (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? } diff --git a/test.sh b/test.sh deleted file mode 100755 index f2b3c71..0000000 --- a/test.sh +++ /dev/null @@ -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