diff --git a/README b/README
index cefd362..55b7b29 100644
--- a/README
+++ b/README
@@ -7,13 +7,11 @@ public viewport and backup. I appreciate suggestions, rants and bug reports :)
requirements
------------
-My configuration expects some repositories checked out in `~/src/pkg/`:
+My zshrc expects the zgen repository checked out in `~/src/pkg/`:
```sh
mkdir -p ~/src/pkg
git clone https://github.com/tarjoilija/zgen.git ~/src/pkg/zgen
-git clone https://github.com/junegunn/vim-plug ~/src/pkg/vim-plug
```
-I also use [i3-gaps](https://github.com/Airblader/i3-gaps) and
-[i3blocks-gaps](https://github.com/Airblader/i3blocks-gaps) from Airblader.
+I use wayland and sway. You can check out [this reddit post](https://www.reddit.com/r/unixporn/comments/d0fuc1/sway_mario_plays_the_blues/)
diff --git a/dot.Xdefaults b/dot.Xdefaults
index c8d358c..1723cba 100644
--- a/dot.Xdefaults
+++ b/dot.Xdefaults
@@ -128,23 +128,12 @@ URxvt*matcher.button: 3
URxvt.keysym.C-minus: perl:mark-yank-urls:activate_mark_mode
rofi.pid: /run/user/1000/rofi.pid
-rofi.modi: run
+rofi.modi: run,calc
rofi.font: monofur for powerline 16
-rofi.width: 100
+rofi.width: 70
rofi.lines: 5
rofi.columns: 1
rofi.opacity: 80
-! rofi.color-enabled: true
-! bg fg altbg hlbg hlfg
-! rofi.normal: #1d2021, #ebdbb2, #1d2021, #ebdbb2, #1d2021
-! rofi.urgent: #1d2021, #ebdbb2, #1d2021, #ebdbb2, #1d2021
-! rofi.active: #1d2021, #ebdbb2, #1d2021, #ebdbb2, #1d2021
-! rofi.color-window: #1d2021, #1d2021
-rofi.fg: #ebdbb2
-rofi.bg: #1d2021
-rofi.hlfg: #1d2021
-rofi.hlbg: #ebdbb2
-rofi.bw: 0
rofi.location: 2
rofi.padding: 100
rofi.fuzzy: false
diff --git a/dot.config/kitty/kitty.conf b/dot.config/kitty/kitty.conf
index f8c14a4..10a0bc7 100644
--- a/dot.config/kitty/kitty.conf
+++ b/dot.config/kitty/kitty.conf
@@ -10,7 +10,7 @@ font_size 11.0
# symbol_map U+E0A0-U+E0A2,U+E0B0-U+E0B3 PowerlineSymbols
# box_drawing_scale 0.001, 1, 1.5, 2
-cursor #888888
+cursor #aca4a1
cursor_text_color background
cursor_shape block
@@ -58,13 +58,13 @@ enabled_layouts tall:bias=60,fat:bias=70,stack
# window_resize_step_cells 2
# window_resize_step_lines 2
-window_border_width 4.0
+window_border_width 3.0
draw_minimal_borders yes
window_margin_width 0.0
# single_window_margin_width -1000.0
window_padding_width 4.0
-active_border_color #555
+active_border_color #3f2e26
inactive_border_color #333
bell_border_color #ff5a00
inactive_text_alpha 0.5
@@ -77,15 +77,15 @@ tab_bar_style fade
tab_fade 0.2 0.5 0.8 1
# tab_separator " ┇"
-active_tab_foreground #eee
-active_tab_background #2f2a4b
+active_tab_foreground #aca4a1
+active_tab_background #3f2e26
active_tab_font_style bold-italic
inactive_tab_foreground #777
inactive_tab_background #444
inactive_tab_font_style normal
-background #424242
-foreground #d9e6f2
+background #2a180e
+foreground #aca4a1
background_opacity 1.0
dynamic_background_opacity no
dim_opacity 0.5
@@ -286,35 +286,35 @@ allow_remote_control yes
#: map ctrl+enter new_window @ some_program
-# map kitty_mod+n new_os_window
-# map kitty_mod+w close_window
-# map kitty_mod+] next_window
-# map kitty_mod+[ previous_window
-# map kitty_mod+f move_window_forward
-# map kitty_mod+b move_window_backward
-# map kitty_mod+` move_window_to_top
-# map kitty_mod+r start_resizing_window
-# map kitty_mod+1 first_window
-# map kitty_mod+2 second_window
-# map kitty_mod+3 third_window
-# map kitty_mod+4 fourth_window
-# map kitty_mod+5 fifth_window
-# map kitty_mod+6 sixth_window
-# map kitty_mod+7 seventh_window
-# map kitty_mod+8 eighth_window
-# map kitty_mod+9 ninth_window
-# map kitty_mod+0 tenth_window
+map kitty_mod+n new_os_window
+map kitty_mod+w close_window
+map kitty_mod+left next_window
+map kitty_mod+right previous_window
+map kitty_mod+alt+left move_window_forward
+map kitty_mod+alt+right move_window_backward
+map kitty_mod+` move_window_to_top
+map kitty_mod+r start_resizing_window
+map kitty_mod+1 first_window
+map kitty_mod+2 second_window
+map kitty_mod+3 third_window
+map kitty_mod+4 fourth_window
+map kitty_mod+5 fifth_window
+map kitty_mod+6 sixth_window
+map kitty_mod+7 seventh_window
+map kitty_mod+8 eighth_window
+map kitty_mod+9 ninth_window
+map kitty_mod+0 tenth_window
#: }}}
#: Tab management {{{
-# map kitty_mod+right next_tab
-# map kitty_mod+left previous_tab
-# map kitty_mod+t new_tab
-# map kitty_mod+q close_tab
-# map kitty_mod+. move_tab_forward
-# map kitty_mod+, move_tab_backward
-# map kitty_mod+alt+t set_tab_title
+map kitty_mod+t new_tab
+map kitty_mod+q close_tab
+map kitty_mod+] next_tab
+map kitty_mod+[ previous_tab
+map kitty_mod+{ move_tab_forward
+map kitty_mod+} move_tab_backward
+map kitty_mod+alt+t set_tab_title
#: You can also create shortcuts to go to specific tabs, with 1 being
#: the first tab::
diff --git a/dot.config/sway/config b/dot.config/sway/config
index 5020564..95e4f67 100644
--- a/dot.config/sway/config
+++ b/dot.config/sway/config
@@ -74,7 +74,7 @@ client.background $black
floating_modifier $mod
bindsym $mod+Return exec $term
bindsym $mod+q kill
-bindsym $mod+p exec --no-startup-id rofi -modi "run,calc" -show run
+bindsym $mod+p exec --no-startup-id rofi -show run
bindsym $mod+Left focus left
bindsym $mod+Right focus right
@@ -192,5 +192,9 @@ bar {
}
# AUTOSTART
-exec --no-startup-id blueman-applet &
-exec --no-startup-id dunst
+exec --no-startup-id blueman-applet & # bluetooth applet
+# the next line is necessary for mako, see https://github.com/emersion/mako
+exec --no-startup-id dbus-daemon --session --address=unix:path=$XDG_RUNTIME_DIR/bus &
+exec --no-startup-id mako & # notifications
+# exec --no-startup-id dunst & # old notifications
+exec --no-startup-id kanshi # automatic screen config
diff --git a/dot.i3/config b/dot.i3/config
deleted file mode 100644
index b11ba78..0000000
--- a/dot.i3/config
+++ /dev/null
@@ -1,312 +0,0 @@
-# vim:filetype=i3
-# i3 config file (v4)
-set $mod Mod4
-set $editor st
-
-# fake-outputs 1280x1440+0+0,1280x1440+1280+0
-
-set $black #212121
-set $darkblack #000000
-set $red #fb4934
-set $darkred #cc241d
-set $green #b8bb26
-set $darkgreen #98971a
-set $yellow #fabd2f
-set $darkyellow #d79921
-set $blue #83a598
-set $darkblue #458588
-set $magenta #d3869b
-set $darkmagenta #b16286
-set $cyan #8ec07c
-set $darkcyan #689d6a
-set $white #ebdbb2
-set $darkwhite #a89984
-# set $background #000000
-set $transparent #1d202100
-
-set $ws1 "1: "
-set $ws2 "2: "
-set $ws3 "3: "
-set $ws4 "4: "
-set $ws5 "5: "
-set $ws6 "6: "
-set $ws7 "7: "
-set $ws8 "8: "
-set $ws9 "9: "
-set $ws10 "10: "
-
-set $default_gaps_inner 10
-set $default_gaps_outer 5
-gaps inner $default_gaps_inner
-gaps outer $default_gaps_outer
-
-workspace $ws1 gaps inner 0
-workspace $ws1 gaps outer 0
-workspace $ws9 gaps inner 0
-workspace $ws9 gaps outer 0
-workspace $ws10 gaps inner 0
-workspace $ws10 gaps outer 0
-
-workspace_auto_back_and_forth yes
-force_display_urgency_hint 0 ms
-focus_on_window_activation urgent
-
-floating_minimum_size -1 x -1
-floating_maximum_size -1 x -1
-
-font pango:monofur for powerline 14, FontAwesome 12
-
-# BORDER BACKGROUND TEXT INDICATOR CHILD_BORDER
-client.focused $yellow $yellow $black $yellow $yellow
-client.unfocused $black $black $white $black $darkyellow
-client.focused_inactive $black $black $white $black $darkyellow
-client.urgent $darkred $darkred $black $darkred $darkred
-client.background $black
-
-floating_modifier $mod
-bindsym $mod+Return exec $editor
-bindsym $mod+Shift+Return exec $editor --name __scratchpad
-
-bindsym $mod+q kill
-bindsym $mod+p exec --no-startup-id rofi -show run
-
-bindsym $mod+Left focus left
-bindsym $mod+Right focus right
-bindsym $mod+Up focus up
-bindsym $mod+Down focus down
-
-bindsym $mod+Shift+Left move left 35px
-bindsym $mod+Shift+Down move down 35px
-bindsym $mod+Shift+Up move up 35px
-bindsym $mod+Shift+Right move right 35px
-
-bindsym $mod+h split h
-bindsym $mod+v split v
-
-bindsym $mod+f fullscreen
-bindsym $mod+g fullscreen global
-
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-bindsym $mod+Shift+space floating toggle
-bindsym $mod+space focus mode_toggle
-
-bindsym $mod+a focus parent
-bindsym $mod+Shift+a focus child
-
-bindsym $mod+1 workspace $ws1
-bindsym $mod+2 workspace $ws2
-bindsym $mod+3 workspace $ws3
-bindsym $mod+4 workspace $ws4
-bindsym $mod+5 workspace $ws5
-bindsym $mod+6 workspace $ws6
-bindsym $mod+7 workspace $ws7
-bindsym $mod+8 workspace $ws8
-bindsym $mod+9 workspace $ws9
-bindsym $mod+0 workspace $ws10
-bindsym $mod+Tab workspace back_and_forth
-
-bindsym $mod+Shift+minus move scratchpad
-bindsym $mod+Shift+plus scratchpad show
-
-bindsym $mod+Shift+s sticky toggle
-# put YouTube into fullscreen and execute this for media mode
-bindsym $mod+y fullscreen disable; floating enable; resize set 400 300; sticky enable; move window to position 1515 20
-
-bindsym $mod+Shift+1 move container to workspace number $ws1
-bindsym $mod+Shift+2 move container to workspace number $ws2
-bindsym $mod+Shift+3 move container to workspace number $ws3
-bindsym $mod+Shift+4 move container to workspace number $ws4
-bindsym $mod+Shift+5 move container to workspace number $ws5
-bindsym $mod+Shift+6 move container to workspace number $ws6
-bindsym $mod+Shift+7 move container to workspace number $ws7
-bindsym $mod+Shift+8 move container to workspace number $ws8
-bindsym $mod+Shift+9 move container to workspace number $ws9
-bindsym $mod+Shift+0 move container to workspace number $ws10
-
-bindsym XF86AudioLowerVolume exec --no-startup-id $HOME/scripts/volume_control.py down 5
-bindsym XF86AudioRaiseVolume exec --no-startup-id $HOME/scripts/volume_control.py up 5
-bindsym XF86AudioMute exec --no-startup-id $HOME/scripts/volume_control.py toggle
-bindsym $mod+Shift+v exec --no-startup-id "killall pavucontrol; $HOME/scripts/fullscreen_wrap.sh pavucontrol -t 1"
-
-bindsym XF86MonBrightnessDown exec --no-startup-id ${HOME}/scripts/backlight.sh -dec 10
-bindsym XF86MonBrightnessUp exec --no-startup-id ${HOME}/scripts/backlight.sh -inc 10
-
-bindsym $mod+Shift+c reload
-bindsym $mod+Shift+r restart
-
-# screenshot
-bindsym --release Print exec --no-startup-id "maim -p 0 -c 0.96,0.5,0.09 $HOME/See/screenshot-$(date +%Y-%m-%d_%H-%M-%S).png"
-bindsym --release Shift+Print exec --no-startup-id "maim -s -p 0 -c 0.96,0.5,0.09 $HOME/See/screenshot-$(date +%Y-%m-%d_%H-%M-%S).png"
-
-bindsym $mod+n exec --no-startup-id thunar
-
-set $mode_resize resize left right up down
-bindsym $mod+r mode "$mode_resize"
-mode --pango_markup "$mode_resize" {
- bindsym Left resize shrink width 10 px or 1 ppt
- bindsym Down resize grow height 10 px or 1 ppt
- bindsym Up resize shrink height 10 px or 1 ppt
- bindsym Right resize grow width 10 px or 1 ppt
-
- bindsym Shift+Left resize shrink width 20 px or 5 ppt
- bindsym Shift+Down resize grow height 20 px or 5 ppt
- bindsym Shift+Up resize shrink height 20 px or 5 ppt
- bindsym Shift+Right resize grow width 20 px or 5 ppt
-
- bindsym s mode "default", exec --no-startup-id $HOME/scripts/slopsize.sh
-
- bindsym Return mode "default"
- bindsym Escape mode "default"
-}
-
-set $mode_power power lock exit suspend reboot poweroff
-mode --pango_markup "$mode_power" {
- bindsym l mode "default", exec --no-startup-id i3lock -c '000000' -i ${HOME}/See/lock.png -d
- bindsym e mode "default", exec --no-startup-id i3-msg exit
- bindsym s mode "default", exec --no-startup-id zzz
- bindsym h mode "default", exec --no-startup-id ZZZ
- bindsym r mode "default", exec --no-startup-id shutdown -r now
- bindsym p mode "default", exec --no-startup-id shutdown -P now
-
- bindsym Return mode "default"
- bindsym Escape mode "default"
-}
-bindsym $mod+l exec i3lock -c '000000' -i ${HOME}/See/lock.png -d
-bindsym $mod+Control+l mode "$mode_power"
-bindsym Mod1+Control+l mode "$mode_power"
-
-set $mode_gaps gaps inner outer 0 d
-set $mode_gaps_outer outer gaps + - 0 d
-set $mode_gaps_inner inner gaps + - 0 d
-bindsym $mod+Shift+g mode "$mode_gaps"
-
-mode --pango_markup "$mode_gaps" {
- bindsym o mode "$mode_gaps_outer"
- bindsym i mode "$mode_gaps_inner"
-
- bindsym 0 mode "default", exec --no-startup-id i3-msg "gaps inner current set 0" && i3-msg "gaps outer current set 0"
- bindsym d mode "default", exec --no-startup-id i3-msg "gaps inner current set $default_gaps_inner" && i3-msg "gaps outer current set $default_gaps_outer"
-
- bindsym Return mode "default"
- bindsym Escape mode "default"
-}
-
-mode --pango_markup "$mode_gaps_inner" {
- bindsym plus gaps inner current plus 5
- bindsym minus gaps inner current minus 5
- bindsym 0 mode "default", gaps inner current set 0
- bindsym d mode "default", gaps inner current set $default_gaps_inner
-
- bindsym Shift+plus gaps inner all plus 5
- bindsym Shift+minus gaps inner all minus 5
- bindsym Shift+0 mode "default", gaps inner all set 0
- bindsym Shift+d mode "default", gaps inner all set $default_gaps_inner
-
- bindsym Return mode "default"
- bindsym Escape mode "default"
-}
-mode --pango_markup "$mode_gaps_outer" {
- bindsym plus gaps outer current plus 5
- bindsym minus gaps outer current minus 5
- bindsym 0 mode "default", gaps outer current set 0
- bindsym d mode "default", gaps outer current set $default_gaps_outer
-
- bindsym Shift+plus gaps outer all plus 5
- bindsym Shift+minus gaps outer all minus 5
- bindsym Shift+0 mode "default", gaps outer all set 0
- bindsym Shift+d mode "default", gaps outer all set $default_gaps_outer
-
- bindsym Return mode "default"
- bindsym Escape mode "default"
-}
-
-set $mode_brightness brightness + increase - decrease
-bindsym $mod+Shift+b mode "$mode_brightness"
-mode --pango_markup "$mode_brightness" {
- bindsym plus exec --no-startup-id ${HOME}/src/scripts/backlight.sh -time 50 -inc 10
- bindsym minus exec --no-startup-id ${HOME}/src/scripts/backlight.sh -time 50 -dec 10
- bindsym Shift+plus exec --no-startup-id ${HOME}/src/scripts/backlight.sh -time 50 -inc 1
- bindsym Shift+minus exec --no-startup-id ${HOME}/src/scripts/backlight.sh -time 50 -dec 1
-
- bindsym 0 mode "default", exec --no-startup-id ${HOME}/src/scripts/backlight.sh -time 50 -set 100
- bindsym 1 mode "default", exec --no-startup-id ${HOME}/src/scripts/backlight.sh -time 50 -set 10
- bindsym 2 mode "default", exec --no-startup-id ${HOME}/src/scripts/backlight.sh -time 50 -set 20
- bindsym 3 mode "default", exec --no-startup-id ${HOME}/src/scripts/backlight.sh -time 50 -set 30
- bindsym 4 mode "default", exec --no-startup-id ${HOME}/src/scripts/backlight.sh -time 50 -set 40
- bindsym 5 mode "default", exec --no-startup-id ${HOME}/src/scripts/backlight.sh -time 50 -set 50
- bindsym 6 mode "default", exec --no-startup-id ${HOME}/src/scripts/backlight.sh -time 50 -set 60
- bindsym 7 mode "default", exec --no-startup-id ${HOME}/src/scripts/backlight.sh -time 50 -set 70
- bindsym 8 mode "default", exec --no-startup-id ${HOME}/src/scripts/backlight.sh -time 50 -set 80
- bindsym 9 mode "default", exec --no-startup-id ${HOME}/src/scripts/backlight.sh -time 50 -set 90
-
- bindsym Return mode "default"
- bindsym Escape mode "default"
-}
-
-# fix graphics glitch
-new_window none
-
-for_window [window_role="pop-up"] floating enable
-for_window [window_role="bubble"] floating enable
-for_window [window_role="task_dialog"] floating enable
-for_window [window_role="Preferences"] floating enable
-
-for_window [window_type="dialog"] floating enable
-for_window [window_type="menu"] floating enable
-
-for_window [class="(?i)gsimplecal"] floating enable, move position mouse
-for_window [class="(?i)qemu-system"] floating enable
-for_window [class="(?i)VirtualBox" title="(?i)Manager"] floating enable
-for_window [class="(?i)blueman"] floating enable
-
-for_window [instance="sun-awt-X11-XFramePeer"] floating enable
-for_window [instance="__scratchpad"] floating enable
-for_window [instance="__nmtui"] floating enable
-
-for_window [class="(?i)pavucontrol"] floating enable, border normal, move position mouse
-
-assign [class="(?i)chrome"] $ws1
-assign [class="(?i)eclipse" window_type="splash"] $ws3
-assign [class="(?i)eclipse" window_type="normal"] $ws3
-assign [class="(?i)thunderbird"] $ws9
-
-bar {
-# verbose yes
- status_command i3blocks
- i3bar_command i3bar -t
- position top
- font pango:Hack 16, FontAwesome 15
- strip_workspace_numbers yes
- separator_symbol "■"
- bindsym button4 nop
- bindsym button5 nop
- tray_output eDP1
- tray_output LVDS-0
- tray_padding 0
- height 40
- colors {
- statusline $white
- background $transparent
- separator $yellow
-
-# BORDER BACKGROUND TEXT
- focused_workspace $transparent $transparent $yellow
- inactive_workspace $transparent $transparent $white
- active_workspace $transparent $transparent $white
- urgent_workspace $darkred $darkred $transparent
- binding_mode $transparent $transparent $yellow
- }
-}
-
-# AUTOSTART
-
-exec --no-startup-id compton -b
-exec --no-startup-id dunst &
-exec --no-startup-id blueman-applet &
-exec --no-startup-id nm-applet &
-exec --no-startup-id xedgewarp -b
-
-exec_always --no-startup-id feh --bg-fill $HOME/.config/wallpapers/octocat.jpg
diff --git a/zsh/kitty.compl.zsh b/dot.zsh/kitty.compl.zsh
similarity index 100%
rename from zsh/kitty.compl.zsh
rename to dot.zsh/kitty.compl.zsh
diff --git a/zsh/koehr.theme.zsh b/dot.zsh/koehr.theme.zsh
similarity index 100%
rename from zsh/koehr.theme.zsh
rename to dot.zsh/koehr.theme.zsh