Josh Bicking 2 ngày trước cách đây
mục cha
commit
2105abe4ce
5 tập tin đã thay đổi với 10 bổ sung112 xóa
  1. 0 2
      doom/.config/doom/config.el
  2. 1 1
      doom/.config/doom/init.el
  3. 2 3
      doom/.config/doom/packages.el
  4. 7 33
      profile/.profile
  5. 0 73
      zsh/.zshrc

+ 0 - 2
doom/.config/doom/config.el

@@ -77,8 +77,6 @@
 ;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how
 ;; they are implemented.
 
-(doom-load-envvars-file "~/.config/doomenv")
-
 (after! ellama
   (setq ellama-major-mode #'markdown-mode)
   )

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

@@ -31,7 +31,7 @@
        :ui
        ;;deft              ; notational velocity for Emacs
        doom              ; what makes DOOM look the way it does
-       doom-dashboard    ; a nifty splash screen for Emacs
+       dashboard           ; a nifty splash screen for Emacs
        ;;doom-quit         ; DOOM quit-message prompts when you quit Emacs
        (emoji +unicode)  ; 🙂
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW

+ 2 - 3
doom/.config/doom/packages.el

@@ -49,6 +49,5 @@
 ;; ...Or *all* packages (NOT RECOMMENDED; will likely break things)
 ;; (unpin! t)
 
-(package! todoist)
-(package! ellama)
-(package! bazel)
+
+(setq lsp-use-plists nil)

+ 7 - 33
profile/.profile

@@ -1,28 +1,7 @@
 # ~/.profile: executed by the command interpreter for login shells.
-# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
-# exists.
-# see /usr/share/doc/bash/examples/startup-files for examples.
-# the files are located in the bash-doc package.
-
-# the default umask is set in /etc/profile; for setting the umask
-# for ssh logins, install and configure the libpam-umask package.
-#umask 022
-
-# if running bash
-if [ -n "$BASH_VERSION" ]; then
-    # include .bashrc if it exists
-    if [ -f "$HOME/.bashrc" ]; then
-	      . "$HOME/.bashrc"
-    fi
-fi
 
 alias ls='ls --color=auto'
 
-# Custom ls colors
-if command -v dircolors 2>&1 >/dev/null; then
-    eval $(dircolors ~/.dircolors)
-fi
-
 pathappend() {
     for ARG in "$@"
     do
@@ -33,13 +12,12 @@ pathappend() {
 }
 
 pathappend \
-    "$HOME/bin" \
     "$HOME/.local/bin" \
-    "$HOME/.cargo/bin" \
-    "$HOME/.poetry/bin" \
     "$HOME/.pyenv/bin" \
-    "/usr/local/go/bin" \
     "/usr/sbin" \
+    "/usr/local/go/bin" \
+    "$HOME/.config/emacs/bin" \
+    "$HOME/.cargo/bin" \
     "$HOME/go/bin"
 
 if [ -d "$HOME/.pyenv/bin" ]; then
@@ -47,12 +25,8 @@ if [ -d "$HOME/.pyenv/bin" ]; then
     eval "$(pyenv virtualenv-init -)"
 fi
 
-# export RUST_SRC_PATH="$(rustc --print sysroot)/lib/rustlib/src/rust/src/"
-
-if [ -f "$HOME/.cargo/env" ]; then
-    source "$HOME/.cargo/env"
-fi
-
-if command -v thefuck 2>&1 >/dev/null; then
-    eval $(thefuck --alias)
+if [ -d "$HOME/.bun" ]; then
+    export BUN_INSTALL="$HOME/.bun"
+    export PATH="$BUN_INSTALL/bin:$PATH"
+    [ -s "/home/josh/.bun/_bun" ] && source "/home/josh/.bun/_bun"
 fi

+ 0 - 73
zsh/.zshrc

@@ -1,46 +1,3 @@
-# local zsh config
-if [ -f ~/.zshrc.local ]; then
-    source ~/.zshrc.local
-fi
-
-# load antigen if it exists
-if [ -h ~/.antigen.zsh ]
-then
-
-    save_aliases=$(alias -L)
-
-    source ~/.antigen.zsh
-
-    # Load oh-my-zsh's library.
-    antigen use oh-my-zsh
-
-    # Bundles from the default repo (robbyrussell's oh-my-zsh).
-    antigen bundle git
-    antigen bundle heroku
-    antigen bundle pip
-    antigen bundle lein
-    antigen bundle command-not-found
-    export NVM_LAZY_LOAD=true
-    export NVM_NO_USE=true
-    antigen bundle lukechilds/zsh-nvm
-
-
-    # Syntax highlighting bundle.
-    antigen bundle zsh-users/zsh-syntax-highlighting
-
-    antigen bundle zsh-users/zsh-autosuggestions
-
-    # Load the theme.
-    antigen theme simple
-
-    # Tell antigen that you're done.
-    antigen apply
-
-    unalias -m '*'
-    eval $save_aliases; unset save_aliases
-
-fi
-
 bindkey '^ ' autosuggest-accept
 
 # History
@@ -60,38 +17,8 @@ setopt HIST_IGNORE_ALL_DUPS
 
 setopt appendhistory autocd extendedglob nomatch
 
-# List of word delimeters
-WORDCHARS='*?_-.[]~=&;!#$%^(){}<>'
-
-# Home and End keys jump the the beginning/end of the command
-bindkey "^[OH" beginning-of-line
-bindkey "^[[H" beginning-of-line
-bindkey "^[OF" end-of-line
-bindkey "^[[F" end-of-line
-
-# Enable forward search
-bindkey "^s" history-incremental-search-forward
-
-# Ctrl-Left and Ctrl-Right keys move between words
-bindkey ";5C" forward-word
-bindkey ";5D" backward-word
-
 # cdls
 function cd {
     builtin cd "$@" && ls -F
 }
 
-function sl_func() {
-    # sl - prints a mirror image of ls. (C) 2017 Tobias Girstmair, https://gir.st/, GPLv3
-    #
-    LEN=$(ls "$@" |sort -nr|head -1|wc -c) # get the length of the longest line
-
-    ls "$@" | rev | while read -r line
-    do
-      builtin printf "%${LEN}.${LEN}s\\n" "$line" | sed 's/^\(\s\+\)\(\S\+\)/\2\1/'
-      done
-
-}
-
-alias sl=sl_func
-