Merge branch 'master' of https://git.mgrote.net/mg/dotfiles

.bash_aliases

@@ -23,6 +23,7 @@ alias untar="tar -xzf"
 alias v="vim"
 alias vi="vim"
 alias vm="vim"
+alias vom="vim"
 alias suspend="systemctl suspend"
 alias hibernate="systemctl hibernate"
 # typo

cheat-sheets/i3.md

@@ -18,7 +18,7 @@
 `mod + r`                         toggle resize mode
 mod + Strg + <                  move Workspace to on the left/right
 mod + Shift + s                 Enable Lockscreen
-
+mod + Shift + Pfeiltasten       Tausche Fenster
 ## Resize-Mode
 `hl/links/rechts`                   breite +-
 `jk/oben/unten`                     höhe +-

i3/config

@@ -2,7 +2,7 @@
 #
 # Please see https://i3wm.org/docs/userguide.html for a complete reference!
 
-set $mod Mod4
+set $mod Mod4 #Super/Windows-Taste
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
@@ -37,7 +37,7 @@ floating_modifier $mod
 bindsym $mod+Return exec alacritty
 
 # kill focused window
-bindsym $mod++shift+q kill
+bindsym $mod++Shift+q kill
 
 # start dmenu (a program launcher)
 bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
@@ -48,36 +48,18 @@ bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
 # bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop
 
 # change focus
-bindsym $mod+j focus down
-bindsym $mod+k focus up
-bindsym $mod+l focus right
-bindsym $mod+h focus left
-
-# alternatively, you can use the cursor keys:
 bindsym $mod+Left focus left
 bindsym $mod+Down focus down
 bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 
 # move focused window
-bindsym $mod+Shift+j move left
-bindsym $mod+Shift+k move down
-bindsym $mod+Shift+l move up
-bindsym $mod+Shift+h move right
-
-# alternatively, you can use the cursor keys:
 bindsym $mod+Shift+Left move left
 bindsym $mod+Shift+Down move down
 bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
 # resize focused window
-bindsym $mod+Control+j resize shrink width 10 px or 10 ppt
-bindsym $mod+Control+k resize grow height 10 px or 10 ppt
-bindsym $mod+Control+l resize shrink height 10 px or 10 ppt
-bindsym $mod+Control+h resize grow width 10 px or 10 ppt
-
-# alternatively, you can use the cursor keys:
 bindsym $mod+Control+Left resize shrink width 10 px or 10 ppt
 bindsym $mod+Control+Down resize grow height 10 px or 10 ppt
 bindsym $mod+Control+Up resize shrink height 10 px or 10 ppt
@@ -87,7 +69,7 @@ bindsym $mod+Control+Right resize grow width 10 px or 10 ppt
 bindsym $mod+v split h
 
 # split in vertical orientation
-bindsym $mod+n split v
+bindsym $mod+h split v
 
 # move focused workspace between monitors
 bindsym $mod+Ctrl+greater move workspace to output right
@@ -97,7 +79,7 @@ bindsym $mod+Ctrl+less move workspace to output left
 bindsym $mod+f fullscreen toggle
 
 # enter lockscreen
-bindsym $mod+Shift+s exec i3lock -c 000000
+bindsym $mod+l exec i3lock -c 000000
 
 # change container layout (stacked, tabbed, toggle split)
 #bindsym $mod+s layout stacking
@@ -160,32 +142,9 @@ bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
 
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindsym j resize shrink width 10 px or 10 ppt
-        bindsym k resize grow height 10 px or 10 ppt
-        bindsym l resize shrink height 10 px or 10 ppt
-        bindsym h resize grow width 10 px or 10 ppt
-
-        # same bindings, but for the arrow keys
-        bindsym Left resize shrink width 10 px or 10 ppt
-        bindsym Up resize grow height 10 px or 10 ppt
-        bindsym Down resize shrink height 10 px or 10 ppt
-        bindsym Right resize grow width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape or $mod+r
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-        bindsym $mod+r mode "default"
-}
-
-# bindsym $mod+r mode "resize" #deaktiviert
+# keine Fensterrahmen wenn nur ein Fenster angezeigt wird
+hide_edge_borders smart
+for_window [class=".*"] border pixel 1
 
 # polybar
 exec_always --no-startup-id /home/mg/dotfiles/polybar/launch.sh

polybar/config

@@ -40,7 +40,7 @@ font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
 font-2 = siji:pixelsize=10;1
 modules-left = i3
 modules-center = popup-calendar
-modules-right = nightscout_script backlight alsa memory cpu wlan eth_intern eth_dock  battery date powermenu
+modules-right = nightscout_script backlight alsa memory cpu wlan eth_intern eth_dock  battery powermenu
 tray-position = right
 tray-padding = 2
 tray-background = #888888

polybar/popup-calendar.sh

@@ -4,7 +4,7 @@ BAR_HEIGHT=22  # polybar height
 BORDER_SIZE=1  # border size from your wm settings
 YAD_WIDTH=222  # 222 is minimum possible value
 YAD_HEIGHT=193 # 193 is minimum possible value
-DATE="$(date +"%a %d %H:%M")"
+DATE="$(date +"%A - %d.%m.%Y - %H:%M")"
 
 case "$1" in
 --popup)

q

@@ -0,0 +1,54 @@
+diff --git a/cheat-sheets/i3.md b/cheat-sheets/i3.md
+index 56165b3..76fa2c7 100644
+--- a/cheat-sheets/i3.md
++++ b/cheat-sheets/i3.md
+@@ -18,7 +18,7 @@
+ `mod + r`                         toggle resize mode
+ mod + Strg + <                  move Workspace to on the left/right
+ mod + Shift + s                 Enable Lockscreen
+-
++mod + Shift + Pfeiltasten       tauscht Fenster
+ ## Resize-Mode
+ `hl/links/rechts`                   breite +-
+ `jk/oben/unten`                     höhe +-
+diff --git a/i3/config b/i3/config
+index 19b3d27..7a70e88 100644
+--- a/i3/config
++++ b/i3/config
+@@ -181,7 +181,9 @@ mode "resize" {
+ }
+ 
+ bindsym $mod+r mode "resize"
+-
++# ausblenden von Fensterrahmen bei nur einem Fenster
++hide_edge_borders smart
++#
+ # Start i3bar to display a workspace bar (plus the system information i3status
+ # finds out, if available)
+ # auskommntiert weil polybar verwendet wird
+diff --git a/polybar/config b/polybar/config
+index 002c385..b401e6d 100644
+--- a/polybar/config
++++ b/polybar/config
+@@ -39,8 +39,8 @@ font-0 = fixed:pixelsize=10;1
+ font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
+ font-2 = siji:pixelsize=10;1
+ modules-left = i3
+-modules-center =
+-modules-right = nightscout_script backlight alsa memory cpu wlan eth_intern eth_dock battery date powermenu
++modules-center = nightscout_script backlight alsa memory cpu wlan eth_intern eth_dock battery date powermenu
++modules-right =
+ tray-position = right
+ tray-padding = 2
+ tray-background = #888888
+diff --git a/polybar/launch.sh b/polybar/launch.sh
+index 70a82ec..a1038be 100755
+--- a/polybar/launch.sh
++++ b/polybar/launch.sh
+@@ -1,5 +1,5 @@
+ #!/bin/bash
+-# Terminate already running bar instances
++# Terminate already running instances
+ killall -q polybar
+ # Launch bar
+ for m in $(polybar --list-monitors | cut -d":" -f1); do