diff --git a/nvim/init.lua b/nvim/init.lua
new file mode 100644
index 0000000..2e24370
--- /dev/null
+++ b/nvim/init.lua
@@ -0,0 +1,7 @@
+require("plugins-setup")
+require("core/options")
+require("core/keymaps")
+require("core/colorscheme")
+require("plugins/comment")
+require("plugins/nvim-tree")
+require("plugins/lualine")
diff --git a/nvim/lua/core/colorscheme.lua b/nvim/lua/core/colorscheme.lua
new file mode 100644
index 0000000..332ff10
--- /dev/null
+++ b/nvim/lua/core/colorscheme.lua
@@ -0,0 +1,8 @@
+-- set colorscheme to nightfly with protected call
+-- in case it isn't installed
+local status, _ = pcall(vim.cmd, "colorscheme tokyonight-night")
+if not status then
+  print("Colorscheme not found!") -- print error if colorscheme not installed
+  return
+end
+
diff --git a/nvim/lua/core/keymaps.lua b/nvim/lua/core/keymaps.lua
new file mode 100644
index 0000000..da22740
--- /dev/null
+++ b/nvim/lua/core/keymaps.lua
@@ -0,0 +1,56 @@
+-- comma as leader key
+vim.g.mapleader = ','
+
+local map = vim.keymap.set
+
+map('n', ';', ':', { noremap=true })
+
+-- splits
+-- moving
+map({'n','c'}, '<C-H>', '<C-W><C-H>', { noremap=true })
+map({'n','c'}, '<C-J>', '<C-W><C-J>', { noremap=true })
+map({'n','c'}, '<C-K>', '<C-W><C-K>', { noremap=true })
+map({'n','c'}, '<C-L>', '<C-W><C-L>', { noremap=true })
+-- terminal management
+map('n', '<leader>vt', ':vertical terminal')
+map('c', 'vt', ':vertical terminal', { noremap=true })
+map('n', '<leader>ht', ':terminal')
+map('c', 'ht', ':terminal', { noremap=true })
+-- window management
+map("n", "<leader>sv", "<C-w>v") -- split window vertically
+map("n", "<leader>sh", "<C-w>s") -- split window horizontally
+map("n", "<leader>se", "<C-w>=") -- make split windows equal width & height
+map("n", "<leader>sx", ":close<CR>") -- close current split window
+
+-- TODO: buffer managment
+
+-- clear search highlighting
+map('n', '<leader><space>', ':noh<CR>', { noremap=true })
+
+-- match bracket pairs
+map({'n','v'}, '<tab>', '%', { noremap=true })
+-- set list and listchars
+map('n', '<leader>l', ':set list!<CR>')
+-- toggle paste and nopaste
+map('n', '<leader>p', ':set paste!<CR>')
+
+-- sudo save
+map('c', 'w!!', 'w !sudo tee > /dev/null %')
+
+-- gf is built in and will "start editing the file whose name is under the cursor
+-- gb is not built in and will "Go back to the file which you came from
+map('n', 'gb', '<C-o>', { noremap=true })
+
+-- insert a 'search and replace' command where the word under the cursor is being replaced
+--map('n', '<leader>s', ':%s/\<<C-r><C-w>\>//g<Left><Left>' { noremap=true }
+
+-- x does not copy character into register
+map('n', 'x', '"_x')
+
+-- keymaps for plugins
+
+-- vim-maximizer
+map('n', '<leader>sm', ':MaximizerToggle<CR>')
+
+-- nvim-tree
+map('n', '<leader>e', ':NvimTreeToggle<CR>')
diff --git a/nvim/lua/core/options.lua b/nvim/lua/core/options.lua
new file mode 100644
index 0000000..5c2a81d
--- /dev/null
+++ b/nvim/lua/core/options.lua
@@ -0,0 +1,80 @@
+local opt = vim.opt -- global option
+local wo = vim.wo -- buffer-local option
+local bo = vim.bo -- window-local option
+local g = vim.g
+local cmd = vim.cmd
+
+
+-- misc
+opt.swapfile = true
+opt.hidden = true --buffers
+opt.backup = false -- no file backups
+opt.encoding = 'utf8'
+opt.writebackup = false
+-- cmd('syntax on')
+-- default opt.backspace = 'indent,eol,start'
+
+-- line numbers
+opt.number = true
+opt.relativenumber = true
+cmd [[
+  augroup numbertoggle
+    autocmd!
+    autocmd BufEnter,FocusGained,InsertLeave * set relativenumber
+    autocmd BufLeave,FocusLost,InsertEnter   * set norelativenumber
+  augroup END
+]]
+
+-- cursor
+opt.cursorline = true
+opt.ruler = true -- cursor
+
+-- line wrapping
+opt.wrap = false
+
+-- searching
+opt.ignorecase = true
+opt.smartcase = true
+opt.showmatch = true
+
+-- appearance
+opt.termguicolors = true
+opt.background = 'dark'
+opt.signcolumn = "yes"
+opt.scrolloff = 6
+
+-- status bar
+opt.showcmd = true
+opt.showmode = false
+
+-- mouse
+opt.mousehide = true -- hide mouse when typing
+opt.selectmode = 'mouse' -- select text with mouse
+
+-- splits
+opt.splitbelow = true
+opt.splitright = true
+
+-- see tabs, spaces, eol (keymap is '<leader>l')
+opt.listchars = 'eol:¬,tab:>·,trail:~,extends:>,precedes:<,space:␣'
+
+-- tab
+opt.expandtab = true
+opt.tabstop = 4
+opt.shiftwidth = 4
+opt.softtabstop = 4
+opt.textwidth = 0
+--[[
+" tab-settings for specific filetypes
+autocmd FileType ruby setlocal tabstop=2 shiftwidth=2
+autocmd FileType yaml setlocal tabstop=2 shiftwidth=2
+autocmd FileType tf setlocal tabstop=2 shiftwidth=2
+]]--
+opt.autoindent = true
+
+-- command completion
+opt.wildmenu = true
+opt.wildmode = 'list:longest'
+
+-- add '-' and '_' as part of a keyword
+opt.iskeyword:append("-", "_")
diff --git a/nvim/lua/plugins-setup.lua b/nvim/lua/plugins-setup.lua
new file mode 100644
index 0000000..1eb7269
--- /dev/null
+++ b/nvim/lua/plugins-setup.lua
@@ -0,0 +1,46 @@
+-- auto install packer if not installed
+local ensure_packer = function()
+  local fn = vim.fn
+  local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
+  if fn.empty(fn.glob(install_path)) > 0 then
+    fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path })
+    vim.cmd([[packadd packer.nvim]])
+    return true
+  end
+  return false
+end
+local packer_bootstrap = ensure_packer() -- true if packer was just installed
+
+-- autocommand that reloads neovim and installs/updates/removes plugins
+-- when file is saved
+vim.cmd([[ 
+  augroup packer_user_config
+    autocmd!
+    autocmd BufWritePost plugins-setup.lua source <afile> | PackerSync
+  augroup end
+]])
+
+-- import packer safely
+local status, packer = pcall(require, "packer")
+if not status then
+  return
+end
+
+-- add list of plugins to install
+return packer.startup(function(use)
+  -- packer manages itself
+  use("wbthomason/packer.nvim")
+
+  use("folke/tokyonight.nvim") -- preferred colorscheme
+  use("szw/vim-maximizer") -- maximizes and restores current window
+  use("tpope/vim-surround") -- add, delete, change surroundings (it's awesome)
+  use("inkarkat/vim-ReplaceWithRegister") -- replace with register contents using motion (gr + motion)
+  use("numToStr/Comment.nvim") -- commenting with gc
+  use("nvim-tree/nvim-tree.lua") -- file explorer
+  use("nvim-tree/nvim-web-devicons") -- icons
+  use("nvim-lualine/lualine.nvim") -- statusline
+
+  if packer_bootstrap then
+    require("packer").sync()
+  end
+end)
diff --git a/nvim/lua/plugins/comment.lua b/nvim/lua/plugins/comment.lua
new file mode 100644
index 0000000..b9df5cd
--- /dev/null
+++ b/nvim/lua/plugins/comment.lua
@@ -0,0 +1,8 @@
+-- import comment plugin safely
+local setup, comment = pcall(require, "Comment")
+if not setup then
+  return
+end
+
+-- enable comment
+comment.setup()
diff --git a/nvim/lua/plugins/lualine.lua b/nvim/lua/plugins/lualine.lua
new file mode 100644
index 0000000..e0efe71
--- /dev/null
+++ b/nvim/lua/plugins/lualine.lua
@@ -0,0 +1,41 @@
+-- import lualine plugin safely
+local status, lualine = pcall(require, "lualine")
+if not status then
+  return
+end
+
+lualine.setup({
+  options = {
+    theme = 'tokyonight'
+  }
+})
+-- get lualine tokyonight theme
+-- local lualine_tokyonight = require("lualine.themes.tokyonight")
+--
+-- -- new colors for theme
+-- local new_colors = {
+--   blue = "#65D1FF",
+--   green = "#3EFFDC",
+--   violet = "#FF61EF",
+--   yellow = "#FFDA7B",
+--   black = "#000000",
+-- }
+--
+-- -- change nightlfy theme colors
+-- lualine_tokyonight.normal.a.bg = new_colors.blue
+-- lualine_tokyonight.insert.a.bg = new_colors.green
+-- lualine_tokyonight.visual.a.bg = new_colors.violet
+-- lualine_tokyonight.command = {
+--   a = {
+--     gui = "bold",
+--     bg = new_colors.yellow,
+--     fg = new_colors.black, -- black
+--   },
+-- }
+--
+-- -- configure lualine with modified theme
+-- lualine.setup({
+--   options = {
+--     theme = lualine_tokyonight,
+--   },
+-- })
diff --git a/nvim/lua/plugins/nvim-tree.lua b/nvim/lua/plugins/nvim-tree.lua
new file mode 100644
index 0000000..4d1eb89
--- /dev/null
+++ b/nvim/lua/plugins/nvim-tree.lua
@@ -0,0 +1,49 @@
+-- import nvim-tree plugin safely
+local setup, nvimtree = pcall(require, "nvim-tree")
+if not setup then
+  return
+end
+
+-- recommended settings from nvim-tree documentation
+vim.g.loaded_netrw = 1
+vim.g.loaded_netrwPlugin = 1
+
+-- change color for arrows in tree to light blue
+vim.cmd([[ highlight NvimTreeIndentMarker guifg=#3FC5FF ]])
+
+-- configure nvim-tree
+nvimtree.setup({
+  -- change folder arrow icons
+  renderer = {
+    icons = {
+      glyphs = {
+        folder = {
+          arrow_closed = "", -- arrow when folder is closed
+          arrow_open = "", -- arrow when folder is open
+        },
+      },
+    },
+  },
+  -- disable window_picker for
+  -- explorer to work well with
+  -- window splits
+  actions = {
+    open_file = {
+      window_picker = {
+        enable = false,
+      },
+    },
+  },
+  view = {
+    mappings = {
+      list = {
+        { key = "v", action = "vsplit" },
+        { key = "h", action = "split" },
+      }
+    }
+  },
+  -- 	git = {
+  -- 		ignore = false,
+  -- 	},
+})
+
diff --git a/nvim/old_init.vim b/nvim/old_init.vim
new file mode 100644
index 0000000..4d7b473
--- /dev/null
+++ b/nvim/old_init.vim
@@ -0,0 +1,182 @@
+set nocompatible
+set backspace=indent,eol,start
+filetype off
+
+call plug#begin()
+
+" let's install some plugins
+Plug 'folke/tokyonight.nvim', { 'branch': 'main' }
+"Plug 'christoomey/vim-tmux-navigator'
+"Plug 'benmills/vimux'
+"Plug 'Raimondi/delimitMate'
+"Plug 'bling/vim-airline'
+"Plug 'bling/vim-bufferline'
+"Plug 'tpope/vim-fugitive'
+"Plug 'godlygeek/tabular'
+"Plug 'morhetz/gruvbox'
+"Plug 'w0rp/ale', {'for': 'python'}
+"Plug 'fatih/vim-go', {'for': 'go', 'do': ':GoUpdateBinaries'}
+"Plug 'hashivim/vim-terraform'
+
+" Initialize plugin system
+call plug#end()
+
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""begin
+" config
+set modelines=0
+
+set hidden
+set t_Co=256
+set history=1000
+set ruler
+set nobackup
+set encoding=utf-8
+set background=dark
+set termguicolors
+" fix problem with termguicolors in tmux
+let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+
+" Tab
+set expandtab
+set tabstop=4
+set shiftwidth=4
+set softtabstop=4
+set textwidth=0
+" tab-settings for specific filetypes
+autocmd FileType ruby setlocal tabstop=2 shiftwidth=2
+autocmd FileType yaml setlocal tabstop=2 shiftwidth=2
+autocmd FileType puppet setlocal tabstop=2 shiftwidth=2
+autocmd FileType tf setlocal tabstop=2 shiftwidth=2
+
+set showcmd
+set noshowmode
+colorscheme gruvbox
+set noswapfile
+set nowb
+set autoindent
+set mousehide
+set scrolloff=8
+set selectmode=mouse
+" Command completion
+set wildmenu
+set wildmode=list:longest
+
+" linenumbers
+set number relativenumber
+
+:augroup numbertoggle
+:  autocmd!
+:  autocmd BufEnter,FocusGained,InsertLeave * set relativenumber
+:  autocmd BufLeave,FocusLost,InsertEnter   * set norelativenumber
+:augroup END
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""end
+"""""""""""""""""""""""
+" set undofile
+"""""""""""""""""""""""
+set cursorline
+
+syntax on
+
+"Mapleader
+let mapleader= ","
+
+" ; same as :
+nnoremap ; :
+
+" open terminal splits
+cnoremap vt vertical terminal
+nmap <leader>vt :vertical terminal<CR>
+cnoremap ht terminal
+nmap <leader>ht :terminal<CR>
+
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""begin
+"searching moving
+set ignorecase
+set smartcase
+set incsearch
+set hlsearch
+set showmatch
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""end
+" moving between splits
+nnoremap <C-H> <C-W><C-H>
+nnoremap <C-J> <C-W><C-J>
+nnoremap <C-K> <C-W><C-K>
+nnoremap <C-L> <C-W><C-L>
+" moving from terminal split
+tnoremap <C-H> <C-W><C-H>
+tnoremap <C-J> <C-W><C-J>
+tnoremap <C-K> <C-W><C-K>
+tnoremap <C-L> <C-W><C-L>
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""begin
+" saner splits
+set splitbelow
+set splitright
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""end
+" Space to clear search highlighting
+nnoremap <leader><space> :noh<cr>
+" Match bracket pairs (normal)
+nnoremap <tab> %
+" Match bracker pairs (visual)
+vnoremap <tab> %
+
+" Toggle set list and set listchars
+nmap <leader>l :set list!<CR>
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""begin
+set listchars=eol:¬,tab:>·,trail:~,extends:>,precedes:<,space:␣
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""end
+
+" Toggle between paste and nopaste
+nmap <leader>p :set paste!<CR>
+
+" sudo-save
+cmap w!! w !sudo tee > /dev/null %
+
+" gf is built in and will "start editing the file whose name is under the cursor
+" gb is not built in and will "Go back to the file which you came from
+nnoremap gb <C-o>
+
+" insert a 'search and replace' command where the word under the cursor is
+" being replaced
+nnoremap <Leader>s :%s/\<<C-r><C-w>\>//g<Left><Left>
+
+" vimux mappings
+" Prompt for a command to run
+map <Leader>vp :VimuxPromptCommand<CR>
+" Run last command executed by VimuxRunCommand
+map <Leader>vl :VimuxRunLastCommand<CR>
+" Inspect runner pane
+map <Leader>vi :VimuxInspectRunner<CR>
+" Zoom the tmux runner pane
+map <Leader>vz :VimuxZoomRunner<CR>
+
+" vim-airline config
+set laststatus=2
+let g:airline_theme='dark'
+let g:airline_powerline_fonts=0
+let g:airline_left_sep='»'
+let g:airline_right_sep='«'
+
+" fix to get out of insert mode immedieatly
+set ttimeout
+set ttimeoutlen=50
+
+"if match($TERM, "screen")!=-1
+"	set term=xterm
+"endif
+
+" red background for letters after 80 chars
+highlight OverLength ctermbg=red ctermfg=white guibg=#592929
+match OverLength /\%81v.\+/
+
+" gruvbox specific
+let g:gruvbox_italic=0
+
+" config for ALE syntax checker
+let g:ale_linters = {'python': ['flake8']}
+let g:ale_fixers = {'python': ['remove_trailing_lines', 'trim_whitespace', 'autopep8']}
+
+" config for vim-terraform
+let g:terraform_fold_sections=1
+let g:terraform_fmt_on_save=1
+let g:terraform_align=1
diff --git a/nvim/plugin/packer_compiled.lua b/nvim/plugin/packer_compiled.lua
new file mode 100644
index 0000000..d98873e
--- /dev/null
+++ b/nvim/plugin/packer_compiled.lua
@@ -0,0 +1,139 @@
+-- Automatically generated packer.nvim plugin loader code
+
+if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then
+  vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"')
+  return
+end
+
+vim.api.nvim_command('packadd packer.nvim')
+
+local no_errors, error_msg = pcall(function()
+
+_G._packer = _G._packer or {}
+_G._packer.inside_compile = true
+
+local time
+local profile_info
+local should_profile = false
+if should_profile then
+  local hrtime = vim.loop.hrtime
+  profile_info = {}
+  time = function(chunk, start)
+    if start then
+      profile_info[chunk] = hrtime()
+    else
+      profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6
+    end
+  end
+else
+  time = function(chunk, start) end
+end
+
+local function save_profiles(threshold)
+  local sorted_times = {}
+  for chunk_name, time_taken in pairs(profile_info) do
+    sorted_times[#sorted_times + 1] = {chunk_name, time_taken}
+  end
+  table.sort(sorted_times, function(a, b) return a[2] > b[2] end)
+  local results = {}
+  for i, elem in ipairs(sorted_times) do
+    if not threshold or threshold and elem[2] > threshold then
+      results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms'
+    end
+  end
+  if threshold then
+    table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)')
+  end
+
+  _G._packer.profile_output = results
+end
+
+time([[Luarocks path setup]], true)
+local package_path_str = "/Users/gisli/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/gisli/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/gisli/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/gisli/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/Users/gisli/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
+if not string.find(package.path, package_path_str, 1, true) then
+  package.path = package.path .. ';' .. package_path_str
+end
+
+if not string.find(package.cpath, install_cpath_pattern, 1, true) then
+  package.cpath = package.cpath .. ';' .. install_cpath_pattern
+end
+
+time([[Luarocks path setup]], false)
+time([[try_loadstring definition]], true)
+local function try_loadstring(s, component, name)
+  local success, result = pcall(loadstring(s), name, _G.packer_plugins[name])
+  if not success then
+    vim.schedule(function()
+      vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {})
+    end)
+  end
+  return result
+end
+
+time([[try_loadstring definition]], false)
+time([[Defining packer_plugins]], true)
+_G.packer_plugins = {
+  ["Comment.nvim"] = {
+    loaded = true,
+    path = "/Users/gisli/.local/share/nvim/site/pack/packer/start/Comment.nvim",
+    url = "https://github.com/numToStr/Comment.nvim"
+  },
+  ["lualine.nvim"] = {
+    loaded = true,
+    path = "/Users/gisli/.local/share/nvim/site/pack/packer/start/lualine.nvim",
+    url = "https://github.com/nvim-lualine/lualine.nvim"
+  },
+  ["nvim-tree.lua"] = {
+    loaded = true,
+    path = "/Users/gisli/.local/share/nvim/site/pack/packer/start/nvim-tree.lua",
+    url = "https://github.com/nvim-tree/nvim-tree.lua"
+  },
+  ["nvim-web-devicons"] = {
+    loaded = true,
+    path = "/Users/gisli/.local/share/nvim/site/pack/packer/start/nvim-web-devicons",
+    url = "https://github.com/nvim-tree/nvim-web-devicons"
+  },
+  ["packer.nvim"] = {
+    loaded = true,
+    path = "/Users/gisli/.local/share/nvim/site/pack/packer/start/packer.nvim",
+    url = "https://github.com/wbthomason/packer.nvim"
+  },
+  ["tokyonight.nvim"] = {
+    loaded = true,
+    path = "/Users/gisli/.local/share/nvim/site/pack/packer/start/tokyonight.nvim",
+    url = "https://github.com/folke/tokyonight.nvim"
+  },
+  ["vim-ReplaceWithRegister"] = {
+    loaded = true,
+    path = "/Users/gisli/.local/share/nvim/site/pack/packer/start/vim-ReplaceWithRegister",
+    url = "https://github.com/inkarkat/vim-ReplaceWithRegister"
+  },
+  ["vim-maximizer"] = {
+    loaded = true,
+    path = "/Users/gisli/.local/share/nvim/site/pack/packer/start/vim-maximizer",
+    url = "https://github.com/szw/vim-maximizer"
+  },
+  ["vim-surround"] = {
+    loaded = true,
+    path = "/Users/gisli/.local/share/nvim/site/pack/packer/start/vim-surround",
+    url = "https://github.com/tpope/vim-surround"
+  }
+}
+
+time([[Defining packer_plugins]], false)
+
+_G._packer.inside_compile = false
+if _G._packer.needs_bufread == true then
+  vim.cmd("doautocmd BufRead")
+end
+_G._packer.needs_bufread = false
+
+if should_profile then save_profiles() end
+
+end)
+
+if not no_errors then
+  error_msg = error_msg:gsub('"', '\\"')
+  vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None')
+end
diff --git a/zsh/.zshrc b/zsh/.zshrc
new file mode 100644
index 0000000..9b498a4
--- /dev/null
+++ b/zsh/.zshrc
@@ -0,0 +1,111 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=/opt/homebrew/bin:$HOME/bin:/usr/local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+export ZSH="$HOME/.oh-my-zsh"
+
+# 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
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+#ZSH_THEME="robbyrussell"
+
+# Set list of themes to pick from when loading at random
+# Setting this variable when ZSH_THEME=random will cause zsh to load
+# a theme from this variable instead of looking in $ZSH/themes/
+# If set to an empty array, this variable will have no effect.
+# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
+
+# Uncomment the following line to use case-sensitive completion.
+# CASE_SENSITIVE="true"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+# Uncomment one of the following lines to change the auto-update behavior
+# zstyle ':omz:update' mode disabled  # disable automatic updates
+# zstyle ':omz:update' mode auto      # update automatically without asking
+# zstyle ':omz:update' mode reminder  # just remind me to update when it's time
+
+# Uncomment the following line to change how often to auto-update (in days).
+# zstyle ':omz:update' frequency 13
+
+# Uncomment the following line if pasting URLs and other text is messed up.
+# DISABLE_MAGIC_FUNCTIONS="true"
+
+# Uncomment the following line to disable colors in ls.
+# DISABLE_LS_COLORS="true"
+
+# Uncomment the following line to disable auto-setting terminal title.
+# DISABLE_AUTO_TITLE="true"
+
+# Uncomment the following line to enable command auto-correction.
+# ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# You can also set it to another string to have that shown instead of the default red dots.
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
+# COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to disable marking untracked files
+# under VCS as dirty. This makes repository status check for large repositories
+# much, much faster.
+# DISABLE_UNTRACKED_FILES_DIRTY="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+# HIST_STAMPS="mm/dd/yyyy"
+
+# Would you like to use another custom folder than $ZSH/custom?
+# ZSH_CUSTOM=/path/to/new-custom-folder
+
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(git, spaceship-vi-mode)
+
+source $ZSH/oh-my-zsh.sh
+
+# User configuration
+
+# export MANPATH="/usr/local/man:$MANPATH"
+
+# You may need to manually set your language environment
+# export LANG=en_US.UTF-8
+
+# Preferred editor for local and remote sessions
+# if [[ -n $SSH_CONNECTION ]]; then
+#   export EDITOR='vim'
+# else
+#   export EDITOR='mvim'
+# fi
+
+# Compilation flags
+# export ARCHFLAGS="-arch x86_64"
+
+# Set personal aliases, overriding those provided by oh-my-zsh libs,
+# plugins, and themes. Aliases can be placed here, though oh-my-zsh
+# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# For a full list of active aliases, run `alias`.
+#
+# Example aliases
+# alias zshconfig="mate ~/.zshrc"
+# alias ohmyzsh="mate ~/.oh-my-zsh"
+
+#vi-mode in terminal
+bindkey -v 
+#use spaceship line
+source "/opt/homebrew/opt/spaceship/spaceship.zsh"
+#get vi mode indicator working
+eval spaceship_vi_mode_enable
+
+export GOPATH=$HOME/go
+export PATH=$PATH:$GOPATH/bin
diff --git a/zsh/spaceship.zsh b/zsh/spaceship.zsh
new file mode 100644
index 0000000..4d09066
--- /dev/null
+++ b/zsh/spaceship.zsh
@@ -0,0 +1,2 @@
+SPACESHIP_TIME_SHOW=false
+spaceship add --before char vi_mode