Skip to content

Add an alias to push and set git branch and tracking#21

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.

Sign up for GitHub

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

Merged
esquivalient merged 5 commits into from
Jul 6, 2022
Merged

Add an alias to push and set git branch and tracking #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9185384
Add org roam and org roam ui
esquivalient Mar 12, 2022
d222811
Merge remote-tracking branch 'origin/emacs_org_roam' into emacs_org_r…
Mar 13, 2022
249a866
Remove custom org roam method for immediate insertion
esquivalient Apr 25, 2022
ba7c950
Add Silver Searcher as an option for projectile searching
esquivalient Jun 28, 2022
5b3f6db
Add an alias that pushes a git branch and sets local to track the remote
esquivalient Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .common_files/lib/git.bash
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,11 @@ alias gst='git status'
alias gco="git checkout"
alias gu="git reset HEAD"
alias ghr="git log -n1 --pretty=format:'%C(bold red)%h%Creset'"
alias gpp="git pull && git push"
# https://stackoverflow.com/questions/17847213/how-to-configure-git-push-to-automatically-set-upstream-without-u
alias gpu='[[ -z $(git config "branch.$(git symbolic-ref --short HEAD).merge") ]] &&
git push -u origin $(git symbolic-ref --short HEAD) ||
git push'
alias gpp="git pull && gpu"
complete -o default -o nospace -F _git_checkout gco
alias gpul="git pull"
complete -o default -o nospace -F _git_pull gpull
Expand Down
105 changes: 104 additions & 1 deletion .emacs.d/config.org
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
#+EMAIL: matt@expectedbehavior.com
#+OPTIONS: num:nil


* About
This is the Expected Behavior Emacs configuation. It's intended to be
used by the Emacsers of EB, but it should be a good starting place for
Expand DownExpand Up@@ -309,7 +310,7 @@ https://www.gnu.org/software/emacs/manual/html_node/emacs/Registers.html
TODO: Project navigation should depend on a function that determines where your code lives
#+BEGIN_SRC emacs-lisp
(global-set-key (kbd "C-c e") (lambda() (interactive)(find-file "~/.emacs.d/config.org")))
(global-set-key (kbd "C-c t") (lambda() (interactive)(find-file "~/Dropbox/tmp.txt")))
(global-set-key (kbd "C-c t") (lambda() (interactive)(find-file "~/Dropbox/tmp.org")))
(global-set-key (kbd "C-c p i w") (lambda() (interactive)(find-file "~/code/instrumental/web/README.md")))
(global-set-key (kbd "C-c p d w") (lambda() (interactive)(find-file "~/code/docraptor/web/README.md")))
#+END_SRC
Expand DownExpand Up@@ -442,6 +443,11 @@ brew cask install font-fira-mono
)
#+END_SRC

** Ag - The Silver Searcher
If you want to use Projectile's search functions with ag

(use-package ag)

** Projectile
#+BEGIN_SRC emacs-lisp
(use-package projectile
Expand DownExpand Up@@ -478,6 +484,21 @@ brew cask install font-fira-mono
:init (doom-modeline-mode 1))
#+END_SRC

** Ensure Emacs Environment Variables Match User Shell
Depending on how you start Emacs, it may or may not have the same
environment variables as your normal shell environment. Some packages
depend on having access to shell commands or other environment
variables and it can be a very non-obvious kind of failure.

In specific, this was installed in response to the
[[https://www.reddit.com/r/emacs/comments/sjstjx/how_can_i_get_orgroam_unlinked_references_working/][problem I was having with org-roam not displaying unlinked references.]]
#+BEGIN_SRC emacs-lisp
(use-package exec-path-from-shell
:init (exec-path-from-shell-initialize))
#+END_SRC

#+RESULTS:

* Per-Mode

This section should contain changes that apply to just one mode or a
Expand DownExpand Up@@ -512,6 +533,88 @@ blacklists a few modes, it belongs in Global.

#+END_SRC

** Org

#+BEGIN_SRC emacs-lisp

(add-hook 'org-mode-hook 'auto-fill-mode)

(let ((current-prefix-arg '(4)))
(setq org-startup-with-inline-images t))

#+END_SRC

** Org Roam
Org Roam is a text based information management system using the
Zettelkasten Method. If you haven't heard of it, think of it as a
personal wiki with tags that tracks and graphs links between
nodes. That's really underselling it.

If you'd like to learn more, [[https://www.youtube.com/watch?v=AyhPmypHDEw&list=PLEoMzSkcN8oN3x3XaZQ-AXFKv52LZzjqD][System Crafters did a YouTube series]] that
starts with the absolute basics and builds from there. You could
always read the [[https://www.orgroam.com/manual.html][Org Roam Manual]], but it's a bit more of a technical
review and less of a user guide.

#+BEGIN_SRC emacs-lisp
;; -*- lexical-binding: t -*-


;; If you're going to make files, they're going to need a directory.
;; I chose a Dropbox folder as the default because it means your
;; files will be backed up as soon as you start working on it.
;; TODO: Dry up the directory. It's in three places, which is bad.
(if (file-exists-p (file-truename "~/Dropbox/OrgRoam"))
(display-message-or-buffer "Org Roam directory already exists")
(make-directory "~/Dropbox/OrgRoam")
)

(use-package org-roam
:custom
(org-roam-directory (file-truename "~/Dropbox/OrgRoam"))
(org-roam-completion-everywhere t)
(org-roam-mode-section-functions
(list #'org-roam-backlinks-section
#'org-roam-reflinks-section
#'org-roam-unlinked-references-section
))
:bind (
("C-c n f" . org-roam-node-find)
("C-c n i" . org-roam-node-insert)
("C-c n l" . org-roam-buffer-toggle)
("C-c n s" . org-roam-db-sync) ;; in case you delete a file outside emacs
("C-c n t" . org-roam-tag-add) ;; in case you delete a file outside emacs
:map org-mode-map
("C-M-i" . completion-at-point)
)
:config
(org-roam-setup)
(org-roam-db-autosync-mode)
)


#+END_SRC


#+BEGIN_SRC emacs-lisp

;; https://github.com/org-roam/org-roam-ui
;; localhost:35901
;;
(use-package org-roam-ui
:after org-roam ;; or :after org
;; normally we'd recommend hooking orui after org-roam, but since org-roam does not have
;; a hookable mode anymore, you're advised to pick something yourself
;; if you don't care about startup time, use
:hook (after-init . org-roam-ui-mode)
:config
(setq org-roam-ui-sync-theme t
org-roam-ui-follow t
org-roam-ui-update-on-save t
org-roam-ui-open-on-start t))

#+END_SRC


** Rust

#+BEGIN_SRC emacs-lisp
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Add an alias to push and set git branch and tracking by esquivalient · Pull Request #21 · expectedbehavior/common-files · GitHub
Skip to content
Add an alias to push and set git branch and tracking#21

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.

 Sign up for GitHub

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

 Merged

esquivalient
merged 5 commits into

from

Jul 6, 2022
 Merged


Add an alias to push and set git branch and tracking
#21
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
9185384

Add org roam and org roam ui


esquivalient Mar 12, 2022
d222811

Merge remote-tracking branch 'origin/emacs_org_roam' into emacs_org_r…

Mar 13, 2022
249a866

Remove custom org roam method for immediate insertion


esquivalient Apr 25, 2022
ba7c950

Add Silver Searcher as an option for projectile searching


esquivalient Jun 28, 2022
5b3f6db

Add an alias that pushes a git branch and sets local to track the remote


esquivalient Jun 28, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 5 additions & 1 deletion
.common_files/lib/git.bash

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,11 @@ alias gst='git status'
alias gco="git checkout"
alias gu="git reset HEAD"
alias ghr="git log -n1 --pretty=format:'%C(bold red)%h%Creset'"
alias gpp="git pull && git push"
# https://stackoverflow.com/questions/17847213/how-to-configure-git-push-to-automatically-set-upstream-without-u
alias gpu='[[ -z $(git config "branch.$(git symbolic-ref --short HEAD).merge") ]] &&
 git push -u origin $(git symbolic-ref --short HEAD) ||
 git push'
alias gpp="git pull && gpu"
complete -o default -o nospace -F _git_checkout gco
alias gpul="git pull"
complete -o default -o nospace -F _git_pull gpull
Expand Down

105 changes: 104 additions & 1 deletion
.emacs.d/config.org

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
#+EMAIL: matt@expectedbehavior.com
#+OPTIONS: num:nil


* About
This is the Expected Behavior Emacs configuation. It's intended to be
used by the Emacsers of EB, but it should be a good starting place for
Expand DownExpand Up@@ -309,7 +310,7 @@ https://www.gnu.org/software/emacs/manual/html_node/emacs/Registers.html
TODO: Project navigation should depend on a function that determines where your code lives
#+BEGIN_SRC emacs-lisp
(global-set-key (kbd "C-c e") (lambda() (interactive)(find-file "~/.emacs.d/config.org")))
(global-set-key (kbd "C-c t") (lambda() (interactive)(find-file "~/Dropbox/tmp.txt")))
(global-set-key (kbd "C-c t") (lambda() (interactive)(find-file "~/Dropbox/tmp.org")))
(global-set-key (kbd "C-c p i w") (lambda() (interactive)(find-file "~/code/instrumental/web/README.md")))
(global-set-key (kbd "C-c p d w") (lambda() (interactive)(find-file "~/code/docraptor/web/README.md")))
#+END_SRC
Expand DownExpand Up@@ -442,6 +443,11 @@ brew cask install font-fira-mono
 )
#+END_SRC

** Ag - The Silver Searcher
If you want to use Projectile's search functions with ag

(use-package ag)

** Projectile
#+BEGIN_SRC emacs-lisp
 (use-package projectile
Expand DownExpand Up@@ -478,6 +484,21 @@ brew cask install font-fira-mono
 :init (doom-modeline-mode 1))
#+END_SRC

** Ensure Emacs Environment Variables Match User Shell
Depending on how you start Emacs, it may or may not have the same
environment variables as your normal shell environment. Some packages
depend on having access to shell commands or other environment
variables and it can be a very non-obvious kind of failure.

In specific, this was installed in response to the
[[https://www.reddit.com/r/emacs/comments/sjstjx/how_can_i_get_orgroam_unlinked_references_working/][problem I was having with org-roam not displaying unlinked references.]]
#+BEGIN_SRC emacs-lisp
 (use-package exec-path-from-shell
 :init (exec-path-from-shell-initialize))
#+END_SRC

#+RESULTS:

* Per-Mode

This section should contain changes that apply to just one mode or a
Expand DownExpand Up@@ -512,6 +533,88 @@ blacklists a few modes, it belongs in Global.

#+END_SRC

** Org

#+BEGIN_SRC emacs-lisp

 (add-hook 'org-mode-hook 'auto-fill-mode)

 (let ((current-prefix-arg '(4)))
 (setq org-startup-with-inline-images t))

#+END_SRC

** Org Roam
Org Roam is a text based information management system using the
Zettelkasten Method. If you haven't heard of it, think of it as a
personal wiki with tags that tracks and graphs links between
nodes. That's really underselling it.

If you'd like to learn more, [[https://www.youtube.com/watch?v=AyhPmypHDEw&list=PLEoMzSkcN8oN3x3XaZQ-AXFKv52LZzjqD][System Crafters did a YouTube series]] that
starts with the absolute basics and builds from there. You could
always read the [[https://www.orgroam.com/manual.html][Org Roam Manual]], but it's a bit more of a technical
review and less of a user guide.

#+BEGIN_SRC emacs-lisp
 ;; -*- lexical-binding: t -*- 


 ;; If you're going to make files, they're going to need a directory.
 ;; I chose a Dropbox folder as the default because it means your
 ;; files will be backed up as soon as you start working on it.
 ;; TODO: Dry up the directory. It's in three places, which is bad.
 (if (file-exists-p (file-truename "~/Dropbox/OrgRoam"))
 (display-message-or-buffer "Org Roam directory already exists")
 (make-directory "~/Dropbox/OrgRoam")
 )

 (use-package org-roam
 :custom
 (org-roam-directory (file-truename "~/Dropbox/OrgRoam"))
 (org-roam-completion-everywhere t)
 (org-roam-mode-section-functions
 (list #'org-roam-backlinks-section
 #'org-roam-reflinks-section
 #'org-roam-unlinked-references-section
 ))
 :bind (
 ("C-c n f" . org-roam-node-find)
 ("C-c n i" . org-roam-node-insert)
 ("C-c n l" . org-roam-buffer-toggle)
 ("C-c n s" . org-roam-db-sync) ;; in case you delete a file outside emacs
 ("C-c n t" . org-roam-tag-add) ;; in case you delete a file outside emacs
 :map org-mode-map
 ("C-M-i" . completion-at-point)
 )
 :config
 (org-roam-setup)
 (org-roam-db-autosync-mode)
 )


#+END_SRC


#+BEGIN_SRC emacs-lisp

 ;; https://github.com/org-roam/org-roam-ui
 ;; localhost:35901
 ;; 
 (use-package org-roam-ui
 :after org-roam ;; or :after org
 ;; normally we'd recommend hooking orui after org-roam, but since org-roam does not have
 ;; a hookable mode anymore, you're advised to pick something yourself
 ;; if you don't care about startup time, use
 :hook (after-init . org-roam-ui-mode)
 :config
 (setq org-roam-ui-sync-theme t
 org-roam-ui-follow t
 org-roam-ui-update-on-save t
 org-roam-ui-open-on-start t))

#+END_SRC


** Rust

#+BEGIN_SRC emacs-lisp
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add an alias to push and set git branch and tracking by esquivalient · Pull Request #21 · expectedbehavior/common-files · GitHub
Skip to content
Add an alias to push and set git branch and tracking#21

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.

 Sign up for GitHub

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

 Merged

esquivalient
merged 5 commits into

from

Jul 6, 2022
 Merged


Add an alias to push and set git branch and tracking
#21
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
9185384

Add org roam and org roam ui


esquivalient Mar 12, 2022
d222811

Merge remote-tracking branch 'origin/emacs_org_roam' into emacs_org_r…

Mar 13, 2022
249a866

Remove custom org roam method for immediate insertion


esquivalient Apr 25, 2022
ba7c950

Add Silver Searcher as an option for projectile searching


esquivalient Jun 28, 2022
5b3f6db

Add an alias that pushes a git branch and sets local to track the remote


esquivalient Jun 28, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 5 additions & 1 deletion
.common_files/lib/git.bash

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,11 @@ alias gst='git status'
alias gco="git checkout"
alias gu="git reset HEAD"
alias ghr="git log -n1 --pretty=format:'%C(bold red)%h%Creset'"
alias gpp="git pull && git push"
# https://stackoverflow.com/questions/17847213/how-to-configure-git-push-to-automatically-set-upstream-without-u
alias gpu='[[ -z $(git config "branch.$(git symbolic-ref --short HEAD).merge") ]] &&
 git push -u origin $(git symbolic-ref --short HEAD) ||
 git push'
alias gpp="git pull && gpu"
complete -o default -o nospace -F _git_checkout gco
alias gpul="git pull"
complete -o default -o nospace -F _git_pull gpull
Expand Down

105 changes: 104 additions & 1 deletion
.emacs.d/config.org

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
#+EMAIL: matt@expectedbehavior.com
#+OPTIONS: num:nil


* About
This is the Expected Behavior Emacs configuation. It's intended to be
used by the Emacsers of EB, but it should be a good starting place for
Expand DownExpand Up@@ -309,7 +310,7 @@ https://www.gnu.org/software/emacs/manual/html_node/emacs/Registers.html
TODO: Project navigation should depend on a function that determines where your code lives
#+BEGIN_SRC emacs-lisp
(global-set-key (kbd "C-c e") (lambda() (interactive)(find-file "~/.emacs.d/config.org")))
(global-set-key (kbd "C-c t") (lambda() (interactive)(find-file "~/Dropbox/tmp.txt")))
(global-set-key (kbd "C-c t") (lambda() (interactive)(find-file "~/Dropbox/tmp.org")))
(global-set-key (kbd "C-c p i w") (lambda() (interactive)(find-file "~/code/instrumental/web/README.md")))
(global-set-key (kbd "C-c p d w") (lambda() (interactive)(find-file "~/code/docraptor/web/README.md")))
#+END_SRC
Expand DownExpand Up@@ -442,6 +443,11 @@ brew cask install font-fira-mono
 )
#+END_SRC

** Ag - The Silver Searcher
If you want to use Projectile's search functions with ag

(use-package ag)

** Projectile
#+BEGIN_SRC emacs-lisp
 (use-package projectile
Expand DownExpand Up@@ -478,6 +484,21 @@ brew cask install font-fira-mono
 :init (doom-modeline-mode 1))
#+END_SRC

** Ensure Emacs Environment Variables Match User Shell
Depending on how you start Emacs, it may or may not have the same
environment variables as your normal shell environment. Some packages
depend on having access to shell commands or other environment
variables and it can be a very non-obvious kind of failure.

In specific, this was installed in response to the
[[https://www.reddit.com/r/emacs/comments/sjstjx/how_can_i_get_orgroam_unlinked_references_working/][problem I was having with org-roam not displaying unlinked references.]]
#+BEGIN_SRC emacs-lisp
 (use-package exec-path-from-shell
 :init (exec-path-from-shell-initialize))
#+END_SRC

#+RESULTS:

* Per-Mode

This section should contain changes that apply to just one mode or a
Expand DownExpand Up@@ -512,6 +533,88 @@ blacklists a few modes, it belongs in Global.

#+END_SRC

** Org

#+BEGIN_SRC emacs-lisp

 (add-hook 'org-mode-hook 'auto-fill-mode)

 (let ((current-prefix-arg '(4)))
 (setq org-startup-with-inline-images t))

#+END_SRC

** Org Roam
Org Roam is a text based information management system using the
Zettelkasten Method. If you haven't heard of it, think of it as a
personal wiki with tags that tracks and graphs links between
nodes. That's really underselling it.

If you'd like to learn more, [[https://www.youtube.com/watch?v=AyhPmypHDEw&list=PLEoMzSkcN8oN3x3XaZQ-AXFKv52LZzjqD][System Crafters did a YouTube series]] that
starts with the absolute basics and builds from there. You could
always read the [[https://www.orgroam.com/manual.html][Org Roam Manual]], but it's a bit more of a technical
review and less of a user guide.

#+BEGIN_SRC emacs-lisp
 ;; -*- lexical-binding: t -*- 


 ;; If you're going to make files, they're going to need a directory.
 ;; I chose a Dropbox folder as the default because it means your
 ;; files will be backed up as soon as you start working on it.
 ;; TODO: Dry up the directory. It's in three places, which is bad.
 (if (file-exists-p (file-truename "~/Dropbox/OrgRoam"))
 (display-message-or-buffer "Org Roam directory already exists")
 (make-directory "~/Dropbox/OrgRoam")
 )

 (use-package org-roam
 :custom
 (org-roam-directory (file-truename "~/Dropbox/OrgRoam"))
 (org-roam-completion-everywhere t)
 (org-roam-mode-section-functions
 (list #'org-roam-backlinks-section
 #'org-roam-reflinks-section
 #'org-roam-unlinked-references-section
 ))
 :bind (
 ("C-c n f" . org-roam-node-find)
 ("C-c n i" . org-roam-node-insert)
 ("C-c n l" . org-roam-buffer-toggle)
 ("C-c n s" . org-roam-db-sync) ;; in case you delete a file outside emacs
 ("C-c n t" . org-roam-tag-add) ;; in case you delete a file outside emacs
 :map org-mode-map
 ("C-M-i" . completion-at-point)
 )
 :config
 (org-roam-setup)
 (org-roam-db-autosync-mode)
 )


#+END_SRC


#+BEGIN_SRC emacs-lisp

 ;; https://github.com/org-roam/org-roam-ui
 ;; localhost:35901
 ;; 
 (use-package org-roam-ui
 :after org-roam ;; or :after org
 ;; normally we'd recommend hooking orui after org-roam, but since org-roam does not have
 ;; a hookable mode anymore, you're advised to pick something yourself
 ;; if you don't care about startup time, use
 :hook (after-init . org-roam-ui-mode)
 :config
 (setq org-roam-ui-sync-theme t
 org-roam-ui-follow t
 org-roam-ui-update-on-save t
 org-roam-ui-open-on-start t))

#+END_SRC


** Rust

#+BEGIN_SRC emacs-lisp
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add an alias to push and set git branch and tracking by esquivalient · Pull Request #21 · expectedbehavior/common-files · GitHub
Skip to content
Add an alias to push and set git branch and tracking#21

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.

 Sign up for GitHub

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

 Merged

esquivalient
merged 5 commits into

from

Jul 6, 2022
 Merged


Add an alias to push and set git branch and tracking
#21
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
9185384

Add org roam and org roam ui


esquivalient Mar 12, 2022
d222811

Merge remote-tracking branch 'origin/emacs_org_roam' into emacs_org_r…

Mar 13, 2022
249a866

Remove custom org roam method for immediate insertion


esquivalient Apr 25, 2022
ba7c950

Add Silver Searcher as an option for projectile searching


esquivalient Jun 28, 2022
5b3f6db

Add an alias that pushes a git branch and sets local to track the remote


esquivalient Jun 28, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 5 additions & 1 deletion
.common_files/lib/git.bash

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,11 @@ alias gst='git status'
alias gco="git checkout"
alias gu="git reset HEAD"
alias ghr="git log -n1 --pretty=format:'%C(bold red)%h%Creset'"
alias gpp="git pull && git push"
# https://stackoverflow.com/questions/17847213/how-to-configure-git-push-to-automatically-set-upstream-without-u
alias gpu='[[ -z $(git config "branch.$(git symbolic-ref --short HEAD).merge") ]] &&
 git push -u origin $(git symbolic-ref --short HEAD) ||
 git push'
alias gpp="git pull && gpu"
complete -o default -o nospace -F _git_checkout gco
alias gpul="git pull"
complete -o default -o nospace -F _git_pull gpull
Expand Down

105 changes: 104 additions & 1 deletion
.emacs.d/config.org

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
#+EMAIL: matt@expectedbehavior.com
#+OPTIONS: num:nil


* About
This is the Expected Behavior Emacs configuation. It's intended to be
used by the Emacsers of EB, but it should be a good starting place for
Expand DownExpand Up@@ -309,7 +310,7 @@ https://www.gnu.org/software/emacs/manual/html_node/emacs/Registers.html
TODO: Project navigation should depend on a function that determines where your code lives
#+BEGIN_SRC emacs-lisp
(global-set-key (kbd "C-c e") (lambda() (interactive)(find-file "~/.emacs.d/config.org")))
(global-set-key (kbd "C-c t") (lambda() (interactive)(find-file "~/Dropbox/tmp.txt")))
(global-set-key (kbd "C-c t") (lambda() (interactive)(find-file "~/Dropbox/tmp.org")))
(global-set-key (kbd "C-c p i w") (lambda() (interactive)(find-file "~/code/instrumental/web/README.md")))
(global-set-key (kbd "C-c p d w") (lambda() (interactive)(find-file "~/code/docraptor/web/README.md")))
#+END_SRC
Expand DownExpand Up@@ -442,6 +443,11 @@ brew cask install font-fira-mono
 )
#+END_SRC

** Ag - The Silver Searcher
If you want to use Projectile's search functions with ag

(use-package ag)

** Projectile
#+BEGIN_SRC emacs-lisp
 (use-package projectile
Expand DownExpand Up@@ -478,6 +484,21 @@ brew cask install font-fira-mono
 :init (doom-modeline-mode 1))
#+END_SRC

** Ensure Emacs Environment Variables Match User Shell
Depending on how you start Emacs, it may or may not have the same
environment variables as your normal shell environment. Some packages
depend on having access to shell commands or other environment
variables and it can be a very non-obvious kind of failure.

In specific, this was installed in response to the
[[https://www.reddit.com/r/emacs/comments/sjstjx/how_can_i_get_orgroam_unlinked_references_working/][problem I was having with org-roam not displaying unlinked references.]]
#+BEGIN_SRC emacs-lisp
 (use-package exec-path-from-shell
 :init (exec-path-from-shell-initialize))
#+END_SRC

#+RESULTS:

* Per-Mode

This section should contain changes that apply to just one mode or a
Expand DownExpand Up@@ -512,6 +533,88 @@ blacklists a few modes, it belongs in Global.

#+END_SRC

** Org

#+BEGIN_SRC emacs-lisp

 (add-hook 'org-mode-hook 'auto-fill-mode)

 (let ((current-prefix-arg '(4)))
 (setq org-startup-with-inline-images t))

#+END_SRC

** Org Roam
Org Roam is a text based information management system using the
Zettelkasten Method. If you haven't heard of it, think of it as a
personal wiki with tags that tracks and graphs links between
nodes. That's really underselling it.

If you'd like to learn more, [[https://www.youtube.com/watch?v=AyhPmypHDEw&list=PLEoMzSkcN8oN3x3XaZQ-AXFKv52LZzjqD][System Crafters did a YouTube series]] that
starts with the absolute basics and builds from there. You could
always read the [[https://www.orgroam.com/manual.html][Org Roam Manual]], but it's a bit more of a technical
review and less of a user guide.

#+BEGIN_SRC emacs-lisp
 ;; -*- lexical-binding: t -*- 


 ;; If you're going to make files, they're going to need a directory.
 ;; I chose a Dropbox folder as the default because it means your
 ;; files will be backed up as soon as you start working on it.
 ;; TODO: Dry up the directory. It's in three places, which is bad.
 (if (file-exists-p (file-truename "~/Dropbox/OrgRoam"))
 (display-message-or-buffer "Org Roam directory already exists")
 (make-directory "~/Dropbox/OrgRoam")
 )

 (use-package org-roam
 :custom
 (org-roam-directory (file-truename "~/Dropbox/OrgRoam"))
 (org-roam-completion-everywhere t)
 (org-roam-mode-section-functions
 (list #'org-roam-backlinks-section
 #'org-roam-reflinks-section
 #'org-roam-unlinked-references-section
 ))
 :bind (
 ("C-c n f" . org-roam-node-find)
 ("C-c n i" . org-roam-node-insert)
 ("C-c n l" . org-roam-buffer-toggle)
 ("C-c n s" . org-roam-db-sync) ;; in case you delete a file outside emacs
 ("C-c n t" . org-roam-tag-add) ;; in case you delete a file outside emacs
 :map org-mode-map
 ("C-M-i" . completion-at-point)
 )
 :config
 (org-roam-setup)
 (org-roam-db-autosync-mode)
 )


#+END_SRC


#+BEGIN_SRC emacs-lisp

 ;; https://github.com/org-roam/org-roam-ui
 ;; localhost:35901
 ;; 
 (use-package org-roam-ui
 :after org-roam ;; or :after org
 ;; normally we'd recommend hooking orui after org-roam, but since org-roam does not have
 ;; a hookable mode anymore, you're advised to pick something yourself
 ;; if you don't care about startup time, use
 :hook (after-init . org-roam-ui-mode)
 :config
 (setq org-roam-ui-sync-theme t
 org-roam-ui-follow t
 org-roam-ui-update-on-save t
 org-roam-ui-open-on-start t))

#+END_SRC


** Rust

#+BEGIN_SRC emacs-lisp
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Add an alias to push and set git branch and tracking by esquivalient · Pull Request #21 · expectedbehavior/common-files · GitHub
Skip to content
Add an alias to push and set git branch and tracking#21

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.

 Sign up for GitHub

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

 Merged

esquivalient
merged 5 commits into

from

Jul 6, 2022
 Merged


Add an alias to push and set git branch and tracking
#21
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
9185384

Add org roam and org roam ui


esquivalient Mar 12, 2022
d222811

Merge remote-tracking branch 'origin/emacs_org_roam' into emacs_org_r…

Mar 13, 2022
249a866

Remove custom org roam method for immediate insertion


esquivalient Apr 25, 2022
ba7c950

Add Silver Searcher as an option for projectile searching


esquivalient Jun 28, 2022
5b3f6db

Add an alias that pushes a git branch and sets local to track the remote


esquivalient Jun 28, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 5 additions & 1 deletion
.common_files/lib/git.bash

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,11 @@ alias gst='git status'
alias gco="git checkout"
alias gu="git reset HEAD"
alias ghr="git log -n1 --pretty=format:'%C(bold red)%h%Creset'"
alias gpp="git pull && git push"
# https://stackoverflow.com/questions/17847213/how-to-configure-git-push-to-automatically-set-upstream-without-u
alias gpu='[[ -z $(git config "branch.$(git symbolic-ref --short HEAD).merge") ]] &&
 git push -u origin $(git symbolic-ref --short HEAD) ||
 git push'
alias gpp="git pull && gpu"
complete -o default -o nospace -F _git_checkout gco
alias gpul="git pull"
complete -o default -o nospace -F _git_pull gpull
Expand Down

105 changes: 104 additions & 1 deletion
.emacs.d/config.org

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
#+EMAIL: matt@expectedbehavior.com
#+OPTIONS: num:nil


* About
This is the Expected Behavior Emacs configuation. It's intended to be
used by the Emacsers of EB, but it should be a good starting place for
Expand DownExpand Up@@ -309,7 +310,7 @@ https://www.gnu.org/software/emacs/manual/html_node/emacs/Registers.html
TODO: Project navigation should depend on a function that determines where your code lives
#+BEGIN_SRC emacs-lisp
(global-set-key (kbd "C-c e") (lambda() (interactive)(find-file "~/.emacs.d/config.org")))
(global-set-key (kbd "C-c t") (lambda() (interactive)(find-file "~/Dropbox/tmp.txt")))
(global-set-key (kbd "C-c t") (lambda() (interactive)(find-file "~/Dropbox/tmp.org")))
(global-set-key (kbd "C-c p i w") (lambda() (interactive)(find-file "~/code/instrumental/web/README.md")))
(global-set-key (kbd "C-c p d w") (lambda() (interactive)(find-file "~/code/docraptor/web/README.md")))
#+END_SRC
Expand DownExpand Up@@ -442,6 +443,11 @@ brew cask install font-fira-mono
 )
#+END_SRC

** Ag - The Silver Searcher
If you want to use Projectile's search functions with ag

(use-package ag)

** Projectile
#+BEGIN_SRC emacs-lisp
 (use-package projectile
Expand DownExpand Up@@ -478,6 +484,21 @@ brew cask install font-fira-mono
 :init (doom-modeline-mode 1))
#+END_SRC

** Ensure Emacs Environment Variables Match User Shell
Depending on how you start Emacs, it may or may not have the same
environment variables as your normal shell environment. Some packages
depend on having access to shell commands or other environment
variables and it can be a very non-obvious kind of failure.

In specific, this was installed in response to the
[[https://www.reddit.com/r/emacs/comments/sjstjx/how_can_i_get_orgroam_unlinked_references_working/][problem I was having with org-roam not displaying unlinked references.]]
#+BEGIN_SRC emacs-lisp
 (use-package exec-path-from-shell
 :init (exec-path-from-shell-initialize))
#+END_SRC

#+RESULTS:

* Per-Mode

This section should contain changes that apply to just one mode or a
Expand DownExpand Up@@ -512,6 +533,88 @@ blacklists a few modes, it belongs in Global.

#+END_SRC

** Org

#+BEGIN_SRC emacs-lisp

 (add-hook 'org-mode-hook 'auto-fill-mode)

 (let ((current-prefix-arg '(4)))
 (setq org-startup-with-inline-images t))

#+END_SRC

** Org Roam
Org Roam is a text based information management system using the
Zettelkasten Method. If you haven't heard of it, think of it as a
personal wiki with tags that tracks and graphs links between
nodes. That's really underselling it.

If you'd like to learn more, [[https://www.youtube.com/watch?v=AyhPmypHDEw&list=PLEoMzSkcN8oN3x3XaZQ-AXFKv52LZzjqD][System Crafters did a YouTube series]] that
starts with the absolute basics and builds from there. You could
always read the [[https://www.orgroam.com/manual.html][Org Roam Manual]], but it's a bit more of a technical
review and less of a user guide.

#+BEGIN_SRC emacs-lisp
 ;; -*- lexical-binding: t -*- 


 ;; If you're going to make files, they're going to need a directory.
 ;; I chose a Dropbox folder as the default because it means your
 ;; files will be backed up as soon as you start working on it.
 ;; TODO: Dry up the directory. It's in three places, which is bad.
 (if (file-exists-p (file-truename "~/Dropbox/OrgRoam"))
 (display-message-or-buffer "Org Roam directory already exists")
 (make-directory "~/Dropbox/OrgRoam")
 )

 (use-package org-roam
 :custom
 (org-roam-directory (file-truename "~/Dropbox/OrgRoam"))
 (org-roam-completion-everywhere t)
 (org-roam-mode-section-functions
 (list #'org-roam-backlinks-section
 #'org-roam-reflinks-section
 #'org-roam-unlinked-references-section
 ))
 :bind (
 ("C-c n f" . org-roam-node-find)
 ("C-c n i" . org-roam-node-insert)
 ("C-c n l" . org-roam-buffer-toggle)
 ("C-c n s" . org-roam-db-sync) ;; in case you delete a file outside emacs
 ("C-c n t" . org-roam-tag-add) ;; in case you delete a file outside emacs
 :map org-mode-map
 ("C-M-i" . completion-at-point)
 )
 :config
 (org-roam-setup)
 (org-roam-db-autosync-mode)
 )


#+END_SRC


#+BEGIN_SRC emacs-lisp

 ;; https://github.com/org-roam/org-roam-ui
 ;; localhost:35901
 ;; 
 (use-package org-roam-ui
 :after org-roam ;; or :after org
 ;; normally we'd recommend hooking orui after org-roam, but since org-roam does not have
 ;; a hookable mode anymore, you're advised to pick something yourself
 ;; if you don't care about startup time, use
 :hook (after-init . org-roam-ui-mode)
 :config
 (setq org-roam-ui-sync-theme t
 org-roam-ui-follow t
 org-roam-ui-update-on-save t
 org-roam-ui-open-on-start t))

#+END_SRC


** Rust

#+BEGIN_SRC emacs-lisp
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add an alias to push and set git branch and tracking by esquivalient · Pull Request #21 · expectedbehavior/common-files · GitHub
Skip to content
Add an alias to push and set git branch and tracking#21

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.

 Sign up for GitHub

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

 Merged

esquivalient
merged 5 commits into

from

Jul 6, 2022
 Merged


Add an alias to push and set git branch and tracking
#21
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
9185384

Add org roam and org roam ui


esquivalient Mar 12, 2022
d222811

Merge remote-tracking branch 'origin/emacs_org_roam' into emacs_org_r…

Mar 13, 2022
249a866

Remove custom org roam method for immediate insertion


esquivalient Apr 25, 2022
ba7c950

Add Silver Searcher as an option for projectile searching


esquivalient Jun 28, 2022
5b3f6db

Add an alias that pushes a git branch and sets local to track the remote


esquivalient Jun 28, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 5 additions & 1 deletion
.common_files/lib/git.bash

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,11 @@ alias gst='git status'
alias gco="git checkout"
alias gu="git reset HEAD"
alias ghr="git log -n1 --pretty=format:'%C(bold red)%h%Creset'"
alias gpp="git pull && git push"
# https://stackoverflow.com/questions/17847213/how-to-configure-git-push-to-automatically-set-upstream-without-u
alias gpu='[[ -z $(git config "branch.$(git symbolic-ref --short HEAD).merge") ]] &&
 git push -u origin $(git symbolic-ref --short HEAD) ||
 git push'
alias gpp="git pull && gpu"
complete -o default -o nospace -F _git_checkout gco
alias gpul="git pull"
complete -o default -o nospace -F _git_pull gpull
Expand Down

105 changes: 104 additions & 1 deletion
.emacs.d/config.org

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
#+EMAIL: matt@expectedbehavior.com
#+OPTIONS: num:nil


* About
This is the Expected Behavior Emacs configuation. It's intended to be
used by the Emacsers of EB, but it should be a good starting place for
Expand DownExpand Up@@ -309,7 +310,7 @@ https://www.gnu.org/software/emacs/manual/html_node/emacs/Registers.html
TODO: Project navigation should depend on a function that determines where your code lives
#+BEGIN_SRC emacs-lisp
(global-set-key (kbd "C-c e") (lambda() (interactive)(find-file "~/.emacs.d/config.org")))
(global-set-key (kbd "C-c t") (lambda() (interactive)(find-file "~/Dropbox/tmp.txt")))
(global-set-key (kbd "C-c t") (lambda() (interactive)(find-file "~/Dropbox/tmp.org")))
(global-set-key (kbd "C-c p i w") (lambda() (interactive)(find-file "~/code/instrumental/web/README.md")))
(global-set-key (kbd "C-c p d w") (lambda() (interactive)(find-file "~/code/docraptor/web/README.md")))
#+END_SRC
Expand DownExpand Up@@ -442,6 +443,11 @@ brew cask install font-fira-mono
 )
#+END_SRC

** Ag - The Silver Searcher
If you want to use Projectile's search functions with ag

(use-package ag)

** Projectile
#+BEGIN_SRC emacs-lisp
 (use-package projectile
Expand DownExpand Up@@ -478,6 +484,21 @@ brew cask install font-fira-mono
 :init (doom-modeline-mode 1))
#+END_SRC

** Ensure Emacs Environment Variables Match User Shell
Depending on how you start Emacs, it may or may not have the same
environment variables as your normal shell environment. Some packages
depend on having access to shell commands or other environment
variables and it can be a very non-obvious kind of failure.

In specific, this was installed in response to the
[[https://www.reddit.com/r/emacs/comments/sjstjx/how_can_i_get_orgroam_unlinked_references_working/][problem I was having with org-roam not displaying unlinked references.]]
#+BEGIN_SRC emacs-lisp
 (use-package exec-path-from-shell
 :init (exec-path-from-shell-initialize))
#+END_SRC

#+RESULTS:

* Per-Mode

This section should contain changes that apply to just one mode or a
Expand DownExpand Up@@ -512,6 +533,88 @@ blacklists a few modes, it belongs in Global.

#+END_SRC

** Org

#+BEGIN_SRC emacs-lisp

 (add-hook 'org-mode-hook 'auto-fill-mode)

 (let ((current-prefix-arg '(4)))
 (setq org-startup-with-inline-images t))

#+END_SRC

** Org Roam
Org Roam is a text based information management system using the
Zettelkasten Method. If you haven't heard of it, think of it as a
personal wiki with tags that tracks and graphs links between
nodes. That's really underselling it.

If you'd like to learn more, [[https://www.youtube.com/watch?v=AyhPmypHDEw&list=PLEoMzSkcN8oN3x3XaZQ-AXFKv52LZzjqD][System Crafters did a YouTube series]] that
starts with the absolute basics and builds from there. You could
always read the [[https://www.orgroam.com/manual.html][Org Roam Manual]], but it's a bit more of a technical
review and less of a user guide.

#+BEGIN_SRC emacs-lisp
 ;; -*- lexical-binding: t -*- 


 ;; If you're going to make files, they're going to need a directory.
 ;; I chose a Dropbox folder as the default because it means your
 ;; files will be backed up as soon as you start working on it.
 ;; TODO: Dry up the directory. It's in three places, which is bad.
 (if (file-exists-p (file-truename "~/Dropbox/OrgRoam"))
 (display-message-or-buffer "Org Roam directory already exists")
 (make-directory "~/Dropbox/OrgRoam")
 )

 (use-package org-roam
 :custom
 (org-roam-directory (file-truename "~/Dropbox/OrgRoam"))
 (org-roam-completion-everywhere t)
 (org-roam-mode-section-functions
 (list #'org-roam-backlinks-section
 #'org-roam-reflinks-section
 #'org-roam-unlinked-references-section
 ))
 :bind (
 ("C-c n f" . org-roam-node-find)
 ("C-c n i" . org-roam-node-insert)
 ("C-c n l" . org-roam-buffer-toggle)
 ("C-c n s" . org-roam-db-sync) ;; in case you delete a file outside emacs
 ("C-c n t" . org-roam-tag-add) ;; in case you delete a file outside emacs
 :map org-mode-map
 ("C-M-i" . completion-at-point)
 )
 :config
 (org-roam-setup)
 (org-roam-db-autosync-mode)
 )


#+END_SRC


#+BEGIN_SRC emacs-lisp

 ;; https://github.com/org-roam/org-roam-ui
 ;; localhost:35901
 ;; 
 (use-package org-roam-ui
 :after org-roam ;; or :after org
 ;; normally we'd recommend hooking orui after org-roam, but since org-roam does not have
 ;; a hookable mode anymore, you're advised to pick something yourself
 ;; if you don't care about startup time, use
 :hook (after-init . org-roam-ui-mode)
 :config
 (setq org-roam-ui-sync-theme t
 org-roam-ui-follow t
 org-roam-ui-update-on-save t
 org-roam-ui-open-on-start t))

#+END_SRC


** Rust

#+BEGIN_SRC emacs-lisp
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Add an alias to push and set git branch and tracking by esquivalient · Pull Request #21 · expectedbehavior/common-files · GitHub
Skip to content
Add an alias to push and set git branch and tracking#21

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.

 Sign up for GitHub

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

 Merged

esquivalient
merged 5 commits into

from

Jul 6, 2022
 Merged


Add an alias to push and set git branch and tracking
#21
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
9185384

Add org roam and org roam ui


esquivalient Mar 12, 2022
d222811

Merge remote-tracking branch 'origin/emacs_org_roam' into emacs_org_r…

Mar 13, 2022
249a866

Remove custom org roam method for immediate insertion


esquivalient Apr 25, 2022
ba7c950

Add Silver Searcher as an option for projectile searching


esquivalient Jun 28, 2022
5b3f6db

Add an alias that pushes a git branch and sets local to track the remote


esquivalient Jun 28, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 5 additions & 1 deletion
.common_files/lib/git.bash

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,11 @@ alias gst='git status'
alias gco="git checkout"
alias gu="git reset HEAD"
alias ghr="git log -n1 --pretty=format:'%C(bold red)%h%Creset'"
alias gpp="git pull && git push"
# https://stackoverflow.com/questions/17847213/how-to-configure-git-push-to-automatically-set-upstream-without-u
alias gpu='[[ -z $(git config "branch.$(git symbolic-ref --short HEAD).merge") ]] &&
 git push -u origin $(git symbolic-ref --short HEAD) ||
 git push'
alias gpp="git pull && gpu"
complete -o default -o nospace -F _git_checkout gco
alias gpul="git pull"
complete -o default -o nospace -F _git_pull gpull
Expand Down

105 changes: 104 additions & 1 deletion
.emacs.d/config.org

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
#+EMAIL: matt@expectedbehavior.com
#+OPTIONS: num:nil


* About
This is the Expected Behavior Emacs configuation. It's intended to be
used by the Emacsers of EB, but it should be a good starting place for
Expand DownExpand Up@@ -309,7 +310,7 @@ https://www.gnu.org/software/emacs/manual/html_node/emacs/Registers.html
TODO: Project navigation should depend on a function that determines where your code lives
#+BEGIN_SRC emacs-lisp
(global-set-key (kbd "C-c e") (lambda() (interactive)(find-file "~/.emacs.d/config.org")))
(global-set-key (kbd "C-c t") (lambda() (interactive)(find-file "~/Dropbox/tmp.txt")))
(global-set-key (kbd "C-c t") (lambda() (interactive)(find-file "~/Dropbox/tmp.org")))
(global-set-key (kbd "C-c p i w") (lambda() (interactive)(find-file "~/code/instrumental/web/README.md")))
(global-set-key (kbd "C-c p d w") (lambda() (interactive)(find-file "~/code/docraptor/web/README.md")))
#+END_SRC
Expand DownExpand Up@@ -442,6 +443,11 @@ brew cask install font-fira-mono
 )
#+END_SRC

** Ag - The Silver Searcher
If you want to use Projectile's search functions with ag

(use-package ag)

** Projectile
#+BEGIN_SRC emacs-lisp
 (use-package projectile
Expand DownExpand Up@@ -478,6 +484,21 @@ brew cask install font-fira-mono
 :init (doom-modeline-mode 1))
#+END_SRC

** Ensure Emacs Environment Variables Match User Shell
Depending on how you start Emacs, it may or may not have the same
environment variables as your normal shell environment. Some packages
depend on having access to shell commands or other environment
variables and it can be a very non-obvious kind of failure.

In specific, this was installed in response to the
[[https://www.reddit.com/r/emacs/comments/sjstjx/how_can_i_get_orgroam_unlinked_references_working/][problem I was having with org-roam not displaying unlinked references.]]
#+BEGIN_SRC emacs-lisp
 (use-package exec-path-from-shell
 :init (exec-path-from-shell-initialize))
#+END_SRC

#+RESULTS:

* Per-Mode

This section should contain changes that apply to just one mode or a
Expand DownExpand Up@@ -512,6 +533,88 @@ blacklists a few modes, it belongs in Global.

#+END_SRC

** Org

#+BEGIN_SRC emacs-lisp

 (add-hook 'org-mode-hook 'auto-fill-mode)

 (let ((current-prefix-arg '(4)))
 (setq org-startup-with-inline-images t))

#+END_SRC

** Org Roam
Org Roam is a text based information management system using the
Zettelkasten Method. If you haven't heard of it, think of it as a
personal wiki with tags that tracks and graphs links between
nodes. That's really underselling it.

If you'd like to learn more, [[https://www.youtube.com/watch?v=AyhPmypHDEw&list=PLEoMzSkcN8oN3x3XaZQ-AXFKv52LZzjqD][System Crafters did a YouTube series]] that
starts with the absolute basics and builds from there. You could
always read the [[https://www.orgroam.com/manual.html][Org Roam Manual]], but it's a bit more of a technical
review and less of a user guide.

#+BEGIN_SRC emacs-lisp
 ;; -*- lexical-binding: t -*- 


 ;; If you're going to make files, they're going to need a directory.
 ;; I chose a Dropbox folder as the default because it means your
 ;; files will be backed up as soon as you start working on it.
 ;; TODO: Dry up the directory. It's in three places, which is bad.
 (if (file-exists-p (file-truename "~/Dropbox/OrgRoam"))
 (display-message-or-buffer "Org Roam directory already exists")
 (make-directory "~/Dropbox/OrgRoam")
 )

 (use-package org-roam
 :custom
 (org-roam-directory (file-truename "~/Dropbox/OrgRoam"))
 (org-roam-completion-everywhere t)
 (org-roam-mode-section-functions
 (list #'org-roam-backlinks-section
 #'org-roam-reflinks-section
 #'org-roam-unlinked-references-section
 ))
 :bind (
 ("C-c n f" . org-roam-node-find)
 ("C-c n i" . org-roam-node-insert)
 ("C-c n l" . org-roam-buffer-toggle)
 ("C-c n s" . org-roam-db-sync) ;; in case you delete a file outside emacs
 ("C-c n t" . org-roam-tag-add) ;; in case you delete a file outside emacs
 :map org-mode-map
 ("C-M-i" . completion-at-point)
 )
 :config
 (org-roam-setup)
 (org-roam-db-autosync-mode)
 )


#+END_SRC


#+BEGIN_SRC emacs-lisp

 ;; https://github.com/org-roam/org-roam-ui
 ;; localhost:35901
 ;; 
 (use-package org-roam-ui
 :after org-roam ;; or :after org
 ;; normally we'd recommend hooking orui after org-roam, but since org-roam does not have
 ;; a hookable mode anymore, you're advised to pick something yourself
 ;; if you don't care about startup time, use
 :hook (after-init . org-roam-ui-mode)
 :config
 (setq org-roam-ui-sync-theme t
 org-roam-ui-follow t
 org-roam-ui-update-on-save t
 org-roam-ui-open-on-start t))

#+END_SRC


** Rust

#+BEGIN_SRC emacs-lisp
Expand Down