Compare commits

...

4 Commits

10 changed files with 30 additions and 12 deletions

View File

@ -1,9 +1,9 @@
:PROPERTIES: :PROPERTIES:
:ID: arcology/django/readme :ID: arcology/django/readme
:END: :END:
#+TITLE: The Arcology Project: Django Edition #+TITLE: The Arcology Project: Django Edition Landing Page
#+FILETAGS: :Project:README: #+FILETAGS: :Project:README:
#+ARCOLOGY_KEY: arcology/django #+ARCOLOGY_KEY: arcology/index
* The Arcology Project * The Arcology Project

View File

@ -4,7 +4,7 @@
#+TITLE: The Arcology's Data Models and Web Server #+TITLE: The Arcology's Data Models and Web Server
#+filetags: :Project:Arcology: #+filetags: :Project:Arcology:
#+ARCOLOGY_KEY: arcology/django/arcology #+ARCOLOGY_KEY: arcology/webserver
#+ARCOLOGY_ALLOW_CRAWL: t #+ARCOLOGY_ALLOW_CRAWL: t
* Data Models for Sites, Web Features, and Feeds * Data Models for Sites, Web Features, and Feeds

View File

@ -152,6 +152,12 @@ let
arcology = pkgs.callPackage /home/rrix/org/arcology-django/default.nix { inherit arroyo_rs; }; arcology = pkgs.callPackage /home/rrix/org/arcology-django/default.nix { inherit arroyo_rs; };
in { in {
imports = [ ./arcology2-module.nix ]; imports = [ ./arcology2-module.nix ];
fileSystems."/media/org" = {
device = "/home/rrix/org";
options = ["bind"];
};
services.arcology-ng = { services.arcology-ng = {
enable = true; enable = true;
packages.arcology = arcology; packages.arcology = arcology;

View File

@ -4,7 +4,7 @@
#+TITLE: Deploying the Arcology #+TITLE: Deploying the Arcology
#+filetags: :Project: #+filetags: :Project:
#+ARCOLOGY_KEY: arcology/django/deploy #+ARCOLOGY_KEY: arcology/deploy
#+ARCOLOGY_ALLOW_CRAWL: t #+ARCOLOGY_ALLOW_CRAWL: t
* NEXT Bootstrapping on non-NixOS * NEXT Bootstrapping on non-NixOS

View File

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1708216868, "lastModified": 1708237433,
"narHash": "sha256-EIG+BQBIU2pEylgZAjd7KRfmZkFMQbqNvx8hIp8M7Po=", "narHash": "sha256-YDvf7g7JUwpFr+SVyKONoiqnSrcfooQy38xAye19U9I=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e3864b81277ff8fdff73487a2bb240300aa68b52", "rev": "9700b20d0e3afb15f5605332197988805eec0cf7",
"revCount": 157, "revCount": 159,
"type": "git", "type": "git",
"url": "https://code.rix.si/rrix/arroyo" "url": "https://code.rix.si/rrix/arroyo"
}, },

View File

@ -28,6 +28,7 @@
inherit python3; inherit python3;
arroyo_rs = arroyo; arroyo_rs = arroyo;
}; };
inherit arroyo;
default = arcology; default = arcology;
}; };
@ -36,6 +37,11 @@
drv = self.packages.${system}.arcology; drv = self.packages.${system}.arcology;
exePath = "/bin/arcology"; exePath = "/bin/arcology";
}; };
# he he he
arroyo = flake-utils.lib.mkApp {
drv = self.packages.${system}.arroyo;
exePath = "/bin/arroyo";
};
default = arcology; default = arcology;
}; };
} }

View File

@ -3,7 +3,7 @@
:END: :END:
#+TITLE: The Arroyo Generators #+TITLE: The Arroyo Generators
#+filetags: :Project: #+filetags: :Project:
#+ARCOLOGY_KEY: arcology/django/code-generators #+ARCOLOGY_KEY: arcology/code-generators
#+begin_src python :tangle generators/__init__.py #+begin_src python :tangle generators/__init__.py
#+end_src #+end_src

View File

@ -5,7 +5,7 @@
:END: :END:
#+TITLE: Interfacing with the Arcology #+TITLE: Interfacing with the Arcology
#+ARCOLOGY_KEY: arcology/django/commands #+ARCOLOGY_KEY: arcology/commands
#+ARROYO_EMACS_MODULE: arcology-django-helpers #+ARROYO_EMACS_MODULE: arcology-django-helpers

View File

@ -5,7 +5,7 @@
#+TITLE: Arcology Roam Models #+TITLE: Arcology Roam Models
#+filetags: :Project: #+filetags: :Project:
#+ARCOLOGY_KEY: arcology/django/roam #+ARCOLOGY_KEY: arcology/roam
#+BEGIN_SRC python :tangle roam/__init__.py #+BEGIN_SRC python :tangle roam/__init__.py
#+END_SRC #+END_SRC

View File

@ -2,7 +2,7 @@
:ID: arcology/django/scaffolding :ID: arcology/django/scaffolding
:END: :END:
#+TITLE: Arcology Project Scaffolding #+TITLE: Arcology Project Scaffolding
#+ARCOLOGY_KEY: arcology/django/scaffolding #+ARCOLOGY_KEY: arcology/scaffolding
* Dev Environment * Dev Environment
@ -167,6 +167,7 @@ Nix is really going this direction, I'm not sure it's worthwhile but I'm going t
inherit python3; inherit python3;
arroyo_rs = arroyo; arroyo_rs = arroyo;
}; };
inherit arroyo;
default = arcology; default = arcology;
}; };
@ -175,6 +176,11 @@ Nix is really going this direction, I'm not sure it's worthwhile but I'm going t
drv = self.packages.${system}.arcology; drv = self.packages.${system}.arcology;
exePath = "/bin/arcology"; exePath = "/bin/arcology";
}; };
# he he he
arroyo = flake-utils.lib.mkApp {
drv = self.packages.${system}.arroyo;
exePath = "/bin/arroyo";
};
default = arcology; default = arcology;
}; };
} }