Merge branch 'master' into car

18 files changed, 75 insertions, 31 deletions

diff --git a/X11/xresources b/X11/xresources
index 13799fc..7d2525a 100644
--- a/X11/xresources
+++ b/X11/xresources
@@ -1,6 +1,6 @@
 !! dmenu
 
-dmenu.font: FiraCode Nerd Font Mono:size=24
+dmenu.font: JetBrainsMono Nerd Font:size=24
 
 !! dwm
 
@@ -30,7 +30,7 @@ st.termname:     st-256color
 st.shell: /usr/bin/tmux
 
 ! The following options options can be reloaded via USR1 signal.
-!st.font:              FiraCode Nerd Font Mono:pixelsize=12:antialias=true:autohint=true;
+!st.font:              JetBrainsMono Nerd Font:pixelsize=12:antialias=true:autohint=true;
 !st.font2:             Symbola:pixelsize=12:antialias=true:autohint=true;
 st.borderpx:          3
 ! st alpha
@@ -76,7 +76,7 @@ URxvt.secondaryScreen: 1
 URxvt.secondaryScroll: 0
 URxvt.secondaryWheel: 1
 ! URxvt font
-URxvt.font: xft:FiraCode:regular:size=8,xft:symbola:regular:size=9
+URxvt.font: xft:JetBrainsMono:regular:size=8,xft:symbola:regular:size=9
 ! fix font spacing
 URxvt.letterSpace: -1
 ! Disable printing
@@ -119,7 +119,7 @@ rofi.width:                          1366
 ! "Number of columns" Set from: Default
 ! rofi.columns:                        1
 ! "Font to use" Set from: Default
-rofi.font:                           FiraCode 9
+rofi.font:                           JetBrainsMono 9
 ! "Border width" Set from: Default
 ! rofi.bw:                             1
 ! "Location on screen" Set from: Default
diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index 1bd8532..0b30805 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -115,7 +115,7 @@ font:
     #   - (macOS) Menlo
     #   - (Linux/BSD) monospace
     #   - (Windows) Consolas
-    family: FiraCode Nerd Font Mono
+    family: JetBrainsMono Nerd Font
 
     # The `style` can be specified to pick a specific face.
     style: Regular
@@ -126,7 +126,7 @@ font:
     #
     # If the bold family is not specified, it will fall back to the
     # value specified for the normal font.
-    family: FiraCode Nerd Font Mono
+    family: JetBrainsMono Nerd Font
 
     # The `style` can be specified to pick a specific face.
     style: Bold
@@ -137,7 +137,7 @@ font:
     #
     # If the italic family is not specified, it will fall back to the
     # value specified for the normal font.
-    family: FiraCode Nerd Font Mono
+    family: JetBrainsMono Nerd Font
 
     # The `style` can be specified to pick a specific face.
     style: Italic
@@ -148,7 +148,7 @@ font:
     #
     # If the bold italic family is not specified, it will fall back to the
     # value specified for the normal font.
-    family: FiraCode Nerd Font Mono
+    family: JetBrainsMono Nerd Font
 
     # The `style` can be specified to pick a specific face.
     style: Bold Italic
diff --git a/awesome/rc.lua b/awesome/rc.lua
index fda4f16..7fa49ef 100644
--- a/awesome/rc.lua
+++ b/awesome/rc.lua
@@ -58,7 +58,7 @@ awesome_config_folder = config_dir .. "awesome"
 theme.dir = string.format("%s/awesome/themes/%s", config_dir, theme.name)
 beautiful.init(theme.dir .. "/theme.lua")
 beautiful.useless_gap = 5
-font = beautiful.font or "FiraCode Nerd Font Mono 18"
+font = beautiful.font or "JetBrainsMono Nerd Font 18"
 
 -- Library I'm using for swallowing, but it does much more
 
diff --git a/awesome/themes/zachir/theme.lua b/awesome/themes/zachir/theme.lua
index b54c3c6..30a575a 100644
--- a/awesome/themes/zachir/theme.lua
+++ b/awesome/themes/zachir/theme.lua
@@ -12,8 +12,8 @@ local themes_path = gfs.get_themes_dir()
 
 local theme = {}
 
-theme.font          = "FiraCode Nerd Font Mono 18"
-theme.font2         = "FiraCode Nerd Font Mono 12"
+theme.font          = "JetBrainsMono Nerd Font 18"
+theme.font2         = "JetBrainsMono Nerd Font 12"
 
 theme.bg_normal     = xrdb.background
 theme.bg_focus      = xrdb.color2
@@ -162,7 +162,7 @@ theme.tabbar_disable = false -- disable the tab bar entirely
 theme.tabbar_ontop = false
 theme.tabbar_radius = 0 -- border radius of the tabbar
 theme.tabbar_style = "default" -- style of the tabbar ("default", "boxes" or "modern")
-theme.tabbar_font = "FiraCode Nerd Font Mono 24" -- font of the tabbar
+theme.tabbar_font = "JetBrainsMono Nerd Font 24" -- font of the tabbar
 theme.tabbar_size = 40 -- size of the tabbar
 theme.tabbar_position = "top" -- position of the tabbar
 theme.tabbar_bg_normal = "#000000" -- background color of the focused client on the tabbar
diff --git a/dunst/dunstrc b/dunst/dunstrc
index 4bdcfba..6377f26 100644
--- a/dunst/dunstrc
+++ b/dunst/dunstrc
@@ -86,7 +86,7 @@
 
     ### Text ###
 
-    font = FiraCode Nerd Font Mono 18
+    font = JetBrainsMono Nerd Font 18
 
     # The spacing between lines.  If the height is smaller than the
     # font height, it will get raised to the font height.
diff --git a/gtk-2.0/gtkrc b/gtk-2.0/gtkrc
index 628ed00..f569e9b 100644
--- a/gtk-2.0/gtkrc
+++ b/gtk-2.0/gtkrc
@@ -2,9 +2,9 @@
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
 include "/home/zachir/.gtkrc-2.0.mine"
-gtk-theme-name="Flat-Remix-GTK-Green-Darkest-Solid"
-gtk-icon-theme-name="Cosmic"
-gtk-font-name="Cantarell 11"
+gtk-theme-name="Flat-Remix-GTK-Green-Darkest"
+gtk-icon-theme-name="ePapirus-Dark"
+gtk-font-name="Noto Sans,  10"
 gtk-cursor-theme-name="BreezeX-Black"
 gtk-cursor-theme-size=32
 gtk-toolbar-style=3
diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini
index 28ef3a0..310ac7b 100644
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@@ -1,7 +1,7 @@
 [Settings]
-gtk-theme-name=Flat-Remix-GTK-Green-Darkest-Solid
-gtk-icon-theme-name=Cosmic
-gtk-font-name=Cantarell 11
+gtk-theme-name=Flat-Remix-GTK-Green-Darkest
+gtk-icon-theme-name=ePapirus-Dark
+gtk-font-name=Noto Sans,  10
 gtk-cursor-theme-name=BreezeX-Black
 gtk-cursor-theme-size=32
 gtk-toolbar-style=3
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index f9772f5..7afcb30 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -6,7 +6,7 @@
 #: individual font faces and even specify special fonts for particular
 #: characters.
 
-font_family      FiraCode Nerd Font Mono
+font_family      JetBrainsMono Nerd Font
 bold_font        auto
 italic_font      auto
 bold_italic_font auto
@@ -24,7 +24,7 @@ bold_italic_font auto
 #:     italic_font      Operator Mono Book Italic
 #:     bold_italic_font Operator Mono Medium Italic
 
-font_size 12.0
+font_size 15.0
 
 #: Font size (in pts)
 
diff --git a/rofi/dmenu.rasi b/rofi/dmenu.rasi
index 6fd198a..2ac7745 100644
--- a/rofi/dmenu.rasi
+++ b/rofi/dmenu.rasi
@@ -8,7 +8,7 @@
     background-color:      Black;
     border-color:          White;
     text-color:           White;
-    font:            "FiraCode Nerd Font Mono 12";
+    font:            "JetBrainsMono Nerd Font 12";
 }
 window {
     anchor:     north;
diff --git a/scroll/config b/scroll/config
index f5f8ce5..849eb1b 100644
--- a/scroll/config
+++ b/scroll/config
@@ -100,6 +100,8 @@ layout_heights [0.33333333 0.5 0.666666667 1.0]
 
 fullscreen_movefocus true
 
+focus_follows_mouse yes
+
 mouse_warping none
 
 # Animations
@@ -511,7 +513,7 @@ bindsym $mod+Alt+comma exec dmount
 # Launch dmenuumount dmenu umount script
 bindsym $mod+Alt+period exec dmenuumount
 
-focus_wrapping no
+focus_wrapping yes
 
 bindgesture swipe:4:right workspace next
 bindgesture swipe:4:left workspace prev
@@ -521,6 +523,9 @@ bindgesture swipe:4:up scale_workspace overview
 # Enable window swallowing (of mpv specifically)
 lua $scripts/swallow.lua
 
+# Enable maximize when only
+lua $scripts/maximize_when_only.lua
+
 # Scratchpads
 for_window [app_id="sphtop"] move scratchpad
 for_window [app_id="sphtop"] scratchpad show
diff --git a/scroll/scripts/maximize_when_only.lua b/scroll/scripts/maximize_when_only.lua
new file mode 100644
index 0000000..a047180
--- /dev/null
+++ b/scroll/scripts/maximize_when_only.lua
@@ -0,0 +1,38 @@
+local args, state = ...
+
+local maximized_containers = scroll.state_get_value(state, "maximized_containers") or {}
+
+local debug_notify = function(msg)
+	scroll.command(nil, "exec notify-send " .. msg)
+end
+
+local maximize_container = function(container, workspace)
+	local wf = scroll.container_get_width_fraction(container)
+	local hf = scroll.container_get_height_fraction(container)
+	maximized_containers[workspace] = { container = container, wf = wf, hf = hf, workspace = workspace }
+	scroll.state_set_value(state, "maximized_containers", maximized_containers)
+	scroll.command(container, "set_size h 1.0")
+	scroll.command(container, "set_size v 1.0")
+end
+
+local maximize_when_only = function()
+	local focused_workspace = scroll.focused_workspace()
+	local containers = scroll.workspace_get_tiling(focused_workspace)
+	local focused_container = scroll.focused_container()
+	local maximized_container = maximized_containers[focused_workspace]
+	if #containers == 1 then
+		if not maximized_container or (maximized_container and maximized_container.container ~= focused_container) then
+			-- debug_notify("Maximizing")
+			maximize_container(focused_container, focused_workspace)
+		end
+	elseif #containers > 1 and maximized_container then
+		-- debug_notify("Shrinking")
+		scroll.command(maximized_container.container, "set_size h " .. maximized_container.wf)
+		scroll.command(maximized_container.container, "set_size v " .. maximized_container.hf)
+		maximized_containers[focused_workspace] = nil
+		scroll.state_set_value(state, "maximized_containers", maximized_containers)
+	end
+	scroll.command(focused_container, "nop")
+end
+
+scroll.add_callback("view_focus", maximize_when_only, nil)
diff --git a/sxhkd/sxhkdrc b/sxhkd/sxhkdrc
index a38f356..96ca393 100755
--- a/sxhkd/sxhkdrc
+++ b/sxhkd/sxhkdrc
@@ -12,11 +12,11 @@ super + Escape
 
 # program launcher
 super + d
-        dmenu_run -i -l 15 -h 36 -fn 'FiraCode Nerd Font Mono' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000'
+        dmenu_run -i -l 15 -h 36 -fn 'JetBrainsMono Nerd Font' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000'
 
 # desktop application launcher
 super + r
-        j4-dmenu-desktop --dmenu="dmenu -i -l 15 -h 36 -fn 'FiraCode Nerd Font Mono' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000'"
+        j4-dmenu-desktop --dmenu="dmenu -i -l 15 -h 36 -fn 'JetBrainsMono Nerd Font' -nb '#000' -nf '#c5c8c6' -sb '#198844' -sf '#000'"
 
 # dmenu prompt for recording
 super + control + r
diff --git a/tofi/cosmic b/tofi/cosmic
index 8be1a31..b339f73 100644
--- a/tofi/cosmic
+++ b/tofi/cosmic
@@ -7,7 +7,7 @@ height = 32
 horizontal = true
 font-size = 18
 prompt-text = ""
-font = FiraCode Nerd Font Mono
+font = JetBrainsMono Nerd Font
 outline-width = 0
 border-width = 0
 min-input-width = 424
diff --git a/tofi/themes/dmenu b/tofi/themes/dmenu
index 82cff1d..8af8c80 100644
--- a/tofi/themes/dmenu
+++ b/tofi/themes/dmenu
@@ -7,7 +7,7 @@ height = 36
 horizontal = true
 font-size = 18
 prompt-text = ""
-font = FiraCode Nerd Font Mono
+font = JetBrainsMono Nerd Font
 outline-width = 0
 border-width = 0
 min-input-width = 424
diff --git a/tofi/themes/dmenu_vertical b/tofi/themes/dmenu_vertical
index 6357b5a..2e95559 100644
--- a/tofi/themes/dmenu_vertical
+++ b/tofi/themes/dmenu_vertical
@@ -8,7 +8,7 @@ horizontal = false
 font-size = 18
 prompt-text = ""
 prompt-padding = 18
-font = FiraCode Nerd Font Mono
+font = JetBrainsMono Nerd Font
 outline-width = 0
 border-width = 0
 min-input-width = 424
diff --git a/waybar/config b/waybar/config
index 6c38bb6..0350845 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,3 +1,4 @@
+// vim: set filetype=json5 :
 {
     "layer": "bottom",
     "position": "top",
diff --git a/waybar/style.css b/waybar/style.css
index 9398381..0a4431c 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -3,7 +3,7 @@
     margin: 0px;
     border-radius: 0px;
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: FiraCode Nerd Font Mono;
+    font-family: JetBrainsMono Nerd Font;
     font-size: 18px;
     min-height: 0px;
     min-width: 0px;
diff --git a/xsettingsd/xsettingsd.conf b/xsettingsd/xsettingsd.conf
index c4ab3db..47a327b 100644
--- a/xsettingsd/xsettingsd.conf
+++ b/xsettingsd/xsettingsd.conf
@@ -1,5 +1,5 @@
-Net/ThemeName "Flat-Remix-GTK-Green-Darkest-Solid"
-Net/IconThemeName "Cosmic"
+Net/ThemeName "Flat-Remix-GTK-Green-Darkest"
+Net/IconThemeName "ePapirus-Dark"
 Gtk/CursorThemeName "BreezeX-Black"
 Net/EnableEventSounds 1
 EnableInputFeedbackSounds 0