Commit Diff


commit - cf2617b6d64964d515617552c1eaeff008c12807
commit + d6fe5befacd205fa6752479de86c35cd8700c309
blob - 3b773025602e2a72e435c4601252acb185a5f7b5
blob + b9757b9deecd2ccf5612ac3d6e4b2b0798cb6d5a
--- flake.lock
+++ flake.lock
@@ -164,11 +164,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1784789275,
-        "narHash": "sha256-cgRTWuG+u1tBPhm01JrId2k0Bni09phVJ1Q0BZlRd7M=",
+        "lastModified": 1784877405,
+        "narHash": "sha256-W649GocILahx7Vb/JMx834217+OLKBrq014VmC/8+NM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3b0e6bbd65869af1beadf5963a99befc179d209f",
+        "rev": "32de400b6ac9f43042bca706f4a64f6ad08117e8",
         "type": "github"
       },
       "original": {
@@ -234,11 +234,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1784555310,
-        "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=",
+        "lastModified": 1784783405,
+        "narHash": "sha256-4IHyyLgLBdKefkljdKod4IMn023pQiDXAWJA187cmdY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493",
+        "rev": "7525d999cd850b9a488817abc89c75dc733acf17",
         "type": "github"
       },
       "original": {
blob - 37648c047003ee448ab5d722c92de69da3ab4808
blob + afe219ca215ca16f04e83ba6dbd77e43e395c123
--- hosts/void/default.nix
+++ hosts/void/default.nix
@@ -46,7 +46,6 @@
       geesefs
       ouch
       xan
-      nb
       yq
       jdupes
       plakar
blob - cc7891f9f7b0f580bb811bad4ab8026c45db8b5b
blob + fbda15b7d16d73daedfa6f8723ceb565ad61cffb
Binary files hosts/void/overlays/config/magdalena/config.json.nix and hosts/void/overlays/config/magdalena/config.json.nix differ
blob - 6e404ec5a65ef5db88cecfd1d2bdfb49e872b3ac (mode 644)
blob + /dev/null
--- hosts/void/overlays/home/nbrc
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-export EDITOR="emacs -nw"
-export NB_DEFAULT_EXTENSION="${NB_DEFAULT_EXTENSION:-org}"
-export NB_SYNTAX_THEME="${NB_SYNTAX_THEME:-base16}"
-export NB_COLOR_THEME="${NB_COLOR_THEME:-smoke}"
-export NB_AUTO_SYNC="${NB_AUTO_SYNC:-0}"
blob - 121c8ac88ee94668b53668910460e7474d5b9cad
blob + 809df8ddb783c0fc1576a3ce2b3be3e03d5b0b8f
--- modules/mixins/dotfiles/bin/backup
+++ modules/mixins/dotfiles/bin/backup
@@ -48,14 +48,14 @@ module Backup
     "bandcamp" => "#{HOME}/misc/music/backlog/_todo",
     "mpd" => "#{HOME}/.config/mpd",
     "nix" => "#{HOME}/src/sr.ht/nix",
-    "nota" => "#{HOME}/.nb/notes",
+    "notes" => "#{HOME}/notes",
     "pass" => "#{HOME}/.password-store",
     "releases" => "#{HOME}/src/mtmn.name/releases"
   }.freeze
 
   TARSNAP_DIRS = {
     "mpd" => "#{HOME}/.config/mpd",
-    "nota" => "#{HOME}/.nb/notes",
+    "notes" => "#{HOME}/notes",
     "password-store" => "#{HOME}/.password-store",
     "releases" => "#{HOME}/src/mtmn.name/releases"
   }.freeze
blob - 5a30f77c84d6db5bebb9c15a26f85d82a23e43b5
blob + 71c85fa55a1dba76ab9ce11a5b1f1bb6d6bf4461
--- modules/mixins/dotfiles/bin/nota
+++ modules/mixins/dotfiles/bin/nota
@@ -2,18 +2,16 @@
 
 set -euo pipefail
 
-notebook=${NOTA_NOTEBOOK:-notes}
-nb_dir=${NB_DIR:-"$HOME/notes"}
-dir=$nb_dir/$notebook
+dir=${NOTA_DIR:-"$HOME/notes/nota"}
 : "${NOTA_READ_ONLY=0}"
 
 case ${1:-} in
 git)
 	shift
-	exec nb "$notebook:git" "$@"
+	exec git -C "$dir" "$@"
 	;;
 ls)
-	exec nb "$notebook:list"
+	exec ls "$dir"
 	;;
 esac
 
@@ -31,8 +29,5 @@ if ((NOTA_READ_ONLY)); then
 	exec cat -- "$dir/$file"
 fi
 
-if [[ -e "$dir/$file" ]]; then
-	exec nb "$notebook:edit" "$file"
-else
-	exec nb "$notebook:add" --filename "$file"
-fi
+mkdir -p "$dir"
+exec emacs -nw "$dir/$file"
blob - d4cecbae8cca66f9dd3f004f6f7aa6b6cf0ebc8c
blob + becf9654abe51bdf504df35118bcb9542922fd7d
--- modules/mixins/dotfiles/bin/todo-notify
+++ modules/mixins/dotfiles/bin/todo-notify
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TODO_FILE="$HOME/.nb/notes/todo.txt"
+TODO_FILE="$HOME/notes/todo.txt"
 current_date=""
 
 while IFS= read -r line || [[ -n "$line" ]]; do
blob - ad1e193cb1bf100bdbbfd0b3e2b86987632b3f82
blob + c1a40b791aae5a46775184fe7997bfc28ac2c2a2
--- modules/mixins/dotfiles/bin/todomenu
+++ modules/mixins/dotfiles/bin/todomenu
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TODO_FILE="$HOME/.nb/notes/todo.txt"
+TODO_FILE="$HOME/notes/todo.txt"
 
 [ ! -f "$TODO_FILE" ] && exit 1
 
blob - ad3005f8315de57e82d53e9b83d28dd9137173f4
blob + 207e362df6c6ca8a0c63d8232184d6e6dedc5c88
--- modules/mixins/dotfiles/bin/yank-to-todo
+++ modules/mixins/dotfiles/bin/yank-to-todo
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-todo_file=~/.nb/notes/todo.txt
+todo_file=~/notes/todo.txt
 
 if [[ -n "$1" ]]; then
 	url="$1"
blob - 94cb9db25b3d90fcfee7da17e0c847e75868847d
blob + a89889a3ec63564ea0f8e61e4d41d8137d997470
--- modules/mixins/dotfiles/config/magdalena/config.json.nix
+++ modules/mixins/dotfiles/config/magdalena/config.json.nix
@@ -31,12 +31,11 @@
   		"${homeDir}/src/misc",
   		"${homeDir}/src/sr.ht",
   		"${homeDir}/misc",
+  		"${homeDir}/notes",
   		"${homeDir}/misc/www",
   		"${homeDir}/misc/llm",
   		"${homeDir}/misc/books",
   		"${homeDir}/misc/notes",
-  		"${homeDir}/.nb/notes",
-  		"${homeDir}/.nb/work",
   		"${homeDir}/misc/screenshots",
   		"${homeDir}/misc/recordings",
   		"${homeDir}/misc/random",
blob - cab7ac1a3ece6b5d05b10112e5057c195d5b4d28
blob + 4d3c6be1ec709889b38f43df5eda0bffc70d47c7
--- modules/mixins/dotfiles/config/shell/rc/todo
+++ modules/mixins/dotfiles/config/shell/rc/todo
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-f=~/.nb/notes/todo.txt
+f=~/notes/todo.txt
 t=${TMPDIR:-/tmp}/ta.$$
 
 alias tt='rg -N -B 1 "^todo:" "$f"'