From bf80b5054acc0a8eee4d2a7e69f0be6f3f6976c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Gremaud?= Date: Wed, 23 Oct 2024 11:53:12 +0200 Subject: [PATCH] Change bindings in I3 + update neovim --- config/i3/config | 2 +- config/i3/config.d/02_keybindings.conf | 19 ++++++++++--------- config/i3/scripts/i3_term | 8 +++++--- gitignore_global | 1 + neovim-config | 2 +- tmux.conf | 14 +++++++++----- zsh/alias.sh | 1 + zsh/keys.sh | 2 ++ 8 files changed, 30 insertions(+), 19 deletions(-) diff --git a/config/i3/config b/config/i3/config index 2e6a620..c10bef0 100644 --- a/config/i3/config +++ b/config/i3/config @@ -320,7 +320,7 @@ tiling_drag modifier titlebar ## Syntax: #exec [--no-startup-id] #exec_always [--no-startup-id] -exec_always --no-startup-id setxkbmap us +# exec_always --no-startup-id setxkbmap us exec_always --no-startup-id ~/.screenlayout/default.sh exec_always --no-startup-id ~/.config/i3/scripts/i3_autostart diff --git a/config/i3/config.d/02_keybindings.conf b/config/i3/config.d/02_keybindings.conf index aa33ccb..68e8b18 100644 --- a/config/i3/config.d/02_keybindings.conf +++ b/config/i3/config.d/02_keybindings.conf @@ -38,8 +38,8 @@ set $web_browser firefox ## -- Terminal -- bindsym $MOD+Return exec --no-startup-id $terminal -bindsym $MOD+Shift+Return exec --no-startup-id $terminal --float -bindsym $MOD+$ALT+Return exec --no-startup-id $terminal --full +# bindsym $MOD+Shift+Return exec --no-startup-id "$terminal --float" +# bindsym $MOD+$ALT+Return exec --no-startup-id "$terminal --full" ## -- GUI Apps -- bindsym $MOD+Shift+f exec --no-startup-id $file_manager @@ -47,10 +47,8 @@ bindsym $MOD+Shift+e exec --no-startup-id $text_editor bindsym $MOD+Shift+w exec --no-startup-id $web_browser ## -- CLI Apps -- -bindsym $ALT+Control+v exec --no-startup-id "$alacritty -e vim" -bindsym $ALT+Control+r exec --no-startup-id "$alacritty -e ranger" -bindsym $ALT+Control+h exec --no-startup-id "$alacritty -e htop" -bindsym $ALT+Control+m exec --no-startup-id $music_player +bindsym $MOD+Shift+Return exec --no-startup-id "$terminal --float -e tmux new-session nvim" +# bindsym $MOD+Control+h exec --no-startup-id "$terminal -e tmux new-session htop" ## -- Rofi Applets -- bindsym $MOD+p exec --no-startup-id $rofi_applets/rofi_launcher -dpi 1 @@ -78,7 +76,7 @@ bindsym XF86AudioStop exec --no-startup-id "mpc stop" bindsym Print exec --no-startup-id "$screenshot --now" bindsym Control+Print exec --no-startup-id "$screenshot --in5" # bindsym Shift+Print exec --no-startup-id "$screenshot --in10" -bindsym Shift+Print exec --no-startup-id $rofi_applets/rofi_screenshot +bindsym Shift+Print exec --no-startup-id $rofi_applets/rofi_screenshot bindsym Control+Shift+Print exec --no-startup-id "$screenshot --win" bindsym $MOD+Print exec --no-startup-id "$screenshot --area" @@ -137,10 +135,13 @@ bindsym $MOD+Left focus left bindsym $MOD+Down focus down bindsym $MOD+Up focus up bindsym $MOD+Right focus right + +bindsym $MOD+a focus left +bindsym $MOD+d focus right ## Sets focus to the parent container of the current container. -bindsym $MOD+a focus parent +# bindsym $MOD+a focus parent ## The opposite of `focus parent`, sets the focus to the last focused child container. -bindsym $MOD+d focus child +# bindsym $MOD+d focus child ## Automatically sets focus to the adjacent container. bindsym $MOD+Tab focus next ## Toggles focus between floating/tiling containers. diff --git a/config/i3/scripts/i3_term b/config/i3/scripts/i3_term index ac7014c..31b2f82 100755 --- a/config/i3/scripts/i3_term +++ b/config/i3/scripts/i3_term @@ -9,12 +9,14 @@ DIR="$HOME/.config/i3" CONFIG="$DIR/alacritty/alacritty.toml" if [ "$1" == "--float" ]; then - alacritty --class 'alacritty-float,alacritty-float' --config-file "$CONFIG" + shift + alacritty --class 'alacritty-float,alacritty-float' --config-file "$CONFIG" $@ elif [ "$1" == "--full" ]; then + shift alacritty --class 'Fullscreen,Fullscreen' --config-file "$CONFIG" \ -o window.startup_mode=fullscreen \ window.padding.x=30 window.padding.y=30 \ - window.opacity=0.95 font.size=14 + window.opacity=0.95 font.size=14 $@ else - alacritty --config-file "$CONFIG" + alacritty --config-file "$CONFIG" $@ fi diff --git a/gitignore_global b/gitignore_global index 20650a9..7bf8838 100644 --- a/gitignore_global +++ b/gitignore_global @@ -2,6 +2,7 @@ .autoenv_leave.zsh tags Session.vim +.exrc *.rest cert.crt cert.key diff --git a/neovim-config b/neovim-config index f3bf598..3d96771 160000 --- a/neovim-config +++ b/neovim-config @@ -1 +1 @@ -Subproject commit f3bf598361b9da8753495b067772cd74fadf40b1 +Subproject commit 3d9677192a225903529a437e6974fa97efffd675 diff --git a/tmux.conf b/tmux.conf index ad08b9a..6d019af 100644 --- a/tmux.conf +++ b/tmux.conf @@ -6,9 +6,9 @@ bind-key C-a send-prefix # split panes bind | split-window -h -c "#{pane_current_path}" bind - split-window -v -c "#{pane_current_path}" -bind s split-window -h -p 20 -c "#{pane_current_path}" -bind g split-window -h -p 20 -c "#{pane_current_path}" -b -bind v split-window -v -p 30 -c "#{pane_current_path}" +# bind s split-window -h -p 20 -c "#{pane_current_path}" +# bind g split-window -h -p 20 -c "#{pane_current_path}" -b +# bind v split-window -v -p 30 -c "#{pane_current_path}" # Switch to last sesions, usefull for cross-project (since i'm using a session per project, with tmux-sessionizer script) bind k switch-client -l @@ -22,21 +22,24 @@ bind -n M-d select-pane -R # reload conf bind r source-file ~/.tmux.conf; display-message "Tmux source file reloaded!" +# VI mode for keys, not sure i'm using this set-window-option -g mode-keys vi bind -T copy-mode-vi v send-keys -X begin-selection bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel 'xclip -in -selection clipboard' +# Color terminal, it's probably the default set -g default-terminal "tmux-256color" set -ag terminal-overrides ",*:RGB" -# change color +# Change color if the panes are synchronized (since it can be deadly) set -g pane-border-style '#{?pane_synchronized, fg=yellow, fg=black}' set -g pane-active-border-style '#{?pane_synchronized, fg=red, fg=#52862d}' -# status bar +# Status bar set -g status-position top set -g status-justify centre +# Change color if the panes are synchronized (since it can be deadly) set -g status-style 'fg=#ffffff #{?pane_synchronized, bg=red, bg=default}' set -g status-left "[#{session_name}] " set -g status-left-length 60 @@ -55,6 +58,7 @@ set -g @resurrect-strategy-nvim 'session' set -g @resurrect-processes 'ssh vim nvim django-run "~manage.py"' set -g @plugin 'tmux-plugins/tmux-yank' +set -g @yank_selection_mouse 'clipboard' run -b '~/.tmux/plugins/tpm/tpm' # run-shell ~/tmux-resurrect/resurrect.tmux diff --git a/zsh/alias.sh b/zsh/alias.sh index c3bb72e..d9cb180 100644 --- a/zsh/alias.sh +++ b/zsh/alias.sh @@ -3,6 +3,7 @@ alias la='ls -A' alias l='ls -CF' alias lla='ls -al' alias mux='tmuxinator' +alias i="ipython" alias pm='python manage.py' alias pmt='clear && pm test' diff --git a/zsh/keys.sh b/zsh/keys.sh index e69de29..a140d90 100644 --- a/zsh/keys.sh +++ b/zsh/keys.sh @@ -0,0 +1,2 @@ +bindkey "^k" up-line-or-history +bindkey "^j" up-line-or-history