From 29b563f3035037e7e2202e84fcf5d85638d80b27 Mon Sep 17 00:00:00 2001 From: Juliana Rat Date: Sun, 5 Nov 2023 18:56:53 -0500 Subject: [PATCH] Cleanup * sloth/editor.scm: Fix indentation to match new .dir-locals.el * zhu-li: Delete. She did the thing and now she is no longer needed :'( * hall.scm: Fix indentation to match new .dir-locals.el --- hall.scm | 81 ++++++++++++++++++++++++------------------------ sloth/editor.scm | 12 +++---- zhu-li | 7 ----- 3 files changed, 46 insertions(+), 54 deletions(-) delete mode 100755 zhu-li diff --git a/hall.scm b/hall.scm index 1cd0877..bd0eedb 100644 --- a/hall.scm +++ b/hall.scm @@ -12,57 +12,56 @@ (dependencies `(("guile-config" ,guile-config) ("guile-ncurses" ,guile-ncurses) ("guile-ts" ,guile-ts) - ("tree-sitter-bash" ,tree-sitter-bash) - ("tree-sitter-bibtex" ,tree-sitter-bibtex) - ("tree-sitter-c" ,tree-sitter-c) - ("tree-sitter-c-sharp" ,tree-sitter-c-sharp) - ("tree-sitter-clojure" ,tree-sitter-clojure) - ("tree-sitter-cmake" ,tree-sitter-cmake) - ("tree-sitter-cpp" ,tree-sitter-cpp) - ("tree-sitter-css" ,tree-sitter-css) - ("tree-sitter-dockerfile" ,tree-sitter-dockerfile) - ("tree-sitter-elixir" ,tree-sitter-elixir) - ("tree-sitter-elm" ,tree-sitter-elm) - ("tree-sitter-go" ,tree-sitter-go) - ("tree-sitter-gomod" ,tree-sitter-gomod) - ("tree-sitter-haskell" ,tree-sitter-haskell) - ("tree-sitter-heex" ,tree-sitter-heex) - ("tree-sitter-html" ,tree-sitter-html) - ("tree-sitter-java" ,tree-sitter-java) - ("tree-sitter-javascript" ,tree-sitter-javascript) - ("tree-sitter-json" ,tree-sitter-json) - ("tree-sitter-julia" ,tree-sitter-julia) - ("tree-sitter-lua" ,tree-sitter-lua) - ("tree-sitter-markdown" ,tree-sitter-markdown) - ("tree-sitter-markdown-gfm" ,tree-sitter-markdown-gfm) - ("tree-sitter-meson" ,tree-sitter-meson) - ("tree-sitter-ocaml" ,tree-sitter-ocaml) - ("tree-sitter-org" ,tree-sitter-org) - ("tree-sitter-php" ,tree-sitter-php) - ("tree-sitter-plantuml" ,tree-sitter-plantuml) - ("tree-sitter-python" ,tree-sitter-python) - ("tree-sitter-r" ,tree-sitter-r) - ("tree-sitter-racket" ,tree-sitter-racket) - ("tree-sitter-ruby" ,tree-sitter-ruby) - ("tree-sitter-rust" ,tree-sitter-rust) - ("tree-sitter-scala" ,tree-sitter-scala) + ("tree-sitter-bash" ,tree-sitter-bash) + ("tree-sitter-bibtex" ,tree-sitter-bibtex) + ("tree-sitter-c" ,tree-sitter-c) + ("tree-sitter-c-sharp" ,tree-sitter-c-sharp) + ("tree-sitter-clojure" ,tree-sitter-clojure) + ("tree-sitter-cmake" ,tree-sitter-cmake) + ("tree-sitter-cpp" ,tree-sitter-cpp) + ("tree-sitter-css" ,tree-sitter-css) + ("tree-sitter-dockerfile" ,tree-sitter-dockerfile) + ("tree-sitter-elixir" ,tree-sitter-elixir) + ("tree-sitter-elm" ,tree-sitter-elm) + ("tree-sitter-go" ,tree-sitter-go) + ("tree-sitter-gomod" ,tree-sitter-gomod) + ("tree-sitter-haskell" ,tree-sitter-haskell) + ("tree-sitter-heex" ,tree-sitter-heex) + ("tree-sitter-html" ,tree-sitter-html) + ("tree-sitter-java" ,tree-sitter-java) + ("tree-sitter-javascript" ,tree-sitter-javascript) + ("tree-sitter-json" ,tree-sitter-json) + ("tree-sitter-julia" ,tree-sitter-julia) + ("tree-sitter-lua" ,tree-sitter-lua) + ("tree-sitter-markdown" ,tree-sitter-markdown) + ("tree-sitter-markdown-gfm" ,tree-sitter-markdown-gfm) + ("tree-sitter-meson" ,tree-sitter-meson) + ("tree-sitter-ocaml" ,tree-sitter-ocaml) + ("tree-sitter-org" ,tree-sitter-org) + ("tree-sitter-php" ,tree-sitter-php) + ("tree-sitter-plantuml" ,tree-sitter-plantuml) + ("tree-sitter-python" ,tree-sitter-python) + ("tree-sitter-r" ,tree-sitter-r) + ("tree-sitter-racket" ,tree-sitter-racket) + ("tree-sitter-ruby" ,tree-sitter-ruby) + ("tree-sitter-rust" ,tree-sitter-rust) + ("tree-sitter-scala" ,tree-sitter-scala) ("tree-sitter-scheme" ,tree-sitter-scheme) - ("tree-sitter-typescript" ,tree-sitter-typescript))) + ("tree-sitter-typescript" ,tree-sitter-typescript))) (skip ()) (files (libraries ((directory "sloth" ((scheme-file "editor") (scheme-file "interface"))))) (tests ((directory "tests" ()))) (programs - ((directory "scripts" ((in-file "sloth"))))) + ((directory "scripts" ((in-file "sloth"))))) (documentation ((directory "doc" ((texi-file "sloth"))) (text-file "LICENSE") - (symlink "README" "README.org") + (symlink "README" "README.org") (org-file "README"))) (infrastructure ((text-file ".gitignore") - (text-file "zhu-li") - (scheme-file "guix") - (scheme-file "hall") - (scheme-file "manifest"))))) + (scheme-file "guix") + (scheme-file "hall") + (scheme-file "manifest"))))) diff --git a/sloth/editor.scm b/sloth/editor.scm index ec9d47d..50dae05 100644 --- a/sloth/editor.scm +++ b/sloth/editor.scm @@ -55,22 +55,22 @@ (define x (getcurx win)) (cond ((or (eqv? key KEY_LEFT) - (eqv? key #\h)) + (eqv? key #\h)) (move-cursor state y (- x 1))) ((or (eqv? key KEY_RIGHT) - (eqv? key #\l)) + (eqv? key #\l)) (move-cursor state y (+ x 1))) ((or (eqv? key KEY_UP) - (eqv? key #\k)) + (eqv? key #\k)) (move-cursor state (- y 1) x)) ((or (eqv? key KEY_DOWN) - (eqv? key #\j)) + (eqv? key #\j)) (move-cursor state (+ y 1) x)) ((eqv? key #\n) (next-node state)) ((eqv? key #\d) (down-node state)) ((eqv? key #\p) (prev-node state)) ((eqv? key #\u) (up-node state)) - ((eqv? key #\i) (set-sloth-state-mode state 'insert-mode)) + ((eqv? key #\i) (set-sloth-state-mode state 'insert-mode)) ((eqv? key #\q) (endwin) (quit)) @@ -81,7 +81,7 @@ (define contents "") (when (file-exists? file) (set! contents - (call-with-input-file file get-string-all)) + (call-with-input-file file get-string-all)) (addstr win contents) (refresh win) (move win 0 0)) diff --git a/zhu-li b/zhu-li deleted file mode 100755 index c95dc4a..0000000 --- a/zhu-li +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# does the thing (build Sloth) - -hall build -x -hall dist -x -guix shell -D -f guix.scm -- autoreconf -vif && ./configure && make