Browse Source

emacs/org/bashrc

Simon Watson 3 years ago
parent
commit
8fc3ce6983
3 changed files with 22 additions and 8 deletions
  1. 8 4
      bashrc/macm1-bashrc
  2. 6 4
      emacs/.emacs-mac
  3. 8 0
      orgmode/1.org

+ 8 - 4
bashrc/macm1-bashrc

@@ -7,14 +7,18 @@ alias ll="/opt/homebrew/bin/exa -lah"
 
 default-ps1
 
-alias tmux="systemd-run --scope --user tmux"
 alias tmuxn="tmux new -s $1"
-alias tmuxa="/bin/tmux attach -t $1"
-alias tmuxl="/bin/tmux ls"
+alias tmuxa="tmux attach -t $1"
+alias tmuxl="tmux ls"
 alias tmuxq="echo $TMUX"
 
+alias httpserver="python -m SimpleHTTPServer"
+
+alias emacs="/Applications/Emacs.app/Contents/MacOS/Emacs"
+
+. "/Users/swatson/Repos/dotfiles/bashrc/wal_alias"
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
 
-PATH='/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/homebrew/bin:/opt/homebrew/sbin:/Users/swatson/.fzf/bin'
+PATH='/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/opt/homebrew/bin:/opt/homebrew/sbin:/Users/swatson/.fzf/bin:/Users/swatson/Library/Python/3.8/bin'
 . "$HOME/.cargo/env"

+ 6 - 4
emacs/.emacs-mac

@@ -127,8 +127,11 @@
       `((".*" ,temporary-file-directory t)))
 
 ;(load-theme 'moe-light t)
-(load-theme 'nano t)
-(nano-dark)
+(if (display-graphic-p)
+    (progn
+      (load-theme 'nano t)
+      (nano-dark))
+  nil)
 
 ;; Allow M-up / M-down behavior to switch windows
 (windmove-default-keybindings 'meta)
@@ -147,7 +150,6 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(cua-mode t nil (cua-base))
  '(custom-safe-themes
    '("27a1dd6378f3782a593cc83e108a35c2b93e5ecc3bd9057313e1d88462701fcd" "f703efe04a108fcd4ad104e045b391c706035bce0314a30d72fbf0840b355c2c" "c9ddf33b383e74dac7690255dd2c3dfa1961a8e8a1d20e401c6572febef61045" "01106ca9b4446341ecb86a76b9db48f1100e2eb13980aa0ec6f6adf8e69fd9a7" "bf798e9e8ff00d4bf2512597f36e5a135ce48e477ce88a0764cfb5d8104e8163" "0feb7052df6cfc1733c1087d3876c26c66410e5f1337b039be44cb406b6187c6" default))
  '(diff-hl-margin-mode t)
@@ -158,4 +160,4 @@
  ;; If you edit it by hand, you could mess it up, so be careful.
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
- '(default ((t (:family "IBM 3270 Condensed" :foundry "nil" :slant normal :weight normal :height 181 :width normal)))))
+ '(default ((t (:family "CodingFontTobi" :foundry "nil" :slant normal :weight normal :height 181 :width normal)))))

+ 8 - 0
orgmode/1.org

@@ -0,0 +1,8 @@
+SPW PERSONAL -*- mode: org -*-
+
+* Notes
+** Interesting Things/Links/Etc
+*** Tuir - new fork of rtv
+- https://pypi.org/project/tuir/
+  
+** Projects