From 3cd69e013903b053395d323d24fd71327a7018d3 Mon Sep 17 00:00:00 2001 From: zachir Date: Sun, 27 Jul 2025 20:24:12 -0500 Subject: Use movewindowto for all directions --- hypr/hyprland.conf | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 059ba5a..68948f5 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -240,11 +240,13 @@ $secdMod = ALT # hyprscrolling layout binds #bind = $mainMod+SHIFT, H, layoutmsg, move -1 #HYPRSCROLLING #bind = $mainMod+SHIFT, L, layoutmsg, move +1 #HYPRSCROLLING -bind = $mainMod+CTRL, H, layoutmsg, movewindowto l #HYPRSCROLLING -bind = $mainMod+CTRL, L, layoutmsg, movewindowto r #HYPRSCROLLING +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+SHIFT, H, movewindow, l #HYPRSCROLLING -bind = $mainMod+SHIFT, L, movewindow, r #HYPRSCROLLING -bind = $mainMod+SHIFT, K, movewindow, u #HYPRSCROLLING +#bind = $mainMod+SHIFT, L, movewindow, r #HYPRSCROLLING +#bind = $mainMod+SHIFT, K, movewindow, u #HYPRSCROLLING #bind = $mainMod+SHIFT, J, movewindow, d #HYPRSCROLLING bind = $mainMod, H, layoutmsg, focus l #HYPRSCROLLING bind = $mainMod, J, layoutmsg, focus d #HYPRSCROLLING -- cgit v1.2.3 From a0abeab1c719c59f0c97adc3353e832826701938 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 28 Jul 2025 12:22:27 -0500 Subject: Use swaysome for more awesome scroll workspaces --- scroll/config | 59 +++++++++++++++++++----------------- scroll/config.d/swaysome.conf | 69 +++++++++++++++++++++++++++++++++++++++++++ waybar/config | 51 +++++++++++++++++++++++++------- 3 files changed, 142 insertions(+), 37 deletions(-) create mode 100644 scroll/config.d/swaysome.conf diff --git a/scroll/config b/scroll/config index e689a61..8117844 100644 --- a/scroll/config +++ b/scroll/config @@ -6,7 +6,10 @@ # # Read `man 5 scroll` for a complete reference. -include ~/.config/scroll/config.d/* +include /etc/scroll/config.d/* + +# This includes config.d/user.conf, which should set the $home variable +include ~/.config/scroll/config.d/user.conf ### Variables # @@ -179,36 +182,38 @@ animations { bindsym $mod+Shift+j focus output down bindsym $mod+Shift+k focus output up bindsym $mod+Shift+l focus output right -# -# Workspaces: -# - # Switch to workspace - bindsym $mod+1 workspace number 1 - bindsym $mod+2 workspace number 2 - bindsym $mod+3 workspace number 3 - bindsym $mod+4 workspace number 4 - bindsym $mod+5 workspace number 5 - bindsym $mod+6 workspace number 6 - bindsym $mod+7 workspace number 7 - bindsym $mod+8 workspace number 8 - bindsym $mod+9 workspace number 9 - # Move focused container to workspace - bindsym $mod+Shift+1 move container to workspace number 1; workspace number 1 - bindsym $mod+Shift+2 move container to workspace number 2; workspace number 2 - bindsym $mod+Shift+3 move container to workspace number 3; workspace number 3 - bindsym $mod+Shift+4 move container to workspace number 4; workspace number 4 - bindsym $mod+Shift+5 move container to workspace number 5; workspace number 5 - bindsym $mod+Shift+6 move container to workspace number 6; workspace number 6 - bindsym $mod+Shift+7 move container to workspace number 7; workspace number 7 - bindsym $mod+Shift+8 move container to workspace number 8; workspace number 8 - bindsym $mod+Shift+9 move container to workspace number 9; workspace number 9 - # Note: workspaces can have any name you want, not just numbers. - # We just use 1-10 as the default. + # Move window to other monitors bindsym $mod+Shift+Ctrl+h move container to output left bindsym $mod+Shift+Ctrl+j move container to output down bindsym $mod+Shift+Ctrl+k move container to output up bindsym $mod+Shift+Ctrl+l move container to output right +## +## Workspaces: +## NOW USING SWAYSOME +## +# # Switch to workspace +# bindsym $mod+1 workspace number 1 +# bindsym $mod+2 workspace number 2 +# bindsym $mod+3 workspace number 3 +# bindsym $mod+4 workspace number 4 +# bindsym $mod+5 workspace number 5 +# bindsym $mod+6 workspace number 6 +# bindsym $mod+7 workspace number 7 +# bindsym $mod+8 workspace number 8 +# bindsym $mod+9 workspace number 9 +# # Move focused container to workspace +# bindsym $mod+Shift+1 move container to workspace number 1; workspace number 1 +# bindsym $mod+Shift+2 move container to workspace number 2; workspace number 2 +# bindsym $mod+Shift+3 move container to workspace number 3; workspace number 3 +# bindsym $mod+Shift+4 move container to workspace number 4; workspace number 4 +# bindsym $mod+Shift+5 move container to workspace number 5; workspace number 5 +# bindsym $mod+Shift+6 move container to workspace number 6; workspace number 6 +# bindsym $mod+Shift+7 move container to workspace number 7; workspace number 7 +# bindsym $mod+Shift+8 move container to workspace number 8; workspace number 8 +# bindsym $mod+Shift+9 move container to workspace number 9; workspace number 9 +# # Note: workspaces can have any name you want, not just numbers. +# # We just use 1-10 as the default. # Scaling # Workspace @@ -579,4 +584,4 @@ bar { #} } # -include /etc/scroll/config.d/* +include ~/.config/scroll/config.d/* diff --git a/scroll/config.d/swaysome.conf b/scroll/config.d/swaysome.conf new file mode 100644 index 0000000..eebf6a3 --- /dev/null +++ b/scroll/config.d/swaysome.conf @@ -0,0 +1,69 @@ +# vim: ft=swayconfig +# +# Use (un)bindcode or (un)bindsym, depending on what you used in your main sway config file. +# The `--no-warn` setting is only added to shortcuts that exist in the default config. You may want to add or remove +# that flag on some bindings depending on your config. + + +# Change focus between workspaces +bindsym --no-warn $mod+1 exec "swaysome focus 1" +bindsym --no-warn $mod+2 exec "swaysome focus 2" +bindsym --no-warn $mod+3 exec "swaysome focus 3" +bindsym --no-warn $mod+4 exec "swaysome focus 4" +bindsym --no-warn $mod+5 exec "swaysome focus 5" +bindsym --no-warn $mod+6 exec "swaysome focus 6" +bindsym --no-warn $mod+7 exec "swaysome focus 7" +bindsym --no-warn $mod+8 exec "swaysome focus 8" +bindsym --no-warn $mod+9 exec "swaysome focus 9" +#bindsym --no-warn $mod+0 exec "swaysome focus 0" + +# Move containers between workspaces +bindsym --no-warn $mod+Shift+1 exec "swaysome move 1" +bindsym --no-warn $mod+Shift+2 exec "swaysome move 2" +bindsym --no-warn $mod+Shift+3 exec "swaysome move 3" +bindsym --no-warn $mod+Shift+4 exec "swaysome move 4" +bindsym --no-warn $mod+Shift+5 exec "swaysome move 5" +bindsym --no-warn $mod+Shift+6 exec "swaysome move 6" +bindsym --no-warn $mod+Shift+7 exec "swaysome move 7" +bindsym --no-warn $mod+Shift+8 exec "swaysome move 8" +bindsym --no-warn $mod+Shift+9 exec "swaysome move 9" +#bindsym --no-warn $mod+Shift+0 exec "swaysome move 0" + +# Focus workspace groups +bindsym $mod+Alt+1 exec "swaysome focus-group 1" +bindsym $mod+Alt+2 exec "swaysome focus-group 2" +bindsym $mod+Alt+3 exec "swaysome focus-group 3" +bindsym $mod+Alt+4 exec "swaysome focus-group 4" +bindsym $mod+Alt+5 exec "swaysome focus-group 5" +bindsym $mod+Alt+6 exec "swaysome focus-group 6" +bindsym $mod+Alt+7 exec "swaysome focus-group 7" +bindsym $mod+Alt+8 exec "swaysome focus-group 8" +bindsym $mod+Alt+9 exec "swaysome focus-group 9" +#bindsym $mod+Alt+0 exec "swaysome focus-group 0" + +# Move containers to other workspace groups +bindsym $mod+Alt+Shift+1 exec "swaysome move-to-group 1" +bindsym $mod+Alt+Shift+2 exec "swaysome move-to-group 2" +bindsym $mod+Alt+Shift+3 exec "swaysome move-to-group 3" +bindsym $mod+Alt+Shift+4 exec "swaysome move-to-group 4" +bindsym $mod+Alt+Shift+5 exec "swaysome move-to-group 5" +bindsym $mod+Alt+Shift+6 exec "swaysome move-to-group 6" +bindsym $mod+Alt+Shift+7 exec "swaysome move-to-group 7" +bindsym $mod+Alt+Shift+8 exec "swaysome move-to-group 8" +bindsym $mod+Alt+Shift+9 exec "swaysome move-to-group 9" +#bindsym $mod+Alt+Shift+0 exec "swaysome move-to-group 0" + +# Move focused container to next output +bindsym $mod+o exec "swaysome next-output" +# Move focused container to previous output +bindsym $mod+Shift+o exec "swaysome prev-output" + +# Move focused workspace group to next output +bindsym $mod+Alt+o exec "swaysome workspace-group-next-output" +# Move focused workspace group to previous output +bindsym $mod+Alt+Shift+o exec "swaysome workspace-group-prev-output" + +# Init workspaces for every screen +exec "swaysome init 1" + + diff --git a/waybar/config b/waybar/config index 77e7e6d..b480559 100644 --- a/waybar/config +++ b/waybar/config @@ -18,17 +18,48 @@ "sway/workspaces": { "all-outputs": false, "persistent-workspaces": { - "1": ["eDP-1"], - "2": ["eDP-1"], - "3": ["eDP-1"], - "4": ["eDP-1"], - "5": ["eDP-1"], - "6": ["eDP-1"], - "7": ["eDP-1"], - "8": ["eDP-1"], - "9": ["eDP-1"], + "11": ["DP-2"], + "12": ["DP-2"], + "13": ["DP-2"], + "14": ["DP-2"], + "15": ["DP-2"], + "16": ["DP-2"], + "17": ["DP-2"], + "18": ["DP-2"], + "19": ["DP-2"], + }, + "format": "{icon}", + "format-icons": { + "1": "1", + "2": "2", + "3": "3", + "4": "4", + "5": "5", + "6": "6", + "7": "7", + "8": "8", + "9": "9", + "10": "0", + "11": "1", + "12": "2", + "13": "3", + "14": "4", + "15": "5", + "16": "6", + "17": "7", + "18": "8", + "19": "9", + "20": "0", + "21": "1", + "22": "2", + "23": "3", + "24": "4", + "25": "5", + "26": "6", + "27": "7", + "28": "8", + "29": "9", }, - "format": "{value}", }, "niri/workspaces": { "format": "{value}", -- cgit v1.2.3 From 0de3a40a14d40a74947ca84396bf0a5b76152377 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 28 Jul 2025 12:22:55 -0500 Subject: Add restart script keybind to scroll --- scroll/config | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scroll/config b/scroll/config index 8117844..15c9f1d 100644 --- a/scroll/config +++ b/scroll/config @@ -126,6 +126,9 @@ animations { # Start your launcher bindsym $mod+e exec $rmenu bindsym $mod+d exec $dmenu + + # Start restart menu + bindsym $mod+r exec rs # Launch your file manager bindsym $mod+Alt+f exec $filemanager -- cgit v1.2.3 From 8a2c32014dc380cf9fc92e60c2ebe5f01f2930e3 Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 28 Jul 2025 13:01:03 -0500 Subject: Fix formatting in waybar cnofig --- waybar/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/waybar/config b/waybar/config index b480559..d9fcbda 100644 --- a/waybar/config +++ b/waybar/config @@ -5,7 +5,7 @@ //"output": "%%DISPLAY%%", "spacing": 4, //"margin-top": 5, - //"margin-bottom":5, + //"margin-bottom": 5, // Choose the order of the modules -- cgit v1.2.3 From 8bc4e11ba7d4ad30f09c376e5ba31d5563471cba Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 28 Jul 2025 13:01:17 -0500 Subject: eDP-1 is the only display in master --- waybar/config | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/waybar/config b/waybar/config index d9fcbda..25fb4dc 100644 --- a/waybar/config +++ b/waybar/config @@ -18,15 +18,15 @@ "sway/workspaces": { "all-outputs": false, "persistent-workspaces": { - "11": ["DP-2"], - "12": ["DP-2"], - "13": ["DP-2"], - "14": ["DP-2"], - "15": ["DP-2"], - "16": ["DP-2"], - "17": ["DP-2"], - "18": ["DP-2"], - "19": ["DP-2"], + "11": ["eDP-1"], + "12": ["eDP-1"], + "13": ["eDP-1"], + "14": ["eDP-1"], + "15": ["eDP-1"], + "16": ["eDP-1"], + "17": ["eDP-1"], + "18": ["eDP-1"], + "19": ["eDP-1"], }, "format": "{icon}", "format-icons": { -- cgit v1.2.3 From 15c221f1edd7b623edf4bcfb79ee2e993ca7d04c Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 28 Jul 2025 13:14:20 -0500 Subject: Remove debugging stuff from scratchpad.lua --- scroll/scripts/scratchpad.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/scroll/scripts/scratchpad.lua b/scroll/scripts/scratchpad.lua index 6972843..2235c33 100644 --- a/scroll/scripts/scratchpad.lua +++ b/scroll/scripts/scratchpad.lua @@ -11,7 +11,6 @@ for i, arg in ipairs(args) do terminal = true else command = arg - --terminal = true end elseif (terminal == true) then command = arg @@ -19,7 +18,6 @@ for i, arg in ipairs(args) do end end ---scroll.command(nil, "exec notify-send \"Spawn command\" \"" .. command .. "\"") local function exists(id) local is_in_array = false -- cgit v1.2.3 From 98d4473f1c9783c7bc8f01208f1996b2e40e53ce Mon Sep 17 00:00:00 2001 From: zachir Date: Mon, 28 Jul 2025 13:14:42 -0500 Subject: Add fallback to scrathpad.lua so command should always be defind --- scroll/scripts/scratchpad.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scroll/scripts/scratchpad.lua b/scroll/scripts/scratchpad.lua index 2235c33..e581cc1 100644 --- a/scroll/scripts/scratchpad.lua +++ b/scroll/scripts/scratchpad.lua @@ -6,6 +6,9 @@ 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 @@ -18,6 +21,7 @@ for i, arg in ipairs(args) do end end +command = command or "kitty" local function exists(id) local is_in_array = false -- cgit v1.2.3 From 0ff1806f2c2d690238c373b8f65ba40f569301d7 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 30 Jul 2025 02:40:49 -0500 Subject: Use JetBrainsMono Nerd Font instead of Fira Code --- X11/xresources | 8 ++++---- alacritty/alacritty.yml | 8 ++++---- awesome/rc.lua | 2 +- awesome/themes/zachir/theme.lua | 6 +++--- dunst/dunstrc | 2 +- kitty/kitty.conf | 4 ++-- rofi/dmenu.rasi | 2 +- sxhkd/sxhkdrc | 4 ++-- tofi/cosmic | 2 +- tofi/themes/dmenu | 2 +- tofi/themes/dmenu_vertical | 2 +- waybar/style.css | 2 +- 12 files changed, 22 insertions(+), 22 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/kitty/kitty.conf b/kitty/kitty.conf index 095607b..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 11.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/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/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; -- cgit v1.2.3 From b22f6afb388054996a43626e6da2bb7bb93e15c8 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 30 Jul 2025 02:41:27 -0500 Subject: Use ePapirus-Dark instead of COSMIC --- gtk-2.0/gtkrc | 6 +++--- gtk-3.0/settings.ini | 6 +++--- xsettingsd/xsettingsd.conf | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) 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/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 -- cgit v1.2.3 From 6e529ca13fd6c9f273cccce6d788c9940b473c6d Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 30 Jul 2025 02:42:52 -0500 Subject: Add maximize when only lua script for scroll --- scroll/config | 7 ++++++- scroll/scripts/maximize_when_only.lua | 38 +++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 scroll/scripts/maximize_when_only.lua diff --git a/scroll/config b/scroll/config index 15c9f1d..889da2e 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) -- cgit v1.2.3 From ec330589a41b423950fe49449248edb546961383 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 30 Jul 2025 02:44:19 -0500 Subject: Add json syntax highlighting to waybar config --- waybar/config | 1 + 1 file changed, 1 insertion(+) diff --git a/waybar/config b/waybar/config index 25fb4dc..5807b92 100644 --- a/waybar/config +++ b/waybar/config @@ -1,3 +1,4 @@ +// vim: set filetype=json5 : { "layer": "bottom", "position": "top", -- cgit v1.2.3 From 66a55d31d6cfa115c99a7fe3c93fbbed7901fe8e Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 30 Jul 2025 04:23:51 -0500 Subject: Add custom/battery for while battery is broken --- waybar/config | 9 +++++++-- waybar/style.css | 5 +++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/waybar/config b/waybar/config index 5807b92..9246fa2 100644 --- a/waybar/config +++ b/waybar/config @@ -160,8 +160,8 @@ "format": "{}% " }, "battery": { - "bat": "BAT0", - "interval": 60, + //"bat": "BAT0", + //"interval": 60, "state": { "warning": 30, "critical": 15 @@ -214,6 +214,11 @@ "on-click": "rofi -show drun", //"on-click-right": "killall rofi" }, + "custom/battery":{ + "interval": 60, + "format": "{}%", + "exec": "cat /sys/class/power_supply/BAT0/capacity", + }, "custom/power":{ "format": "", "on-click": "rofi -show p -modi p:rofi-power-menu", diff --git a/waybar/style.css b/waybar/style.css index 0a4431c..865e806 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -89,6 +89,7 @@ window#waybar.hidden { #custom-media, #custom-launcher, #custom-power, +#custom-battery, #custom-layout, #custom-updater, #custom-snip, @@ -215,7 +216,11 @@ label:focus { background-color: #1b1d1c; font-size: 18px; margin-right: 5px; +} +#custom-battery{ + background-color: #1b1d1c; + font-size: 18px; } #custom-launcher{ -- cgit v1.2.3 From d1412fdffa7388d04c01a26ab89cef8151efde6e Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 30 Jul 2025 05:06:22 -0500 Subject: Restore battery waybar settings in case it starts working again --- waybar/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/waybar/config b/waybar/config index 9246fa2..7775078 100644 --- a/waybar/config +++ b/waybar/config @@ -160,8 +160,8 @@ "format": "{}% " }, "battery": { - //"bat": "BAT0", - //"interval": 60, + "bat": "BAT0", + "interval": 60, "state": { "warning": 30, "critical": 15 -- cgit v1.2.3 From 218e54aa900ba4e469a405f3e81bf00e024b228d Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 30 Jul 2025 05:06:51 -0500 Subject: Expand custom/battery module --- waybar/config | 8 +++++--- waybar/style.css | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/waybar/config b/waybar/config index 7775078..933dedc 100644 --- a/waybar/config +++ b/waybar/config @@ -215,9 +215,11 @@ //"on-click-right": "killall rofi" }, "custom/battery":{ - "interval": 60, - "format": "{}%", - "exec": "cat /sys/class/power_supply/BAT0/capacity", + "interval": 15, + "format": "{percentage}%", + "return-type": "json", + "exec": "custom-battery", + "tooltip": true, }, "custom/power":{ "format": "", diff --git a/waybar/style.css b/waybar/style.css index 865e806..ff6dc9a 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -223,6 +223,21 @@ label:focus { 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{ background-color: #1b1d1c; font-size: 20px; -- cgit v1.2.3 From a18b9a97b6c3262da597efd0b4afc0b27b7f2e1f Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 30 Jul 2025 04:06:13 -0500 Subject: Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 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`. -- cgit v1.2.3 From 758bf486be2560343561b1d03bffe998f6f932b4 Mon Sep 17 00:00:00 2001 From: ZachIR Date: Wed, 30 Jul 2025 05:10:56 -0500 Subject: Don't swallow dragon-drop --- hypr/hyprland.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 68948f5..0547c21 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -106,7 +106,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 } -- cgit v1.2.3