From dc38a9a3a639bcf00de7ae0151991ece4fa0bf0e Mon Sep 17 00:00:00 2001 From: ethanholz Date: Sun, 8 Aug 2021 01:30:25 -0500 Subject: [PATCH 1/3] Create README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..d390c1f --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# config_files + +My dotfiles used for configuring Linux dev machines. Uses Gnu stow for management. -- 2.51.2 From 4f543ab920c65133ffde2bfc19b5218cda8c7a36 Mon Sep 17 00:00:00 2001 From: Ethan Holz Date: Sat, 21 Aug 2021 13:00:48 -0500 Subject: [PATCH 2/3] Theme change --- nvim/.config/nvim/init.lua | 6 +++--- nvim/.config/nvim/lua/packer-plugins.lua | 8 +++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 27bb997..42128a5 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -25,10 +25,10 @@ vim.opt.bg = "dark" vim.cmd([[command! Bootstrap lua require('format-config').bootstrap()]]) require("nvim-lastplace").setup({}) -vim.g.material_style = "palenight" -require("material").set() +-- vim.g.nightfox_style = "palefox" +require("nightfox").set() -require("lualine").setup({ options = { theme = "material-nvim" } }) +require("lualine").setup({ options = { theme = "nightfox" } }) -- require('lualine').setup {options = {theme = 'material-nvim'}} -- Set Bufferline require("bufferline").setup() diff --git a/nvim/.config/nvim/lua/packer-plugins.lua b/nvim/.config/nvim/lua/packer-plugins.lua index f7ee74b..0eb2d2c 100644 --- a/nvim/.config/nvim/lua/packer-plugins.lua +++ b/nvim/.config/nvim/lua/packer-plugins.lua @@ -50,7 +50,7 @@ return require("packer").startup({ requires = { "kyazdani42/nvim-web-devicons", opt = true }, }) - use("marko-cerovac/material.nvim") + use("EdenEast/nightfox.nvim") -- Treesitter use({ "nvim-treesitter/nvim-treesitter", run = ":TSUpdate" }) @@ -78,11 +78,9 @@ return require("packer").startup({ if not is_wsl then use("andweeb/presence.nvim") end - use("ethanholz/nvim-lastplace") + -- use("ethanholz/nvim-lastplace") + use("/home/ethan/Documents/nvim-lastplace") -- use 'sbdchd/neoformat' use("mhartington/formatter.nvim") - use("~/Documents/neospot") - use_rocks("media_player") - use_rocks("lpeg") end, }) -- 2.51.2 From 5a20672396d61a260519b61818c9eb646949cd51 Mon Sep 17 00:00:00 2001 From: Ethan Holz Date: Mon, 13 Sep 2021 08:20:21 -0500 Subject: [PATCH 3/3] Updated config --- nvim/.config/nvim/init.lua | 15 ++++++++++----- nvim/.config/nvim/lua/lspconf.lua | 2 ++ nvim/.config/nvim/lua/packer-plugins.lua | 1 + zsh/.config/zsh/.zshrc | 12 +++++++++++- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 84bde40..4e71a78 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -21,16 +21,21 @@ vim.opt.softtabstop = tab_value vim.opt.shiftwidth = tab_value vim.opt.shell = "zsh" vim.opt.bg = "dark" - vim.cmd([[command! Bootstrap lua require('format-config').bootstrap()]]) -require("nvim-lastplace").setup({}) +--[[ require("nvim-lastplace").setup({ + lastplace_ignore_buftype = {"nofile", "help"}, +}) ]] -- vim.g.nightfox_style = "palefox" -require("nightfox").set() +require("nightfox").load() -require("lualine").setup({ options = { theme = "nightfox" } }) +require("lualine").setup{ + options = { + theme = "nightfox" + }, +} -- Set Bufferline -require("bufferline").setup() +-- require("bufferline").setup() require("toggleterm").setup() require("gitsigns").setup() diff --git a/nvim/.config/nvim/lua/lspconf.lua b/nvim/.config/nvim/lua/lspconf.lua index 7ad268b..0dc8200 100644 --- a/nvim/.config/nvim/lua/lspconf.lua +++ b/nvim/.config/nvim/lua/lspconf.lua @@ -2,6 +2,8 @@ vim.o.completeopt = "menuone,noinsert,noselect" require("lspconfig").ccls.setup({ on_attach = require("compe").on_attach }) -- require'lspconfig'.pyls.setup{on_attach=require'completion'.on_attach} require("lspconfig").jedi_language_server.setup({}) +require("lspconfig").vimls.setup({}) +require("lspconfig").ansiblels.setup({python={interpreterPath = python3}}) require("trouble").setup({}) require("compe").setup({ diff --git a/nvim/.config/nvim/lua/packer-plugins.lua b/nvim/.config/nvim/lua/packer-plugins.lua index fa96743..b0624c4 100644 --- a/nvim/.config/nvim/lua/packer-plugins.lua +++ b/nvim/.config/nvim/lua/packer-plugins.lua @@ -24,6 +24,7 @@ return require("packer").startup({ -- LSP use("neovim/nvim-lspconfig") use("folke/lsp-trouble.nvim") + use("nvim-lua/lsp-status.nvim") use("hrsh7th/nvim-compe") use("tjdevries/nlua.nvim") use("nvim-lua/plenary.nvim") diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc index a48fc62..b59da9a 100644 --- a/zsh/.config/zsh/.zshrc +++ b/zsh/.config/zsh/.zshrc @@ -1,6 +1,10 @@ # NOTE: Set WSL_FLAG in .zprofile # If you come from bash you might have to change your $PATH. -export PATH=$HOME/bin:/usr/local/bin:$HOME/.local/bin:$HOME/.luarocks/bin:$HOME/aibin:$HOME/.cargo/bin:$PATH +HISTFILE=~/.zsh_history +HISTSIZE=10000 +SAVEHIST=10000 +setopt appendhistory +export PATH=$HOME/.yarn/bin/:$HOME/bin:/usr/local/bin:$HOME/.local/bin:$HOME/.luarocks/bin:$HOME/aibin:$HOME/.cargo/bin:$PATH setopt autocd extendedglob nomatch menucomplete setopt interactive_comments # Colors @@ -21,7 +25,9 @@ export GPG_TTY=$(tty) # source ~/.config/zsh-plugins/bootstrap.zsh export EDITOR='nvim' +export SUDO_EDITOR='nvim' alias python='python3' +alias ssh='kitty +kitten ssh' # Completions autoload -U compinit @@ -36,3 +42,7 @@ bindkey -s '^f' 'fzf^M' # Add prompt and zoxide eval "$(starship init zsh)" eval "$(zoxide init zsh)" + +#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!! +export SDKMAN_DIR="$HOME/.sdkman" +[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" -- 2.51.2