Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DRAFT: reference PR: multi upstreaming #23

Open
wants to merge 73 commits into
base: master
Choose a base branch
from
Open

Conversation

qzdl
Copy link
Contributor

@qzdl qzdl commented Feb 7, 2022

not to merge, reference on #tropin

@qzdl
Copy link
Contributor Author

qzdl commented Feb 7, 2022

$ git log origin/master..$(git rev-parse --abbrev-ref HEAD) --oneline --numstat

b1c72fc qz: add WLR_DRM_DEVICES, no xwayland
46	15	rde/examples/abcdw/configs.scm
4441ee8 features: wm: sway: add tool mode mappings
2	1	rde/features/wm.scm
4465b5f packages: ob-restclient
23	0	rde/packages.scm
92877f3 qz: sway: dp-1 as 5120
2	1	rde/examples/abcdw/config/sway/config
8ff84fc qz: emacs: fix whitespace
41	31	rde/examples/abcdw/emacs.org
377b117 qz: emacs: add lob features (goto, name, restclient copy)
173	4	rde/examples/abcdw/emacs.org
86	3	rde/examples/abcdw/emacs.scm
106000d qz: emacs: agenda view: TODOs from daily files
40	7	rde/examples/abcdw/emacs.org
2222457 fontutils: specify default font-size as kword
2	1	rde/features/fontutils.scm
1d8952d emacs: restclient: allow for custom packages
6	2	rde/features/emacs.scm
e5c41cd qz: update channels
18	1	stale/guix-related/guix/channels
13	3	stale/guix-related/guix/channels-lock
cae31da qz: make lob-ingest more robust to nils
548	53	rde/examples/abcdw/emacs.org
204	7	rde/examples/abcdw/emacs.scm
e99a98d various updates ; notably created/updated properties
448	66	rde/examples/abcdw/emacs.org
51	1	rde/examples/abcdw/emacs.scm
c350b9b qz: config: emacs: fix roam-directory ref; post RDE autoload changes
112	14	rde/examples/abcdw/emacs.org
62	55	rde/examples/abcdw/emacs.scm
86d70ff qz: configs: add notes commit hourly
10	0	rde/examples/abcdw/configs.scm
3ecc6a4 rde: TODO: document how mcron-home-service doesn't reload
437	0	TODO
0455c43 qz: stashing bundle
1	1	rde/examples/abcdw/Makefile
16	4	rde/examples/abcdw/configs.scm
-	-	rde/examples/abcdw/configs/2021-12-12_22-14-04_screenshot.png
293	52	rde/examples/abcdw/emacs.org
120	2	rde/examples/abcdw/emacs.scm
28	12	rde/features/emacs.scm
10	6	rde/features/mail.scm
48	1	rde/packages.scm
72b22f1 rde: features: emacs: add vterm + project.el mapping
17	0	rde/features/emacs.scm
19e8ce2 gitignore: quick debugs with ; sanity.scm
1	0	.gitignore
4d1bc77 qz: TODO: recoll | examples/makefile: verbose | sway: wacom
19	0	TODO
1	1	rde/examples/abcdw/Makefile
31	17	rde/examples/abcdw/config/sway/config
06f4a14 qz: configs: add pre-rde guix emacs-packages, address H-s-*
17	25	rde/examples/abcdw/configs.scm
37	11	rde/examples/abcdw/emacs.org
28	22	rde/examples/abcdw/emacs.scm
2	2	stale/guix-related/guix/channels-lock
e78543a rde: features: wm: sway ; use smart_borders on (attention friendly)
1	0	rde/features/wm.scm
15f36d1 rde: packages: add emacs-consult-recoll,emasc-consult-eglot
67	1	rde/packages.scm
b1bf69f qz: rde: features: wm: input tablet_tool relative, bar opacity
5	1	rde/features/wm.scm
e5c9493 rde: features: emacs: add consult-ripgrep,magit to emacs-project
9	0	rde/features/emacs.scm
2291918 rde: features: emacs: add org/roam bindings for id, ref, note search
9	5	rde/features/emacs.scm
d0d35df rde: features: emacs: full config for vterm+zsh
42	15	rde/features/emacs.scm
2ca3dcf ffs
2	1	rde/examples/abcdw/config/sway/config
81	11	rde/examples/abcdw/configs.scm
2266	0	rde/examples/abcdw/emacs.org
652	0	rde/examples/abcdw/emacs.scm
0	175	rde/examples/abcdw/extra-config.el
2	1	rde/features/emacs.scm
14	35	rde/features/mail.scm
14	7	rde/features/shells.scm
12	10	rde/features/system.scm
0	29	rde/packages.scm
15	5	stale/guix-related/guix/channels
13	3	stale/guix-related/guix/channels-lock
a9477ec rde: mail: add msmtp home-service & config
92	0	gnu/home-services/mail.scm
0	204	rde/examples/abcdw/config/sway/#config#
53	26	rde/examples/abcdw/configs.scm
95	23	rde/features/mail.scm
4eaca5d rde: features: emacs: enable org-protocol w/ x-scheme
1	1	README
2	2	rde/examples/abcdw/config/alacritty/alacritty.yml
7	0	rde/examples/abcdw/config/sway/config
7	1	rde/features/emacs.scm
1	1	stale/guix-related/guix/channels-lock
36ea257 feat: extend wm,emacs,ssh
11	0	Makefile
8	5	gnu/home-services/ssh.scm
7	2	rde/examples/abcdw/Makefile
65	17	rde/examples/abcdw/configs.scm
2	2	rde/features.scm
145	9	rde/features/emacs.scm
11	2	rde/features/ssh.scm
47	36	rde/features/wm.scm
70	1	rde/packages.scm
2	2	stale/guix-related/guix/channels-lock
2bbe68e channels: update pins
1	1	stale/guix-related/guix/channels-lock
8da18ae mail: name job
8	0	.gitignore
1	1	rde/examples/abcdw/Makefile
204	0	rde/examples/abcdw/config/sway/#config#
42	16	rde/examples/abcdw/configs.scm
175	0	rde/examples/abcdw/extra-config.el
114	13	rde/features/emacs.scm
0	30	rde/features/emacs/#README#
0	1	rde/features/emacs/.#README
6	4	rde/features/emacs/README
2	1	rde/features/mail.scm
19	0	rde/packages.scm
81baed6 qzdl working(nonfree) rde configs
1	1	gnu/home-services/ssh.scm
1	1	rde/examples/abcdw/Makefile
80	57	rde/examples/abcdw/configs.scm
36	0	rde/features/bluetooth.scm
30	0	rde/features/emacs/#README#
1	0	rde/features/emacs/.#README
8	1	rde/features/keyboard.scm
10	12	rde/features/system.scm
1	1	rde/features/wm.scm
2	0	rde/packages.scm
5	1	stale/guix-related/guix/channels
8	3	stale/guix-related/guix/channels-lock

emacs: configure roam

emacs: add perfect-margin
- add .PHONY to Makefiles for better UX
- add transparency options to sway
- add ssh-config options
- add emacs-es-mode
- add emacs-restclient (-> qzdl)

- update channels lock
- update emacs-pgtk-pin
TODO generalisation, then mapping of home-shell-type -> vterm-rc

zsh -> zshrc cust
bash/dash -> subset zsh
fish -> fishrc cust

TODO copying region with M-w ; yes, vterm-copy-mode, but #musclememorymatters^(TM)
- :: https://github.com/akermu/emacs-libvterm#vterm-enable-manipulate-selection-data-by-osc52

vterm uses 'XTerm Control Sequences'
- :: https://invisible-island.net/xterm/ctlseqs/ctlseqs.html

which I think can be remapped in the shell context, but the challenge
remains on the emacs side with respect to the 'mark' etc

issue leading vterm-copy-mode's development
- :: akermu/emacs-libvterm#75
{C-c C-x i} -> org-id-get-create

  ~org-id-get-create~ is pretty crucial for the org-roam workflow, so
  and a free key exists in {C-c C-x i}, which fits semantically with
  the types of functions in ~org-mode-map : C-c C-x~.

{C-c n C-f} -> org-roam-ref-find

  org-roam-ref-find is super handy to correlate web/cite links with
  nodes, the ~C-~ layer is free, so it fits well here.

{C-c n s} -> rde-search-notes

  I concede that given the existing keybind conventions this may be
  better suited as {C-c n M-g}, but my hands know but way to curl; a
  mod sequence of Ctrl->None->Meta is too much for my brain given the
  frequency of invocation.

  this functionality became essential in my habbledashery of a
  workflow coming from doom; my notes under vc are a 'project' - but I
  spend most of the time in org, jumping to source, as opposed to the
  other way around, so it pays to have interactive, incremental
  search over the corpora, in addition to the current search
  interfaces at the time of writing:

  - explicit project   ~find-regexp~     {C-x p p PROJ-COMPL RET g}
  - explicit project   ~consult-ripgrep~ {C-x p p PROJ-COMPL RET M-g}
  - implicit project   ~consult-ripgrep~ {M-s M-g}
  - explicit directory ~consult-ripgrep~ {C-u M-s M-g}
consult-ripgrep

  I'm a big believer in the power of iterative search - this change
  lazily adds ~consult-ripgrep~ within the convention of {M-g} used
  elsewhere (i.e {M-s M-g})

magit-project-status

  Some custom configuration is applied to project-switch-commands, so
  it doesn't equal it's initial value, given

     (get 'project-switch-commands 'standard-value)

  it seemed appropriate to reinstate the binding explicitly ; note
  that this action will not cause error or undefined behaviour if the
  mappings are already defined in ~project-prefix-map~ and/or
  ~project-switch-commands~.

PS:

  the relevant magit source to preclude project mapping data if modified
  when loaded

  --
  (defvar magit-bind-magit-project-status t
    "Whether to bind \"m\" to `magit-project-status' in `project-prefix-map'.
  If so, then an entry is added to `project-switch-commands' as
  well.  If you want to use another key, then you must set this
  to nil before loading Magit to prevent \"m\" from being bound.")

  (with-eval-after-load 'project
    ;; Only more recent versions of project.el have `project-prefix-map' and
    ;; `project-switch-commands', though project.el is available in Emacs 25.
    (when (and magit-bind-magit-project-status
               (boundp 'project-prefix-map)
               ;; Only modify if it hasn't already been modified.
               (equal project-switch-commands
                      (eval (car (get 'project-switch-commands 'standard-value))
                            t)))
      (define-key project-prefix-map "m" #'magit-project-status)
      (add-to-list 'project-switch-commands '(magit-project-status
      "Magit") t)))
  --
* rde/examples/abcdw

  * configs.scm
    - add new packages: consult-eglot, consult-recoll
    - add remaining non-feature, pre-rde emacs packages

  * emacs.org, emacs.scm
    - add ob-async
    - add rde-sanity load command
    - fix bindings H-s-hjkl
    - fix bindings H-s-M-hjkl
    - fix bindings H-s-\

* stale/guix-related/guix/channels-lock
  - update pins
a useful file at the root

sanity.scm
--
(use-modules (rde packages)
             (rde examples abcdw configs))
--

emacs
--
(defun rde-sanity
  (async-shell-command "cd $HOME/git/sys/rde && guix repl -L . sanity.scm"))
--
rde-project-vterm

  this is really just a rip from `project-shell' -- happily, vterm
  respects `default directory'.
- magit start collapsed
- work agenda
- org-link ; man ; ol-man
- org-log-done 'time
- ingest files to include prefix-arg helper
- aws & kubectl ui
also, fixing clock-files <-> files-clock
including a new package, tessen@1.3.1
- adds config package - emacs-justify-kp
note: this will be valid for any theme string parsed by rofi, which is
any named theme file implicitly located in the theme search path, but
more usefully, can be some arbitrary file which can be enclosed with
`local-file'.

example usage:

   (feature-rofi
    #:theme (local-file "config/rofi/themes/base16-default-dark.rasi"))
used for providing additional options directly to sway, such as for
the use of nonstandard DRM devices:

  (feature-sway-run-on-tty
    #:launch-args "--unsupported-gpu --debug &>/tmp/sway")
the `which-key' indirect buffer starts as 'fundamental-mode, thus
global-olivetti-mode will still apply, giving a squashed unreadable
key-suggestion buffer.

- note: we can instead check `which-key-buffer-name', or just use the
  hardcoded string

- note: updates to `global-olivetti-ignore-[modes|buffer]' variables
  may require fresh enabling of `global-olivetti-mode', if they are
  inlined during compilation

related might be the use of 'olivetti-mode' in the minibuffer, which
is useful in my 5120x1440 monitor, lest I look 45 centimeters from the
center of my screen each time I pop the minibuffer.

It's quite cool as the bindings to expand the buffer `C-c }' still
work here.

I have used this as:

    (add-hook 'minibuffer-mode-hook 'olivetti-mode)

or some variant for better width:

    (add-hook 'minibuffer-mode-hook
              (lambda ()
                (let ((olivetti-body-width 200))
                  (olivetti-mode))))
rde: packages: Add wlroots patch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant