From 9961a1ee25f722a46500f7d9c356b9751cd8408c Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 11 Jan 2024 13:52:15 -0600 Subject: hypr: use hyprpm instead of hyprload Not that hyprload hasn't worked, but I would rather use the first party solution where practical, and this seems to be the case for that. And hyprpm is now in the upstream Arch package. --- hypr/hyprland.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 62c1693..dd12307 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -13,7 +13,8 @@ monitor = DP-1, 1920x1080@60, 1920x0, 1 exec-once = ~/.config/autostart.sh exec-once = /usr/lib/polkit-kde-authentication-agent-1 exec-once = xdph -exec-once = $HOME/.local/share/hyprload/hyprload.sh +#exec-once = $HOME/.local/share/hyprload/hyprload.sh +exec-once = hyprpm reload -n exec-once = pypr #}}} -- cgit v1.2.3 From a6309f12fe1b589307ef4f14bc3e88dce9f28617 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 11 Jan 2024 13:54:32 -0600 Subject: swayidle: lock after 5 min, suspend at 10 Swayidle will now lock the screen after 5 minutes, and it will suspend after 10. Basically just decreased the lock timeout and added that it will suspend. --- swayidle/config | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/swayidle/config b/swayidle/config index 00fb5a7..52f7c7e 100644 --- a/swayidle/config +++ b/swayidle/config @@ -1,3 +1,4 @@ -timeout 600 swaylockd +timeout 300 swaylockd +timeout 600 'loginctl suspend' before-sleep swaylockd lock swaylockd -- cgit v1.2.3 From 05e8093ec8f8955dadaa29d65d811c6122084757 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 11 Jan 2024 14:01:40 -0600 Subject: waybar: clean up battery config Change the battery config to just use stuff that I want in it, rather than copying off of someone else's config. --- waybar/config | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/waybar/config b/waybar/config index 0590008..c7035b7 100644 --- a/waybar/config +++ b/waybar/config @@ -81,6 +81,16 @@ "memory": { "format": "{}% " }, + "battery": { + "bat": "BAT0", + "interval": 60, + "state": { + "warning": 30, + "critical": 15 + }, + "format": "{capacity}%", + "max-length": 25 + }, "temperature#cpu": { // "thermal-zone": 2, "hwmon-path": "/sys/class/hwmon/hwmon3/temp1_input", @@ -102,26 +112,6 @@ "format": "{percent}%" //"format-icons": ["", ""] }, - "battery": { - "states": { - // "good": 95, - "warning": 30, - "critical": 15 - }, - "format": "{capacity}%", - "format-charging": "{capacity}% +", - "format-plugged": "{capacity}% =", - "format-alt": "{time}", - // "format-good": "", // An empty format will hide the module - // "format-full": "", - //"format-icons": ["", "", "", "", ""] - }, - "battery#bat0": { - "bat": "BAT0" - }, - "battery#bat1": { - "bat": "BAT1" - }, "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface "format-wifi": "{essid} ({signalStrength}%) ", -- cgit v1.2.3 From d5bfa592c2a9effa0c8f94f6c8f38f10d024cc34 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 11 Jan 2024 14:03:24 -0600 Subject: git: update .gitignore Ignore nwg-look and dinit.d, as these will be system independent anyways --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 686a71d..447a23c 100644 --- a/.gitignore +++ b/.gitignore @@ -77,6 +77,7 @@ odysee-nativefier*/ obs-studio/ nvim/plugged/ nwg-outputs/ +nwg-look/ nssdb/ npm/ notmuch/ @@ -168,6 +169,7 @@ emacs/ easyeffects/ ears.cfg dolphin-emu/ +dinit.d/ dde-printer.ini dconf/ cordless/config.json -- cgit v1.2.3 From d55aba0182cf7b2751cad027b59b12dc97648474 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 1 Feb 2024 20:48:13 -0600 Subject: hypr: Disable Hyprchan (so sad) I don't want to have to explain the anime mascot that shows up for a split second whenever I open the wm. Further, she sometimes shows up when xray transparency glitches. --- hypr/hyprland.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index dd12307..bba6c5c 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -57,6 +57,8 @@ general { #{{{ Misc options misc { + disable_hyprland_logo = true + disable_splash_rendering = true enable_swallow = true swallow_regex = ^(kitty)$ vfr = false -- cgit v1.2.3 From 8e85303657d8876aeae1d22ed05a0821050d6e59 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 1 Feb 2024 20:51:03 -0600 Subject: hypr: add pseudo minimize functionality Using the 'expose' module in pyprland to create a hidden workspace for 'minimizing' windows. Windows do not know they are minimized, however. --- hypr/hyprland.conf | 2 ++ hypr/pyprland.toml | 1 + 2 files changed, 3 insertions(+) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index bba6c5c..2be6fbb 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -225,6 +225,8 @@ bind = $mainMod SHIFT, SPACE, togglefloating, bind = $mainMod $secdMod, F2, exec, ~/.config/hypr/gamemode.sh bind = $mainMod, F, fullscreen, 0 bind = $mainMod, M, fullscreen, 1 +bind = $mainMod, N, exec, pypr toggle_minimized +bind = $mainMod SHIFT, N, togglespecialworkspace, minimized #}}} #{{{ Workspace binds (implied using split-monitor-workspaces plugin!) diff --git a/hypr/pyprland.toml b/hypr/pyprland.toml index 600c30a..935f1a8 100644 --- a/hypr/pyprland.toml +++ b/hypr/pyprland.toml @@ -1,6 +1,7 @@ [pyprland] plugins = [ "scratchpads", + "expose" ] [scratchpads.sphtop] -- cgit v1.2.3 From 697a746b50a74f9bb57126d63c6a41e244d72af0 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 1 Feb 2024 20:52:36 -0600 Subject: hypr: enable variable refresh rate --- hypr/hyprland.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 2be6fbb..985a706 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -62,6 +62,7 @@ misc { enable_swallow = true swallow_regex = ^(kitty)$ vfr = false + vrr = true } #}}} -- cgit v1.2.3 From 28974a5b97c592d3a820fe9c7e5774aa3f7f7a44 Mon Sep 17 00:00:00 2001 From: zachir Date: Fri, 2 Feb 2024 20:47:27 -0600 Subject: git: change around gitignore to add more stuff Ignoring systemsettingsrc, r2modman dirs, gtkrc and gtkrc-2.0, droidcam, and Trolltech.conf. --- .gitignore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitignore b/.gitignore index 447a23c..597b4c4 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ touchegg/ torbrowser/ tmux/plugins themes/ +systemsettingsrc systemd/ syncthing/ switcher/ @@ -46,6 +47,8 @@ rncbc.org/ retroarch/ rclone/ raveloxmidi/ +r2modmanPlus-local/ +r2modman/ qutebrowser/jmatrix-rules qtile/__pycache__/ !qt6ct/qt6ct.conf @@ -150,6 +153,8 @@ htop/htoprc guitarix/ gtk-2.0/ gtk-3.0/ +gtkrc-2.0 +gtkrc gomuks/ godot/ goa-1.0/ @@ -168,6 +173,7 @@ enchant/ emacs/ easyeffects/ ears.cfg +droidcam dolphin-emu/ dinit.d/ dde-printer.ini @@ -197,6 +203,7 @@ abook/ VirtualBox/ VeraCrypt/ UNDERTALE*/ +Trolltech.conf The Crown EXEX.settings SUPERHOT/ Shibalba EXEX.settings -- cgit v1.2.3 From cec1539c6eea4f0a800d1d547609de80c072cd6e Mon Sep 17 00:00:00 2001 From: zachir Date: Fri, 2 Feb 2024 20:48:32 -0600 Subject: git: reorganize gitignore to be alpha Reorder the gitignore to be in normal alphabetical order. --- .gitignore | 495 +++++++++++++++++++++++++++++++------------------------------ 1 file changed, 250 insertions(+), 245 deletions(-) diff --git a/.gitignore b/.gitignore index 597b4c4..0197c0b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,254 +1,259 @@ -zsh/zfunc -zsh/zcompdump -zsh/hist -zsh/.zsh_theme -zsh/.zcompdump -zoomus.conf -zirless/ -zec-qt-wallet-org/ -yuzu/ -ytfzf/subscriptions -yabridgectl/ -xmonad/.stack-work -xmonad/stack.yaml.lock -xmonad/xmonad-x86_64-linux -xmonad/xmonad.o -xmonad/xmonad.hi -whoozle.github.io/ -weechat/ -waybar/config-Hyprland-* -waybar/config-river-* -waybar/config-dwl-* -vlc/vlc-qt-interface.conf -vdirsyncer/ -Valve Corporation/ -unity3d/ -ubports-installer/ -tremc/ -transmission-daemon/ -transmission/ -!transmission/settings.json -touchegg/ -torbrowser/ -tmux/plugins -themes/ -systemsettingsrc -systemd/ -syncthing/ -switcher/ -straw-viewer/ -spotify-tui/ -spotifyd/ -solaar/ -snownews/urls.opml -sh/weather -rtorrent/ -rncbc.org/ -retroarch/ -rclone/ -raveloxmidi/ -r2modmanPlus-local/ -r2modman/ -qutebrowser/jmatrix-rules -qtile/__pycache__/ -!qt6ct/qt6ct.conf -qt6ct/* -!qt5ct/qt5ct.conf -qt5ct/* -qrcp/ -pupgui/ -pulse/ -protonvpn/ -protonmail/ -protonfixes/ -profanity/profrc -print-manager/ -pop-system-updater/ -pop-shell/ -polychromatic/ -poezio/ -pmbootstrap.cfg -pipewire/ -PCSX2/ -pcmanfm-qt/ -pcmanfm/ -pavucontrol.ini -openrazer/ -okularrc -okularpartrc -odysee-nativefier*/ -obs-studio/ -nvim/plugged/ -nwg-outputs/ -nwg-look/ -nssdb/ -npm/ -notmuch/ -nitrogen/bg-saved.cfg -newsboat/urls -newsboat/cache.db -nextcloud/ -neofetch/ -ncmpcpp/error.log -mutt/ -musnify-mpd/musnify-mpd.config -msmtp/ -mpv/watch_later/ -mpv/download.log +abook/ +AHM 5050 v3/ +AHM 5050 v3.settings +aIR Impulse RackEX.settings +Amp Locker/ +Amp Locker.settings +amsynth/ +ardour*/ +autostart/ +Binance/ +Blacksun/ +Blacksun.settings +blender/ +BraveSoftware/ +BULLDOG.settings +Cadence/ +caffeine +calcurse/* +!calcurse/keys +calibre/ +calibre/conversion +carla/ +cef_user_data +.charles.config +chromium/ +clangd/ +cni/ +coc/extensions/db.json +companion*/ +computerrc +computerrc.sh +configstore/ +cordless/config.json +dconf/ +dde-printer.ini +DELTARUNE/ +dinit.d/ +dolphin-emu/ +droidcam +ears.cfg +easyeffects/ +Element/ +emacs/ +EmeraldWallet/ +enchant/ +Epic/ +Etherdyne/ +evolution/ +falkTX/ +filezilla/ +fontconfig/ +FreakQ305/ +FreakQ305.settings +FreeTube/ +gaiasky/ +galculator/ +gamescope/ +ghb/ +GIMP/ +glib-2.0/ +gnome-control-center/ +gnome-initial-setup-done +gnome-session/ +goa-1.0/ +godot/ +gomuks/ +gtk-2.0/ +gtk-3.0/ +gtkrc +gtkrc-2.0 +guitarix/ +<<<<<<< HEAD +Hellbeast v2/ +Hellbeast v2.settings +htop/htoprc +ibus/ +icedtea-web/ +inkscape/ +Iriun/ +irssi/ +isync/ +jack/ +jack_mixer/ +jamesdsp/ +java/ +@joplin/ +joplin/ +Joplin/ +joplin-desktop/ +kaidan/ +kdeconnect/ +kdeglobals +kdenlive.* +kdenlive-appimagerc +kdenlive-layoutsrc +kdenliverc +kde.org/ +keepassxc/ +khal/ +kicad/ +Kitware/ +kritadisplayrc +kritarc +ksh/history +lab/ +lbry/ +LBRY/ +LBRY-GTK/ +lbry-viewer/ +libfm/ +libreoffice/ +LibrePCB/ +light/ +linvst/ +lkjb/ +lsp-plugins/ +lutris/ +lxqt/ +menus/ +mgba/ +micro/buffers/ +mimeapps.list +minigalaxy/ +mixbus9/ +mksh/history +modprobed.db +modprobed-db.conf +monero-project/ mpd/database mpd/log mpd/pid +mpd/playlists/ mpd/socket mpd/state mpd/sticker.sql -mpd/playlists/ -monero-project/ -modprobed-db.conf -modprobed.db -mksh/history -mixbus9/ -mimeapps.list -minigalaxy/ -micro/buffers/ -mgba/ -menus/ -lxqt/ -lutris/ -lsp-plugins/ -lkjb/ -linvst/ -light/ -libreoffice/ -libfm/ -lbry-viewer/ -LBRY-GTK/ -lbry/ -lab/ -ksh/history -kritarc -kritadisplayrc -kicad/ -khal/ -keepassxc/ -kdenlive-layoutsrc -kdenlive-appimagerc -kdenlive.* -kdenliverc -kdeglobals -kdeconnect/ -kde.org/ -kaidan/ -joplin/ -joplin-desktop/ -java/ -jamesdsp/ -jack_mixer/ -jack/ -isync/ -irssi/ -inkscape/ -icedtea-web/ -ibus/ -htop/htoprc -guitarix/ -gtk-2.0/ -gtk-3.0/ -gtkrc-2.0 -gtkrc -gomuks/ -godot/ -goa-1.0/ -gnome-session/ -gnome-initial-setup-done -gnome-control-center/ -glib-2.0/ -ghb/ -galculator/ -gaiasky/ -fontconfig/ -filezilla/ -falkTX/ -evolution/ -enchant/ -emacs/ -easyeffects/ -ears.cfg -droidcam -dolphin-emu/ -dinit.d/ -dde-printer.ini -dconf/ -cordless/config.json -configstore/ -computerrc.sh -computerrc -companion*/ -coc/extensions/db.json -cni/ -clangd/ -chromium/ -cef_user_data -carla/ -calibre/conversion -calibre/ -calcurse/* -!calcurse/keys -caffeine -blender/ -autostart/ -ardour*/ -amsynth/ -aIR Impulse RackEX.settings -abook/ -VirtualBox/ -VeraCrypt/ -UNDERTALE*/ -Trolltech.conf -The Crown EXEX.settings -SUPERHOT/ -Shibalba EXEX.settings -Session/ -Serenity/ -SchildiChat/ +mpv/download.log +mpv/watch_later/ +msmtp/ +musnify-mpd/musnify-mpd.config +mutt/ +ncmpcpp/error.log +neofetch/ +newsboat/cache.db +newsboat/urls +nextcloud/ +Nextcloud/ +nitrogen/bg-saved.cfg +notmuch/ +npm/ +nssdb/ +NuGet/ +nvim/plugged/ +nwg-look/ +nwg-outputs/ +obs-studio/ +odysee-nativefier*/ +okularpartrc +okularrc +openrazer/ +pavucontrol.ini +pcmanfm/ +pcmanfm-qt/ +PCSX2/ +pipewire/ +pipewire/media-session.d/ +pipewire/pipewire.conf.d/ +pmbootstrap.cfg +poezio/ +polychromatic/ +pop-shell/ +pop-system-updater/ +Portmaster/ +print-manager/ +profanity/profrc +Proton AG/ +protonfixes/ +protonmail/ +protonvpn/ +pulse/ +pupgui/ +qrcp/ +qt5ct/* +!qt5ct/qt5ct.conf +qt6ct/* +!qt6ct/qt6ct.conf +qtile/__pycache__/ +QtProject/ +QtProject.conf +qutebrowser/jmatrix-rules +r2modman/ +r2modmanPlus-local/ +raveloxmidi/ +rclone/ +ReAmp Studio R1/ +ReAmp Studio R1.settings +REAPER/ +Resonant DSP/ +retroarch/ +rncbc.org/ +rtorrent/ +RVXX EXEX.settings RVXX v2/ RVXX v2.settings -RVXX EXEX.settings -Resonant DSP/ -REAPER/ -ReAmp Studio R1.settings -ReAmp Studio R1/ -QtProject.conf -QtProject/ -Proton AG/ -Portmaster/ -NuGet/ -Nextcloud/ -LibrePCB/ -LBRY/ -Kitware/ -Joplin/ -Iriun/ -Hellbeast v2/ -Hellbeast v2.settings -GIMP/ -FreeTube/ -FreakQ305.settings -FreakQ305/ -Epic/ -Etherdyne/ -EmeraldWallet/ -Element/ -DELTARUNE/ -Cadence/ -BULLDOG.settings -BraveSoftware/ -Blacksun.settings -Blacksun/ -Binance/ -Amp Locker.settings -Amp Locker/ -AHM 5050 v3.settings -AHM 5050 v3/ -@joplin/ +SchildiChat/ +Serenity/ +Session/ +Shibalba EXEX.settings +sh/weather +snownews/urls.opml +solaar/ +spotifyd/ +spotify-tui/ +straw-viewer/ +SUPERHOT/ +switcher/ +syncthing/ +systemd/ +systemsettingsrc +The Crown EXEX.settings +themes/ +tmux/plugins +torbrowser/ +touchegg/ +transmission/ +transmission-daemon/ +!transmission/settings.json +tremc/ +Trolltech.conf .tsrc -.charles.config +ubports-installer/ +UNDERTALE*/ +unity3d/ +Valve Corporation/ +vdirsyncer/ +VeraCrypt/ +VirtualBox/ +vlc/vlc-qt-interface.conf +waybar/config-dwl-* +waybar/config-Hyprland-* +waybar/config-river-* +weechat/ +whoozle.github.io/ +xmonad/.stack-work +xmonad/stack.yaml.lock +xmonad/xmonad.hi +xmonad/xmonad.o +xmonad/xmonad-x86_64-linux +xsettingsd/ +yabridgectl/ +ytfzf/subscriptions +yuzu/ +zec-qt-wallet-org/ +zirless/ +zoomus.conf +zsh/hist +zsh/.zcompdump +zsh/zcompdump +zsh/zfunc +zsh/.zsh_theme -- cgit v1.2.3 From 49c44c10397dcb42d04662c111657c35677653eb Mon Sep 17 00:00:00 2001 From: zachir Date: Fri, 2 Feb 2024 20:53:32 -0600 Subject: qt5ct: Set qt theme to gtk2 and icon theme This sets the qt theme to use gtk2, and the icon theme to use Mint-X-Grey. --- qt5ct/qt5ct.conf | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 qt5ct/qt5ct.conf diff --git a/qt5ct/qt5ct.conf b/qt5ct/qt5ct.conf new file mode 100644 index 0000000..bf4c0e0 --- /dev/null +++ b/qt5ct/qt5ct.conf @@ -0,0 +1,32 @@ +[Appearance] +color_scheme_path=/usr/share/qt5ct/colors/darker.conf +custom_palette=false +icon_theme=Mint-X-Grey +standard_dialogs=gtk2 +style=gtk2 + +[Fonts] +fixed=@Variant(\0\0\0@\0\0\0\x1e\0\x44\0\x65\0j\0\x61\0V\0u\0 \0L\0G\0\x43\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) +general=@Variant(\0\0\0@\0\0\0\x1e\0\x44\0\x65\0j\0\x61\0V\0u\0 \0L\0G\0\x43\0 \0S\0\x61\0n\0s@(\0\0\0\0\0\0\xff\xff\xff\xff\x5\x1\0\x32\x10) + +[Interface] +activate_item_on_single_click=1 +buttonbox_layout=0 +cursor_flash_time=1000 +dialog_buttons_have_icons=1 +double_click_interval=400 +gui_effects=@Invalid() +keyboard_scheme=2 +menus_have_icons=true +show_shortcuts_in_context_menus=true +stylesheets=@Invalid() +toolbutton_style=4 +underline_shortcut=1 +wheel_scroll_lines=3 + +[SettingsWindow] +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x1\x95\0\0\0\xfb\0\0\x5\x45\0\0\x3\x93\0\0\x1\x96\0\0\0\xfc\0\0\x5\x44\0\0\x3\x92\0\0\0\0\0\0\0\0\a\x80\0\0\x1\x96\0\0\0\xfc\0\0\x5\x44\0\0\x3\x92) + +[Troubleshooting] +force_raster_widgets=1 +ignored_applications=@Invalid() -- cgit v1.2.3 From f10950b5aff5197a338a0b5a93338e4ee3233f01 Mon Sep 17 00:00:00 2001 From: zachir Date: Fri, 2 Feb 2024 20:55:49 -0600 Subject: qt6ct: set theme to gtk2 and icon theme This sets the qt6 theme to gtk2 and the icon theme to Mint-X. --- qt6ct/qt6ct.conf | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 qt6ct/qt6ct.conf diff --git a/qt6ct/qt6ct.conf b/qt6ct/qt6ct.conf new file mode 100644 index 0000000..29cd0a9 --- /dev/null +++ b/qt6ct/qt6ct.conf @@ -0,0 +1,32 @@ +[Appearance] +color_scheme_path=/usr/share/qt6ct/colors/airy.conf +custom_palette=false +icon_theme=Mint-X +standard_dialogs=default +style=qt6gtk2 + +[Fonts] +fixed="DejaVu LGC Sans,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" +general="DejaVu LGC Sans,12,-1,5,400,0,0,0,0,0,0,0,0,0,0,1" + +[Interface] +activate_item_on_single_click=1 +buttonbox_layout=0 +cursor_flash_time=1000 +dialog_buttons_have_icons=1 +double_click_interval=400 +gui_effects=@Invalid() +keyboard_scheme=2 +menus_have_icons=true +show_shortcuts_in_context_menus=true +stylesheets=@Invalid() +toolbutton_style=4 +underline_shortcut=1 +wheel_scroll_lines=3 + +[SettingsWindow] +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3\x42\0\0\x3\xe7\0\0\0\0\0\0\0\0\0\0\x2\xde\0\0\x2\x46\0\0\0\0\x2\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x3\x42\0\0\x3\xe7) + +[Troubleshooting] +force_raster_widgets=1 +ignored_applications=@Invalid() -- cgit v1.2.3 From 469bf1ace66604e6b2b5b5e4a027d69383f6e63d Mon Sep 17 00:00:00 2001 From: zachir Date: Tue, 6 Feb 2024 12:09:17 -0600 Subject: hypr: remove hyprload Upstream hyprpm is now in both Artix and Arch repos, so now we will be using that instead of hyprload. --- hypr/hyprland.conf | 3 --- hypr/hyprload.toml | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 hypr/hyprload.toml diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 985a706..4754afe 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -13,7 +13,6 @@ monitor = DP-1, 1920x1080@60, 1920x0, 1 exec-once = ~/.config/autostart.sh exec-once = /usr/lib/polkit-kde-authentication-agent-1 exec-once = xdph -#exec-once = $HOME/.local/share/hyprload/hyprload.sh exec-once = hyprpm reload -n exec-once = pypr #}}} @@ -305,8 +304,6 @@ bind = $mainMod, W, exec, t waybar bind = $mainMod, Q, exec, loginctl lock-session bind = $mainMod $secdMod CONTROL, Q, exec, systemctl suspend bind = $mainMod SHIFT, G, exec, get-app-id -bind = $mainMod CONTROL SHIFT, R, hyprload, reload -bind = $mainMod CONTROL SHIFT, U, hyprload, update #bind = $mainMod CONTROL, R, exec, startx -- /usr/bin/Xephyr -screen 1920x1080 :1 #}}} diff --git a/hypr/hyprload.toml b/hypr/hyprload.toml deleted file mode 100644 index 65e668c..0000000 --- a/hypr/hyprload.toml +++ /dev/null @@ -1,3 +0,0 @@ -plugins = [ - "Duckonaut/split-monitor-workspaces", -] -- cgit v1.2.3 From bc62c581b2f9ce9fa72d0ac14addee6cba073cf2 Mon Sep 17 00:00:00 2001 From: zachir Date: Tue, 6 Feb 2024 12:18:16 -0600 Subject: waybar: max network name length Sets the max network name length to 22 characters --- waybar/config | 1 + 1 file changed, 1 insertion(+) diff --git a/waybar/config b/waybar/config index c7035b7..790e786 100644 --- a/waybar/config +++ b/waybar/config @@ -120,6 +120,7 @@ "format-linked": "{ifname} (No IP) ", "format-disconnected": "Disconnected ⚠", "format-alt": "{ifname}: {ipaddr}/{cidr}", + "max-length": 22, "on-click-right": "bash ~/.config/rofi/wifi_menu/rofi_wifi_menu" }, "pulseaudio": { -- cgit v1.2.3 From 52c285a7906def19f3fb18a27a39cbc1e5b58e30 Mon Sep 17 00:00:00 2001 From: zachir Date: Tue, 6 Feb 2024 12:22:29 -0600 Subject: hypr: fix kitty lf binding, add volsv mic mute --- hypr/hyprland.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 4754afe..85f625b 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -299,11 +299,12 @@ bind = $mainMod $secdMod, P, exec, passmenu #{{{ Misc bindings bind = $mainMod, Return, exec, kitty -bind = $mainMod $secdMod, F, exec, kitty -e lfrun +bind = $mainMod $secdMod, F, exec, kitty -e lf bind = $mainMod, W, exec, t waybar bind = $mainMod, Q, exec, loginctl lock-session bind = $mainMod $secdMod CONTROL, Q, exec, systemctl suspend bind = $mainMod SHIFT, G, exec, get-app-id +bind = $mainMod Control, M, exec, volsv -m #bind = $mainMod CONTROL, R, exec, startx -- /usr/bin/Xephyr -screen 1920x1080 :1 #}}} -- cgit v1.2.3 From 83274ffd4d91721d643d6c9995df9a670d0bcad3 Mon Sep 17 00:00:00 2001 From: zachir Date: Tue, 6 Feb 2024 15:46:57 -0600 Subject: hypr: Actually implement pseudo-minimize I apparently lied in the commit where I said I did --- hypr/hyprland.conf | 2 +- hypr/pyprland.toml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 85f625b..679dcda 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -225,7 +225,7 @@ bind = $mainMod SHIFT, SPACE, togglefloating, bind = $mainMod $secdMod, F2, exec, ~/.config/hypr/gamemode.sh bind = $mainMod, F, fullscreen, 0 bind = $mainMod, M, fullscreen, 1 -bind = $mainMod, N, exec, pypr toggle_minimized +bind = $mainMod, N, exec, pypr toggle_special bind = $mainMod SHIFT, N, togglespecialworkspace, minimized #}}} diff --git a/hypr/pyprland.toml b/hypr/pyprland.toml index 935f1a8..f9775ab 100644 --- a/hypr/pyprland.toml +++ b/hypr/pyprland.toml @@ -1,6 +1,7 @@ [pyprland] plugins = [ "scratchpads", + "toggle_special", "expose" ] -- cgit v1.2.3 From a4413556bfa84121291f687195d53bc21bce0ff1 Mon Sep 17 00:00:00 2001 From: zachir Date: Tue, 6 Feb 2024 23:30:46 -0600 Subject: sh: fix volsv in PATH volsv was wrong in .profile when setting the path in two different ways. Nice. --- sh/profile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sh/profile b/sh/profile index 901c581..33faf7a 100644 --- a/sh/profile +++ b/sh/profile @@ -115,8 +115,8 @@ fi if [ -d "$HOME/.local/bin/ignore" ]; then addtopath "$HOME/.local/bin/ignore" fi -if [ -d "$HOME/local/bin/volsv" ]; then - addtopath "$HOME/.local/volsv" +if [ -d "$HOME/.local/bin/volsv" ]; then + PATH="$PATH:$HOME/.local/bin/volsv" fi if [ -d "$HOME/.local/bin" ]; then addtopath "$HOME/.local/bin" -- cgit v1.2.3 From f8fe06ceeff3629fbe1bef75f9754d04a9083d77 Mon Sep 17 00:00:00 2001 From: zachir Date: Tue, 6 Feb 2024 23:31:35 -0600 Subject: hypr: Fix REAPER/yabridge broken menus This adds in windowrules to fix the broken menu spawning when using certain plugins through yabridge in REAPER. --- hypr/hyprland.conf | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 679dcda..7f26816 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -154,10 +154,16 @@ plugin { windowrule = windowdance, title:^(Rhythm Doctor)$ windowrule = fullscreen, ^(Xephyr)$ windowrule = float, title:^(LibreWolf - Choose User Profile)$ -windowrulev2 = float, class:^(yabridge-host.exe.so)$, title:^(menu)$ -windowrulev2 = float,floating:0,title:^(menu*) -windowrulev2 = forceinput,title:^(menu*) -windowrulev2 = windowdance,title:^(menu*) +windowrule = float, class:^(xdg-desktop-portal-gtk) +windowrulev2 = tile, class:^(REAPER)$, title:^(.*REAPER v[0-9.]* - Licensed for personal/small business use)$ +windowrulev2 = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(menu)$ +windowrulev2 = nofocus, class:^(yabridge-host.exe.so)$, title:^(\s*)$ +windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Snap/Grid Settings)$ +windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Routing for track [0-9]*)$ +#windowrulev2 = float,floating:0, title:^(menu)$ +#windowrulev2 = forceinput, title:^(menu)$ +#windowrulev2 = windowdance, title:^(menu)$ +#windowrulev2 = nofocus, title:^(menu)$, class:^(yabridge\-host\.exe\.so)$ #}}} #{{{ Mods -- cgit v1.2.3 From 4f070005de1e8de35a66fe4679a478b6c4001a2e Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 8 Feb 2024 21:51:15 -0600 Subject: nvim: Expand tabs to spaces We're switching back to the objectively correct method of using spaces instead of tabs. --- nvim/init.vim | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index 59332e9..1f877ed 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -51,12 +51,12 @@ set hlsearch " Highlight all search results set smartcase " Enable smart-case search set incsearch " Searches for strings incrementally -set noexpandtab " Use spaces instead of tabs -set shiftwidth=4 " Number of auto-indent spaces -set smartindent " Enable smart-indent -set nosmarttab " Enable smart-tabs -"set softtabstop=2 " Number of spaces per Tab -set tabstop=4 +set autoindent " Enable auto-indent +"set smartindent " Enable smart-indent +"set nosmarttab " Enable smart-tabs +set expandtab " Use spaces instead of tabs +set tabstop=2 " Number of spaces per tab +set shiftwidth=2 " Number of auto-indent spaces "" Advanced -- cgit v1.2.3 From 1802af2caf8f26820a8c0dfa3149fbfe82afe4c3 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 8 Feb 2024 21:52:00 -0600 Subject: nvim: reorganize init.vim to have better comment alignment This is purely for my OCD. --- nvim/init.vim | 60 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index 1f877ed..211452e 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -1,34 +1,34 @@ " vimplugs {{{ call plug#begin('~/.config/nvim/plugged') " colorschemes {{{ -Plug 'tomasiser/vim-code-dark' " codedark color scheme -Plug 'flazz/vim-colorschemes' " meta-color scheme package -Plug 'ZachIndigo/vim-preglow' " my old color scheme +Plug 'tomasiser/vim-code-dark' " codedark color scheme +Plug 'flazz/vim-colorschemes' " meta-color scheme package +Plug 'ZachIndigo/vim-preglow' " my old color scheme " }}} " language support {{{ -Plug 'axvr/org.vim' " basic org markup language implementation -Plug 'ziglang/zig.vim' " zig programming language -Plug 'jdonaldson/vaxe' " haxe programming language +Plug 'axvr/org.vim' " basic org markup language implementation +Plug 'ziglang/zig.vim' " zig programming language +Plug 'jdonaldson/vaxe' " haxe programming language Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' } " latex live preview support -Plug 'waycrate/swhkd-vim' " swhkd syntax highlighting -Plug 'HiPhish/guile.vim' " guile syntax highlighting +Plug 'waycrate/swhkd-vim' " swhkd syntax highlighting +Plug 'HiPhish/guile.vim' " guile syntax highlighting " }}} " utility {{{ -Plug 'preservim/nerdtree' " directory tree interface -Plug 'Xuyuanp/nerdtree-git-plugin' " git status indicator for nerdtree -Plug 'PhilRunninger/nerdtree-visual-selection' " allows visual selection mode in nerdtree -Plug 'tpope/vim-fugitive' " git command interface -Plug 'junegunn/goyo.vim' " simplify the user interface (distraction-free) [BROKEN] -Plug 'junegunn/limelight.vim' " focus on single paragraph of text at a time -Plug 'vim-airline/vim-airline' " powerline the vim bottom bar -Plug 'nathanaelkane/vim-indent-guides' " indent guides for vim -Plug 'mhinz/vim-signify' " use signs to show diffs -Plug 'tpope/vim-endwise' " auto end functions/if statements -Plug 'tpope/vim-surround' " auto close stuff -Plug 'mattn/emmet-vim' " html css easy formating -Plug 'godlygeek/tabular' " Needed for vim-markdown -Plug 'plasticboy/vim-markdown' " Better markdown support -Plug 'ryanoasis/vim-devicons' " dev icons for nerdtree +Plug 'preservim/nerdtree' " directory tree interface +Plug 'Xuyuanp/nerdtree-git-plugin' " git status indicator for nerdtree +Plug 'PhilRunninger/nerdtree-visual-selection' " allows visual selection mode in nerdtree +Plug 'tpope/vim-fugitive' " git command interface +Plug 'junegunn/goyo.vim' " simplify the user interface (distraction-free) [BROKEN] +Plug 'junegunn/limelight.vim' " focus on single paragraph of text at a time +Plug 'vim-airline/vim-airline' " powerline the vim bottom bar +Plug 'nathanaelkane/vim-indent-guides' " indent guides for vim +Plug 'mhinz/vim-signify' " use signs to show diffs +Plug 'tpope/vim-endwise' " auto end functions/if statements +Plug 'tpope/vim-surround' " auto close stuff +Plug 'mattn/emmet-vim' " html css easy formating +Plug 'godlygeek/tabular' " Needed for vim-markdown +Plug 'plasticboy/vim-markdown' " Better markdown support +Plug 'ryanoasis/vim-devicons' " dev icons for nerdtree " }}} call plug#end() @@ -38,7 +38,7 @@ call plug#end() "" nvimrc: "" General -set showmatch " Highlight matching brace +set showmatch " Highlight matching brace set number set relativenumber @@ -47,9 +47,9 @@ set relativenumber "colorscheme SlateDark colorscheme preglow -set hlsearch " Highlight all search results -set smartcase " Enable smart-case search -set incsearch " Searches for strings incrementally +set hlsearch " Highlight all search results +set smartcase " Enable smart-case search +set incsearch " Searches for strings incrementally set autoindent " Enable auto-indent "set smartindent " Enable smart-indent @@ -60,9 +60,9 @@ set shiftwidth=2 " Number of auto-indent spaces "" Advanced -set ruler " Show row and column ruler information -set undolevels=1000 " Number of undo levels -set backspace=indent,eol,start " Backspace behaviour +set ruler " Show row and column ruler information +set undolevels=1000 " Number of undo levels +set backspace=indent,eol,start " Backspace behaviour filetype plugin indent on "" GUI Config -- cgit v1.2.3 From 5bb5ef9ec51f4efced3a06cafcf420aa805a5066 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 8 Feb 2024 21:52:42 -0600 Subject: nvim: enable live preview for .tex This re-enables the live preview plugin for .tex files. --- nvim/init.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nvim/init.vim b/nvim/init.vim index 211452e..cac706f 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -188,7 +188,7 @@ autocmd BufWinEnter * if getcmdwintype() == '' | silent NERDTreeMirror | endif " custom augroup {{{ augroup custom autocmd! - " au BufEnter *.tex :LLPStartPreview + au BufEnter *.tex :LLPStartPreview au BufEnter *.md :set textwidth=80 au BufEnter *.ms :set textwidth=80 " au BufEnter *.c :colo DevC++ -- cgit v1.2.3 From c28620857a470ba43b93207c4c339dce43c1df83 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 8 Feb 2024 21:53:11 -0600 Subject: nvim: Use DevC++ colo for c/c++ files This uses a colorscheme specifically for c/c++ files when editing c/c++ files. --- nvim/init.vim | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index cac706f..a28cfc3 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -191,12 +191,12 @@ augroup custom au BufEnter *.tex :LLPStartPreview au BufEnter *.md :set textwidth=80 au BufEnter *.ms :set textwidth=80 - " au BufEnter *.c :colo DevC++ - " au BufEnter *.h :colo DevC++ - " au BufEnter *.cc :colo DevC++ - " au BufEnter *.hh :colo DevC++ - " au BufEnter *.cpp :colo DevC++ - " au BufEnter *.hpp :colo DevC++ + au BufEnter *.c :colo DevC++ + au BufEnter *.h :colo DevC++ + au BufEnter *.cc :colo DevC++ + au BufEnter *.hh :colo DevC++ + au BufEnter *.cpp :colo DevC++ + au BufEnter *.hpp :colo DevC++ au BufWritePost init.vim :source % " au BufWritePost *.tex :make au BufWritePost *sxhkdrc* :!pkill -USR1 -x sxhkd -- cgit v1.2.3 From d5549cea2e3750c0f9bc566645c90227603da7ba Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 8 Feb 2024 21:54:34 -0600 Subject: hyprpaper: Disables the splash text This disables the text from showing up over the wallpaper. --- hypr/hyprpaper.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf index a0239e5..69e5224 100644 --- a/hypr/hyprpaper.conf +++ b/hypr/hyprpaper.conf @@ -1 +1,2 @@ +splash = false preload = ~/Pictures/background.png -- cgit v1.2.3 From 881fb04020a42f37c7383a634f682b608c3d2398 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 8 Feb 2024 21:55:12 -0600 Subject: tmux: Use user-installed tpm rather than the system path This uses the path from the github install guide for tpm, so it should work if you just copy and paste from there. --- tmux/tmux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tmux/tmux.conf b/tmux/tmux.conf index d421349..5d3bd6c 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -27,4 +27,4 @@ set -g @plugin 'tmux-plugins/tmux-sensible' set -g @plugin 'https://git.linux-help.org/psi-jack/tmux-indicators' set -g @plugin 'tmux-plugins/tmux-battery' -run '/usr/share/tmux-plugin-manager/tpm' +run '~/.config/tmux/plugins/tpm/tpm' -- cgit v1.2.3 From 18bdbb45e95ca985faebcd28802b92f70d0a4776 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 8 Feb 2024 21:57:23 -0600 Subject: hypr: this is a basic ptt using volsv This toggles the mic mute when pressing the keybinding, and when releasing it. This acts as a push-to-talk, or a push-to-mute, depending on what the mic status is before pressing it.` --- hypr/hyprland.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 7f26816..8346fbf 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -310,7 +310,9 @@ bind = $mainMod, W, exec, t waybar bind = $mainMod, Q, exec, loginctl lock-session bind = $mainMod $secdMod CONTROL, Q, exec, systemctl suspend bind = $mainMod SHIFT, G, exec, get-app-id -bind = $mainMod Control, M, exec, volsv -m +#bindr = , XF86AudioMicMute, exec, volsv -m +bind = $mainMod CONTROL, M, exec, volsv -m +bindr = $mainMod CONTROL, M, exec, volsv -m #bind = $mainMod CONTROL, R, exec, startx -- /usr/bin/Xephyr -screen 1920x1080 :1 #}}} -- cgit v1.2.3 From ea51e17e52199a89b34a3550c920cb6a6a8cf590 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 8 Feb 2024 21:59:19 -0600 Subject: hypr: Fix XF86 keys XF86AudioMicMute, XF86MonBrightnessUp and XF86MonBrightnessDown were not working properly; this fixes all of those buttons. --- hypr/hyprland.conf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 8346fbf..2da44f8 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -422,10 +422,11 @@ bind = , XF86AudioStop, exec, playerctl stop bind = , XF86AudioPrev, exec, playerctl previous bind = , XF86AudioNext, exec, playerctl next bind = , XF86AudioMute, exec, volsv -t -bindl = , XF86AudioMicMute, exec, volsv -m +#bindl = , XF86AudioMicMute, exec, volsv -m +bind = , XF86AudioMicMute, exec, volsv -m bindel = , XF86MonBrightnessUp, exec, bl -i bindel = , XF86MonBrightnessDown, exec, bl -d -bindl = $mainMod, XF86MonBrightnessUp, exec, bl -s 100 -bindl = $mainMod, XF86MonBrightnessDown, exec, bl -s 1 +bindl = $mainMod, XF86MonBrightnessUp, exec, bl -I 1 +bindl = $mainMod, XF86MonBrightnessDown, exec, bl -D 1 bind = , Print, exec, scrshot #}}} -- cgit v1.2.3 From f56d144efa5a36af5c55d54bb42d7f9bfd1c00d5 Mon Sep 17 00:00:00 2001 From: zachir Date: Thu, 8 Feb 2024 22:00:06 -0600 Subject: hypr: float Tk windows Tk windows should float (this is mostly for testing the python tk programs I've written that need to). --- hypr/hyprland.conf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 2da44f8..c3b1e2b 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -155,15 +155,12 @@ windowrule = windowdance, title:^(Rhythm Doctor)$ windowrule = fullscreen, ^(Xephyr)$ windowrule = float, title:^(LibreWolf - Choose User Profile)$ windowrule = float, class:^(xdg-desktop-portal-gtk) +windowrule = float, class:^(Tk)$ windowrulev2 = tile, class:^(REAPER)$, title:^(.*REAPER v[0-9.]* - Licensed for personal/small business use)$ windowrulev2 = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(menu)$ windowrulev2 = nofocus, class:^(yabridge-host.exe.so)$, title:^(\s*)$ windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Snap/Grid Settings)$ windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Routing for track [0-9]*)$ -#windowrulev2 = float,floating:0, title:^(menu)$ -#windowrulev2 = forceinput, title:^(menu)$ -#windowrulev2 = windowdance, title:^(menu)$ -#windowrulev2 = nofocus, title:^(menu)$, class:^(yabridge\-host\.exe\.so)$ #}}} #{{{ Mods -- cgit v1.2.3 From 144724f2784d3ea39f35a35250b66c38a4507024 Mon Sep 17 00:00:00 2001 From: zachir Date: Sat, 23 Mar 2024 18:04:57 -0500 Subject: Update hyprland config - Remove workspace module - Update window rules - Update looks --- hypr/hyprland.conf | 135 +++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 94 insertions(+), 41 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index c3b1e2b..7cd4959 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -31,6 +31,7 @@ input { numlock_by_default = true scroll_method = "2fg" follow_mouse = 1 + mouse_refocus = false touchpad { natural_scroll = no } @@ -116,7 +117,7 @@ master { # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more new_is_master = false new_on_top = true - no_gaps_when_only = true + no_gaps_when_only = false orientation = left inherit_fullscreen = true } @@ -138,11 +139,11 @@ device:epic mouse V1 { #}}} #{{{ plugin options -plugin { - split-monitor-workspaces { - count = 9 - } -} +#plugin { +# split-monitor-workspaces { +# count = 9 +# } +#} #}}} #{{{ Windowrules @@ -156,11 +157,27 @@ windowrule = fullscreen, ^(Xephyr)$ windowrule = float, title:^(LibreWolf - Choose User Profile)$ windowrule = float, class:^(xdg-desktop-portal-gtk) windowrule = float, class:^(Tk)$ +windowrule = workspace 2, title:^(REAPER .*initializing.*)$ +windowrulev2 = stayfocused, title:^()$,class:^(steam)$ +windowrulev2 = minsize 1 1, title:^()$,class:^(steam)$ +windowrulev2 = stayfocused, title:^(menu)$,class:^(yabridge-host.exe.so)$ +windowrulev2 = minsize 1 1, title:^(menu)$,class:^(yabridge-host.exe.so)$ windowrulev2 = tile, class:^(REAPER)$, title:^(.*REAPER v[0-9.]* - Licensed for personal/small business use)$ windowrulev2 = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(menu)$ -windowrulev2 = nofocus, class:^(yabridge-host.exe.so)$, title:^(\s*)$ -windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Snap/Grid Settings)$ -windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Routing for track [0-9]*)$ +#windowrulev2 = nofocus, class:^(yabridge-host.exe.so)$, title:^(\s*)$ +#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Snap/Grid Settings)$ +#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Routing for track [0-9]*)$ +#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Metronome and pre-roll settings)$ +windowrulev2 = tile, class:^(WebApp-Qobuz[0-9]*)$ +#windowrulev2 = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(menu)$ +#windowrulev2 = nofocus, class:^(yabridge-host.exe.so)$, title:^(\s*)$ +#windowrulev2 = move cursor -50% -50%, class:^(yabridge-host.exe.so)$, title:^(\s*)$ +#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Snap/Grid Settings)$ +#windowrulev2 = move cursor -50% -50%, class:^(REAPER)$, title:^(Routing for track [0-9]*)$ +#windowrulev2 = float,floating:0, title:^(menu)$ +#windowrulev2 = forceinput, title:^(menu)$ +#windowrulev2 = windowdance, title:^(menu)$ +#windowrulev2 = nofocus, title:^(menu)$, class:^(yabridge\-host\.exe\.so)$ #}}} #{{{ Mods @@ -232,40 +249,76 @@ bind = $mainMod, N, exec, pypr toggle_special bind = $mainMod SHIFT, N, togglespecialworkspace, minimized #}}} -#{{{ Workspace binds (implied using split-monitor-workspaces plugin!) +#{{{ Workspace binds (using split-monitor-workspaces plugin!) +## Switch workspaces with mainMod + [0-9] +#bind = $mainMod, 1, split-workspace, 1 +#bind = $mainMod, 2, split-workspace, 2 +#bind = $mainMod, 3, split-workspace, 3 +#bind = $mainMod, 4, split-workspace, 4 +#bind = $mainMod, 5, split-workspace, 5 +#bind = $mainMod, 6, split-workspace, 6 +#bind = $mainMod, 7, split-workspace, 7 +#bind = $mainMod, 8, split-workspace, 8 +#bind = $mainMod, 9, split-workspace, 9 +## Move active window to a workspace with mainMod + SHIFT + [0-9] +#bind = $mainMod SHIFT, 1, split-movetoworkspacesilent, 1 +#bind = $mainMod SHIFT, 2, split-movetoworkspacesilent, 2 +#bind = $mainMod SHIFT, 3, split-movetoworkspacesilent, 3 +#bind = $mainMod SHIFT, 4, split-movetoworkspacesilent, 4 +#bind = $mainMod SHIFT, 5, split-movetoworkspacesilent, 5 +#bind = $mainMod SHIFT, 6, split-movetoworkspacesilent, 6 +#bind = $mainMod SHIFT, 7, split-movetoworkspacesilent, 7 +#bind = $mainMod SHIFT, 8, split-movetoworkspacesilent, 8 +#bind = $mainMod SHIFT, 9, split-movetoworkspacesilent, 9 +#bind = $mainMod CONTROL SHIFT, 1, split-movetoworkspace, 1 +#bind = $mainMod CONTROL SHIFT, 2, split-movetoworkspace, 2 +#bind = $mainMod CONTROL SHIFT, 3, split-movetoworkspace, 3 +#bind = $mainMod CONTROL SHIFT, 4, split-movetoworkspace, 4 +#bind = $mainMod CONTROL SHIFT, 5, split-movetoworkspace, 5 +#bind = $mainMod CONTROL SHIFT, 6, split-movetoworkspace, 6 +#bind = $mainMod CONTROL SHIFT, 7, split-movetoworkspace, 7 +#bind = $mainMod CONTROL SHIFT, 8, split-movetoworkspace, 8 +#bind = $mainMod CONTROL SHIFT, 9, split-movetoworkspace, 9 +#bind = $mainMod, mouse_down, split-workspace, e+1 +#bind = $mainMod, mouse_up, split-workspace, e-1 +#bind = $mainMod, comma, split-changemonitor, +1 +#bind = $mainMod, period, split-changemonitor, -1 +#}}} + +#{{{ Workspace binds (not using split-monitor-workspaces plugin!) # Switch workspaces with mainMod + [0-9] -bind = $mainMod, 1, split-workspace, 1 -bind = $mainMod, 2, split-workspace, 2 -bind = $mainMod, 3, split-workspace, 3 -bind = $mainMod, 4, split-workspace, 4 -bind = $mainMod, 5, split-workspace, 5 -bind = $mainMod, 6, split-workspace, 6 -bind = $mainMod, 7, split-workspace, 7 -bind = $mainMod, 8, split-workspace, 8 -bind = $mainMod, 9, split-workspace, 9 +bind = $mainMod, 1, workspace, 1 +bind = $mainMod, 2, workspace, 2 +bind = $mainMod, 3, workspace, 3 +bind = $mainMod, 4, workspace, 4 +bind = $mainMod, 5, workspace, 5 +bind = $mainMod, 6, workspace, 6 +bind = $mainMod, 7, workspace, 7 +bind = $mainMod, 8, workspace, 8 +bind = $mainMod, 9, workspace, 9 # Move active window to a workspace with mainMod + SHIFT + [0-9] -bind = $mainMod SHIFT, 1, split-movetoworkspacesilent, 1 -bind = $mainMod SHIFT, 2, split-movetoworkspacesilent, 2 -bind = $mainMod SHIFT, 3, split-movetoworkspacesilent, 3 -bind = $mainMod SHIFT, 4, split-movetoworkspacesilent, 4 -bind = $mainMod SHIFT, 5, split-movetoworkspacesilent, 5 -bind = $mainMod SHIFT, 6, split-movetoworkspacesilent, 6 -bind = $mainMod SHIFT, 7, split-movetoworkspacesilent, 7 -bind = $mainMod SHIFT, 8, split-movetoworkspacesilent, 8 -bind = $mainMod SHIFT, 9, split-movetoworkspacesilent, 9 -bind = $mainMod CONTROL SHIFT, 1, split-movetoworkspace, 1 -bind = $mainMod CONTROL SHIFT, 2, split-movetoworkspace, 2 -bind = $mainMod CONTROL SHIFT, 3, split-movetoworkspace, 3 -bind = $mainMod CONTROL SHIFT, 4, split-movetoworkspace, 4 -bind = $mainMod CONTROL SHIFT, 5, split-movetoworkspace, 5 -bind = $mainMod CONTROL SHIFT, 6, split-movetoworkspace, 6 -bind = $mainMod CONTROL SHIFT, 7, split-movetoworkspace, 7 -bind = $mainMod CONTROL SHIFT, 8, split-movetoworkspace, 8 -bind = $mainMod CONTROL SHIFT, 9, split-movetoworkspace, 9 -bind = $mainMod, mouse_down, split-workspace, e+1 -bind = $mainMod, mouse_up, split-workspace, e-1 -bind = $mainMod, comma, split-changemonitor, +1 -bind = $mainMod, period, split-changemonitor, -1 +bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1 +bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2 +bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3 +bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4 +bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5 +bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6 +bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7 +bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8 +bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9 +bind = $mainMod CONTROL SHIFT, 1, movetoworkspace, 1 +bind = $mainMod CONTROL SHIFT, 2, movetoworkspace, 2 +bind = $mainMod CONTROL SHIFT, 3, movetoworkspace, 3 +bind = $mainMod CONTROL SHIFT, 4, movetoworkspace, 4 +bind = $mainMod CONTROL SHIFT, 5, movetoworkspace, 5 +bind = $mainMod CONTROL SHIFT, 6, movetoworkspace, 6 +bind = $mainMod CONTROL SHIFT, 7, movetoworkspace, 7 +bind = $mainMod CONTROL SHIFT, 8, movetoworkspace, 8 +bind = $mainMod CONTROL SHIFT, 9, movetoworkspace, 9 +bind = $mainMod, mouse_down, workspace, e+1 +bind = $mainMod, mouse_up, workspace, e-1 +#bind = $mainMod, comma, split-changemonitor, +1 +#bind = $mainMod, period, split-changemonitor, -1 #}}} #{{{ Mouse binds -- cgit v1.2.3 From 5cc306a5da9174e9dbb3aed5cfb441d317ff24cc Mon Sep 17 00:00:00 2001 From: zachir Date: Sat, 23 Mar 2024 18:07:17 -0500 Subject: Set pyprland scratchpads to a size and position --- hypr/pyprland.toml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/hypr/pyprland.toml b/hypr/pyprland.toml index f9775ab..dfa2aab 100644 --- a/hypr/pyprland.toml +++ b/hypr/pyprland.toml @@ -10,70 +10,94 @@ animation = "" command = "kitty --class sphtop htop" class = "sphtop" lazy = true +size = "50% 50%" +position = "25% 25%" [scratchpads.spterm] animation = "" command = "kitty --class spterm" class = "spterm" lazy = true +size = "50% 50%" +position = "25% 25%" [scratchpads.sppmxr] animation = "" command = "kitty --class sppmxr pulsemixer" class = "sppmxr" lazy = true +size = "50% 50%" +position = "25% 25%" [scratchpads.spblue] animation = "" command = "kitty --class spblue bluetoothctl" class = "spblue" lazy = true +size = "50% 50%" +position = "25% 25%" [scratchpads.spncmp] animation = "" command = "kitty --class spncmp ncmpcpp" class = "spncmp" lazy = true +size = "50% 50%" +position = "25% 25%" [scratchpads.spmutt] animation = "" command = "kitty --class spmutt neomutt" class = "spmutt" lazy = true +size = "50% 50%" +position = "25% 25%" [scratchpads.spprof] animation = "" command = "kitty --class spprof profanity" class = "spprof" lazy = true +size = "50% 50%" +position = "25% 25%" [scratchpads.spirss] animation = "" command = "kitty --class spirss irssi" class = "spirss" lazy = true +size = "50% 50%" +position = "25% 25%" [scratchpads.sptodo] animation = "" command = "kitty --class sptodo todo" class = "sptodo" lazy = true +size = "50% 50%" +position = "25% 25%" [scratchpads.sptrmc] animation = "" command = "kitty --class sptrmc tremc" class = "sptremc" lazy = true +size = "50% 50%" +position = "25% 25%" [scratchpads.qpwgraph] animation = "" command = "qpwgraph" class = "org.rncbc.qpwgraph" lazy = true +size = "50% 50%" +position = "25% 25%" [scratchpads.easyeffects] animation = "" command = "flatpak run com.github.wwmm.easyeffects" class = "com.github.wwmm.easyeffects" lazy = true +size = "50% 50%" +position = "25% 25%" unfocus = "hide" -- cgit v1.2.3 From ec4d2768355e09bef1ddc0cbb7fa54b71c7f1e17 Mon Sep 17 00:00:00 2001 From: zachir Date: Sat, 23 Mar 2024 18:07:49 -0500 Subject: Set kitty TERM to kitty-256color This increases compatibility with SSH. --- kitty/kitty.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 99d5440..6207c2f 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -1469,7 +1469,7 @@ color15 #ffffff #: This option must be a comma separated list of the above values. #: This only source the first valid one in the above order. -# term xterm-kitty +term xterm-256color #: The value of the TERM environment variable to set. Changing this #: can break many terminal programs, only change it if you know what -- cgit v1.2.3 From 1747bb03f303ce3bd4b61b373f05af836ff0ecbc Mon Sep 17 00:00:00 2001 From: zachir Date: Sat, 23 Mar 2024 18:08:59 -0500 Subject: Set nvim colo and remove C++ auto colo --- nvim/init.vim | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/nvim/init.vim b/nvim/init.vim index a28cfc3..8c0d378 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -43,9 +43,7 @@ set showmatch " Highlight matching brace set number set relativenumber -"colorscheme CandyPaper -"colorscheme SlateDark -colorscheme preglow +colorscheme 256-grayvim set hlsearch " Highlight all search results set smartcase " Enable smart-case search @@ -191,12 +189,12 @@ augroup custom au BufEnter *.tex :LLPStartPreview au BufEnter *.md :set textwidth=80 au BufEnter *.ms :set textwidth=80 - au BufEnter *.c :colo DevC++ - au BufEnter *.h :colo DevC++ - au BufEnter *.cc :colo DevC++ - au BufEnter *.hh :colo DevC++ - au BufEnter *.cpp :colo DevC++ - au BufEnter *.hpp :colo DevC++ + "au BufEnter *.c :colo DevC++ + "au BufEnter *.h :colo DevC++ + "au BufEnter *.cc :colo DevC++ + "au BufEnter *.hh :colo DevC++ + "au BufEnter *.cpp :colo DevC++ + "au BufEnter *.hpp :colo DevC++ au BufWritePost init.vim :source % " au BufWritePost *.tex :make au BufWritePost *sxhkdrc* :!pkill -USR1 -x sxhkd -- cgit v1.2.3 From d2bf0ad637eaa5dd472f0c4d173e03d4b2a2c47f Mon Sep 17 00:00:00 2001 From: zachir Date: Sat, 23 Mar 2024 18:09:54 -0500 Subject: Add systemctl aliases --- sh/aliases | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sh/aliases b/sh/aliases index ef9a53b..7b3eba2 100644 --- a/sh/aliases +++ b/sh/aliases @@ -71,5 +71,9 @@ case `uname -s` in ;; esac +## Systemctl +alias us='systemctl --user' +alias s='systemctl' + ## Runit #alias ursm='env SVDIR="$HOME/.local/sv/" rsm' -- cgit v1.2.3 From 7a250319aaa6ca612b8c30f362b6855ae43e410c Mon Sep 17 00:00:00 2001 From: zachir Date: Sat, 23 Mar 2024 18:11:04 -0500 Subject: Fix sh not loading xdg user dirs --- sh/profile | 3 ++- zsh/.zshenv | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sh/profile b/sh/profile index 33faf7a..c03fc93 100644 --- a/sh/profile +++ b/sh/profile @@ -6,13 +6,14 @@ export XDG_DATA_HOME=${XDG_DATA_HOME:="$HOME/.local/share"} export XDG_CACHE_HOME=${XDG_CACHE_HOME:="$HOME/.cache"} export XDG_CONFIG_HOME=${XDG_CONFIG_HOME:="$HOME/.config"} -[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/user-dirs.dirs" +. "$HOME/.config/user-dirs.dirs" export XDG_CURRENT_DESKTOP="i3" export XDG_DOCUMENTS_DIR=${HOME}/Documents export XDG_DOWNLOAD_DIR=${HOME}/Downloads export XDG_DESKTOP_DIR=${HOME}/Desktop export XDG_VIDEOS_DIR=${HOME}/Videos +export XDG_DATA_DIRS="${XDG_DATA_DIRS}:$HOME/.nix-profile/share" # Doesn't seem to work export ANDROID_SDK_HOME="$XDG_CONFIG_HOME"/android diff --git a/zsh/.zshenv b/zsh/.zshenv index 286e11a..1740c82 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -1,3 +1,4 @@ # ZSH SPECIFIC CONFIGS unset HISTFILE +[ -f "$HOME/.profile" ] && . "$HOME/.profile" export ZDOTDIR=$HOME/.config/zsh -- cgit v1.2.3 From ac6234e68cb849be9a0fda7ee8c9c6dc63043615 Mon Sep 17 00:00:00 2001 From: zachir Date: Sat, 23 Mar 2024 21:56:37 -0500 Subject: Update waybar rules for hyprland/workspaces Waybar v0.10.0 changed how persistent workspaces are done in config. --- waybar/config | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/waybar/config b/waybar/config index 790e786..ec04dec 100644 --- a/waybar/config +++ b/waybar/config @@ -19,16 +19,29 @@ "format": "{icon}", "active-only": false, "all-outputs": false, - "persistent_workspaces": { - "1": [], - "2": [], - "3": [], - "4": [], - "5": [], - "6": [], - "7": [], - "8": [], - "9": [] + "format-icons": { + "1": "1", + "2": "2", + "3": "3", + "4": "4", + "5": "5", + "6": "6", + "7": "7", + "8": "8", + "9": "9", + "10": "1", + "11": "2", + "12": "3", + "13": "4", + "14": "5", + "15": "6", + "16": "7", + "17": "8", + "18": "9", + }, + "persistent-workspaces": { + "DP-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], + "HDMI-A-1": [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ], }, "on-scroll-up": "hyprctl dispatch split-workspace e+1", "on-scroll-down": "hyprctl dispatch split-workspace e-1", -- cgit v1.2.3 From de752a009e8ac1df83c1631dac8bbf61a741d087 Mon Sep 17 00:00:00 2001 From: zachir Date: Sun, 24 Mar 2024 01:59:30 -0500 Subject: Fix hyprland config file errors --- hypr/hyprland.conf | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 7cd4959..e053008 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -130,14 +130,6 @@ gestures { } #}}} -#{{{ Device options -# Example per-device config -# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more -device:epic mouse V1 { - sensitivity = -0.5 -} -#}}} - #{{{ plugin options #plugin { # split-monitor-workspaces { @@ -207,20 +199,20 @@ bind = $mainMod, O, splitratio, exact 0.69 #MASTER #}}} #{{{ Dwindle layout binds -## Dwindle layout binds +# Dwindle layout binds #bind = $mainMod, P, pseudo, #DWINDLE #bind = $mainMod $secdMod, S, togglesplit, #DWINDLE -## Move focus with mainMod + HJKL +# Move focus with mainMod + HJKL #bind = $mainMod, H, movefocus, l #DWINDLE #bind = $mainMod, L, movefocus, r #DWINDLE #bind = $mainMod, K, movefocus, u #DWINDLE #bind = $mainMod, J, movefocus, d #DWINDLE -## Move window with mainMod + HJKL +# Move window with mainMod + HJKL #bind = $mainMod SHIFT, L, movewindow, r #DWINDLE #bind = $mainMod SHIFT, H, movewindow, l #DWINDLE #bind = $mainMod SHIFT, J, movewindow, d #DWINDLE #bind = $mainMod SHIFT, K, movewindow, u #DWINDLE -## Resize clients with mainMod + secdMod + HJKL +# Resize clients with mainMod + secdMod + HJKL #binde = $mainMod $secdMod, L, resizeactive, 10 0 #DWINDLE #binde = $mainMod $secdMod, H, resizeactive, -10 0 #DWINDLE #binde = $mainMod $secdMod, K, resizeactive, 0 -10 #DWINDLE @@ -250,7 +242,7 @@ bind = $mainMod SHIFT, N, togglespecialworkspace, minimized #}}} #{{{ Workspace binds (using split-monitor-workspaces plugin!) -## Switch workspaces with mainMod + [0-9] +# Switch workspaces with mainMod + [0-9] #bind = $mainMod, 1, split-workspace, 1 #bind = $mainMod, 2, split-workspace, 2 #bind = $mainMod, 3, split-workspace, 3 @@ -260,7 +252,7 @@ bind = $mainMod SHIFT, N, togglespecialworkspace, minimized #bind = $mainMod, 7, split-workspace, 7 #bind = $mainMod, 8, split-workspace, 8 #bind = $mainMod, 9, split-workspace, 9 -## Move active window to a workspace with mainMod + SHIFT + [0-9] +# Move active window to a workspace with mainMod + SHIFT + [0-9] #bind = $mainMod SHIFT, 1, split-movetoworkspacesilent, 1 #bind = $mainMod SHIFT, 2, split-movetoworkspacesilent, 2 #bind = $mainMod SHIFT, 3, split-movetoworkspacesilent, 3 -- cgit v1.2.3