bump best-blog

change from Andromeda/blog to Andromeda/best-blog
fix merge conflicts?
2025-06-19 09:53:24 -04:00 · 2025-06-19 06:27:03 -04:00 · 2025-06-18 14:04:49 -04:00 · 2025-06-18 13:32:49 -04:00
3 changed files with 130 additions and 252 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -1,39 +1,27 @@
 {
  "nodes": {
-    "advisory-db": {
-      "flake": false,
+    "best-blog": {
+      "inputs": {
+        "nixpkgs": "nixpkgs",
+        "rust-http-server": "rust-http-server"
+      },
      "locked": {
-        "lastModified": 1747937073,
-        "narHash": "sha256-52H8P6jAHEwRvg7rXr4Z7h1KHZivO8T1Z9tN6R0SWJg=",
-        "owner": "rustsec",
-        "repo": "advisory-db",
-        "rev": "bccf313a98c034573ac4170e6271749113343d97",
-        "type": "github"
+        "lastModified": 1750341141,
+        "narHash": "sha256-6aVmNXmX+cDh+bCAPBOTfeSm/UI3/iRY6xA9ZQdUdQg=",
+        "ref": "refs/heads/master",
+        "rev": "50c9b7fbfa6862ded556d178b8234332f6fc3f9e",
+        "revCount": 8,
+        "type": "git",
+        "url": "https://git.mtgmonkey.net/Andromeda/best-blog.git"
      },
      "original": {
-        "owner": "rustsec",
-        "repo": "advisory-db",
-        "type": "github"
-      }
-    },
-    "crane": {
-      "locked": {
-        "lastModified": 1748047550,
-        "narHash": "sha256-t0qLLqb4C1rdtiY8IFRH5KIapTY/n3Lqt57AmxEv9mk=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "b718a78696060df6280196a6f992d04c87a16aef",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
+        "type": "git",
+        "url": "https://git.mtgmonkey.net/Andromeda/best-blog.git"
      }
    },
    "elmskell-blog": {
      "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs_3"
      },
      "locked": {
        "lastModified": 1749494299,
@@ -42,16 +30,16 @@
        "rev": "596af4a7318d60816ee995526d571643e21744b5",
        "revCount": 11,
        "type": "git",
-        "url": "file:///var/lib/git-server/blog.git"
+        "url": "https://git.mtgmonkey.net/Andromeda/blog.git"
      },
      "original": {
        "type": "git",
-        "url": "file:///var/lib/git-server/blog.git"
+        "url": "https://git.mtgmonkey.net/Andromeda/blog.git"
      }
    },
    "flake-utils": {
      "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
      },
      "locked": {
        "lastModified": 1731533236,
@@ -67,25 +55,9 @@
        "type": "github"
      }
    },
-    "helix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1727654850,
-        "narHash": "sha256-du6Vy5Yxy6aZFP7ad5guz5GOD/8uMY+Pgse1ZM+K2Jo=",
-        "owner": "JordanForks",
-        "repo": "helix",
-        "rev": "1603715cc91bf6fdffb4aedfb5b76fb69fd10e28",
-        "type": "github"
-      },
-      "original": {
-        "owner": "JordanForks",
-        "repo": "helix",
-        "type": "github"
-      }
-    },
    "jank-client": {
      "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_4"
      },
      "locked": {
        "lastModified": 1749606892,
@@ -94,16 +66,16 @@
        "rev": "0e59a339c813bcf1e9969344d8b50ed380231552",
        "revCount": 1179,
        "type": "git",
-        "url": "file:///var/lib/git-server/jank-client-fork.git"
+        "url": "https://git.mtgmonkey.net/Andromeda/jank-client-fork.git"
      },
      "original": {
        "type": "git",
-        "url": "file:///var/lib/git-server/jank-client-fork.git"
+        "url": "https://git.mtgmonkey.net/Andromeda/jank-client-fork.git"
      }
    },
    "math-project": {
      "inputs": {
-        "nixpkgs": "nixpkgs_3"
+        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
        "lastModified": 1750258769,
@@ -112,41 +84,20 @@
        "rev": "fa0e8ca47dd5341d24d8aae90a0bc28a689c3d46",
        "revCount": 6,
        "type": "git",
-        "url": "file:///var/lib/git-server/math-project.git"
+        "url": "https://git.mtgmonkey.net/Andromeda/math-project.git"
      },
      "original": {
        "type": "git",
-        "url": "file:///var/lib/git-server/math-project.git"
-      }
-    },
-    "nix-github-actions": {
-      "inputs": {
-        "nixpkgs": [
-          "rgit",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737420293,
-        "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "type": "github"
+        "url": "https://git.mtgmonkey.net/Andromeda/math-project.git"
      }
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1749143949,
-        "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
+        "lastModified": 1750134718,
+        "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
+        "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
        "type": "github"
      },
      "original": {
@@ -156,36 +107,6 @@
      }
    },
    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1749285348,
-        "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1748889542,
-        "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-25.05",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_4": {
      "locked": {
        "lastModified": 1749794982,
        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
@@ -200,7 +121,67 @@
        "type": "indirect"
      }
    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1749143949,
+        "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1749285348,
+        "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1748889542,
+        "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-25.05",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1750134718,
+        "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_7": {
      "locked": {
        "lastModified": 1714253743,
        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
@@ -216,37 +197,6 @@
        "type": "github"
      }
    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1748159586,
-        "narHash": "sha256-xeCMAhKjhDjVFsfJcftv+CWcExYo+X8IBUW8L947ww4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "7382d075365a977c4a9c8aa4c5e4abed15f00ee1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_7": {
-      "locked": {
-        "lastModified": 1745377448,
-        "narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
    "nixpkgs_8": {
      "locked": {
        "lastModified": 1746141548,
@@ -265,7 +215,7 @@
    },
    "noshell": {
      "inputs": {
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_7"
      },
      "locked": {
        "lastModified": 1717396029,
@@ -281,41 +231,35 @@
        "type": "github"
      }
    },
-    "rgit": {
-      "inputs": {
-        "advisory-db": "advisory-db",
-        "crane": "crane",
-        "helix": "helix",
-        "nix-github-actions": "nix-github-actions",
-        "nixpkgs": "nixpkgs_6",
-        "treefmt-nix": "treefmt-nix",
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1748169485,
-        "narHash": "sha256-JxPNDrvpqgpz6MQp6LKT3cbK4bl7/E9+eST1cEhl/jA=",
-        "owner": "w4",
-        "repo": "rgit",
-        "rev": "9224aa1a006acb6af6da8cfbee82278612bd05d0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "w4",
-        "repo": "rgit",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
+        "best-blog": "best-blog",
        "elmskell-blog": "elmskell-blog",
        "jank-client": "jank-client",
        "math-project": "math-project",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_6",
        "noshell": "noshell",
-        "rgit": "rgit",
        "spacebar-server": "spacebar-server"
      }
    },
+    "rust-http-server": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1750341039,
+        "narHash": "sha256-iT6qEBuHJMEAFDnRNUydh6eJu7LX4OklUy0CpOtz/tg=",
+        "ref": "refs/heads/master",
+        "rev": "d214b0bf8646ee7f2f0792bbf3b96db8dacc2468",
+        "revCount": 3,
+        "type": "git",
+        "url": "https://git.mtgmonkey.net/Andromeda/rust-http-server.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.mtgmonkey.net/Andromeda/rust-http-server.git"
+      }
+    },
    "spacebar-server": {
      "inputs": {
        "flake-utils": "flake-utils",
@@ -349,57 +293,6 @@
        "repo": "default",
        "type": "github"
      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_7"
-      },
-      "locked": {
-        "lastModified": 1747912973,
-        "narHash": "sha256-XgxghfND8TDypxsMTPU2GQdtBEsHTEc3qWE6RVEk8O0=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "020cb423808365fa3f10ff4cb8c0a25df35065a3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@@ -4,22 +4,21 @@
    nixpkgs.url = "nixpkgs/nixos-unstable";
    noshell.url = "github:viperML/noshell";
    spacebar-server.url = "github:spacebarchat/server";
-    rgit.url = "github:w4/rgit";

-    elmskell-blog.url = "git+file:///var/lib/git-server/blog.git";
-    jank-client.url = "git+file:///var/lib/git-server/jank-client-fork.git";
-    math-project.url = "git+file:///var/lib/git-server/math-project.git";
+    elmskell-blog.url = "git+https://git.mtgmonkey.net/Andromeda/blog.git";
+    jank-client.url = "git+https://git.mtgmonkey.net/Andromeda/jank-client-fork.git";
+    math-project.url = "git+https://git.mtgmonkey.net/Andromeda/math-project.git";
+    best-blog.url = "git+https://git.mtgmonkey.net/Andromeda/best-blog.git";
  };

  outputs = {
    self,
    nixpkgs,
    noshell,
-    elmskell-blog,
    spacebar-server,
    jank-client,
    math-project,
-    rgit,
+    best-blog,
    ...
  }: let
    system = "x86_64-linux";
@@ -29,33 +28,30 @@
      specialArgs = {
        inherit self;
        inherit system;
-        inherit elmskell-blog;
        inherit spacebar-server;
        inherit math-project;
-        inherit rgit;
+        inherit best-blog;
        ssh-pub-keys = import ./ssh-pub-keys.nix;
      };
      modules = [
-        ./services/ferron.nix
+        ./configuration.nix

-        ./services/elmskell.nix
        ./services/blog.nix
-
-        jank-client.nixosModules.x86_64-linux.default
-        ./services/spacebar.nix
-        #        ./services/rgit.nix
+        ./services/elmskell.nix
+        ./services/ferron.nix
        ./services/gitea.nix
-
+        #./services/rgit.nix
+        ./services/math-project.nix
+        ./services/spacebar.nix
        ./services/translate.nix

-        noshell.nixosModules.default
-        {programs.noshell.enable = true;}
-
+        jank-client.nixosModules.x86_64-linux.default
        math-project.nixosModules.x86_64-linux.default
-        {services.math-project.enable = true;}
-        ./services/math-project.nix
-
-        ./configuration.nix
+        noshell.nixosModules.default
+        {
+          programs.noshell.enable = true;
+          services.math-project.enable = true;
+        }
      ];
    };
  };
--- a/services/blog.nix
+++ b/services/blog.nix
@@ -1,5 +1,5 @@
 {
-  elmskell-blog,
+  best-blog,
  lib,
  pkgs,
  ...
@@ -18,13 +18,6 @@
      }
    ];
  };
-  ferron-conf-nix = {
-    global = {
-      port = 8181;
-      secure = false;
-      wwwroot = "${elmskell-blog.packages.x86_64-linux.default}/wwwroot";
-    };
-  };
 in {
  services.anubis = {
    instances.blog = {
@@ -36,7 +29,7 @@ in {
        METRICS_BIND = "[::1]:9182";
        METRICS_BIND_NETWORK = "tcp";
        POLICY_FNAME = "/etc/anubis/blog.botPolicies.yaml";
-        TARGET = "http://localhost:8181";
+        TARGET = "http://localhost:9345";
      };
    };
  };
@@ -44,10 +37,10 @@ in {
    source = (pkgs.formats.yaml {}).generate "" botPolicies-nix;
    mode = "644";
  };
-  systemd.services.blog-ferron = {
+  systemd.services.blog = {
    serviceConfig = {
      Type = "simple";
-      ExecStart = "${lib.getExe pkgs.ferron} --config=/etc/blog.ferron.yaml";
+      ExecStart = "${lib.getExe best-blog.packages.x86_64-linux.default}";
      RemainAfterExit = true;
      Restart = "always";
      RestartMaxDelaySec = "1m";
@@ -56,8 +49,4 @@ in {
    };
    wantedBy = ["multi-user.target"];
  };
-  environment.etc."blog.ferron.yaml" = {
-    source = (pkgs.formats.yaml {}).generate "" ferron-conf-nix;
-    mode = "644";
-  };
 }
Author	SHA1	Message	Date
mtgmonkey	7cef5d8798	bump best-blog	2025-06-19 09:53:24 -04:00
mtgmonkey	3f5ad1a3df	change from Andromeda/blog to Andromeda/best-blog	2025-06-19 06:27:03 -04:00
mtgmonkey	39b987332b	fix merge conflicts?	2025-06-18 14:04:49 -04:00
mtgmonkey	3c96c9818c	update lockfile, gitiffy	2025-06-18 13:32:49 -04:00