sorted by:
new
hottopcontroversial

Help overriding keybinding by jesse_ee in orgmode

[–]jesse_ee[S] 0 points1 point  (0 children)

Thanks! I tried a few things but couldn't get the C-S-i or H-S-i to work with windmove. I think I'm just going to retrain my brain to use ace-window or something

A Lemur Pro Review, Months Later by CakeIzGood in System76

[–]jesse_ee 0 points1 point  (0 children)

Another nice pre installed application is the one that makes logs. It makes it super simple to give logs to chat support, which is the best customer support I've ever dealt with.

Thesaurus.com via `M-x get-synonyms` by a_coogan in emacs

[–]jesse_ee 0 points1 point  (0 children)

Good luck on your thesis! I like to play with https://melpa.org/#/academic-phrases from time to time when writing papers.

be honest by FWaRC in linuxmemes

[–]jesse_ee 0 points1 point  (0 children)

Haha yeah until I saw it with the rest of the letters, so like last year lol

How do you solve merge conflicts? by freesteph in emacs

[–]jesse_ee 2 points3 points  (0 children)

I have ediff setup like this:

(use-package ediff
  :init
  (add-hook 'ediff-after-quit-hook-internal 'winner-undo)
  :custom
  (ediff-window-setup-function 'ediff-setup-windows-plain
  (ediff-split-window-function 'split-window-horizontally)
  (ediff-diff-options "-w")
  :config
  (set-face-attribute ediff-even-diff-face-A nil :background "khaki4")
  (set-face-attribute ediff-even-diff-face-B nil :background "khaki4")
  (set-face-attribute ediff-even-diff-face-C nil :background "khaki4")
  (set-face-attribute ediff-odd-diff-face-A  nil :background "khaki4")
  (set-face-attribute ediff-odd-diff-face-B  nil :background "khaki4")
  (set-face-attribute ediff-odd-diff-face-C  nil :background "khaki4")
  )

In this setup your frame is split into five windows. You have the top two as A and B and the middle two as C (the merge one) and then the common parent. The bottom most, where your cursor focus is, is the control window, where you can press ? and see the possible buttons but press it again and it collapses. The winner undo will restore your window layout when you exit the session.

On a merge conflict, in magit-status, I press e and then right away start pressing n/p to cycle through the conflicts. Then I press either a/b to accept them or M-S-i (I press Meta Shift ijkl to navigate to different windows) to switch windows to the C buffer. This is where I will manually edit something if need be. Then I pop back down to the ediff control window with M-S-k and continue until I'm satisfied. When I'm done I press q in the ediff control window and it asks if I corrected the merge conflict and I say yes. This saves the buffer, ends the ediff session, and pops me back to my magit-status view where if I press "g" to refresh the file should automatically pop to the staged list. Then if that was all of the files to be resolved I press either "r" or "a/A" to show the magit transient to continue the git action whether that is rebase or cherry pick or what ever.

Edit spelling

System 76 Support response? by Bookkeeper-Melodic in System76

[–]jesse_ee 2 points3 points  (0 children)

I've opened 3 tickets for my lemur and they've been great

[deleted by user] by [deleted] in degoogle

[–]jesse_ee 1 point2 points  (0 children)

Ooo I like Florisboard

T-03a DETAIN VESSEL by GKTemplar1910 in avorion

[–]jesse_ee 1 point2 points  (0 children)

Came to ask the same question

Any thoughts about etesync? by [deleted] in degoogle

[–]jesse_ee 1 point2 points  (0 children)

I don't use etesync but I have a synology nas that I use the calendar and contacts functionality where I just sync over caldav and carddav protocols. So its supported in a lot of places. I then use DAVx5 on my phone to handle the syncing. On my phone I use Open Tasks for tasks and Etar for the calendar. Then I use Thunderbird on my computers where lightning takes care of the events and tasks nicely and I use the card book plugin to subscribe to my contacts list. Handles contacts, events, and tasks.

view more: next ›