Cleaning up for 2021

README.md

@@ -1,15 +1,4 @@
-# Gaiety's (Jo Wroten's) Dotfiles
+# Gaiety's Dotfiles
 
-Designed for Linux (Ubuntu).
+Designed for Linux (Arch) and MacOS.
-
-## Setup
-
-```bash
-apt-get install git # May need sudo
-git clone git@gitlab.com:gaiety/dotfiles.git ~/dotfiles
-cd ~/dotfiles
-$0 install.sh # May need sudo
-```
-
-Log out then log back in and open the Konsole terminal emulator.
 

ag/install.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-echo "🤔 Checking for Ag (The Silver Searcher) installation"
-if ag -V; then
-  echo "🥰 Ag is already installed"
-else
-  echo "🤩 Installing Ag (The Silver Searcher)"
-  sudo apt-get install silversearcher-ag
-  echo "👍 Ag Installed"
-fi

autojump/install.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-echo "🤔 Checking for autojump installation"
-if autojump --version; then
-  echo "🥰 autojump is already installed"
-else
-  echo "🤩 Installing autojump"
-  sudo apt-get install zsh
-  ~/autojump/install.py
-  echo "👍 autojump Installed"
-fi

hasklig/install.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-echo "🤩 Downloading Hasklig Fonts"
-curl -L https://github.com/i-tu/Hasklig/releases/download/1.1/Hasklig-1.1.zip -o ~/Downloads/hasklig.zip
-echo "👍 Hasklig Fonts Downloaded"
-echo "🦄 Installing Hasklig Fonts"
-mkdir -p ~/.local/share/fonts
-unzip ~/Downloads/hasklig.zip -d ~/.local/share/fonts
-echo "👍 Hasklig Fonts Installed"

install.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-sudo bash hasklig/install.sh
-sudo bash konsole/install.sh
-sudo bash ag/install.sh
-sudo bash nvim/install.sh
-sudo bash autojump/install.sh
-sudo bash tmux/install.sh
-sudo bash zsh/install.sh

konsole/install.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-echo "🤔 Checking for Konsole installation..."
-if konsole -v; then
-  echo "🥰 Konsole is already installed"
-else
-  echo "🤩 Installing Konsole Terminal"
-  sudo apt-get install konsole
-  echo "👍 Konsole installed"
-fi
-
-echo "🦄 Configuring Konsole"
-if [ ! -d ~/dracula-konsole ]; then
-  git clone https://github.com/dracula/konsole.git ~/dracula-konsole
-fi
-cp ~/dracula-konsole/Dracula.colorscheme ~/.local/share/konsole
-rm ~/.local/share/konsole/{space-octopus.profile,konsolerc}
-ln -s ~/dotfiles/konsole/space-octopus.profile ~/.local/share/konsole/space-octopus.profile
-ln -s ~/dotfiles/konsole/konsolerc ~/.local/share/konsole/konsolerc
-echo "👍 Konsole configured"

konsole/konsolerc

@@ -1,13 +0,0 @@
-[KonsoleWindow]
-ShowMenuBarByDefault=false
-ShowWindowTitleOnTitleBar=true
-
-[MainWindow]
-Height 1440=829
-State=AAAA/wAAAAD9AAAAAAAABMcAAAMnAAAABAAAAAQAAAAIAAAACPwAAAAA
-ToolBarsMovable=Disabled
-Width 2560=1223
-
-[TabBar]
-TabBarPosition=Top
-TabBarVisibility=ShowTabBarWhenNeeded

konsole/space-octopus.profile

@@ -1,20 +0,0 @@
-[Appearance]
-ColorScheme=Dracula
-Font=Hasklig,15,-1,5,50,0,0,0,0,0
-
-[General]
-Name=space-octopus
-Parent=FALLBACK/
-
-[Interaction Options]
-MouseWheelZoomEnabled=false
-OpenLinksByDirectClickEnabled=true
-TrimTrailingSpacesInSelectedText=true
-UnderlineFilesEnabled=true
-
-[Scrolling]
-HistoryMode=2
-ScrollBarPosition=2
-
-[Terminal Features]
-BlinkingTextEnabled=false

nvim/README.md

@@ -1,4 +1,4 @@
-# Gaiety's (Jo Wroten's) Dotfiles
+# Gaiety's Dotfiles
 
 ## Neovim
 
@@ -7,10 +7,6 @@ Vim alternative `nvim`.
 ## Setup
 
 ```bash
-apt-get install software-properties-common
+sudo pacman -S neovim
-apt-get install python-software-properties
-add-apt-repository ppa:neovim-ppa/stable
-apt-get update
-apt-get install neovim
 ```
 

nvim/init.vim

@@ -46,69 +46,3 @@ nnoremap <S-Tab> :bprev<CR>
   nnoremap <Esc><Esc> :bd<CR>
   "" Shortcut to reopen closed buffer
   nmap <Leader><Leader> <c-^>
-
-" - Load Plugins -
-"" Begin vim-plug
-call plug#begin('~/.vim/plugged')
-"" Visual Plugins
-Plug 'mhinz/vim-startify'
-Plug 'dracula/vim'
-Plug 'ap/vim-buftabline'
-"" Syntax Plugins
-Plug 'dense-analysis/ale'
-"" Ease of Editing Plugins
-Plug 'tpope/vim-surround'
-Plug 'tpope/vim-eunuch'
-Plug 'tpope/vim-surround'
-Plug 'terryma/vim-expand-region'
-"" Project/File Navigation Plugins
-Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
-Plug 'junegunn/fzf.vim'
-"" Git
-Plug 'tpope/vim-fugitive'
-Plug 'airblade/vim-gitgutter'
-"" Initialize plugin system
-call plug#end()
-
-" - Config Plugins -
-"" Colorscheme Dracula
-let g:dracula_colorterm = 0 " Set background as transparent
-colorscheme dracula
-"" FZF
-nnoremap <Leader>t :Files<cr>
-nnoremap <Leader>T :Buffers<cr>
-nnoremap <Leader>g :Ag 
-nnoremap <Leader>c :Commits<cr>
-nnoremap <Leader>C :BCommits<cr>
-nnoremap <Leader>m :GFiles?<cr>
-"" Buftablines
-let g:buftabline_indicators=1
-highlight BufTabLineFill ctermfg=11
-highlight BufTabLineCurrent cterm=bold ctermfg=236 ctermbg=141 gui=bold guifg=#282A36 guibg=#BD93F9
-"" vim-expand-region
-vmap v <Plug>(expand_region_expand)
-vmap <S-v> <Plug>(expand_region_shrink)
-"" vim-startify
-let g:startify_custom_header = [
-  \ ' Gaiety | 2019',
-  \ '   ____                    ____      __                   ',
-  \ '  / __/__  ___ ________   / __ \____/ /____  ___  __ _____',
-  \ ' _\ \/ _ \/ _ `/ __/ -_) / /_/ / __/ __/ _ \/ _ \/ // (_-<',
-  \ '/___/ .__/\_,_/\__/\__/  \____/\__/\__/\___/ .__/\_,_/___/',
-  \ '   /_/                                    /_/             ',
-  \ '',
-  \ 'MAPPING            ACTION',
-  \ '----------------------------------------------------------',
-  \ '<Space>            Leader',
-  \ '<Leader>w          Save Buffer',
-  \ '<Esc><Esc>         Close Buffer',
-  \ '<Leader><Leader>   Open Previous Buffer',
-  \ '<Tab>              Next buffer',
-  \ '<S-Tab>            Previous buffer',
-  \ '<Leader>k          Move line up',
-  \ '<Leader>j          Move line down',
-  \ 'v                  Expand Selection',
-  \ 'S-v                Shrink Selection',
-  \ '',
-\ ]
-let g:startify_change_to_dir = 0

nvim/install.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-echo "🤔 Checking for Neovim installation..."
-if nvim -v; then
-  echo "🥰 Neovim is already installed"
-else
-  echo "🤩 Installing Neovim"
-  sudo apt-get install software-properties-common
-  sudo apt-get install python-software-properties
-  sudo add-apt-repository ppa:neovim-ppa/stable
-  sudo apt-get update
-  sudo apt-get install neovim
-  sudo apt-get install python-dev python-pip python3-dev python3-pip
-  echo "👍 Neovim installed"
-fi
-
-echo "🦄 Setting Neovim as default editor"
-sudo update-alternatives --install /usr/bin/vi vi /usr/bin/nvim 60
-sudo update-alternatives --config vi
-sudo update-alternatives --install /usr/bin/vim vim /usr/bin/nvim 60
-sudo update-alternatives --config vim
-sudo update-alternatives --install /usr/bin/editor editor /usr/bin/nvim 60
-sudo update-alternatives --config editor
-echo "👍 Neovim set as default editor"
-
-echo "🦄 Symlinking Neovim configuration"
-rm ~/.config/nvim/init.vim
-ln -s ~/dotfiles/nvim/init.vim ~/.config/nvim/init.vim
-echo "👍 Symlinked Neovim configuration"
-
-echo "🤔 Checking for vim-plug"
-if [ -f ~/.local/share/nvim/site/autoload/plug.vim ]; then
-  echo "🥰 vim-plug is already installed"
-else
-  echo "🤩 Installing vim-plug"
-  curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs \
-      https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-  echo "👍 vim-plug installed"
-  fi

tmux/.tmux.conf

@@ -1,25 +0,0 @@
-# Config
-## Correct numbering
-set -g base-index 1
-set -g pane-base-index 1
-set -g renumber-windows on
-## Activity Monitoring
-setw -g monitor-activity on
-set -g visual-activity on
-## Move tabs to top
-set-option -g status-position top
-
-# Mappings
-## <Leader> |,- Split panes
-bind-key \ split-window -h
-bind-key - split-window -v
-## <Leader> h,j,k,l to switch pane
-bind h select-pane -L
-bind j select-pane -D 
-bind k select-pane -U
-bind l select-pane -R
-## <Leader>r to reload
-bind r source-file ~/.tmux.conf
-
-# Theme
-source-file ~/dotfiles/tmux/.tmux.theme

tmux/.tmux.theme

@@ -1,30 +0,0 @@
-# Non-Airline version of tmux-airline-dracula by sei40kr https://github.com/sei40kr/tmux-airline-dracula/blob/master/airline-dracula.tmux
-
-black='colour16'
-white='colour255'
-gray='colour236'
-dark_gray='default'
-yellow='colour215'
-light_purple='colour141'
-dark_purple='colour61'
-
-set-option -g status on
-set-option -g status-left-length 100
-set-option -g status-right-length 100
-set-option -g status-bg "${dark_gray}"
-set-option -g pane-active-border-fg "${dark_purple}"
-set-option -g pane-border-fg "${gray}"
-set-option -g message-bg "${gray}"
-set-option -g message-fg "${white}"
-set-option -g message-command-bg "${gray}"
-set-option -g message-command-fg "${white}"
-set-option -g status-left ""
-set-option -g status-left-style "fg=${white},bg=${dark_purple},bold"
-set-option -g status-right ""
-set-window-option -g window-status-activity-style "fg=${white},bg=${gray}"
-set-window-option -g window-status-separator ''
-set-window-option -g window-status-format ' #I #W '
-set-window-option -g window-status-style "fg=${yellow},bg=${dark_gray}"
-set-window-option -g window-status-current-format \
-       "#[fg=${black}] #I #W #[fg=${dark_gray},reverse]"
-set-window-option -g window-status-current-style "fg=${dark_gray},bg=${yellow},bold"

tmux/install.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-echo "🤔 Checking for Tmux installation..."
-if tmux -V; then
-  echo "🥰 Tmux is already installed"
-else
-  echo "🤩 Installing Tmux Terminal"
-  sudo apt-get install tmux
-  echo "👍 Tmux installed"
-fi
-
-echo "🦄 Configuring Tmux"
-if [ -f ~/.tmux.conf ]; then
-  rm ~/.tmux.conf
-fi
-ln -s ~/dotfiles/tmux/.tmux.conf ~/.tmux.conf
-echo "👍 Tmux configured"

zsh/.zshrc

@@ -1,19 +0,0 @@
-export ZSH=~/.oh-my-zsh
-
-ZSH_THEME="kardan"
-
-ENABLE_CORRECTION="true"
-
-[[ -s ~/.autojump/etc/profile.d/autojump.sh ]] && source ~/.autojump/etc/profile.d/autojump.sh
-autoload -U compinit && compinit -u
-
-FRONTEND_SEARCH_FALLBACK='duckduckgo'
-
-ZSH_TMUX_AUTOSTART=true
-ZSH_TMUX_FIXTERM=true
-
-plugins=(git zsh-autosuggestions autojump fancy-ctrl-z frontend-search tmux)
-
-source $ZSH/oh-my-zsh.sh
-
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh

zsh/install.sh

@@ -1,39 +0,0 @@
-#!/bin/bash
-echo "🤔 Checking for Zsh installation"
-if zsh --version; then
-  echo "🥰 Zsh is already installed"
-else
-  echo "🤩 Installing Zsh"
-  sudo apt-get install zsh
-  echo "👍 Zsh Installed"
-fi
-
-echo "🦄 Setting Zsh as default shell"
-sudo chsh -s /usr/bin/zsh
-echo "👍 Zsh set as default shell, will take effect next time you log in (or type zsh into your terminal)"
-
-echo "🤔 Checking for oh-my-zsh installation"
-if [ -d ~/.oh-my-zsh ]; then
-  echo "🥰 oh-my-zsh is already installed"
-else
-  echo "🤩 Installing oh-my-zsh"
-  sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
-  echo "👍 oh-my-zsh Installed"
-fi
-
-echo "🤔 Checking for zsh-autosuggestions installation"
-if [ -d ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions ]; then
-  echo "🥰 zsh-autosuggestions is already installed"
-else
-  echo "🤩 Installing zsh-autosuggestions"
-  git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
-  echo "👍 zsh-autosuggestions Installed"
-fi
-
-echo "🦄 Symlinking Zsh configuration"
-rm ~/.zshrc
-ln -s ~/dotfiles/zsh/.zshrc ~/.zshrc
-echo "👍 Symlinked Zsh configuration"
-
-source ~/.zshrc
-echo "👍 Sourced updated zshrc"