Merge branch 'master' of 207.154.210.186:/home/yigit/dots

3 files changed, 41 insertions, 11 deletions

diff --git a/.config/conky/conky.conf##desktop.Linux.Maus b/.config/conky/conky.conf##desktop.Linux.Maus
index 16d87ee..b340c80 100644
--- a/.config/conky/conky.conf##desktop.Linux.Maus
+++ b/.config/conky/conky.conf##desktop.Linux.Maus
@@ -18,7 +18,7 @@ conky.config = {
     font = 'FuraCode Nerd Font Mono:size=10',
 
     gap_x = 1200,
-    gap_y = 35,
+    gap_y = 150,
 
     minimum_height = 5,
     minimum_width = 5,
@@ -30,8 +30,11 @@ conky.config = {
     own_window = true,
     own_window_class = 'Conky',
     own_window_type = 'override',
-    own_window_transparent = true,
+    own_window_transparent = false,
     own_window_hints = 'below,undecorated,skip_taskbar,skip_pager,sticky',
+    own_window_argb_visual = true,
+    own_window_argb_value = 200,
+    own_window_colour = '282828',
     short_units = true,
     update_interval = 1.0,
     uppercase = false,
@@ -54,6 +57,7 @@ conky.config = {
 }
 
 conky.text = [[
+${color4}${alignr}
 ${color}${alignc}$sysname $kernel on $machine
 ${color}${alignc}${exec whoami} @ $nodename
 ${color0}$hr${color}
@@ -98,4 +102,5 @@ ${voffset 1}
 ${color0}$stippled_hr${color}
 ${voffset 1}
 ${execp TODAY=`date +%_d`; cal | tail -n+2 | sed -e '1 s:.*:\${color3}&\${color6}:' -e '1 s:'"$(date +%a |cut -c 1-2)"':\${color4}&\${color5}:' -e '0,/'"$TODAY"'/{s/'"$TODAY"'/\${color7}'"$TODAY"'\${color8}/}' | sed s/^/'${alignc}'/}
+${color4}${alignr}
 ]]
diff --git a/.config/i3/config##desktop.Linux.Lowe b/.config/i3/config##desktop.Linux.Lowe
index 36343ed..9f1cffd 100644
--- a/.config/i3/config##desktop.Linux.Lowe
+++ b/.config/i3/config##desktop.Linux.Lowe
@@ -17,6 +17,10 @@ font pango:Lato 11
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $alt
 
+##############
+#  bindings  #
+##############
+
 # i switched back to firefox can you tell
 bindsym Ctrl+q exec --no-startup-id true
 
@@ -43,6 +47,12 @@ bindsym XF86AudioPlay exec mpc toggle
 bindsym XF86AudioPrev exec /home/yigit/bin/mpcPrevSong.sh
 bindsym XF86AudioNext exec mpc next
 
+# Make the currently focused window a scratchpad
+bindsym $mod+Shift+minus move scratchpad
+
+# Show the first scratchpad window
+bindsym $mod+minus scratchpad show
+
 # shortcuts for frequent programs
 bindsym $mod+Shift+z exec zotero
 bindsym $mod+Shift+f exec thunar
diff --git a/.config/i3/config##desktop.Linux.Maus b/.config/i3/config##desktop.Linux.Maus
index 83a08a7..f089d70 100644
--- a/.config/i3/config##desktop.Linux.Maus
+++ b/.config/i3/config##desktop.Linux.Maus
@@ -39,19 +39,23 @@ font pango:Lato 11
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $alt
 
-# bindings
-
-# shoo the mouse
-bindsym $mod+o exec --no-startup-id xdotool mousemove 1087 1101
+##############
+#  bindings  #
+##############
 
 # i switched back to firefox can you tell
 bindsym Ctrl+q exec --no-startup-id true
 
+# get the mouse out of the way
+bindsym $mod+o exec --no-startup-id xdotool mousemove 1087 1101
 # bookmark from clipboard
 bindsym $mod+u exec --no-startup-id ~/bin/bukuadd_c
 
-# swap caps lock and escape, set keyboard layout
-bindsym $mod+p exec --no-startup-id "setxkbmap -model pc105 -layout us,tr -option grp:alt_shift_toggle,caps:swapescape"
+# add taskwarrior/gtd calendar item
+bindsym $mod+Shift+t --no-startup-id ~/bin/td
+
+# swap caps lock and escape, set keyboard layout, 35 is ]/ü (layout agnostic)
+bindcode $mod+35 exec --no-startup-id "setxkbmap -model pc105 -layout us,tr -option grp:alt_shift_toggle,caps:swapescape"
 
 # use flameshot with print screen
 bindsym Print exec flameshot gui
@@ -64,11 +68,22 @@ bindsym $mod+q exec mpc toggle
 bindsym $mod+Left exec /home/yigit/bin/mpvPrev
 bindsym $mod+Right exec mpc next
 
+# Make the currently focused window a scratchpad
+bindsym $mod+Shift+minus move scratchpad
+
+# Show the first scratchpad window
+bindsym $mod+minus scratchpad show
+
+# shortcuts for frequent programs
+bindsym $mod+Shift+z exec zotero
+bindsym $mod+Shift+f exec thunar
+
 # start a terminal
 bindsym $mod+Return exec kitty
 
 # kill focused window
 bindsym $mod+Shift+q kill
+bindsym --whole-window $mod+button2 kill
 
 # start rofi (a program launcher)
 bindsym $mod+d exec rofi -show combi
@@ -165,19 +180,19 @@ mode "resize" {
 
         # back to normal: Enter or Escape or $mod+r
         bindsym Return mode "default"
-        bindsym Caps_Lock mode "default"
+        bindsym Escape mode "default"
         bindsym $mod+r mode "default"
 }
 
 # session
-mode "(L)ock, (S)ignout, (R)eboot, (P)oweroff" {
+mode " (L)ock (S)ignout (R)eboot (P)oweroff" {
     bindsym $mod+l exec i3lock-fancy -f Lato-Light -t 'welcome back' -- scrot -z
     bindsym $mod+r exec systemctl reboot
     bindsym $mod+p exec systemctl poweroff
     bindsym $mod+s exit
     bindsym Escape mode "default"
 }
-bindsym $mod+Shift+e mode "(L)ock, (S)ignout, (R)eboot, (P)oweroff"
+bindsym $mod+Shift+e mode " (L)ock (S)ignout (R)eboot (P)oweroff"
 
 bindsym $mod+r mode "resize"