Merge branch 'master' into archtuf

.gitmodules

@@ -3,10 +3,13 @@
 	url = https://github.com/Legrems/nv-chad.git
 [submodule "scripts"]
 	path = scripts
-	url = git@github.com:Legrems/scripts.git
+	url = ../scripts.git
 [submodule "scripts-hidden"]
 	path = scripts-hidden
-	url = git@github.com:Legrems/scripts-hidden.git
+	url = ../scripts-hidden.git
 [submodule "neovim-config"]
 	path = neovim-config
-	url = git@github.com:Legrems/neovim-config.git
+	url = ../neovim-config.git
+[submodule "hyprland-config"]
+	path = hyprland-config
+	url = ../hyprland-config.git

config/i3/config

@@ -320,7 +320,7 @@ tiling_drag modifier titlebar
 ## Syntax:
 #exec [--no-startup-id] <command>
 #exec_always [--no-startup-id] <command>
-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
 

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+Shift+Return 		exec --no-startup-id "$terminal --float"
-bindsym $MOD+$ALT+Return 		exec --no-startup-id $terminal --full
+# 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 $MOD+Shift+Return 		exec --no-startup-id "$terminal --float -e tmux new-session nvim"
-bindsym $ALT+Control+r 			exec --no-startup-id "$alacritty -e ranger"
+# bindsym $MOD+Control+h 			exec --no-startup-id "$terminal -e tmux new-session htop"
-bindsym $ALT+Control+h 			exec --no-startup-id "$alacritty -e htop"
-bindsym $ALT+Control+m 			exec --no-startup-id $music_player
 
 ## -- 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.

config/i3/config.d/05_rules.conf

@@ -4,9 +4,12 @@
 
 ##-- Workspace Rules ------------------------
 
-workspace 1 output HDMI-A-0
+workspace 1 output DisplayPort-2
-workspace 2 output HDMI-A-0
+workspace 2 output DisplayPort-2
 workspace 3 output DisplayPort-0
+workspace 4 output DisplayPort-0
+workspace 9 output HDMI-A-0
+workspace 10 output HDMI-A-0
 
 # workspace 1 output DisplayPort-0
 # workspace 2 output DisplayPort-0
@@ -50,8 +53,21 @@ workspace 3 output DisplayPort-0
 ## The first part of the WM_CLASS is the instance ("irssi" in this example), 
 ## the second part is the class ("URxvt" in this example).
 ##
-assign [class="Lxappearance|Nitrogen"] 6
+# assign [class="Lxappearance|Nitrogen"] 6
-assign [class="Pavucontrol|Xfce4-power-manager-settings"] 6
+# assign [class="Pavucontrol|Xfce4-power-manager-settings"] 6
+# Top-Left
+assign [class="steam"] 3
+assign [class="spotify"] 4
+
+# Top-Right
+assign [class="discord"] 9
+assign [class="telegram-desktop|easyeffects"] 10
+
+# Middle
+# assign [class="discord"] 9
+
+# Scratchpad
+assign [class="keepassxc"] scratchpad
 
 ##-- Window Rules ---------------------------
 
@@ -72,3 +88,4 @@ for_window [class="Pavucontrol|Xfce4-power-manager-settings|Nm-connection-editor
 for_window [class="feh|Viewnior|Gpicview|Gimp|MPlayer"] floating enable
 for_window [class="Kvantum Manager|qt5ct"] floating enable
 for_window [class="VirtualBox Manager|qemu|Qemu-system-x86_64"] floating enable
+for_window [class="Keepassxc"] floating enable

config/i3/scripts/i3_autostart

@@ -50,3 +50,12 @@ xsetroot -cursor_name left_ptr
 
 # Start mpd
 # exec mpd &
+
+nm-applet &
+keepassxc &
+easyeffects &
+discord &
+# spotify &
+flameshot &
+# telegram-desktop &
+# firefox &

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

config/i3/scripts/rofi_powermenu

@@ -82,7 +82,7 @@ run_cmd() {
 	elif [[ "$1" == '--opt2' ]]; then
 		confirm_run 'i3-msg exit'
 	elif [[ "$1" == '--opt3' ]]; then
-		confirm_run 'mpc -q pause' 'pulsemixer --mute' 'betterlockscreen --suspend'
+		confirm_run 'pulsemixer --mute' 'betterlockscreen --suspend'
 	elif [[ "$1" == '--opt4' ]]; then
 		confirm_run 'systemctl hibernate'
 	elif [[ "$1" == '--opt5' ]]; then

config/keepassxc/keepassxc.ini

@@ -14,8 +14,9 @@ TrayIconAppearance=monochrome-light
 
 [PasswordGenerator]
 AdditionalChars=
+EASCII=false
 ExcludedChars=
-Length=32
+Length=64
 
 [SSHAgent]
 Enabled=false

gitconfig

@@ -1,8 +1,8 @@
 [user]
 	email = loic.gremaud@arcanite.ch
 	name = Loïc Gremaud
-    ;signingkey = 8B2741BF148B1059065A71EEE81E8B180465D116 ;540
+    signingkey = 8B2741BF148B1059065A71EEE81E8B180465D116 ;540
-    signingkey = BAE2CD06F0A3753A0F8D0A21D4620E6DF3E0121D ;539
+    ;signingkey = BAE2CD06F0A3753A0F8D0A21D4620E6DF3E0121D ;539
     ;signingkey = 4F78275C96E34F56920CF7B5CACB2A128E557EFD ;W
     ;signingkey = C6424C524F8B4D0B0C6F9380ACD9F65FA7E19986;USB-C
     token = REPLACE HERE TOKEN

gitignore_global

@@ -2,6 +2,7 @@
 .autoenv_leave.zsh
 tags
 Session.vim
+.exrc
 *.rest
 cert.crt
 cert.key

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 s split-window -h -p 20 -c "#{pane_current_path}"
-bind g split-window -h -p 20 -c "#{pane_current_path}" -b
+# bind g split-window -h -p 20 -c "#{pane_current_path}" -b
-bind v split-window -v -p 30 -c "#{pane_current_path}"
+# 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

xinitrc

@@ -47,10 +47,11 @@ xrandr --output eDP1 --mode 2560x1440 --scale 1x1 --primary
 xinput --set-prop "pointer:Razer Razer DeathAdder V2" 'libinput Accel Speed' -0.1
 
 # Swap caps + escape
-setxkbmap -option caps:swapescape
+# setxkbmap -option caps:swapescape
+setxkbmap us
 
 #~/.screenlayout/wide.sh
-~/.screenlayout/swide.sh
+~/.screenlayout/default.sh
 
 # Set background
 feh --bg-fill ~/Downloads/wp4473722-5120x1440-wallpapers.jpg

xprofile

@@ -19,8 +19,3 @@ xss-lock -n /usr/lib/xsecurelock/dimmer -l -- xsecurelock &
 nm-applet &
 #autocutsel -fork &
 #autocutsel -selection PRIMARY -fork &
-
-flameshot &
-discord &
-firefox &
-spotify &

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'

zsh/generic.sh

@@ -36,9 +36,6 @@ export NB_PROXMOXS=2
 export VAGRANT_ABACUS_BOX="ubuntu/focal64"
 export VISUAL=nvim
 export EDITOR=nvim
-#export AUTOENV_ENV_FILENAME='.autoenv.zsh'
-#export AUTOENV_ENV_LEAVE_FILENAME='.autoenv_leave.zsh'
-#export AUTOENV_ENABLE_LEAVE='yes'
 #export PS1='${SSH_TTY:+"%F{9}%n%f%F{7}@%f%F{3}%m%F "}%F{4}${_prompt_sorin_pwd}%(!. %B%F{1}#%f%b.)${editor_info[keymap]} '
 # export PS1='%F{4}${_prompt_sorin_pwd}%(!. %B%F{1}#%f%b.)${editor_info[keymap]} '
 
@@ -48,5 +45,3 @@ export EDITOR=nvim
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
 eval $(thefuck --alias)
-
-#source ~/.autoenv/activate.sh

zsh/keys.sh

@@ -0,0 +1,2 @@
+bindkey "^k" up-line-or-history
+bindkey "^j" up-line-or-history