Merge branch 'master' into archtuf

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/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

neovim

@@ -1 +1 @@
-Subproject commit 822b092d1533065a0f347f2bb7cc685f605a2f2b
+Subproject commit 3f08c78c134c6c577b64d6b4161999ff459bd394

neovim-config

@@ -1 +1 @@
-Subproject commit 3d9677192a225903529a437e6974fa97efffd675
+Subproject commit 258b42a1d5d77cf3dc7242af161ebb763e3d6372

scripts

@@ -1 +1 @@
-Subproject commit 36bd56bcc48c6818802fe177debaf98cdda25d3d
+Subproject commit 5c5d2c4927d207ea31ed88fd54e2b873350c06f2

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/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