merge

Signed-off-by: Tuan-Dat Tran <tuan-dat.tran@tudattr.dev>

config/.config/i3/config

@@ -21,9 +21,8 @@ focus_follows_mouse no
 
 # Configure
 # border style <normal|1pixel|pixel xx|none|pixel>
-new_window pixel 2
-new_float normal
 hide_edge_borders none
+default_border none
 
 ################################################################################################
 ###################################### Workspace Settings ######################################
@@ -80,6 +79,7 @@ bindsym $mod+Shift+9 move container to workspace $ws9; workspace $ws9
 bindsym $mod+Shift+0 move container to workspace $ws0; workspace $ws0
 
 # Open specific applications in floating mode
+<<<<<<< HEAD
 for_window [class="^Thunderbird$" title="^.*Event:"] floating enable
 
 # https://github.com/z3ntu/dotfiles/blob/master/i3/.config/i3/config
@@ -93,22 +93,53 @@ for_window [class="^Steam$" title="^Steam - Self Updater$"] floating enable
 for_window [class="^Steam$" title="^Screenshot Uploader$"] floating enable
 for_window [class="^Steam$" title="^Steam Guard - Computer Authorization Required$"] floating enable
 for_window [title="^Steam Keyboard$"] floating enable
+||||||| e9d53f0
+for_window [class="(?i)virtualbox"] floating enable border normal
+for_window [title="KeePassX$"] floating enable border normal
+for_window [class="^Thunderbird$" title="^.*Event:"] floating enable
+
+# https://github.com/z3ntu/dotfiles/blob/master/i3/.config/i3/config
+# Steam
+for_window [class="^Steam$" title="^Friends List$"] floating enable
+for_window [class="^Steam$" title="Steam"] floating enable
+for_window [class="^Steam$" title="^Settings$"] floating enable
+for_window [class="^Steam$" title=".* - event started"] floating enable
+for_window [class="^Steam$" title=".* CD key"] floating enable
+for_window [class="^Steam$" title="^Steam - Self Updater$"] floating enable
+for_window [class="^Steam$" title="^Screenshot Uploader$"] floating enable
+for_window [class="^Steam$" title="^Steam Guard - Computer Authorization Required$"] floating enable
+for_window [title="^Steam Keyboard$"] floating enable
+=======
+for_window [class="(?i)virtualbox"] floating enable border normal
+for_window [title="KeePassX$"] floating enable border normal
+>>>>>>> clean_emacs
 
 ###############################################################################
 ############################ Startup Applications #############################
 ###############################################################################
 
-# exec --no-startup-id setxkbmap us,de; setxkbmap -option ctrl:nocaps; setxkbmap -option grp:lalt_lshift_toggle
+exec --no-startup-id setxkbmap eu; setxkbmap -option ctrl:nocaps;
 exec --no-startup-id picom
 exec --no-startup-id udiskie
 exec --no-startup-id conky -c ~/.conky/syclo-crimson-bottomleft.conkyrc
 # exec --no-startup-id synergyc -f --no-tray --debug INFO --name genesis --enable-crypto 192.168.178.38:24800
 exec --no-startup-id dunst
 exec --no-startup-id ~/.scripts/startup.sh
+<<<<<<< HEAD
 exec --no-startup-id ~/.scripts/battery_stats.sh
 exec --no-startup-id llk
+||||||| e9d53f0
+exec --no-startup-id llk
+exec --no-startup-id emacs --daemon
+=======
+>>>>>>> clean_emacs
 exec --no-startup-id syncthing
+<<<<<<< HEAD
 exec --no-startup-id xrandr --output eDP1 --auto  --left-of HDMI1 --output HDMI1 --off --output DP1 --off
+||||||| e9d53f0
+exec --no-startup-id xrandr --output eDP1 --auto  --left-of HDMI1 --output HDMI1 --off --output DP1 --off; feh --randomize --bg-fill /home/tuan/Pictures/Wallpaper/*
+=======
+>>>>>>> clean_emacs
 exec --no-startup-id feh --randomize --bg-fill $HOME/Pictures/Wallpaper/*   
 
 ###############################################################################
@@ -122,13 +153,13 @@ bindsym $mod+Shift+s exec poweroff
 
 # start a terminal
 bindsym $mod+space exec alacritty
-bindsym $mod+Return exec alacritty -e nu /home/tuan/.scripts/zellij-chooser.nu
+bindsym $mod+Return exec alacritty -e zellij
 
 # kill focused window
 bindsym $mod+Shift+q kill
 
 # start program launcher
-bindsym $mod+d exec --no-startup-id /home/tuan/.config/rofi/launchers/type-1/launcher.sh
+bindsym $mod+d exec --no-startup-id $HOME/.config/rofi/launchers/type-1/launcher.sh
 
 # Screen brightness controls
 bindsym XF86MonBrightnessUp exec --no-startup-id ~/.scripts/screen.sh up
@@ -138,21 +169,30 @@ bindsym XF86MonBrightnessDown exec --no-startup-id ~/.scripts/screen.sh down
 bindsym XF86AudioLowerVolume exec --no-startup-id ~/.scripts/sound.sh down
 bindsym XF86AudioRaiseVolume exec --no-startup-id ~/.scripts/sound.sh up
 bindsym XF86AudioMute exec --no-startup-id ~/.scripts/sound.sh toggle
-bindsym XF86AudioPlay exec "playerctl play-pause; cmus-remote -u"
-bindsym XF86AudioStop exec "playerctl stop; cmus-remote -s"
-bindsym XF86AudioNext exec "playerctl next; cmus-remote -n"
-bindsym XF86AudioPrevious exec "playerctl previous; cmus-remote -r"
+bindsym XF86AudioPlay exec "playerctl play-pause"
+bindsym XF86AudioStop exec "playerctl stop"
+bindsym XF86AudioNext exec "playerctl next"
+bindsym XF86AudioPrevious exec "playerctl previous"
 
 # Application Shortcuts
 bindsym $mod+b exec firefox
+<<<<<<< HEAD
 bindsym $mod+p exec firefox --private-window https://mos4.de
 bindsym $mod+e exec emacs
 bindsym $mod+m exec thunderbird
+||||||| e9d53f0
+bindsym $mod+p exec firefox --private-window https://mos4.de
+bindsym $mod+e exec emacsclient -c
+bindsym $mod+m exec thunderbird
+=======
+bindsym $mod+p exec firefox --private-window https://tudattr.dev
+>>>>>>> clean_emacs
 
 # Whole Screen
 bindsym Control+Print exec --no-startup-id ~/.scripts/screenshot.sh screen
 
 # Window
+
 bindsym Mod1+Sys_Req --release exec --no-startup-id ~/.scripts/screenshot.sh window
 
 # Area
@@ -191,7 +231,7 @@ bindsym $mod+f fullscreen toggle
 bindsym $mod+Mod1+space floating toggle
 
 # change focus between tiling / floating windows
-# bindsym $mod+space focus mode_toggle
+bindsym $mod+Shift+f focus mode_toggle
 
 # focus the parent container
 bindsym $mod+a focus parent
@@ -313,3 +353,4 @@ bindsym $mod+g mode "default"
 bindsym Return mode "default"
 bindsym Escape mode "default"
 }
+