Skip to content

Commit

Permalink
commit to setup latte
Browse files Browse the repository at this point in the history
  • Loading branch information
hattajr committed Feb 2, 2023
1 parent 2854154 commit 88cce1f
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 29 deletions.
7 changes: 7 additions & 0 deletions .bashrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
# ~/.bashrc: executed by bash(1) for non-login shells.
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
# for examples
# pyenv
export PATH="$HOME/.pyenv/bin:$PATH"
eval "$(pyenv init --path)"
eval "$(pyenv virtualenv-init -)"



alias vim=nvim

# If not running interactively, don't do anything
Expand Down
3 changes: 1 addition & 2 deletions .config/nvim/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,4 @@
}
```
1. Install **which-key** vscode extension and copy the **which-key** extension settings from `setting.json` file into you vscode settings.
1. You also need to copy the `keybindings.json` file into your vscode settings (vscode `keybindings.json`).

1. You also need to copy the `keybindings.json` file into your vscode settings (vscode `keybindings.json`).
5 changes: 3 additions & 2 deletions .config/nvim/general/settings.vim
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
" set leader key
let g:mapleader = "\<Space>"
set relativenumber
let mapleader = "\<Space>"
set relativenumber
set scrolloff=9
set shiftwidth=4
set hidden
set nohlsearch
Expand Down
28 changes: 25 additions & 3 deletions .config/nvim/init.vim
Original file line number Diff line number Diff line change
@@ -1,12 +1,34 @@

" ____ _ __ _
" / _/___ (_) /__ __(_)___ ___
" / // __ \/ / __/ | / / / __ `__ \
" _/ // / / / / /__| |/ / / / / / / /
"/___/_/ /_/_/\__(_)___/_/_/ /_/ /_/


" General Settings
source $HOME/.config/nvim/vim-plug/plugins.vim
source $HOME/.config/nvim/general/settings.vim
source $HOME/.config/nvim/keys/mappings.vim

if exists('g:vscode')
source ~/.config/nvim/general/vscode_settings.vim
else
source ~/.config/nvim/general/settings.vim
source ~/.config/nvim/keys/mappings.vim
source ~/.config/nvim/vim-plug/plugins.vim
source ~/.config/nvim/after/themes/tokyonight.vim
endif
















5 changes: 4 additions & 1 deletion .config/nvim/vim-plug/plugins.vim
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@ call plug#begin('~/.config/nvim/autoload/plugged')
Plug 'folke/tokyonight.nvim', { 'branch': 'main' }
" Better Syntax Support
Plug 'sheerun/vim-polyglot'
" File Explorer
" Copilot
Plug 'github/copilot.vim'
"File Explorer
Plug 'scrooloose/NERDTree'
" Auto pairs for '(' '[' '{'
Plug 'jiangmiao/auto-pairs'
" Status bar
Plug 'itchyny/lightline.vim'
" Comment
Plug 'tpope/vim-commentary'

call plug#end()
36 changes: 20 additions & 16 deletions .zshrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
# Initialization code that may require console input (password prompts, [y/n]
# confirmations, etc.) must go above this block; everything else may go below.
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
Expand All @@ -7,10 +6,10 @@ fi

# If you come from bash you might have to change your $PATH.
export PATH=$HOME/bin:/usr/local/bin:$PATH

export PATH=/opt/conda/bin:$PATH
# Path to your oh-my-zsh installation.
export ZSH="$HOME/.oh-my-zsh"

export ZSH_DISABLE_COMPFIX=true
# Set name of the theme to load --- if set to "random", it will
# load a random theme each time oh-my-zsh is loaded, in which case,
# to know which specific one was loaded, run: echo $RANDOM_THEME
Expand Down Expand Up @@ -112,27 +111,32 @@ source $HOME/.zprofile
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh



if [ -x "$(command -v exa)" ]; then
alias ls="exa"
alias la="exa --long --all --group"
fi
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion


# >>> conda initialize >>>
# !! Contents within this block are managed by 'conda init' !!
__conda_setup="$('/home/hattajr/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
__conda_setup="$('/opt/conda/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
if [ $? -eq 0 ]; then
eval "$__conda_setup"
else
if [ -f "/home/hattajr/miniconda3/etc/profile.d/conda.sh" ]; then
. "/home/hattajr/miniconda3/etc/profile.d/conda.sh"
if [ -f "/opt/conda/etc/profile.d/conda.sh" ]; then
. "/opt/conda/etc/profile.d/conda.sh"
else
export PATH="/home/hattajr/miniconda3/bin:$PATH"
export PATH="/opt/conda/bin:$PATH"
fi
fi
unset __conda_setup
# <<< conda initialize <<<



if [ -x "$(command -v exa)" ]; then
alias ls="exa"
alias la="exa --long --all --group"
fi
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
export PYENV_ROOT="$HOME/.pyenv"
command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
eval "$(pyenv init -)"
5 changes: 0 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@ note: Assume you have neovim >= 0.5
```
1. Install nvim > 0.5

1. Instal vim-plug
```bash
sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \
https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
```
1. Install git

1. Install zsh
Expand Down

0 comments on commit 88cce1f

Please sign in to comment.