Compare commits

...

2 Commits

Author SHA1 Message Date
Ryan Rix 62209c33b0 use arcology-django to generate configurations 2023-12-18 23:02:32 -08:00
Ryan Rix 2fcd97f2fe update version pins 2023-12-18 22:55:27 -08:00
4 changed files with 24 additions and 21 deletions

View File

@ -3,7 +3,7 @@
:ROAM_ALIASES: home-manager "Nix Home Manager" :ROAM_ALIASES: home-manager "Nix Home Manager"
:END: :END:
#+TITLE: Generate a Dynamic Home Manager Configuration #+TITLE: Generate a Dynamic Home Manager Configuration
#+filetags: :CCE: #+filetags: :Project:CCE:
#+ARROYO_MODULE_WANTS: arroyo/arroyo.org #+ARROYO_MODULE_WANTS: arroyo/arroyo.org
#+PROPERTY: header-args :mkdirp yes #+PROPERTY: header-args :mkdirp yes
@ -179,8 +179,8 @@ hm/direnv.nix
hm/dovecot-shell-access.nix hm/dovecot-shell-access.nix
hm/drawingbot.nix hm/drawingbot.nix
hm/emacs-helpers.nix hm/emacs-helpers.nix
hm/emacs-pager.nix
hm/emacs.nix hm/emacs.nix
hm/emacs-pager.nix
hm/fehbg.nix hm/fehbg.nix
hm/firefox.nix hm/firefox.nix
hm/git.nix hm/git.nix
@ -210,8 +210,8 @@ hm/smac.nix
hm/spell-check.nix hm/spell-check.nix
hm/ssh_client.nix hm/ssh_client.nix
hm/supercollider.nix hm/supercollider.nix
hm/syncthing-tray.nix
hm/syncthing.nix hm/syncthing.nix
hm/syncthing-tray.nix
hm/tabfs.nix hm/tabfs.nix
hm/vsketch.nix hm/vsketch.nix
hm/xmonad.nix hm/xmonad.nix

View File

@ -3,7 +3,7 @@
:ROAM_ALIASES: "Endpoint Configuration" configuration.nix :ROAM_ALIASES: "Endpoint Configuration" configuration.nix
:END: :END:
#+TITLE: My NixOS configuration #+TITLE: My NixOS configuration
#+filetags: :CCE: #+filetags: :Project:CCE:
#+ARCOLOGY_KEY: cce/nix-configuration #+ARCOLOGY_KEY: cce/nix-configuration
#+ARCOLOGY_ALLOW_CRAWL: t #+ARCOLOGY_ALLOW_CRAWL: t
@ -33,10 +33,9 @@ Here the strings are basically just taken out of [[id:arroyo/nixos][Arroyo NixOS
#+NAME: arroyo_nixos_imports #+NAME: arroyo_nixos_imports
#+begin_src emacs-lisp #+begin_src emacs-lisp
(->> (arroyo-nixos-imports "endpoint") (setenv "ARCOLOGY_DB_PATH" "/home/rrix/org/arcology-django/db.sqlite3")
(-map (lambda (r) (format "../../%s" r))) (shell-command-to-string "nix run path:/home/rrix/org/arcology-django#arcology -- ingest_files ~/org &>/dev/null")
(-sort #'s-less-p) (shell-command-to-string "nix run path:/home/rrix/org/arcology-django#arcology -- generate -m nixos -r endpoint 2>/dev/null | sort"))
(s-join "\n"))
#+end_src #+end_src
#+results: arroyo_nixos_imports #+results: arroyo_nixos_imports
@ -49,6 +48,7 @@ Here the strings are basically just taken out of [[id:arroyo/nixos][Arroyo NixOS
../../nixos/cups.nix ../../nixos/cups.nix
../../nixos/direnv.nix ../../nixos/direnv.nix
../../nixos/emacs.nix ../../nixos/emacs.nix
../../nixos/flipper-zero.nix
../../nixos/fonts.nix ../../nixos/fonts.nix
../../nixos/gnupg-pam.nix ../../nixos/gnupg-pam.nix
../../nixos/home-manager.nix ../../nixos/home-manager.nix
@ -59,8 +59,8 @@ Here the strings are basically just taken out of [[id:arroyo/nixos][Arroyo NixOS
../../nixos/location.nix ../../nixos/location.nix
../../nixos/mopidy.nix ../../nixos/mopidy.nix
../../nixos/morph-wrapper.nix ../../nixos/morph-wrapper.nix
../../nixos/nix-path.nix
../../nixos/nixos-builder.nix ../../nixos/nixos-builder.nix
../../nixos/nix-path.nix
../../nixos/nixpkgs.nix ../../nixos/nixpkgs.nix
../../nixos/nm-online.nix ../../nixos/nm-online.nix
../../nixos/poetry2nix.nix ../../nixos/poetry2nix.nix

View File

@ -3,7 +3,7 @@
:ROAM_ALIASES: Wobserver :ROAM_ALIASES: Wobserver
:END: :END:
#+title: The Wobserver #+title: The Wobserver
#+filetags: :Wobserver:Development: #+filetags: :Project:Wobserver:Development:
#+ARCOLOGY_KEY: cce/wobserver #+ARCOLOGY_KEY: cce/wobserver
#+ARCOLOGY_ALLOW_CRAWL: t #+ARCOLOGY_ALLOW_CRAWL: t
@ -70,10 +70,9 @@ rec {
#+NAME: arroyo_nixos_imports #+NAME: arroyo_nixos_imports
#+begin_src emacs-lisp :exports both #+begin_src emacs-lisp :exports both
(->> (arroyo-nixos-imports "server") (setenv "ARCOLOGY_DB_PATH" "/home/rrix/org/arcology-django/db.sqlite3")
(-sort #'s-less?) (shell-command-to-string "nix run path:/home/rrix/org/arcology-django#arcology -- ingest_files ~/org &>/dev/null")
(-map (lambda (r) (format "../../%s" r))) (shell-command-to-string "nix run path:/home/rrix/org/arcology-django#arcology -- generate -m nixos -r server 2>/dev/null | sort")
(s-join "\n"))
#+end_src #+end_src
#+results: arroyo_nixos_imports #+results: arroyo_nixos_imports
@ -94,8 +93,8 @@ rec {
../../nixos/morph-wrapper.nix ../../nixos/morph-wrapper.nix
../../nixos/nextcloud.nix ../../nixos/nextcloud.nix
../../nixos/nginx.nix ../../nixos/nginx.nix
../../nixos/nix-path.nix
../../nixos/nixos-builder.nix ../../nixos/nixos-builder.nix
../../nixos/nix-path.nix
../../nixos/nixpkgs.nix ../../nixos/nixpkgs.nix
../../nixos/paperless.nix ../../nixos/paperless.nix
../../nixos/poetry2nix.nix ../../nixos/poetry2nix.nix
@ -116,10 +115,14 @@ rec {
#+NAME: arroyo_home-manager_imports #+NAME: arroyo_home-manager_imports
#+begin_src emacs-lisp :exports both #+begin_src emacs-lisp :exports both
(setenv "ARCOLOGY_DB_PATH" "/home/rrix/org/arcology-django/db.sqlite3")
(shell-command-to-string "nix run path:/home/rrix/org/arcology-django#arcology -- ingest_files ~/org &>/dev/null")
(->> (arroyo-home-manager-imports "server") (->> (arroyo-home-manager-imports "server")
(-sort #'s-less?) (s-split "\n")
(-map (lambda (r) (format "../../%s" r))) (-map (lambda (r) (format "../../%s" r)))
(butlast)
(s-join "\n")) (s-join "\n"))
;; (shell-command-to-string "nix run path:/home/rrix/org/arcology-django#arcology -- generate -m home-manager -r server 2>/dev/null | sort")
#+end_src #+end_src
#+results: arroyo_home-manager_imports #+results: arroyo_home-manager_imports
@ -130,8 +133,8 @@ rec {
../../hm/deadgrep.nix ../../hm/deadgrep.nix
../../hm/defexpr.nix ../../hm/defexpr.nix
../../hm/emacs-helpers.nix ../../hm/emacs-helpers.nix
../../hm/emacs-pager.nix
../../hm/emacs.nix ../../hm/emacs.nix
../../hm/emacs-pager.nix
../../hm/git.nix ../../hm/git.nix
../../hm/gnupg.nix ../../hm/gnupg.nix
../../hm/morph.nix ../../hm/morph.nix

View File

@ -135,7 +135,7 @@ Right now I am running off a branch of [[id:c75d20e6-8888-4c5a-ac97-5997e2f1c711
#+NAME: prefetch-hm #+NAME: prefetch-hm
#+results: #+results:
: "aeb2232d7a32530d3448318790534d196bf9427a" : "1488651d02c1a7a15e284210f0d380a62d8d8cef"
#+begin_src nix :noweb-ref homeManager :noweb yes #+begin_src nix :noweb-ref homeManager :noweb yes
homeManager = _: builtins.fetchGit { homeManager = _: builtins.fetchGit {
@ -153,7 +153,7 @@ homeManager = _: builtins.fetchGit {
#+NAME: prefetch-em #+NAME: prefetch-em
#+results: #+results:
: "ffe08c51b289d92ee8d82f13dd069a54b8bdf3f1" : "47798c4ab07d5f055bb2625010cf6d8e3f384923"
#+NAME: emacsOverlay #+NAME: emacsOverlay
#+begin_src nix :noweb yes #+begin_src nix :noweb yes
@ -177,7 +177,7 @@ emacsOverlay = _: /home/rrix/Code/emacs-overlay;
#+NAME: prefetch-p2n #+NAME: prefetch-p2n
#+results: #+results:
: "0b2bff39e9bd4e6db3208e09c276ca83a063b370" : "9d9d434528404a22fb0c8283fea1ea3a7410ff80"
#+NAME: poetry2nix #+NAME: poetry2nix
#+begin_src nix :noweb yes #+begin_src nix :noweb yes
@ -279,7 +279,7 @@ ement = rec {
src = { pkgs, ... }: pkgs.fetchurl { src = { pkgs, ... }: pkgs.fetchurl {
url = "https://github.com/alphapapa/ement.el/archive/8aea26acefd9e3eafa24db240e41aa9d41603586.tar.gz"; url = "https://github.com/alphapapa/ement.el/archive/8aea26acefd9e3eafa24db240e41aa9d41603586.tar.gz";
sha256 = "1zs8j9zvwda029ld2lnqkw03i7zsibrdy68fpsz5ylw7czd6qfzi"; sha256 = "1zs8j9zvwda029ld2lnqkw03i7zsibrdy68fpsz5ylw7czd6qfzi";
# date = "2023-11-29T17:07:01-0800"; # date = "2023-12-17T17:45:23-0800";
}; };
}; };
#+end_src #+end_src