Compare commits

..

No commits in common. "fbd9314bb772bcf7a31d5107f433576409587df7" and "b2d03efaf404d8de3fe48090b69acaefeb52741a" have entirely different histories.

4 changed files with 32 additions and 34 deletions

View file

@ -7753,7 +7753,7 @@ base toot."
(telega-webpage-chat-link :foreground (my/color-value 'base0)
:background (my/color-value 'fg)))
:config
(when (file-exists-p "~/.guix-extra-profiles/emacs/emacs/bin/telega-server")
(when (file-directory-p "~/.guix-extra-profiles/emacs/")
(setq telega-server-command
(expand-file-name
"~/.guix-extra-profiles/emacs/emacs/bin/telega-server")))
@ -8670,16 +8670,16 @@ Which creates the following output:
The functions also skips lines in [square brackets] and ones that
start with more than 3 spaces."
(when-let* ((lines (seq-filter
(lambda (s) (not (or (string-empty-p s)
(string-match-p (rx bos "[" (* nonl) "]") s)
(string-match-p (rx bos (>= 3 " ")) s))))
(split-string string "\n")))
(first-line (car lines))
(headers (split-string first-line))
(header-indices (mapcar
(lambda (header)
(cl-search header first-line))
headers)))
(lambda (s) (not (or (string-empty-p s)
(string-match-p (rx bos "[" (* nonl) "]") s)
(string-match-p (rx bos (>= 3 " ")) s))))
(split-string string "\n")))
(first-line (car lines))
(headers (split-string first-line))
(header-indices (mapcar
(lambda (header)
(cl-search header first-line))
headers)))
(cl-loop for line in (cdr lines)
collect (cl-loop for header in headers
for start in header-indices
@ -8703,9 +8703,8 @@ The return value is a list of alists with the following keys:
collect `((path . ,(if (file-directory-p localpath)
(concat localpath "/")
localpath))
(enabled . ,(seq-contains-p
'("Pending" "Loading" "Running")
(alist-get 'RUN_STATE value)))))))
(enabled . ,(string-equal (alist-get 'ACTIVE value)
"Enabled"))))))
(defun my/index--tree-get-paths (tree &optional kind)
"Get paths from TREE.
@ -8747,7 +8746,7 @@ The return value is a list of commands as defined by
(append
(cl-loop for path in (seq-difference mega-paths-to-enable mega-paths-enabled)
if (seq-contains-p mega-paths-disabled path)
collect (list (format "mega-sync -r \"%s\"" path) "Mega enable sync" 5)
collect (list (format "mega-sync -e \"%s\"" path) "Mega enable sync" 5)
else append (list
(list (format "mega-mkdir -p \"%s\""
(my/index--mega-local-path path))

View file

@ -52,10 +52,10 @@ fi
# [[file:Console.org::*ssh-agent][ssh-agent:1]]
if ! pgrep -u "$USER" ssh-agent > /dev/null; then
ssh-agent -t 1h > "/tmp/ssh-agent.env"
ssh-agent -t 1h > "$XDG_RUNTIME_DIR/ssh-agent.env"
fi
if [[ ! -f "$SSH_AUTH_SOCK" ]]; then
source "/tmp/ssh-agent.env" >/dev/null
source "$XDG_RUNTIME_DIR/ssh-agent.env" >/dev/null
fi
# ssh-agent:1 ends here
@ -69,7 +69,7 @@ if [ -z "$IS_ANDROID" ] && [ -z "$NO_GUIX" ] ; then
. "$GUIX_PROFILE"/etc/profile
fi
if [ -d "$profile"/share/man ]; then
if command -v manpath >/dev/null 2>/dev/null; then
if command -v manpath; then
export MANPATH="${MANPATH:-$(manpath)}:$profile/share/man"
else
export MANPATH="${MANPATH}:$profile/share/man"

View file

@ -129,7 +129,7 @@ if [ -z "$IS_ANDROID" ] && [ -z "$NO_GUIX" ] ; then
. "$GUIX_PROFILE"/etc/profile
fi
if [ -d "$profile"/share/man ]; then
if command -v manpath >/dev/null 2>/dev/null; then
if command -v manpath; then
export MANPATH="${MANPATH:-$(manpath)}:$profile/share/man"
else
export MANPATH="${MANPATH}:$profile/share/man"

View file

@ -10670,7 +10670,7 @@ Or you can load up Element for a moment to see what the mention was, if that's e
(telega-webpage-chat-link :foreground (my/color-value 'base0)
:background (my/color-value 'fg)))
:config
(when (file-exists-p "~/.guix-extra-profiles/emacs/emacs/bin/telega-server")
(when (file-directory-p "~/.guix-extra-profiles/emacs/")
(setq telega-server-command
(expand-file-name
"~/.guix-extra-profiles/emacs/emacs/bin/telega-server")))
@ -11943,16 +11943,16 @@ Which creates the following output:
The functions also skips lines in [square brackets] and ones that
start with more than 3 spaces."
(when-let* ((lines (seq-filter
(lambda (s) (not (or (string-empty-p s)
(string-match-p (rx bos "[" (* nonl) "]") s)
(string-match-p (rx bos (>= 3 " ")) s))))
(split-string string "\n")))
(first-line (car lines))
(headers (split-string first-line))
(header-indices (mapcar
(lambda (header)
(cl-search header first-line))
headers)))
(lambda (s) (not (or (string-empty-p s)
(string-match-p (rx bos "[" (* nonl) "]") s)
(string-match-p (rx bos (>= 3 " ")) s))))
(split-string string "\n")))
(first-line (car lines))
(headers (split-string first-line))
(header-indices (mapcar
(lambda (header)
(cl-search header first-line))
headers)))
(cl-loop for line in (cdr lines)
collect (cl-loop for header in headers
for start in header-indices
@ -11979,9 +11979,8 @@ The return value is a list of alists with the following keys:
collect `((path . ,(if (file-directory-p localpath)
(concat localpath "/")
localpath))
(enabled . ,(seq-contains-p
'("Pending" "Loading" "Running")
(alist-get 'RUN_STATE value)))))))
(enabled . ,(string-equal (alist-get 'ACTIVE value)
"Enabled"))))))
#+end_src
And get the same data from the tree.
@ -12029,7 +12028,7 @@ The return value is a list of commands as defined by
(append
(cl-loop for path in (seq-difference mega-paths-to-enable mega-paths-enabled)
if (seq-contains-p mega-paths-disabled path)
collect (list (format "mega-sync -r \"%s\"" path) "Mega enable sync" 5)
collect (list (format "mega-sync -e \"%s\"" path) "Mega enable sync" 5)
else append (list
(list (format "mega-mkdir -p \"%s\""
(my/index--mega-local-path path))