diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index d14a61b..63384bf 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -45,7 +45,8 @@ vim.o.mousemodel = extend require"pack-impatient" vim.cmd("packadd plenary") -require"pack-onedark" +require"theme" + require"pack-dirdiff" require"pack-easy-align" require"pack-indent-blankline" diff --git a/.config/nvim/lua/theme.lua b/.config/nvim/lua/theme.lua new file mode 100644 index 0000000..da91797 --- /dev/null +++ b/.config/nvim/lua/theme.lua @@ -0,0 +1,5 @@ +vim.cmd("packadd onedark") +require"onedark".setup { + style = "dark" +} +require"onedark".load() diff --git a/.config/nvim/pack/plugins/opt/black b/.config/nvim/pack/plugins/opt/black new file mode 160000 index 0000000..d4a8564 --- /dev/null +++ b/.config/nvim/pack/plugins/opt/black @@ -0,0 +1 @@ +Subproject commit d4a85643a465f5fae2113d07d22d021d4af4795a diff --git a/.config/nvim/pack/plugins/opt/onedark b/.config/nvim/pack/plugins/opt/onedark new file mode 160000 index 0000000..89dde49 --- /dev/null +++ b/.config/nvim/pack/plugins/opt/onedark @@ -0,0 +1 @@ +Subproject commit 89dde4963ad198c9b6144dee3d5e8bcbb7559ddc diff --git a/.config/zsh/.gitignore b/.config/zsh/.gitignore new file mode 100644 index 0000000..4d45295 --- /dev/null +++ b/.config/zsh/.gitignore @@ -0,0 +1 @@ +.zcompdump* diff --git a/.config/zsh/.zsh_aliases b/.config/zsh/.zsh_aliases index 4e837b6..59619e8 100644 --- a/.config/zsh/.zsh_aliases +++ b/.config/zsh/.zsh_aliases @@ -7,9 +7,9 @@ alias vi='$EDITOR' # conf alias config='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' -alias viconf='$EDITOR $XDG_CONFIG_HOME/nvim' -alias wconf='$EDITOR $HOME/.config/sway' -alias zshconf='$EDITOR $ZDOTDIR/.zshrc && . $ZDOTDIR/.zshrc' +alias viconf='(cd $XDG_CONFIG_HOME/nvim && $EDITOR .)' +alias wconf='(cd $HOME/.config/sway && $EDITOR .)' +alias zshconf='(cd $ZDOTDIR/ && $EDITOR . && . $ZDOTDIR/.zshrc)' # dev alias epitest='docker run -it --rm -v $PWD:/usr/app/ epitechcontent/epitest-docker bash' diff --git a/.config/zsh/custom/themes/simpletheme.zsh-theme b/.config/zsh/custom/themes/simpletheme.zsh-theme index e9409b9..9de637f 100644 --- a/.config/zsh/custom/themes/simpletheme.zsh-theme +++ b/.config/zsh/custom/themes/simpletheme.zsh-theme @@ -1,5 +1,4 @@ -PROMPT=' -$(kube_ps1) +PROMPT='$(kube_ps1) %(?::%{$fg_bold[red]%}%? )%{$fg_bold[cyan]%}%~%{$reset_color%} $(git_prompt_info)' ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}(%{$fg[red]%}" diff --git a/.gitmodules b/.gitmodules index 7d497c2..38db8aa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,6 +13,9 @@ [submodule ".config/nvim/pack/plugins/opt/lspconfig"] path = .config/nvim/pack/plugins/opt/lspconfig url = https://github.com/neovim/nvim-lspconfig.git +[submodule ".config/nvim/pack/plugins/opt/onedark"] + path = .config/nvim/pack/plugins/opt/onedark + url = https://github.com/navarasu/onedark.nvim [submodule ".config/nvim/pack/plugins/opt/plenary"] path = .config/nvim/pack/plugins/opt/plenary url = https://github.com/nvim-lua/plenary.nvim.git