From 6028aad2f2905eb4264a724db131ef9f2d47acd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Madeleine=20Sydney=20=C5=9Alaga?= Date: Sat, 31 Jan 2026 22:51:54 -0700 Subject: [PATCH] rename server -> publisher --- flake.nix | 6 +++--- {server => publisher}/.dir-locals.el | 6 +++--- {server => publisher}/deps.edn | 4 +--- {server => publisher}/override_deps.bb | 0 {server => publisher}/package.nix | 4 ++-- .../src/net/deertopia/publisher}/main.clj | 4 ++-- {server => publisher}/vendor.nix | 0 7 files changed, 11 insertions(+), 13 deletions(-) rename {server => publisher}/.dir-locals.el (66%) rename {server => publisher}/deps.edn (94%) rename {server => publisher}/override_deps.bb (100%) rename {server => publisher}/package.nix (82%) rename {server/src/net/deertopia/server => publisher/src/net/deertopia/publisher}/main.clj (59%) rename {server => publisher}/vendor.nix (100%) diff --git a/flake.nix b/flake.nix index 1d6ff08..30b0139 100644 --- a/flake.nix +++ b/flake.nix @@ -30,14 +30,14 @@ _pkgs = each-system ({ pkgs, ... }: pkgs); packages = each-system ({ pkgs, ... }: { - inherit (pkgs) server doerg doerg-parser; - default = pkgs.server; + inherit (pkgs) publisher doerg doerg-parser; + default = pkgs.publisher; }); overlays.default = final: prev: let graal = x: final.mkGraalBin { cljDrv = x; }; in rec { - server = final.callPackage ./server/package.nix {}; + publisher = final.callPackage ./publisher/package.nix {}; doerg = final.callPackage ./doerg/package.nix {}; doerg-parser = final.callPackage ./doerg/doerg-parser/package.nix {}; }; diff --git a/server/.dir-locals.el b/publisher/.dir-locals.el similarity index 66% rename from server/.dir-locals.el rename to publisher/.dir-locals.el index ae9a945..5191489 100644 --- a/server/.dir-locals.el +++ b/publisher/.dir-locals.el @@ -4,8 +4,8 @@ . (progn (defun start-deertopia-server () (let ((n (cider-format-connection-params "%j" cider-launch-params))) - (when (equal n "deertopia.net") + (when (equal n "net-deertopia") (cider-interactive-eval - "(do (require '[net.deertopia.publish.server :as server]) - (server/start!))")))) + "(do (require '[net.deertopia.publisher.server :as server]) + (server/start!))")))) (add-hook 'cider-connected-hook #'start-deertopia-server)))))) diff --git a/server/deps.edn b/publisher/deps.edn similarity index 94% rename from server/deps.edn rename to publisher/deps.edn index 1ee3664..2958bdb 100644 --- a/server/deps.edn +++ b/publisher/deps.edn @@ -20,6 +20,4 @@ :paths ["src" "resources" "test"] :aliases {:dev - {:extra-deps {vvvvalvalval/scope-capture-nrepl {:mvn/version "0.3.1"}}} - :run - {:main-opts ["-m" "net.deertopia.main"]}}} + {:extra-deps {vvvvalvalval/scope-capture-nrepl {:mvn/version "0.3.1"}}}}} diff --git a/server/override_deps.bb b/publisher/override_deps.bb similarity index 100% rename from server/override_deps.bb rename to publisher/override_deps.bb diff --git a/server/package.nix b/publisher/package.nix similarity index 82% rename from server/package.nix rename to publisher/package.nix index c2003c3..9f757d9 100644 --- a/server/package.nix +++ b/publisher/package.nix @@ -4,11 +4,11 @@ }: mkCljBin { - name = "net.deertopia/server"; + name = "net.deertopia/publisher"; version = "0.1.0"; projectSrc = ./.; lockfile = ../deps-lock.json; - main-ns = "net.deertopia.server.main"; + main-ns = "net.deertopia.publisher.main"; buildInputs = []; nativeBuildInputs = [ babashka diff --git a/server/src/net/deertopia/server/main.clj b/publisher/src/net/deertopia/publisher/main.clj similarity index 59% rename from server/src/net/deertopia/server/main.clj rename to publisher/src/net/deertopia/publisher/main.clj index 18b8eb4..d5bbd93 100644 --- a/server/src/net/deertopia/server/main.clj +++ b/publisher/src/net/deertopia/publisher/main.clj @@ -1,7 +1,7 @@ -(ns net.deertopia.server.main +(ns net.deertopia.publisher.main (:require [net.deertopia.doerg.main :as doerg]) (:gen-class)) (defn -main [] (doerg/-main) - (println "hi from server")) + (println "hi from publisher")) diff --git a/server/vendor.nix b/publisher/vendor.nix similarity index 100% rename from server/vendor.nix rename to publisher/vendor.nix