Browse Source

add mac changes

Josh Bicking 6 months ago
parent
commit
6a3a799951
3 changed files with 20 additions and 6 deletions
  1. 1 1
      doom/.config/doom/config.el
  2. 13 2
      profile/.profile
  3. 6 3
      zsh/.zshrc

+ 1 - 1
doom/.config/doom/config.el

@@ -40,7 +40,7 @@
 
 ;; If you use `org' and don't want your org files in the default location below,
 ;; change `org-directory'. It must be set before org loads!
-(setq org-directory "~/Nextcloud/org/")
+(setq org-directory "~/org/")
 
 
 ;; Whenever you reconfigure a package, make sure to wrap your config in an

+ 13 - 2
profile/.profile

@@ -19,7 +19,9 @@ fi
 alias ls='ls --color=auto'
 
 # Custom ls colors
-eval $(dircolors ~/.dircolors)
+if command -v dircolors 2>&1 >/dev/null; then
+    eval $(dircolors ~/.dircolors)
+fi
 
 pathappend() {
     for ARG in "$@"
@@ -37,7 +39,8 @@ pathappend \
     "$HOME/.poetry/bin" \
     "$HOME/.pyenv/bin" \
     "/usr/local/go/bin" \
-    "/usr/sbin"
+    "/usr/sbin" \
+    "$HOME/go/bin"
 
 if [ -d "$HOME/.pyenv/bin" ]; then
     eval "$(pyenv init -)"
@@ -49,3 +52,11 @@ fi
 if [ -f "$HOME/.cargo/env" ]; then
     source "$HOME/.cargo/env"
 fi
+
+if command -v thefuck 2>&1 >/dev/null; then
+    eval $(thefuck --alias)
+fi
+
+if [ -f "$HOME/.local/share/cloudflare-warp-certs/config.sh" ]; then
+    source $HOME/.local/share/cloudflare-warp-certs/config.sh
+fi

+ 6 - 3
zsh/.zshrc

@@ -20,6 +20,9 @@ then
     antigen bundle pip
     antigen bundle lein
     antigen bundle command-not-found
+    export NVM_LAZY_LOAD=true
+    antigen bundle lukechilds/zsh-nvm
+
 
     # Syntax highlighting bundle.
     antigen bundle zsh-users/zsh-syntax-highlighting
@@ -27,7 +30,7 @@ then
     antigen bundle zsh-users/zsh-autosuggestions
 
     # Load the theme.
-    antigen theme bureau
+    antigen theme simple
 
     # Tell antigen that you're done.
     antigen apply
@@ -80,11 +83,11 @@ function cd {
 function sl_func() {
     # sl - prints a mirror image of ls. (C) 2017 Tobias Girstmair, https://gir.st/, GPLv3
     #
-    LEN=$(ls "$@" |wc -L) # get the length of the longest line
+    LEN=$(ls "$@" |sort -nr|head -1|wc -c) # get the length of the longest line
 
     ls "$@" | rev | while read -r line
     do
-      printf "%${LEN}.${LEN}s\\n" "$line" | sed 's/^\(\s\+\)\(\S\+\)/\2\1/'
+      builtin printf "%${LEN}.${LEN}s\\n" "$line" | sed 's/^\(\s\+\)\(\S\+\)/\2\1/'
       done
 
 }