commit 971a2b22bb91d1d2baad1303a72b312b8e1c8233
parent e90d463fbc512721cb592f4eba1471e662fc84f1
Author: Vincent Demeester <vincent@sbr.pm>
Date: Sat, 9 May 2020 14:07:04 +0200
Add private/* to replace assets
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
3 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@ tools/emacs/recentf
qemu
accounts.nix
assets/*
+private/*
networking.nix
wireguard*.key
.envrc
diff --git a/README.org b/README.org
@@ -6,18 +6,15 @@
:CUSTOM_ID: h:0272c5ac-0b7f-4ebb-91f0-defa66c2d285
:END:
-This repository is my dotfiles, using ~home-manager~, ~nix~, some shell script and maybe
-sometimes ansible — especially on non-NixOS system.
+This repository is the monorepo for my personal tools and infrastructure. It containers my
+dotfiles, some tools and scripts. It is mainly based on =nix= and =home-manager=some shell
+script and maybe sometimes ansible — especially on non-NixOS system.
The goal of is repository is to be able to have a way to setup dotfiles and packages in
/one go/, sharing those configuration between multiple computers. The documentation part
is using (or /will/) =org-mode= following principles of "literate programming": a
combination of ordinary language and inline code blocks.
-This means it could become the /monorepo/ of my configuration, slowly migrating other
-repositories into this one (like [[https://github.com/vdemeester/emacs-config][~emacs-config~]]). This repository should be the source of
-truth of all my configuration.
-
On idea is also to try to do something like "[[https://willschenk.com/articles/2020/leveraging_disposability_for_exploration/][Leveraging disposability for exploration]]",
aka "how to play around without leaving a mess". I'll try my best to make everything
reproducible and easily testable without making /a mess/. Nix/NixOS should help with that…
@@ -25,11 +22,13 @@
This will be a all-time work-in-progress, so please beware that things might change
dramatically or even not working anymore 😛.
-* Installation
+* TODO Installation
:PROPERTIES:
:CUSTOM_ID: h:e289aa81-d0ec-49a0-ba94-933e85d4ee8c
:END:
+/todo: rework that part/
+
You should be able to run the =bootstrap.sh= script as is. And if you feel adventurous,
you can use ~curl~ for this.
@@ -40,7 +39,9 @@
Otherwise, clone this repository somewhere, read the =bootstrap.sh= file and execute it if
you feel safe
-** ~home-manager~ only
+** TODO ~home-manager~ only
+
+/todo: rework that part/
If you don't have ~nix~ installed, run ~curl https://nixos.org/nix/install | sh~ to install it.
@@ -63,7 +64,7 @@
** TODO ~nixos~ only
-TBD: migrate ~nixos-configuration~ here.
+/todo: rework that part/
* Organization of the repository
:PROPERTIES:
@@ -84,6 +85,7 @@
- ~modules~: holds nix modules (services, programs, hardware, profiles, …)
- ~overlays~: holds [[https://nixos.wiki/wiki/Overlays][nix overlays]]
- ~pkgs~: holds nix packages (those should migrate under ~overlays~ or on ~nur-packages~)
+- ~private~: holds non-shareable code, like /secrets/.
- ~tmp~: things to… organize (e.g. where I import my other /legacy/ configuration)
<<literate configuration>>As I'm slowly, but _surely_, going to have =org-mode= files for
diff --git a/tasks.org b/tasks.org
@@ -220,13 +220,13 @@
* TODO Handle machines.nix better (somehow?)
-* TODO Update auto-update service
+* TODO [#A] Update auto-update service
Make it simpler
- auto-update simple
- a nightly git pull --rebase … as *user*
-* TODO =qemu=/=kvm= setup to tests things
+* TODO [#B] =qemu=/=kvm= setup to tests things
- start a system with nixos iso (cache and download)
- start a system with nixos pre-installed (cached)
@@ -247,7 +247,7 @@
- [ ] completion
- [ ] take some stuff from ~home~ configuration
-* TODO [#B] Have a ~emacs.nix~ aware config :nixos:emacs:
+* TODO Have a ~emacs.nix~ aware config :nixos:emacs:
:PROPERTIES:
:CREATED:[2019-03-16 Sat 11:57]
:END:
@@ -262,13 +262,15 @@
- [ ] =default.nix= to import others
- [ ] =pkgs= and overlay smooth integration (aka no prefix =my=)
-* TODO bootstrap.nix (and install.nix)
+* TODO [#B] bootstrap.nix (and install.nix)
Reduce the sh script to the minimum and use =nix-shell= with a =.nix= file as much as
possible.
To run the install script from a NixOS livecd, =nix-shell= can be used, same in bootstrap
as soon as we have installed nix.
+* TODO [#A] Add =.githooks= support
+
* TODO virtualization.buildkit options
- [ ] with containerd, default is to use runc only
@@ -283,17 +285,17 @@
- State "DONE" from "TODO" [2020-05-06 Wed 10:13]
:END:
-* TODO cron-job to schedule a build at build.sr.ht 👼
+* TODO [#B] cron-job to schedule a build at build.sr.ht 👼
Daily or weekly build
-* TODO self-contained configuration
+* TODO [#A] self-contained configuration
- Pin different channels in the configuration (?)
- Run the configuration against multiple channels (?)
* TODO =private= folder for nix (instead of =assets=)
-* TODO Setup nur-package and cachix push
+* TODO [#A] =ci.nix= build on multiple channels
:PROPERTIES:
:CREATED:[2020-05-05 Tue 12:45]
:END:
