Merge pull request #3 from rayanramoul/dev

Dev

.gitignore

@@ -2,3 +2,6 @@ tags
 test.sh
 .luarc.json
 lazy-lock.json
+*gcloud*
+*credentials*
+*aws*

.gitmodules

@@ -0,0 +1,36 @@
+[submodule "dotfiles/.tmux/plugins/tmux"]
+	path = dotfiles/.tmux/plugins/tmux
+	url = https://github.com/catppuccin/tmux
+[submodule "dotfiles/.tmux/plugins/tpm"]
+	path = dotfiles/.tmux/plugins/tpm
+	url = https://github.com/tmux-plugins/tpm
+[submodule "dotfiles/.tmux/plugins/vim-tmux-navigator"]
+	path = dotfiles/.tmux/plugins/vim-tmux-navigator
+	url = https://github.com/christoomey/vim-tmux-navigator
+[submodule "dotfiles/.tmux/plugins/tmux-sensible"]
+	path = dotfiles/.tmux/plugins/tmux-sensible
+	url = https://github.com/tmux-plugins/tmux-sensible
+[submodule "dotfiles/.tmux/plugins/tmux-yank"]
+	path = dotfiles/.tmux/plugins/tmux-yank
+	url = https://github.com/tmux-plugins/tmux-yank
+[submodule "dotfiles/.tmux/plugins/tmux-fzf"]
+	path = dotfiles/.tmux/plugins/tmux-fzf
+	url = https://github.com/sainnhe/tmux-fzf
+[submodule "dotfiles/.tmux/plugins/tmux-resurrect"]
+	path = dotfiles/.tmux/plugins/tmux-resurrect
+	url = https://github.com/tmux-plugins/tmux-resurrect
+[submodule "dotfiles/.tmux/plugins/tmux-continuum"]
+	path = dotfiles/.tmux/plugins/tmux-continuum
+	url = https://github.com/tmux-plugins/tmux-continuum
+[submodule "dotfiles/.tmux/plugins/tmux-fuzzback"]
+	path = dotfiles/.tmux/plugins/tmux-fuzzback
+	url = https://github.com/roosta/tmux-fuzzback
+[submodule "dotfiles/.oh-my-zsh"]
+	path = dotfiles/.oh-my-zsh
+	url = https://github.com/ohmyzsh/ohmyzsh
+[submodule "dotfiles/powerlevel10k"]
+	path = dotfiles/powerlevel10k
+	url = https://github.com/romkatv/powerlevel10k
+[submodule "dotfiles/.fzf"]
+	path = dotfiles/.fzf
+	url = https://github.com/junegunn/fzf

README.md

@@ -41,6 +41,11 @@ cd RayTerm
 stow -t $HOME -R dotfiles
 ```
 
+Or if you want a minimal setup for a server (only copy dotfiles) you can run the following command :
+```bash
+sh -c "$(wget https://raw.githubusercontent.com/rayanramoul/RayTerm/master/install_minimal.sh -O -)" -- -m
+```
+
 _for Windows you can check the [Windows](docs/Windows.md) doc_
 
 # What is this ?

docs/Neovim.md

@@ -116,6 +116,9 @@ In File
 | r b | refactor extract block |
 | r b f | refactor extract block file |
 | r n | refactor rename |
+| Ctrl ^ |  typically toggles between the current buffer and the previously edited buffer. This allows you to quickly switch back and forth between two buffers. It's particularly useful when you need to refer to or copy/paste content between two different files without losing your current editing context. |
+| 5 j | in [] for example jump to beginning |
+| 5 k | in [] for example jump to ending |
 
 TERMINAL :
 | Keybinding  | Description |
@@ -152,15 +155,6 @@ HARPOON :
 | Space 3 | Nav 3 |
 | Space 4 | Nav 4 |
 
-DAP DEBUGGING :
-| Keybinding  | Description |
-| ------------- | ------------- |
-| Space d b | TOGGLE BREAKPOINT |
-| Space d l | RUN LAST |
-| Space d c | CONTINUE |
-| Space d u i | DAP UI TOGGLE |
-| Space 5 | RUN CURRENT FILE |
-
 TMUX :
 | Keybinding  | Description |
 | ------------- | ------------- |
@@ -171,6 +165,15 @@ GIT :
 | Keybinding  | Description |
 | ------------- | ------------- |
 | Space g g | Activate LazyGit |
+| Space g a | Git add all project |
+| Space g A | Git add current file |
+| Space g c | Git Commit |
+| Space g p | Git Push |
+| Space g P | Git Pull |
+| Space g c o | Git Conflict Accept Ours |
+| Space g c t | Git Conflict Accept Theirs |
+| Space g c n | Git Conflict Next Conflict |
+| Space g c p | Git Conflict Previous Conflict |
 
 
 Indentation :

docs/VSCode.md

@@ -0,0 +1,18 @@
+# VSCode keybindings
+| Keybinding |	Action |
+| ------------- | -------------
+| Cmd + b | Open side file explorer |
+| Cmd + p | Go to file |
+| Option + Enter | Select all occurrences of Find match|
+| Cmd + . | Quickfix |
+| Cmd + \ | Split Editor |
+| Cmd + 2 | Go to Pane 2 |
+| Ctrl + 2 | Go to Tab 2 |
+| Ctrl + 2 | Go to Tab 2 |
+| Ctrl + n | Create New File |
+| Cmd + k| Go to Definition |
+| Ctrl + r | Go to References |
+| Cmd + g + c | Git Commit |
+| Cmd + g + p | Git Push |
+| Cmd + g + P | Git Pull |
+| Cmd + t | Open Terminal |

dotfiles/.config/alacritty/alacritty.toml

@@ -1,76 +1,38 @@
+[colors.primary]
+background = '#121216'
+foreground = '#c0caf5'
+
+
+# Normal colors
+[colors.normal]
+black = '#15161e'
+red = '#f7768e'
+green = '#9ece6a'
+yellow = '#e0af68'
+blue = '#7aa2f7'
+magenta = '#bb9af7'
+cyan = '#7dcfff'
+white = '#a9b1d6'
+
+# Bright colors
+[colors.bright]
+black = '#414868'
+red = '#f7768e'
+green = '#9ece6a'
+yellow = '#e0af68'
+blue = '#7aa2f7'
+magenta = '#bb9af7'
+cyan = '#7dcfff'
+white = '#c0caf5'
+
+# Indexed Colors
 [[colors.indexed_colors]]
-color = "#FAB387"
 index = 16
+color = '#ff9e64'
 
 [[colors.indexed_colors]]
-color = "#F5E0DC"
 index = 17
-
-[colors.bright]
-black = "#585B70"
-blue = "#89B4FA"
-cyan = "#94E2D5"
-green = "#A6E3A1"
-magenta = "#F5C2E7"
-red = "#F38BA8"
-white = "#A6ADC8"
-yellow = "#F9E2AF"
-
-[colors.cursor]
-cursor = "#F5E0DC"
-text = "#1E1E2E"
-
-[colors.dim]
-black = "#45475A"
-blue = "#89B4FA"
-cyan = "#94E2D5"
-green = "#A6E3A1"
-magenta = "#F5C2E7"
-red = "#F38BA8"
-white = "#BAC2DE"
-yellow = "#F9E2AF"
-
-[colors.hints.end]
-background = "#A6ADC8"
-foreground = "#1E1E2E"
-
-[colors.hints.start]
-background = "#F9E2AF"
-foreground = "#1E1E2E"
-
-[colors.normal]
-black = "#45475A"
-blue = "#89B4FA"
-cyan = "#94E2D5"
-green = "#A6E3A1"
-magenta = "#F5C2E7"
-red = "#F38BA8"
-white = "#BAC2DE"
-yellow = "#F9E2AF"
-
-[colors.primary]
-background = "#000000"
-bright_foreground = "#CDD6F4"
-dim_foreground = "#CDD6F4"
-foreground = "#CDD6F4"
-
-[colors.search.focused_match]
-background = "#A6E3A1"
-foreground = "#1E1E2E"
-
-
-[colors.search.matches]
-background = "#A6ADC8"
-foreground = "#1E1E2E"
-
-[colors.selection]
-background = "#F5E0DC"
-text = "#1E1E2E"
-
-[colors.vi_mode_cursor]
-cursor = "#B4BEFE"
-text = "#1E1E2E"
-
+color = '#db4b4b'
 
 [font]
 size = 18
@@ -98,7 +60,13 @@ y = 1
 [window]
 blur = true
 dynamic_title = false
-opacity = 0.95
+opacity = 0.85
 startup_mode = "Maximized"
 title = "RayTerm"
 decorations = 'buttonless'
+
+[cursor]
+style = "Beam"
+
+[cursor.vi_mode_style]
+shape = "Block"