summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md8
-rw-r--r--X11/xresources8
-rw-r--r--alacritty/alacritty.yml8
-rw-r--r--awesome/rc.lua2
-rw-r--r--awesome/themes/zachir/theme.lua6
-rw-r--r--dunst/dunstrc2
-rw-r--r--gtk-2.0/gtkrc6
-rw-r--r--gtk-3.0/settings.ini6
-rw-r--r--hypr/hyprland.conf14
-rw-r--r--kitty/kitty.conf4
-rw-r--r--rofi/dmenu.rasi2
-rw-r--r--scroll/config9
-rw-r--r--scroll/scripts/maximize_when_only.lua38
-rw-r--r--scroll/scripts/scratchpad.lua6
-rwxr-xr-xsxhkd/sxhkdrc4
-rw-r--r--tofi/cosmic2
-rw-r--r--tofi/themes/dmenu2
-rw-r--r--tofi/themes/dmenu_vertical2
-rw-r--r--waybar/config14
-rw-r--r--waybar/style.css23
-rw-r--r--xsettingsd/xsettingsd.conf4
21 files changed, 126 insertions, 44 deletions
diff --git a/README.md b/README.md
index 2644588..9a783de 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ make install`
Note that the `make install` will only install the files that are required to be
in the home dir to their corresponding place as hard links and install vimplug
-for neovim, vim, or both (depending on which are installed). Make sure to save
-changes to these files before running `make install`! Additionally, if you only
-want my configs for specific programs, I would recommend cloning it into a
-separate directory and avoiding the `make install`.
+for vim if it is installed. Make sure to save changes to these files before
+running `make install`! Additionally, if you only want my configs for specific
+programs, I would recommend cloning it into a separate directory and avoiding
+the `make install`.
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..42f1844 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="Papirus-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..809e192 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=Papirus-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/hypr/hyprland.conf b/hypr/hyprland.conf
index 6dbbef6..e7549f8 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -18,8 +18,8 @@ exec-once = waybar
exec-once = pypr
exec-once = hyprscratch init
exec-once = lxqt-policykit-agent
-exec-once = import-gsettings gtk-theme 'Flat-Remix-GTK-Green-Darkest-Solid'
-exec-once = import-gsettings icon-theme 'COSMIC'
+exec-once = import-gsettings gtk-theme 'Flat-Remix-GTK-Green-Darkest'
+exec-once = import-gsettings icon-theme 'Papirus-Dark'
exec-once = import-gsettings cursor-theme 'BreezeX-Black'
exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
exec-once = xrdb -load "$XDG_CONFIG_HOME"/X11/xresources
@@ -108,7 +108,7 @@ misc {
disable_splash_rendering = true
enable_swallow = true
swallow_regex = ^(kitty)$
- swallow_exception_regex = ^(wev|.*ueberzug|n?vi?m? .*)$
+ swallow_exception_regex = ^(wev|.*ueberzug|n?vi?m? .*|.*dragon.*)$
vfr = true
vrr = 3
}
@@ -124,7 +124,7 @@ decoration {
size = 3
passes = 1
new_optimizations = true
- xray = false
+ xray = true
}
#}}}
#{{{ Shadow options
@@ -220,6 +220,10 @@ windowrulev2 = workspace special:easyeffects silent, class: ^(com\.github\.wwmm\
windowrulev2 = xray 0, class: ^(\s*), title: ^(\s*)$
#}}}
+#{{{ Layerrules
+layerrule = blur, waybar
+#}}}
+
#{{{ Mods
# See https://wiki.hyprland.org/Configuring/Keywords/ for more
$mainMod = SUPER
@@ -254,6 +258,8 @@ bind = $mainMod+SHIFT, H, layoutmsg, movewindowto l #HYPRSCROLLING
bind = $mainMod+SHIFT, J, layoutmsg, movewindowto d #HYPRSCROLLING
bind = $mainMod+SHIFT, K, layoutmsg, movewindowto u #HYPRSCROLLING
bind = $mainMod+SHIFT, L, layoutmsg, movewindowto r #HYPRSCROLLING
+bind = $mainMod+CONTROL, H, exec, hyprswap.sh -l
+bind = $mainMod+CONTROL, L, exec, hyprswap.sh -r
#bind = $mainMod+SHIFT, H, movewindow, l #HYPRSCROLLING
#bind = $mainMod+SHIFT, L, movewindow, r #HYPRSCROLLING
#bind = $mainMod+SHIFT, K, movewindow, u #HYPRSCROLLING
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 095607b..dddd806 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 11.0
+font_size 12.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 29c8cab..e3502d1 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
@@ -228,7 +230,7 @@ animations {
# Overview
bindsym --no-repeat $mod+tab scale_workspace overview
- bindsym --whole-window button8 scale_workspace overview
+ #bindsym --whole-window button8 scale_workspace overview
# Jump
# jump_labels_color #9e1530FF
@@ -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/scroll/scripts/scratchpad.lua b/scroll/scripts/scratchpad.lua
index 3dcfe8f..0afaa97 100644
--- a/scroll/scripts/scratchpad.lua
+++ b/scroll/scripts/scratchpad.lua
@@ -6,12 +6,14 @@ local command = nil
for i, arg in ipairs(args) do
if i <= 1 then
id = arg
+ if #args == 1 then
+ command = arg
+ end
elseif i == 2 then
if (arg == "kitty") then
terminal = true
else
command = arg
- --terminal = true
end
elseif (terminal == true) then
command = arg
@@ -19,6 +21,8 @@ for i, arg in ipairs(args) do
end
end
+command = command or "kitty"
+
local function exists(id)
local is_in_scratchpad = false
local cons = scroll.scratchpad_get_containers()
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 c6cb9f5..2ee744d 100644
--- a/waybar/config
+++ b/waybar/config
@@ -1,3 +1,4 @@
+// vim: set filetype=json5 :
{
"layer": "bottom",
"position": "top",
@@ -9,7 +10,7 @@
// Choose the order of the modules
- "modules-left":[ "sway/workspaces", "custom/launcher", "sway/window"],
+ "modules-left":[ "hyprland/workspaces", "custom/launcher", "hyprland/window"],
"modules-center":[],
"modules-right":[ "tray", "mpd", "idle_inhibitor", "temperature#cpu0", "temperature#cpu1", "temperature#gpu0", "temperature#gpu1", "temperature#gpu2", "wireplumber", "cpu", "memory", "network", "clock", "custom/power"],
@@ -166,7 +167,7 @@
"tooltip": false
},
"memory": {
- "format": "{}% "
+ "format": "{used}G "
},
"battery": {
"bat": "BAT0",
@@ -247,9 +248,16 @@
"on-click": "rofi -show drun",
//"on-click-right": "killall rofi"
},
+ "custom/battery":{
+ "interval": 15,
+ "format": "{percentage}%",
+ "return-type": "json",
+ "exec": "custom-battery",
+ "tooltip": true,
+ },
"custom/power":{
"format": "",
- "on-click": "rofi -show p -modi p:rofi-power-menu",
+ "on-click": "power-menu",
//"on-click-right": "killall rofi"
},
"custom/snip":{
diff --git a/waybar/style.css b/waybar/style.css
index f8fec13..2432be5 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;
@@ -14,6 +14,7 @@ window#waybar {
color: #ffffff;
transition-property: background-color;
transition-duration: .5s;
+ background: rgba(0, 0, 0, 0.2);
}
window#waybar.hidden {
@@ -89,6 +90,7 @@ window#waybar.hidden {
#custom-media,
#custom-launcher,
#custom-power,
+#custom-battery,
#custom-layout,
#custom-updater,
#custom-snip,
@@ -215,7 +217,26 @@ label:focus {
background-color: #1b1d1c;
font-size: 18px;
margin-right: 5px;
+}
+
+#custom-battery{
+ background-color: #1b1d1c;
+ font-size: 18px;
+}
+#custom-battery.battery_low{
+ background-color: yellow;
+ color: #1b1d1c;
+}
+
+#custom-battery.battery_crit{
+ background-color: red;
+ color: #1b1d1c;
+}
+
+#custom-battery.battery_charging{
+ background-color: #1d1b1c;
+ color: #198844;
}
#custom-launcher{
diff --git a/xsettingsd/xsettingsd.conf b/xsettingsd/xsettingsd.conf
index c4ab3db..7e001eb 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 "Papirus-Dark"
Gtk/CursorThemeName "BreezeX-Black"
Net/EnableEventSounds 1
EnableInputFeedbackSounds 0
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-02 09:02:33 +0000