From e9d5bc639d80edba61e2cb12e47fde2e4ca5a878 Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Thu, 27 May 2021 18:39:34 +0200 Subject: [PATCH] Switch to onedark theme --- .config/nvim/lua/globals.lua | 2 +- .config/nvim/lua/keymappings.lua | 1 + .config/nvim/lua/plugins.lua | 3 +- .config/nvim/lua/plugins/lualine.lua | 6 +- .tmux.conf | 107 ++++++++++++++++++++++++++- .zshrc | 8 +- 6 files changed, 116 insertions(+), 11 deletions(-) diff --git a/.config/nvim/lua/globals.lua b/.config/nvim/lua/globals.lua index 4153e4b..99b4005 100644 --- a/.config/nvim/lua/globals.lua +++ b/.config/nvim/lua/globals.lua @@ -6,7 +6,7 @@ O = { clipboard = unnamedplus, incsearch = true, termguicolors = true, - colorscheme = 'darcula-solid', + colorscheme = 'onedark', hidden_files = true, wrap_lines = false, number = true, diff --git a/.config/nvim/lua/keymappings.lua b/.config/nvim/lua/keymappings.lua index 3faf0f8..2434d4b 100644 --- a/.config/nvim/lua/keymappings.lua +++ b/.config/nvim/lua/keymappings.lua @@ -2,6 +2,7 @@ vim.g.mapleader = ' ' -- TODO find better place vim.g.floaterm_open_command = 'vsplit' +--vim.g.floaterm_position = 'bottom' -- better window movement vim.api.nvim_set_keymap('n', '', 'h', {silent = true}) diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 6c6f36a..9f30c89 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -119,12 +119,11 @@ return require("packer").startup( use {'kdheepak/JuliaFormatter.vim'} -- themes & colorschemes - use {'challenger-deep-theme/vim', as='challenger-deep' } use {'dracula/vim', as='dracula' } use { "briones-gabriel/darcula-solid.nvim", requires = "rktjmp/lush.nvim" } use {'shaunsingh/moonlight.nvim', as='moonlight'} - use {'tanvirtin/monokai.nvim'} use {'arcticicestudio/nord-vim'} + use {'joshdick/onedark.vim'} require_plugin('julia-vim') end diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua index dd69a2c..2549ad0 100644 --- a/.config/nvim/lua/plugins/lualine.lua +++ b/.config/nvim/lua/plugins/lualine.lua @@ -2,15 +2,15 @@ require'lualine'.setup { options = { icons_enabled = true, theme = 'nord', - component_separators = {'', ''}, - section_separators = {'', ''}, + --component_separators = {'', ''}, + --section_separators = {'', ''}, disabled_filetypes = {} }, sections = { lualine_a = {'mode'}, lualine_b = {'branch'}, lualine_c = {'filename', require'lsp-status'.status}, - lualine_x = {'encoding', 'fileformat', 'filetype'}, + lualine_x = {'filetype'}, lualine_y = {'progress'}, lualine_z = {'location'} }, diff --git a/.tmux.conf b/.tmux.conf index 3750d8e..faa2621 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -1,2 +1,107 @@ -set -g mouse on +###################################################################### +# START OF PLUGINS +###################################################################### + +# Plugin manager for tmux +set -g @plugin 'tmux-plugins/tpm' + +# Simple tmux options for anyone +set -g @plugin 'tmux-plugins/tmux-sensible' + +#set -g @plugin 'dracula/tmux' +set -g @plugin 'odedlaz/tmux-onedark-theme' + +# Persistent tmux envs across system restarts +set -g @plugin 'tmux-plugins/tmux-resurrect' + +# Continuous saving of tmux environment +set -g @plugin 'tmux-plugins/tmux-continuum' + +####################################################### +# TMUX-CONTINUUM +####################################################### + +# Enables restoral of saved tmux config +set -g @continuum-restore 'on' + +# How often to save a tmux layout +set -g @continuum-save-interval '10' + +####################################################### +# TMUX-RESURRECT +####################################################### + +# Capture contents of each pane +set -g @resurrect-capture-pane-contents 'on' + +# Set to resurrect neovim sessions +set -g @resurrect-strategy-nvim 'session' + +# Processes to resurrect +set -g @resurrect-processes '~julia' + +####################################################### +# TMUX-SENSIBLE +####################################################### + +# Increase scrollback buffer size +set -g history-limit 5000 + +###################################################################### +# END OF PLUGINS +###################################################################### + + + + +###################################################################### +# START OF GENERAL CONFIGURATIONS +###################################################################### + +# Turn on interactivity with mouse +set -g mouse on bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'copy-mode -e; send-keys -M'" + +# Enables italics in tmux +#set -g default-terminal "tmux-256color" +set -g default-terminal "tmux-256color" + +# Terminal type configuration +set -ga terminal-overrides ",tmux-256color:Tc" + +# Start window numbering at specific num +set -g base-index 1 + +# Renumber windows on window close +set -g renumber-windows on + +####################################################### +# KEY BINDING +####################################################### + +# hjkl pane traversal +bind h select-pane -L +bind j select-pane -D +bind k select-pane -U +bind l select-pane -R + +# Remap prefix from 'C-b' to 'C-a' +unbind C-b +set-option -g prefix C-a +bind-key C-a send-prefix + +# Bind popup display commands +# bind t popup -KER "topydo columns" +# bind d popup -h80% -w80% -KR "gcalcli --calendar \"JZ Calendar\" calw" +# bind s popup -h80% -w80% -KER "spt" +# bind C-t popup -KR "$SHELL" + +###################################################################### +# END OF GENERAL CONFIGURATIONS +###################################################################### + + + + +# Initialize tpm plugin manager - DO NOT MOVE +run '~/.tmux/plugins/tpm/tpm' diff --git a/.zshrc b/.zshrc index c29f0ee..aa6e62f 100644 --- a/.zshrc +++ b/.zshrc @@ -4,7 +4,7 @@ ZSH_THEME="robbyrussell" # Plugins plugins=( git - zsh-autosuggestions +# zsh-autosuggestions ) export ZSH=$HOME/.oh-my-zsh @@ -26,9 +26,9 @@ HISTSIZE=10000 SAVEHIST=10000 # completion -autoload -Uz compinit -compinit -setopt COMPLETE_ALIASES +#autoload -Uz compinit +#compinit +#setopt COMPLETE_ALIASES # goodies eval "$(direnv hook zsh)"