diff --git a/.gitmodules b/.gitmodules index e00f7cc..713d68a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "desktop/configs/awesome/awesome-wm-widgets"] path = desktop/configs/awesome/awesome-wm-widgets url = https://github.com/streetturtle/awesome-wm-widgets +[submodule "desktop/configs/desktop/configs/awesome/.config/awesome/awesome-sharedtags"] + path = desktop/configs/desktop/configs/awesome/.config/awesome/awesome-sharedtags + url = https://github.com/Drauthius/awesome-sharedtags.git diff --git a/desktop/configs/MangoHud/MangoHud.conf b/desktop/configs/MangoHud/.config/MangoHud/MangoHud.conf similarity index 100% rename from desktop/configs/MangoHud/MangoHud.conf rename to desktop/configs/MangoHud/.config/MangoHud/MangoHud.conf diff --git a/desktop/configs/MangoHud/wine-Gw2-64.conf b/desktop/configs/MangoHud/.config/MangoHud/wine-BlishHUD.conf similarity index 100% rename from desktop/configs/MangoHud/wine-Gw2-64.conf rename to desktop/configs/MangoHud/.config/MangoHud/wine-BlishHUD.conf diff --git a/desktop/configs/MangoHud/wine-CodeVein-Win64-Shipping.conf b/desktop/configs/MangoHud/.config/MangoHud/wine-CodeVein-Win64-Shipping.conf similarity index 100% rename from desktop/configs/MangoHud/wine-CodeVein-Win64-Shipping.conf rename to desktop/configs/MangoHud/.config/MangoHud/wine-CodeVein-Win64-Shipping.conf diff --git a/desktop/configs/MangoHud/wine-CodeVein.conf b/desktop/configs/MangoHud/.config/MangoHud/wine-CodeVein.conf similarity index 100% rename from desktop/configs/MangoHud/wine-CodeVein.conf rename to desktop/configs/MangoHud/.config/MangoHud/wine-CodeVein.conf diff --git a/desktop/configs/MangoHud/wine-DeadByDaylight-Win64-Shipping.conf b/desktop/configs/MangoHud/.config/MangoHud/wine-DeadByDaylight-Win64-Shipping.conf similarity index 100% rename from desktop/configs/MangoHud/wine-DeadByDaylight-Win64-Shipping.conf rename to desktop/configs/MangoHud/.config/MangoHud/wine-DeadByDaylight-Win64-Shipping.conf diff --git a/desktop/configs/MangoHud/wine-DeadByDaylight.conf b/desktop/configs/MangoHud/.config/MangoHud/wine-DeadByDaylight.conf similarity index 100% rename from desktop/configs/MangoHud/wine-DeadByDaylight.conf rename to desktop/configs/MangoHud/.config/MangoHud/wine-DeadByDaylight.conf diff --git a/desktop/configs/MangoHud/wine-Diablo IV.conf b/desktop/configs/MangoHud/.config/MangoHud/wine-Diablo IV.conf similarity index 100% rename from desktop/configs/MangoHud/wine-Diablo IV.conf rename to desktop/configs/MangoHud/.config/MangoHud/wine-Diablo IV.conf diff --git a/desktop/configs/MangoHud/.config/MangoHud/wine-Gw2-64.conf b/desktop/configs/MangoHud/.config/MangoHud/wine-Gw2-64.conf new file mode 100644 index 0000000..0650b2b --- /dev/null +++ b/desktop/configs/MangoHud/.config/MangoHud/wine-Gw2-64.conf @@ -0,0 +1,47 @@ +################### File Generated by GOverlay ################### +toggle_fps_limit=F1 + + +legacy_layout=false +gpu_stats +gpu_temp +gpu_load_change +gpu_load_value=50,90 +gpu_load_color=FFFFFF,FFAA7F,CC0000 +gpu_text=GPU +cpu_stats +cpu_temp +cpu_load_change +core_load_change +cpu_load_value=50,90 +cpu_load_color=FFFFFF,FFAA7F,CC0000 +cpu_color=DE0835 +cpu_text=CPU +io_color=D8D8D8 +vram +vram_color=DE0835 +ram +ram_color=DE0835 +fps +engine_color=950524 +gpu_color=DE0835 +wine_color=950524 +frame_timing=1 +frametime_color=DE0835 +media_player_color=950524 +table_columns=3 +background_alpha=0.4 +font_size=24 +font_file=/yang/.local/share/fonts/CartographCFNerdFont-DemiBold.ttf +background_color=020202 +position=bottom-left +text_color=D8D8D8 +round_corners=5 +#GOVERLAY_THEME=amdradeon +toggle_hud=Shift_R+F12 +toggle_logging=Shift_L+F2 +upload_log=F5 +output_folder=/home/jab +media_player_name=spotify +font_scale=0.8 +fps_limit=72 diff --git a/desktop/configs/MangoHud/wine-MonsterHunterWorld.conf b/desktop/configs/MangoHud/.config/MangoHud/wine-MonsterHunterWorld.conf similarity index 100% rename from desktop/configs/MangoHud/wine-MonsterHunterWorld.conf rename to desktop/configs/MangoHud/.config/MangoHud/wine-MonsterHunterWorld.conf diff --git a/desktop/configs/MangoHud/wine-SoTGame.conf b/desktop/configs/MangoHud/.config/MangoHud/wine-SoTGame.conf similarity index 100% rename from desktop/configs/MangoHud/wine-SoTGame.conf rename to desktop/configs/MangoHud/.config/MangoHud/wine-SoTGame.conf diff --git a/desktop/configs/MangoHud/wine-StarRail.conf b/desktop/configs/MangoHud/.config/MangoHud/wine-StarRail.conf similarity index 100% rename from desktop/configs/MangoHud/wine-StarRail.conf rename to desktop/configs/MangoHud/.config/MangoHud/wine-StarRail.conf diff --git a/desktop/configs/MangoHud/wine-Warframe.x64.conf b/desktop/configs/MangoHud/.config/MangoHud/wine-Warframe.x64.conf similarity index 100% rename from desktop/configs/MangoHud/wine-Warframe.x64.conf rename to desktop/configs/MangoHud/.config/MangoHud/wine-Warframe.x64.conf diff --git a/desktop/configs/MangoHud/wine-start_protected_game.conf b/desktop/configs/MangoHud/.config/MangoHud/wine-eldenring.conf similarity index 100% rename from desktop/configs/MangoHud/wine-start_protected_game.conf rename to desktop/configs/MangoHud/.config/MangoHud/wine-eldenring.conf diff --git a/desktop/configs/MangoHud/wine-ffxiv_dx11.conf b/desktop/configs/MangoHud/.config/MangoHud/wine-ffxiv_dx11.conf similarity index 100% rename from desktop/configs/MangoHud/wine-ffxiv_dx11.conf rename to desktop/configs/MangoHud/.config/MangoHud/wine-ffxiv_dx11.conf diff --git a/desktop/configs/MangoHud/.config/MangoHud/wine-start_protected_game.conf b/desktop/configs/MangoHud/.config/MangoHud/wine-start_protected_game.conf new file mode 100644 index 0000000..3990199 --- /dev/null +++ b/desktop/configs/MangoHud/.config/MangoHud/wine-start_protected_game.conf @@ -0,0 +1,46 @@ +################### File Generated by GOverlay ################### +toggle_fps_limit=F1 + + +legacy_layout=false +gpu_stats +gpu_temp +gpu_load_change +gpu_load_value=50,90 +gpu_load_color=FFFFFF,FFAA7F,CC0000 +gpu_text=GPU +cpu_stats +cpu_temp +cpu_load_change +core_load_change +cpu_load_value=50,90 +cpu_load_color=FFFFFF,FFAA7F,CC0000 +cpu_color=DE0835 +cpu_text=CPU +io_color=D8D8D8 +vram +vram_color=DE0835 +ram +ram_color=DE0835 +fps +engine_color=950524 +gpu_color=DE0835 +wine_color=950524 +frame_timing=1 +frametime_color=DE0835 +media_player_color=950524 +table_columns=3 +background_alpha=0.4 +font_size=24 +font_file=/yang/.local/share/fonts/CartographCFNerdFont-DemiBold.ttf +background_color=020202 +position=top-right +text_color=D8D8D8 +round_corners=5 +#GOVERLAY_THEME=amdradeon +toggle_hud=Shift_R+F12 +toggle_logging=Shift_L+F2 +upload_log=F5 +output_folder=/home/jab +media_player_name=spotify +font_scale=0.8 diff --git a/desktop/configs/MangoHud/wine-DarkSoulsII.conf b/desktop/configs/MangoHud/wine-DarkSoulsII.conf deleted file mode 100644 index a562af0..0000000 --- a/desktop/configs/MangoHud/wine-DarkSoulsII.conf +++ /dev/null @@ -1,13 +0,0 @@ -gamemode -wine -position=top-right -cpu_temp -gpu_temp -ram -custom_text_center=jabuxas-benchmark -cpu_load_color=00FFFF,00FFFF,FF00FF -cpu_load_value=50,90 -core_load_change -engine_version -swap -font_scale=0.8 diff --git a/desktop/configs/MangoHud/wine-DarkSoulsIII.conf b/desktop/configs/MangoHud/wine-DarkSoulsIII.conf deleted file mode 100644 index a562af0..0000000 --- a/desktop/configs/MangoHud/wine-DarkSoulsIII.conf +++ /dev/null @@ -1,13 +0,0 @@ -gamemode -wine -position=top-right -cpu_temp -gpu_temp -ram -custom_text_center=jabuxas-benchmark -cpu_load_color=00FFFF,00FFFF,FF00FF -cpu_load_value=50,90 -core_load_change -engine_version -swap -font_scale=0.8 diff --git a/desktop/configs/MangoHud/wine-DarkSoulsRemastered.conf b/desktop/configs/MangoHud/wine-DarkSoulsRemastered.conf deleted file mode 100644 index a562af0..0000000 --- a/desktop/configs/MangoHud/wine-DarkSoulsRemastered.conf +++ /dev/null @@ -1,13 +0,0 @@ -gamemode -wine -position=top-right -cpu_temp -gpu_temp -ram -custom_text_center=jabuxas-benchmark -cpu_load_color=00FFFF,00FFFF,FF00FF -cpu_load_value=50,90 -core_load_change -engine_version -swap -font_scale=0.8 diff --git a/desktop/configs/MangoHud/wine-eldenring.conf b/desktop/configs/MangoHud/wine-eldenring.conf deleted file mode 100644 index 4245376..0000000 --- a/desktop/configs/MangoHud/wine-eldenring.conf +++ /dev/null @@ -1,11 +0,0 @@ -gamemode -wine -position=top-right -cpu_temp -gpu_temp -ram -core_load_change -engine_version -swap -wine_color=#548813 -font_scale=0.7 diff --git a/desktop/configs/awesome/awesome-sharedtags b/desktop/configs/awesome/.config/awesome/awesome-sharedtags similarity index 100% rename from desktop/configs/awesome/awesome-sharedtags rename to desktop/configs/awesome/.config/awesome/awesome-sharedtags diff --git a/desktop/configs/awesome/awesome-wm-widgets b/desktop/configs/awesome/.config/awesome/awesome-wm-widgets similarity index 100% rename from desktop/configs/awesome/awesome-wm-widgets rename to desktop/configs/awesome/.config/awesome/awesome-wm-widgets diff --git a/desktop/configs/awesome/.config/awesome/awesome.log b/desktop/configs/awesome/.config/awesome/awesome.log new file mode 100644 index 0000000..e69de29 diff --git a/desktop/configs/awesome/gruvbox/README b/desktop/configs/awesome/.config/awesome/gruvbox/README similarity index 100% rename from desktop/configs/awesome/gruvbox/README rename to desktop/configs/awesome/.config/awesome/gruvbox/README diff --git a/desktop/configs/awesome/gruvbox/background.png b/desktop/configs/awesome/.config/awesome/gruvbox/background.png similarity index 100% rename from desktop/configs/awesome/gruvbox/background.png rename to desktop/configs/awesome/.config/awesome/gruvbox/background.png diff --git a/desktop/configs/awesome/gruvbox/background_white.png b/desktop/configs/awesome/.config/awesome/gruvbox/background_white.png similarity index 100% rename from desktop/configs/awesome/gruvbox/background_white.png rename to desktop/configs/awesome/.config/awesome/gruvbox/background_white.png diff --git a/desktop/configs/awesome/gruvbox/layouts/cornerne.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornerne.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/cornerne.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornerne.png diff --git a/desktop/configs/awesome/gruvbox/layouts/cornernew.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornernew.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/cornernew.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornernew.png diff --git a/desktop/configs/awesome/gruvbox/layouts/cornernw.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornernw.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/cornernw.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornernw.png diff --git a/desktop/configs/awesome/gruvbox/layouts/cornernww.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornernww.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/cornernww.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornernww.png diff --git a/desktop/configs/awesome/gruvbox/layouts/cornerse.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornerse.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/cornerse.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornerse.png diff --git a/desktop/configs/awesome/gruvbox/layouts/cornersew.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornersew.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/cornersew.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornersew.png diff --git a/desktop/configs/awesome/gruvbox/layouts/cornersw.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornersw.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/cornersw.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornersw.png diff --git a/desktop/configs/awesome/gruvbox/layouts/cornersww.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornersww.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/cornersww.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/cornersww.png diff --git a/desktop/configs/awesome/gruvbox/layouts/dwindle.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/dwindle.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/dwindle.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/dwindle.png diff --git a/desktop/configs/awesome/gruvbox/layouts/dwindlew.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/dwindlew.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/dwindlew.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/dwindlew.png diff --git a/desktop/configs/awesome/gruvbox/layouts/fairh.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/fairh.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/fairh.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/fairh.png diff --git a/desktop/configs/awesome/gruvbox/layouts/fairhw.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/fairhw.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/fairhw.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/fairhw.png diff --git a/desktop/configs/awesome/gruvbox/layouts/fairv.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/fairv.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/fairv.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/fairv.png diff --git a/desktop/configs/awesome/gruvbox/layouts/fairvw.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/fairvw.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/fairvw.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/fairvw.png diff --git a/desktop/configs/awesome/gruvbox/layouts/floating.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/floating.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/floating.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/floating.png diff --git a/desktop/configs/awesome/gruvbox/layouts/floatingw.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/floatingw.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/floatingw.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/floatingw.png diff --git a/desktop/configs/awesome/gruvbox/layouts/fullscreen.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/fullscreen.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/fullscreen.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/fullscreen.png diff --git a/desktop/configs/awesome/gruvbox/layouts/fullscreenw.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/fullscreenw.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/fullscreenw.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/fullscreenw.png diff --git a/desktop/configs/awesome/gruvbox/layouts/magnifier.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/magnifier.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/magnifier.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/magnifier.png diff --git a/desktop/configs/awesome/gruvbox/layouts/magnifierw.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/magnifierw.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/magnifierw.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/magnifierw.png diff --git a/desktop/configs/awesome/gruvbox/layouts/max.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/max.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/max.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/max.png diff --git a/desktop/configs/awesome/gruvbox/layouts/maxw.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/maxw.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/maxw.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/maxw.png diff --git a/desktop/configs/awesome/gruvbox/layouts/spiral.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/spiral.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/spiral.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/spiral.png diff --git a/desktop/configs/awesome/gruvbox/layouts/spiralw.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/spiralw.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/spiralw.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/spiralw.png diff --git a/desktop/configs/awesome/gruvbox/layouts/tile.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/tile.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/tile.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/tile.png diff --git a/desktop/configs/awesome/gruvbox/layouts/tilebottom.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/tilebottom.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/tilebottom.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/tilebottom.png diff --git a/desktop/configs/awesome/gruvbox/layouts/tilebottomw.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/tilebottomw.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/tilebottomw.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/tilebottomw.png diff --git a/desktop/configs/awesome/gruvbox/layouts/tileleft.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/tileleft.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/tileleft.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/tileleft.png diff --git a/desktop/configs/awesome/gruvbox/layouts/tileleftw.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/tileleftw.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/tileleftw.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/tileleftw.png diff --git a/desktop/configs/awesome/gruvbox/layouts/tiletop.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/tiletop.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/tiletop.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/tiletop.png diff --git a/desktop/configs/awesome/gruvbox/layouts/tiletopw.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/tiletopw.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/tiletopw.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/tiletopw.png diff --git a/desktop/configs/awesome/gruvbox/layouts/tilew.png b/desktop/configs/awesome/.config/awesome/gruvbox/layouts/tilew.png similarity index 100% rename from desktop/configs/awesome/gruvbox/layouts/tilew.png rename to desktop/configs/awesome/.config/awesome/gruvbox/layouts/tilew.png diff --git a/desktop/configs/awesome/gruvbox/submenu.png b/desktop/configs/awesome/.config/awesome/gruvbox/submenu.png similarity index 100% rename from desktop/configs/awesome/gruvbox/submenu.png rename to desktop/configs/awesome/.config/awesome/gruvbox/submenu.png diff --git a/desktop/configs/awesome/gruvbox/taglist/squarefw.png b/desktop/configs/awesome/.config/awesome/gruvbox/taglist/squarefw.png similarity index 100% rename from desktop/configs/awesome/gruvbox/taglist/squarefw.png rename to desktop/configs/awesome/.config/awesome/gruvbox/taglist/squarefw.png diff --git a/desktop/configs/awesome/gruvbox/taglist/squarew.png b/desktop/configs/awesome/.config/awesome/gruvbox/taglist/squarew.png similarity index 100% rename from desktop/configs/awesome/gruvbox/taglist/squarew.png rename to desktop/configs/awesome/.config/awesome/gruvbox/taglist/squarew.png diff --git a/desktop/configs/awesome/gruvbox/theme.lua b/desktop/configs/awesome/.config/awesome/gruvbox/theme.lua similarity index 100% rename from desktop/configs/awesome/gruvbox/theme.lua rename to desktop/configs/awesome/.config/awesome/gruvbox/theme.lua diff --git a/desktop/configs/awesome/gruvbox/titlebar/close_focus.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/close_focus.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/close_focus.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/close_focus.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/close_normal.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/close_normal.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/close_normal.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/close_normal.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/floating_focus_active.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/floating_focus_active.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/floating_focus_active.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/floating_focus_active.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/floating_focus_inactive.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/floating_focus_inactive.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/floating_focus_inactive.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/floating_focus_inactive.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/floating_normal_active.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/floating_normal_active.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/floating_normal_active.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/floating_normal_active.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/floating_normal_inactive.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/floating_normal_inactive.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/floating_normal_inactive.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/floating_normal_inactive.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/maximized_focus_active.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/maximized_focus_active.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/maximized_focus_active.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/maximized_focus_active.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/maximized_focus_inactive.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/maximized_focus_inactive.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/maximized_focus_inactive.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/maximized_focus_inactive.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/maximized_normal_active.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/maximized_normal_active.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/maximized_normal_active.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/maximized_normal_active.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/maximized_normal_inactive.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/maximized_normal_inactive.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/maximized_normal_inactive.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/maximized_normal_inactive.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/minimize_focus.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/minimize_focus.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/minimize_focus.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/minimize_focus.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/minimize_normal.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/minimize_normal.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/minimize_normal.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/minimize_normal.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/ontop_focus_active.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/ontop_focus_active.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/ontop_focus_active.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/ontop_focus_active.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/ontop_focus_inactive.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/ontop_focus_inactive.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/ontop_focus_inactive.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/ontop_focus_inactive.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/ontop_normal_active.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/ontop_normal_active.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/ontop_normal_active.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/ontop_normal_active.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/ontop_normal_inactive.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/ontop_normal_inactive.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/ontop_normal_inactive.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/ontop_normal_inactive.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/sticky_focus_active.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/sticky_focus_active.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/sticky_focus_active.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/sticky_focus_active.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/sticky_focus_inactive.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/sticky_focus_inactive.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/sticky_focus_inactive.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/sticky_focus_inactive.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/sticky_normal_active.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/sticky_normal_active.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/sticky_normal_active.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/sticky_normal_active.png diff --git a/desktop/configs/awesome/gruvbox/titlebar/sticky_normal_inactive.png b/desktop/configs/awesome/.config/awesome/gruvbox/titlebar/sticky_normal_inactive.png similarity index 100% rename from desktop/configs/awesome/gruvbox/titlebar/sticky_normal_inactive.png rename to desktop/configs/awesome/.config/awesome/gruvbox/titlebar/sticky_normal_inactive.png diff --git a/desktop/configs/awesome/rc.lua b/desktop/configs/awesome/.config/awesome/rc.lua similarity index 99% rename from desktop/configs/awesome/rc.lua rename to desktop/configs/awesome/.config/awesome/rc.lua index bb93c4e..69c43b0 100644 --- a/desktop/configs/awesome/rc.lua +++ b/desktop/configs/awesome/.config/awesome/rc.lua @@ -840,4 +840,4 @@ client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_n awful.spawn.with_shell("~/scripts/awesome.sh") -- Gaps -beautiful.useless_gap = 6 +beautiful.useless_gap = 1 diff --git a/desktop/configs/desktop/configs/awesome/.config/awesome/awesome-sharedtags b/desktop/configs/desktop/configs/awesome/.config/awesome/awesome-sharedtags new file mode 160000 index 0000000..346ec10 --- /dev/null +++ b/desktop/configs/desktop/configs/awesome/.config/awesome/awesome-sharedtags @@ -0,0 +1 @@ +Subproject commit 346ec10905a38c7a68504ccc3322fb98f95d70fc diff --git a/desktop/configs/doom/.config/doom/config.el b/desktop/configs/doom/.config/doom/config.el new file mode 100644 index 0000000..ca2e2a2 --- /dev/null +++ b/desktop/configs/doom/.config/doom/config.el @@ -0,0 +1,85 @@ +;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- + +;; Place your private configuration here! Remember, you do not need to run 'doom +;; sync' after modifying this file! + + +;; Some functionality uses this to identify you, e.g. GPG configuration, email +;; clients, file templates and snippets. It is optional. +;; (setq user-full-name "John Doe" +;; user-mail-address "john@doe.com") + +;; Doom exposes five (optional) variables for controlling fonts in Doom: +;; +;; - `doom-font' -- the primary font to use +;; - `doom-variable-pitch-font' -- a non-monospace font (where applicable) +;; - `doom-big-font' -- used for `doom-big-font-mode'; use this for +;; presentations or streaming. +;; - `doom-symbol-font' -- for symbols +;; - `doom-serif-font' -- for the `fixed-pitch-serif' face +;; +;; See 'C-h v doom-font' for documentation and more examples of what they +;; accept. For example: +;; +(setq doom-font "CartographCF Nerd Font-15") +;; +;; If you or Emacs can't find your font, use 'M-x describe-font' to look them +;; up, `M-x eval-region' to execute elisp code, and 'M-x doom/reload-font' to +;; refresh your font settings. If Emacs still can't find your font, it likely +;; wasn't installed correctly. Font issues are rarely Doom issues! + +;; There are two ways to load a theme. Both assume the theme is installed and +;; available. You can either set `doom-theme' or manually load a theme with the +;; `load-theme' function. This is the default: +;;(setq doom-theme 'doom-one) + + +;; This determines the style of line numbers in effect. If set to `nil', line +;; numbers are disabled. For relative line numbers, set this to `relative'. +(setq display-line-numbers-type 'relative) + +;; If you use `org' and don't want your org files in the default location below, +;; change `org-directory'. It must be set before org loads! +(setq org-directory "~/org/") + + +;; Whenever you reconfigure a package, make sure to wrap your config in an +;; `after!' block, otherwise Doom's defaults may override your settings. E.g. +;; +;; (after! PACKAGE +;; (setq x y)) +;; +;; The exceptions to this rule: +;; +;; - Setting file/directory variables (like `org-directory') +;; - Setting variables which explicitly tell you to set them before their +;; package is loaded (see 'C-h v VARIABLE' to look up their documentation). +;; - Setting doom variables (which start with 'doom-' or '+'). +;; +;; Here are some additional functions/macros that will help you configure Doom. +;; +;; - `load!' for loading external *.el files relative to this one +;; - `use-package!' for configuring packages +;; - `after!' for running code after a package has loaded +;; - `add-load-path!' for adding directories to the `load-path', relative to +;; this file. Emacs searches the `load-path' when you load packages with +;; `require' or `use-package'. +;; - `map!' for binding new keys +;; +;; To get information about any of these functions/macros, move the cursor over +;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). +;; This will open documentation for it, including demos of how they are used. +;; Alternatively, use `C-h o' to look up a symbol (functions, variables, faces, +;; etc). +;; +;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how +;; they are implemented. + +(add-to-list 'custom-theme-load-path "~/docs/everforest-theme") +(load-theme 'everforest-hard-dark t) + +;; https://superuser.com/questions/271023/can-i-disable-continuation-of-comments-to-the-next-line-in-vim +(setq +evil-want-o/O-to-continue-comments nil) + +(global-set-key (kbd "M-<") 'previous-buffer) +(global-set-key (kbd "M->") 'next-buffer) diff --git a/desktop/configs/doom/.config/doom/custom.el b/desktop/configs/doom/.config/doom/custom.el new file mode 100644 index 0000000..e73c802 --- /dev/null +++ b/desktop/configs/doom/.config/doom/custom.el @@ -0,0 +1,14 @@ +(custom-set-variables + ;; custom-set-variables was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + '(custom-safe-themes + '("dfb1c8b5bfa040b042b4ef660d0aab48ef2e89ee719a1f24a4629a0c5ed769e8" default)) + '(package-selected-packages '(djvu))) +(custom-set-faces + ;; custom-set-faces was added by Custom. + ;; If you edit it by hand, you could mess it up, so be careful. + ;; Your init file should contain only one such instance. + ;; If there is more than one, they won't work right. + ) diff --git a/desktop/configs/doom/.config/doom/init.el b/desktop/configs/doom/.config/doom/init.el new file mode 100644 index 0000000..37ad131 --- /dev/null +++ b/desktop/configs/doom/.config/doom/init.el @@ -0,0 +1,195 @@ +;;; init.el -*- lexical-binding: t; -*- + +;; This file controls what Doom modules are enabled and what order they load +;; in. Remember to run 'doom sync' after modifying it! + +;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's +;; documentation. There you'll find a link to Doom's Module Index where all +;; of our modules are listed, including what flags they support. + +;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or +;; 'C-c c k' for non-vim users) to view its documentation. This works on +;; flags as well (those symbols that start with a plus). +;; +;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its +;; directory (for easy access to its source code). + +(doom! :input + ;;bidi ; (tfel ot) thgir etirw uoy gnipleh + ;;chinese + ;;japanese + ;;layout ; auie,ctsrnm is the superior home row + + :completion + company ; the ultimate code completion backend + ;;(corfu +orderless) ; complete with cap(f), cape and a flying feather! + ;;helm ; the *other* search engine for love and life + ;;ido ; the other *other* search engine... + ;;ivy ; a search engine for love and life + vertico ; the search engine of the future + + :ui + ;;deft ; notational velocity for Emacs + doom ; what makes DOOM look the way it does + doom-dashboard ; a nifty splash screen for Emacs + ;;doom-quit ; DOOM quit-message prompts when you quit Emacs + (emoji +unicode) ; 🙂 + hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW + ;;hydra + indent-guides ; highlighted indent columns + ;;ligatures ; ligatures and symbols to make your code pretty again + ;;minimap ; show a map of the code on the side + modeline ; snazzy, Atom-inspired modeline, plus API + ;;nav-flash ; blink cursor line after big motions + ;;neotree ; a project drawer, like NERDTree for vim + ophints ; highlight the region an operation acts on + (popup +defaults) ; tame sudden yet inevitable temporary windows + ;;tabs ; a tab bar for Emacs + ;;treemacs ; a project drawer, like neotree but cooler + ;;unicode ; extended unicode support for various languages + (vc-gutter +pretty) ; vcs diff in the fringe + vi-tilde-fringe ; fringe tildes to mark beyond EOB + ;;window-select ; visually switch windows + workspaces ; tab emulation, persistence & separate workspaces + zen ; distraction-free coding or writing + + :editor + (evil +everywhere); come to the dark side, we have cookies + file-templates ; auto-snippets for empty files + fold ; (nigh) universal code folding + (format +onsave) ; automated prettiness + ;;god ; run Emacs commands without modifier keys + ;;lispy ; vim for lisp, for people who don't like vim + ;;multiple-cursors ; editing in many places at once + ;;objed ; text object editing for the innocent + ;;parinfer ; turn lisp into python, sort of + ;;rotate-text ; cycle region at point between text candidates + snippets ; my elves. They type so I don't have to + ;;word-wrap ; soft wrapping with language-aware indent + + :emacs + dired ; making dired pretty [functional] + electric ; smarter, keyword-based electric-indent + ;;ibuffer ; interactive buffer management + undo ; persistent, smarter undo for your inevitable mistakes + vc ; version-control and Emacs, sitting in a tree + + :term + eshell ; the elisp shell that works everywhere + ;;shell ; simple shell REPL for Emacs + ;;term ; basic terminal emulator for Emacs + ;;vterm ; the best terminal emulation in Emacs + + :checkers + syntax ; tasing you for every semicolon you forget + (spell +flyspell) ; tasing you for misspelling mispelling + grammar ; tasing grammar mistake every you make + + :tools + ;;ansible + ;;biblio ; Writes a PhD for you (citation needed) + ;;collab ; buffers with friends + debugger ; FIXME stepping through code, to help you add bugs + ;;direnv + docker + ;;editorconfig ; let someone else argue about tabs vs spaces + ;;ein ; tame Jupyter notebooks with emacs + (eval +overlay) ; run code, run (also, repls) + lookup ; navigate your code and its documentation + lsp ; M-x vscode + magit ; a git porcelain for Emacs + make ; run make tasks from Emacs + ;;pass ; password manager for nerds + pdf ; pdf enhancements + ;;prodigy ; FIXME managing external services & code builders + rgb ; creating color strings + ;;taskrunner ; taskrunner for all your projects + ;;terraform ; infrastructure as code + tmux ; an API for interacting with tmux + ;;tree-sitter ; syntax and parsing, sitting in a tree... + ;;upload ; map local to remote projects via ssh/ftp + + :os + (:if (featurep :system 'macos) macos) ; improve compatibility with macOS + tty ; improve the terminal Emacs experience + + :lang + ;;agda ; types of types of types of types... + ;;beancount ; mind the GAAP + (cc +lsp) ; C > C++ == 1 + ;;clojure ; java with a lisp + ;;common-lisp ; if you've seen one lisp, you've seen them all + ;;coq ; proofs-as-programs + ;;crystal ; ruby at the speed of c + ;;csharp ; unity, .NET, and mono shenanigans + ;;data ; config/data formats + ;;(dart +flutter) ; paint ui and not much else + ;;dhall + ;;elixir ; erlang done right + ;;elm ; care for a cup of TEA? + emacs-lisp ; drown in parentheses + ;;erlang ; an elegant language for a more civilized age + ;;ess ; emacs speaks statistics + ;;factor + ;;faust ; dsp, but you get to keep your soul + ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) + ;;fsharp ; ML stands for Microsoft's Language + ;;fstar ; (dependent) types and (monadic) effects and Z3 + ;;gdscript ; the language you waited for + (go +lsp) ; the hipster dialect + ;;(graphql +lsp) ; Give queries a REST + ;;(haskell +lsp) ; a language that's lazier than I am + ;;hy ; readability of scheme w/ speed of python + ;;idris ; a language you can depend on + ;;json ; At least it ain't XML + ;;(java +lsp) ; the poster child for carpal tunnel syndrome + ;;javascript ; all(hope(abandon(ye(who(enter(here)))))) + ;;julia ; a better, faster MATLAB + ;;kotlin ; a better, slicker Java(Script) + ;;latex ; writing papers in Emacs has never been so fun + ;;lean ; for folks with too much to prove + ;;ledger ; be audit you can be + ;;lua ; one-based indices? one-based indices + markdown ; writing docs for people to ignore + ;;nim ; python + lisp at the speed of c + ;;nix ; I hereby declare "nix geht mehr!" + ;;ocaml ; an objective camel + org ; organize your plain life in plain text + ;;php ; perl's insecure younger brother + ;;plantuml ; diagrams for confusing people more + ;;purescript ; javascript, but functional + python ; beautiful is better than ugly + ;;qt ; the 'cutest' gui framework ever + ;;racket ; a DSL for DSLs + ;;raku ; the artist formerly known as perl6 + ;;rest ; Emacs as a REST client + ;;rst ; ReST in peace + ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + ;;(rust +lsp) ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;scala ; java, but good + ;;(scheme +guile) ; a fully conniving family of lisps + sh ; she sells {ba,z,fi}sh shells on the C xor + ;;sml + ;;solidity ; do you need a blockchain? No. + ;;swift ; who asked for emoji variables? + ;;terra ; Earth and Moon in alignment for performance. + ;;web ; the tubes + ;;yaml ; JSON, but readable + ;;zig ; C, but simpler + + :email + ;;(mu4e +org +gmail) + ;;notmuch + ;;(wanderlust +gmail) + + :app + ;;calendar + ;;emms + ;;everywhere ; *leave* Emacs!? You must be joking + ;;irc ; how neckbeards socialize + ;;(rss +org) ; emacs as an RSS reader + ;;twitter ; twitter client https://twitter.com/vnought + + :config + ;;literate + (default +bindings +smartparens)) diff --git a/desktop/configs/doom/.config/doom/init.elc b/desktop/configs/doom/.config/doom/init.elc new file mode 100644 index 0000000..853aa95 Binary files /dev/null and b/desktop/configs/doom/.config/doom/init.elc differ diff --git a/desktop/configs/doom/.config/doom/packages.el b/desktop/configs/doom/.config/doom/packages.el new file mode 100644 index 0000000..364e6e9 --- /dev/null +++ b/desktop/configs/doom/.config/doom/packages.el @@ -0,0 +1,50 @@ +;; -*- no-byte-compile: t; -*- +;;; $DOOMDIR/packages.el + +;; To install a package with Doom you must declare them here and run 'doom sync' +;; on the command line, then restart Emacs for the changes to take effect -- or +;; use 'M-x doom/reload'. + + +;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: +;; (package! some-package) + +;; To install a package directly from a remote git repo, you must specify a +;; `:recipe'. You'll find documentation on what `:recipe' accepts here: +;; https://github.com/radian-software/straight.el#the-recipe-format +;; (package! another-package +;; :recipe (:host github :repo "username/repo")) + +;; If the package you are trying to install does not contain a PACKAGENAME.el +;; file, or is located in a subdirectory of the repo, you'll need to specify +;; `:files' in the `:recipe': +;; (package! this-package +;; :recipe (:host github :repo "username/repo" +;; :files ("some-file.el" "src/lisp/*.el"))) + +;; If you'd like to disable a package included with Doom, you can do so here +;; with the `:disable' property: +;; (package! builtin-package :disable t) + +;; You can override the recipe of a built in package without having to specify +;; all the properties for `:recipe'. These will inherit the rest of its recipe +;; from Doom or MELPA/ELPA/Emacsmirror: +;; (package! builtin-package :recipe (:nonrecursive t)) +;; (package! builtin-package-2 :recipe (:repo "myfork/package")) + +;; Specify a `:branch' to install a package from a particular branch or tag. +;; This is required for some packages whose default branch isn't 'master' (which +;; our package manager can't deal with; see radian-software/straight.el#279) +;; (package! builtin-package :recipe (:branch "develop")) + +;; Use `:pin' to specify a particular commit to install. +;; (package! builtin-package :pin "1a2b3c4d5e") + + +;; Doom's packages are pinned to a specific commit and updated from release to +;; release. The `unpin!' macro allows you to unpin single packages... +;; (unpin! pinned-package) +;; ...or multiple packages +;; (unpin! pinned-package another-pinned-package) +;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) +;; (unpin! t) diff --git a/desktop/configs/dunst/dunstrc b/desktop/configs/dunst/.config/dunst/dunstrc similarity index 93% rename from desktop/configs/dunst/dunstrc rename to desktop/configs/dunst/.config/dunst/dunstrc index d4a251f..da7dcfb 100644 --- a/desktop/configs/dunst/dunstrc +++ b/desktop/configs/dunst/.config/dunst/dunstrc @@ -1,5 +1,5 @@ [global] - font = "Ubuntu Nerd Font, Cartograph CF Regular 13" + font = " Cartograph CF Regular 13" allow_markup = yes markup = yes format = "%s\n%b" @@ -12,7 +12,7 @@ origin = bottom-center transparency = 5 idle_threshold = 120 - monitor = 0 + monitor = 1 follow = mouse sticky_history = yes line_height = 0 @@ -48,13 +48,13 @@ background = "#131519" foreground = "#ffffff" highlight = "#5bb1b4" - timeout = 5 + timeout = 3 [urgency_normal] background = "#131519" foreground = "#ffffff" highlight = "#5bb1b4" - timeout = 20 + timeout = 5 [urgency_critical] background = "#131519" diff --git a/desktop/configs/dunst/original b/desktop/configs/dunst/.config/dunst/original similarity index 100% rename from desktop/configs/dunst/original rename to desktop/configs/dunst/.config/dunst/original diff --git a/desktop/configs/emacs/custom-file.el b/desktop/configs/emacs/emacs-config/custom-file.el similarity index 100% rename from desktop/configs/emacs/custom-file.el rename to desktop/configs/emacs/emacs-config/custom-file.el diff --git a/desktop/configs/emacs/init.el b/desktop/configs/emacs/emacs-config/init.el similarity index 100% rename from desktop/configs/emacs/init.el rename to desktop/configs/emacs/emacs-config/init.el diff --git a/desktop/configs/eww/eww-bar.png b/desktop/configs/eww/.config/eww/eww-bar.png similarity index 100% rename from desktop/configs/eww/eww-bar.png rename to desktop/configs/eww/.config/eww/eww-bar.png diff --git a/desktop/configs/eww/eww.scss b/desktop/configs/eww/.config/eww/eww.scss similarity index 100% rename from desktop/configs/eww/eww.scss rename to desktop/configs/eww/.config/eww/eww.scss diff --git a/desktop/configs/eww/eww.yuck b/desktop/configs/eww/.config/eww/eww.yuck similarity index 100% rename from desktop/configs/eww/eww.yuck rename to desktop/configs/eww/.config/eww/eww.yuck diff --git a/desktop/configs/eww/scripts/getram b/desktop/configs/eww/.config/eww/scripts/getram similarity index 100% rename from desktop/configs/eww/scripts/getram rename to desktop/configs/eww/.config/eww/scripts/getram diff --git a/desktop/configs/eww/scripts/getvol b/desktop/configs/eww/.config/eww/scripts/getvol similarity index 100% rename from desktop/configs/eww/scripts/getvol rename to desktop/configs/eww/.config/eww/scripts/getvol diff --git a/desktop/configs/feh/buttons b/desktop/configs/feh/.config/feh/buttons similarity index 100% rename from desktop/configs/feh/buttons rename to desktop/configs/feh/.config/feh/buttons diff --git a/desktop/configs/hypr/binds.conf b/desktop/configs/hypr/.config/hypr/binds.conf similarity index 82% rename from desktop/configs/hypr/binds.conf rename to desktop/configs/hypr/.config/hypr/binds.conf index adac9b7..b3befd4 100644 --- a/desktop/configs/hypr/binds.conf +++ b/desktop/configs/hypr/.config/hypr/binds.conf @@ -5,7 +5,7 @@ bind = $mainMod, apostrophe, exec, hyprctl switchxkblayout logotech-gaming-keybo bind = $mainMod SHIFT, apostrophe, exec, ~/scripts/change-colorscheme.sh # app bindings -bind = $mainMod, Return, exec, wezterm +bind = $mainMod, Return, exec, ~/.local/bin/wezterm bind = $mainMod, E, exec, thunar bind = $mainMod SHIFT, s, exec,steam --noverifyfiles -cef-enable-debugging bind = $mainMod CONTROL, s, exec, ~/scripts/sfp.sh @@ -17,6 +17,17 @@ bind = CONTROL, Print, exec, ~/.local/bin/way-print.sh m bind = $mainMod, b, exec, ~/scripts/firefox_to_workspace.sh main 2 bind = $mainMod SHIFT, b, exec, ~/scripts/firefox_to_workspace.sh dev 1 bind = $mainMod ALT, x, exec, XL_SECRET_PROVIDER=file xivlauncher +bind = $mainMod SHIFT, e, exec, emacsclient -c +bind = $mainMod SHIFT, d, exec, WEBKIT_DISABLE_COMPOSITING_MODE=1 dbeaver + +bind = $mainMod CONTROL, n, togglegroup, +bind = $mainMod CONTROL, j, changegroupactive,b +bind = $mainMod CONTROL, k, changegroupactive,f +bind = $mainMod CONTROL, l, lockactivegroup, toggle +bind = $mainMod CONTROL, l, lockactivegroup, toggle +bind = $mainMod CONTROL, comma, moveintogroup, l +bind = $mainMod CONTROL, period, moveintogroup, r +bind = $mainMod CONTROL, colon, moveoutofgroup, bind = ALT, m, exec, ~/scripts/macro.sh @@ -40,6 +51,8 @@ binde = $mainMod, L, resizeactive, 30 -30 bind = $mainMod, J, layoutmsg, cyclenext bind = $mainMod, K, layoutmsg, cycleprev bind = $mainMod, N, layoutmsg, orientationnext +bind = $mainMod, W, swapactiveworkspaces, current -1 +bind = $mainMod, P, pin, # workspace control bind = $mainMod, 1, exec, try_swap_workspace 1 @@ -72,3 +85,5 @@ bind = $mainMod SHIFT, F1, movetoworkspacesilent, 13 bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow + +# vim: ft=hyprlang diff --git a/desktop/configs/hypr/hyprland.conf b/desktop/configs/hypr/.config/hypr/hyprland.conf similarity index 79% rename from desktop/configs/hypr/hyprland.conf rename to desktop/configs/hypr/.config/hypr/hyprland.conf index 70b261d..f72fa12 100644 --- a/desktop/configs/hypr/hyprland.conf +++ b/desktop/configs/hypr/.config/hypr/hyprland.conf @@ -1,6 +1,7 @@ # jab -monitor=DP-3, 1920x1080, 2560x0, 1 +monitor=DP-2, 1920x1080, 2560x0, 1 monitor=HDMI-A-1, 2560x1080, 0x0, 1 +monitor=DP-3, 1920x1080, 0x-1080,1 source = ~/.config/hypr/init.conf diff --git a/desktop/configs/hypr/.config/hypr/init.conf b/desktop/configs/hypr/.config/hypr/init.conf new file mode 100644 index 0000000..63280bc --- /dev/null +++ b/desktop/configs/hypr/.config/hypr/init.conf @@ -0,0 +1,18 @@ +exec-once = ~/scripts/fix.sh +exec-once = spotifyd & +exec-once = lxqt-policykit-agent & +exec-once = pipewire & wireplumber & pipewire-pulse +exec-once = ~/scripts/swww.sh +exec-once = gammastep -t 4500:3500 -l -23.5475:-46.63611 -b 1.0:0.6 & +# exec-once = gsettings set org.gnome.desktop.interface icon-theme Win10Sur-black-dark & gsettings set org.gnome.desktop.interface gtk-theme Numix-BLACK-Pomegranate & gsettings set org.gnome.desktop.interface cursor-theme Simp1e +exec-once = dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP +exec-once = xrandr --output HDMI-A-1 --primary +exec-once = rm -rf ~/tmp/* +exec-once = corectrl --minimize-systray +exec-once = ~/scripts/weechat.sh +exec-once = otd-daemon & +exec-once = syncthing & +# exec = ~/scripts/hypr.sh +exec-once = ags & +exec-once = xembedsniproxy & +exec-once = emacs --daemon & diff --git a/desktop/configs/hypr/rules.conf b/desktop/configs/hypr/.config/hypr/rules.conf similarity index 72% rename from desktop/configs/hypr/rules.conf rename to desktop/configs/hypr/.config/hypr/rules.conf index df141d3..6fce8f2 100644 --- a/desktop/configs/hypr/rules.conf +++ b/desktop/configs/hypr/.config/hypr/rules.conf @@ -9,7 +9,6 @@ windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$ windowrulev2 = stayfocused, title:^()$,class:^(steam)$ windowrulev2 = minsize 1 1, title:^()$,class:^(steam)$ windowrulev2=float,class:anki,title:Add -windowrulev2=size 0%,class:explorer.exe,title:Wine System Tray windowrulev2=float, class:(firefox), title:(Picture-in-Picture) windowrulev2=workspace 5 silent, class:(jetbrains-idea) @@ -28,6 +27,8 @@ windowrule=workspace 10 silent,thunderbird windowrule=workspace 7 silent,XIVLauncher.Core windowrule=workspace 7 silent,moe.launcher.the-honkers-railway-launcher windowrule=workspace 9 silent,ffxiv_dx11.exe +windowrule=workspace 9 silent,dota2 +windowrule=fullscreen,dota2 windowrule=float,.*.exe$ windowrule=workspace 9 silent,.*.exe$ windowrule=workspace 9 silent,Terraria.bin.x86_64 @@ -49,5 +50,22 @@ windowrule=float,steam_.* windowrule=workspace 9 silent,steam_.* windowrule=workspace 10 silent,SFP_UI windowrule=workspace 4 silent,Spotify -windowrule=workspace 3 silent,parsecd +windowrule=workspace 5 silent,parsecd windowrule=workspace 13 silent,Chromium-browser-chromium +windowrule=workspace 3 silent,DBeaver +windowrule=workspace 9 silent,net-runelite-launcher-Launcher + +# hopefully gw2 works. + +windowrulev2=float, title:^(Blish HUD)$ +windowrulev2=center, title:^(Blish HUD)$ +windowrulev2=nofocus, title:^(Blish HUD)$ +windowrulev2=noinitialfocus, title:^(Blish HUD)$ +windowrulev2=noborder, title:^(Blish HUD)$ +windowrulev2=pin, title:^(Blish HUD)$ +windowrulev2=opacity 0.2 0.1, title:^(Blish HUD)$ +windowrulev2=workspace 9 silent, title:$(Blish HUD)$ + +windowrulev2=stayfocused, title:^(Guild Wars 2)$ +windowrulev2=forceinput, title:^(Guild Wars 2)$ +windowrulev2=workspace 10 silent,class:(explorer.exe),title:(Wine System Tray) diff --git a/desktop/configs/hypr/.config/hypr/settings.conf b/desktop/configs/hypr/.config/hypr/settings.conf new file mode 100644 index 0000000..95403ac --- /dev/null +++ b/desktop/configs/hypr/.config/hypr/settings.conf @@ -0,0 +1,100 @@ +input { + kb_layout = br,br + kb_variant = abnt2,dvorak + kb_options = ctrl:nocaps + kb_model = + kb_rules = + + follow_mouse = 1 + + touchpad { + natural_scroll = no + } + + sensitivity = -0.3 # -1.0 - 1.0, 0 means no modification. +} + +device { + name = logotech-gaming-keyboard + kb_layout = br,br + kb_variant = abnt2,dvorak + kb_options = ctrl:nocaps +} +general { + gaps_in = 7 + gaps_out = 7 + border_size = 2 + col.inactive_border = rgba(595959aa) + col.active_border = rgb(a7c080) rgb(87bf80) + no_cursor_warps = false + layout = master +} + +decoration { + rounding = 10 + + blur { + enabled = true + size = 4 + passes = 2 + } + + drop_shadow = yes + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(1a1a1aee) +} + +animations { + enabled = true + # Animation curves + + bezier = linear, 0, 0, 1, 1 + bezier = md3_standard, 0.2, 0, 0, 1 + bezier = md3_decel, 0.05, 0.7, 0.1, 1 + bezier = md3_accel, 0.3, 0, 0.8, 0.15 + bezier = overshot, 0.05, 0.9, 0.1, 1.1 + bezier = crazyshot, 0.1, 1.5, 0.76, 0.92 + bezier = hyprnostretch, 0.05, 0.9, 0.1, 1.0 + bezier = menu_decel, 0.1, 1, 0, 1 + bezier = menu_accel, 0.38, 0.04, 1, 0.07 + bezier = easeInOutCirc, 0.85, 0, 0.15, 1 + bezier = easeOutCirc, 0, 0.55, 0.45, 1 + bezier = easeOutExpo, 0.16, 1, 0.3, 1 + bezier = softAcDecel, 0.26, 0.26, 0.15, 1 + bezier = md2, 0.4, 0, 0.2, 1 # use with .2s duration + animation = windows, 1, 3, md3_decel, popin 60% + animation = windowsIn, 1, 3, md3_decel, popin 60% + animation = windowsOut, 1, 3, md3_accel, popin 60% + animation = border, 1, 10, default + animation = fade, 1, 3, md3_decel + animation = layersIn, 1, 3, menu_decel, slide + animation = layersOut, 1, 1.6, menu_accel + animation = fadeLayersIn, 1, 2, menu_decel + animation = fadeLayersOut, 1, 4.5, menu_accel + animation = workspaces, 1, 7, menu_decel, slide + animation = specialWorkspace, 1, 3, md3_decel, slidevert + +} + +master { + new_is_master = false + allow_small_split = true + mfact = 0.5 +} + +gestures { + workspace_swipe = off +} + +misc { + mouse_move_enables_dpms = true + key_press_enables_dpms = true + enable_swallow = true + disable_hyprland_logo = true + focus_on_activate = false +} + +binds { + workspace_back_and_forth = true +} diff --git a/desktop/configs/hypr/init.conf b/desktop/configs/hypr/init.conf deleted file mode 100644 index 7d6de4a..0000000 --- a/desktop/configs/hypr/init.conf +++ /dev/null @@ -1,14 +0,0 @@ -exec-once = ~/scripts/fix.sh -exec-once = spotifyd & -exec-once = lxqt-policykit-agent & -exec-once = gentoo-pipewire-launcher & -exec-once = ~/scripts/swww.sh -exec-once = gammastep -t 4500:3500 -l -23.5475:-46.63611 -b 1.0:0.6 & -exec-once = gsettings set org.gnome.desktop.interface icon-theme Win10Sur-black-dark & gsettings set org.gnome.desktop.interface gtk-theme Numix-BLACK-Pomegranate & gsettings set org.gnome.desktop.interface cursor-theme Simp1e -exec-once = dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP -exec-once = rm -rf ~/tmp/* -exec-once = corectrl --minimize-systray -exec-once = ~/scripts/weechat.sh -exec-once = otd-daemon & -exec-once = syncthing & -exec = ~/scripts/hypr.sh diff --git a/desktop/configs/hypr/settings.conf b/desktop/configs/hypr/settings.conf deleted file mode 100644 index d452917..0000000 --- a/desktop/configs/hypr/settings.conf +++ /dev/null @@ -1,91 +0,0 @@ -input { - kb_layout = br,br - kb_variant = abnt2,dvorak - kb_options = ctrl:nocaps,grp:alt_shift_toggle - kb_model = - kb_rules = - - follow_mouse = 1 - - touchpad { - natural_scroll = no - } - - sensitivity = -0.3 # -1.0 - 1.0, 0 means no modification. -} - -device:logotech-gaming-keyboard { - kb_layout = br,br - kb_variant = abnt2,dvorak - kb_options = ctrl:nocaps,grp:alt_shift_toggle -} -general { - gaps_in = 5 - gaps_out = 5 - border_size = 2 - col.inactive_border = rgba(595959aa) - no_cursor_warps = false - layout = master -} - -decoration { - rounding = 0 - - blur { - enabled = true - size = 3 - passes = 2 - } - - drop_shadow = yes - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) -} - -animations { - enabled = false - - bezier = myBezier, 0.05, 1.2, 0.1, 1.05 - - animation = windows, 1, 7, myBezier - animation = windowsOut, 1, 7, default, popin 80% - animation = border, 1, 10, default - animation = borderangle, 1, 8, default - animation = fade, 1, 7, default - animation = workspaces, 1, 6, default -} - -master { - new_is_master = false - allow_small_split = true - mfact = 0.5 -} - -gestures { - workspace_swipe = off -} - -misc { - mouse_move_enables_dpms = true - key_press_enables_dpms = true - enable_swallow = true - disable_hyprland_logo = true - focus_on_activate = false -} - -binds { - workspace_back_and_forth = true -} - -plugin { - hyprbars { - # example config - bar_height = 20 - - # example buttons (R -> L) - # hyprbars-button = color, size, on-click - hyprbars-button = rgb(ff4040), 10, 󰖭, hyprctl dispatch killactive - hyprbars-button = rgb(eeee11), 10, , hyprctl dispatch fullscreen 1 - } -} diff --git a/desktop/configs/kitty/.config/kitty/2 b/desktop/configs/kitty/.config/kitty/2 new file mode 100644 index 0000000..82a058d --- /dev/null +++ b/desktop/configs/kitty/.config/kitty/2 @@ -0,0 +1,189 @@ +################################## +############# FONTS ############## +################################## + +font_family CartographCF Nerd Font +italic_font CartographCF Nerd Font Italic +bold_font CartographCF Nerd Font Bold +bold_italic_font CartographCF Nerd Font Bold Italic + +# font_family FiraCode Nerd Font +# italic_font FiraCode Nerd Font +# bold_font FiraCode Bold Nerd Font +# bold_italic_font FiraCode SemiBold Nerd Font + +allow_remote_control socket-only +listen_on unix:/tmp/kitty + +font_size 14.0 +confirm_os_window_close 0 + +#foreground #FFFFFF +#background #060609 + +#selection_foreground #000000 +#selection_background #dddddd + +adjust_line_height 110% + +################################## +############# CURSOR ############# +################################## + +cursor #FFFFFF +cursor_shape beam +# shell_integration no-cursor +select_by_word_characters : @-./_~?&=%+# +repaint_delay 10 +term xterm-kitty +open_url_with default +scrollback_lines 10000 +cursor_blink_interval 0 + + +################################## +############# BORDER ############# +################################## + +window_border_width 8 +window_margin_width 8 +active_border_color #ffffff +inactive_border_color #cccccc +background_opacity 0.85 +# window settings +remember_window_size yes +initial_window_width 135c +initial_window_height 35c + +################################## +############# COLORS ############# +################################## + +# background #fdf6e3 +# foreground #52676f +# cursor #52676f +# selection_background #e9e2cb +# color0 #e4e4e4 +# color8 #ffffd7 +# color1 #d70000 +# color9 #d75f00 +# color2 #5f8700 +# color10 #585858 +# color3 #af8700 +# color11 #626262 +# color4 #0087ff +# color12 #808080 +# color5 #af005f +# color13 #5f5faf +# color6 #00afaf +# color14 #8a8a8a +# color7 #262626 +# color15 #1c1c1c + +selection_foreground #fcf4dc +selection_background #002731 +background #001e26 +foreground #708183 +cursor #708183 +color0 #002731 +color8 #465a61 +color1 #d01b24 +color9 #bd3612 +color2 #728905 +color10 #465a61 +color3 #a57705 +color11 #52676f +color4 #2075c7 +color12 #708183 +color5 #c61b6e +color13 #5856b9 +color6 #259185 +color14 #81908f +color7 #e9e2cb +color15 #fcf4dc + +# moonfly +# background #080808 +# foreground #bdbdbd +# cursor #9e9e9e +# color0 #323437 +# color1 #ff5454 +# color2 #8cc85f +# color3 #e3c78a +# color4 #80a0ff +# color5 #cf87e8 +# color6 #79dac8 +# color7 #c6c6c6 +# color8 #949494 +# color9 #ff5189 +# color10 #36c692 +# color11 #c2c292 +# color12 #74b2ff +# color13 #ae81ff +# color14 #85dc85 +# color15 #e4e4e4 +# selection_background #b2ceee +# selection_foreground #080808 + +# selection_foreground #001e26 + +# foreground #D8DEE9 +# background #2E3440 +# selection_foreground #000000 +# selection_background #FFFACD +# url_color #0087BD +# cursor #81A1C1 +# color0 #3B4252 +# color8 #4C566A +# color1 #BF616A +# color9 #BF616A +# color2 #A3BE8C +# color10 #A3BE8C +# color3 #EBCB8B +# color11 #EBCB8B +# color4 #81A1C1 +# color12 #81A1C1 +# color5 #B48EAD +# color13 #B48EAD +# color6 #88C0D0 +# color14 #8FBCBB +# color7 #E5E9F0 +# color15 #ECEFF4 + +# melange +# background #292522 +# foreground #ECE1D7 +# cursor #867462 +# color0 #34302C +# color1 #BD8183 +# color2 #78997A +# color3 #E49B5D +# color4 #7F91B2 +# color5 #B380B0 +# color6 #7B9695 +# color7 #C1A78E +# color8 #867462 +# color9 #D47766 +# color10 #85B695 +# color11 #EBC06D +# color12 #A3A9CE +# color14 #CF9BC2 +# color14 #89B3B6 +# color15 #422741 + + +################################## +########## KEY BINDINGS ########## +################################## + +map ctrl+l clear_log_notice + +map shift+up scroll_line_up +map shift+down scroll_line_down +map shift+page_up scroll_page_up +map shift+page_down scroll_page_down +map ctrl+shift+home scroll_home +map ctrl+shift+end scroll_end + +map ctrl+equal increase_font_size +map ctrl+minus decrease_font_size diff --git a/desktop/configs/kitty/kitty.conf b/desktop/configs/kitty/.config/kitty/kitty.conf similarity index 98% rename from desktop/configs/kitty/kitty.conf rename to desktop/configs/kitty/.config/kitty/kitty.conf index 223b77e..a922755 100644 --- a/desktop/configs/kitty/kitty.conf +++ b/desktop/configs/kitty/.config/kitty/kitty.conf @@ -15,7 +15,8 @@ bold_italic_font CartographCF Nerd Font Bold Italic allow_remote_control socket-only listen_on unix:/tmp/kitty -font_size 14.0 +font_size 16.0 +confirm_os_window_close 0 #foreground #FFFFFF #background #060609 @@ -48,7 +49,7 @@ window_border_width 8 window_margin_width 8 active_border_color #ffffff inactive_border_color #cccccc -background_opacity 0.88 +background_opacity 0.80 # window settings remember_window_size yes initial_window_width 135c diff --git a/desktop/configs/kitty/undefined.conf b/desktop/configs/kitty/.config/kitty/undefined.conf similarity index 100% rename from desktop/configs/kitty/undefined.conf rename to desktop/configs/kitty/.config/kitty/undefined.conf diff --git a/desktop/configs/leftwm/config.ron b/desktop/configs/leftwm/.config/leftwm/config.ron similarity index 100% rename from desktop/configs/leftwm/config.ron rename to desktop/configs/leftwm/.config/leftwm/config.ron diff --git a/desktop/configs/leftwm/themes.toml b/desktop/configs/leftwm/.config/leftwm/themes.toml similarity index 100% rename from desktop/configs/leftwm/themes.toml rename to desktop/configs/leftwm/.config/leftwm/themes.toml diff --git a/desktop/configs/leftwm/themes/current b/desktop/configs/leftwm/.config/leftwm/themes/current similarity index 100% rename from desktop/configs/leftwm/themes/current rename to desktop/configs/leftwm/.config/leftwm/themes/current diff --git a/desktop/configs/leftwm/themes/solarized/down b/desktop/configs/leftwm/.config/leftwm/themes/solarized/down similarity index 100% rename from desktop/configs/leftwm/themes/solarized/down rename to desktop/configs/leftwm/.config/leftwm/themes/solarized/down diff --git a/desktop/configs/leftwm/themes/solarized/theme.ron b/desktop/configs/leftwm/.config/leftwm/themes/solarized/theme.ron similarity index 100% rename from desktop/configs/leftwm/themes/solarized/theme.ron rename to desktop/configs/leftwm/.config/leftwm/themes/solarized/theme.ron diff --git a/desktop/configs/leftwm/themes/solarized/up b/desktop/configs/leftwm/.config/leftwm/themes/solarized/up similarity index 100% rename from desktop/configs/leftwm/themes/solarized/up rename to desktop/configs/leftwm/.config/leftwm/themes/solarized/up diff --git a/desktop/configs/leftwm/.config/leftwm/themes/test/README.md b/desktop/configs/leftwm/.config/leftwm/themes/test/README.md new file mode 100644 index 0000000..2d6e4dc --- /dev/null +++ b/desktop/configs/leftwm/.config/leftwm/themes/test/README.md @@ -0,0 +1,16 @@ +This is a very basic README, merely containing a bunch of heads-up notes for using `eww` with `leftwm` + +Important: +Copy the `eww-bar` folder to `~/.config/eww/` otherwise every `eww` command needs to pass the path to the folder where the `eww.yuck` and `eww.scss` files are located. +It is also possible to symlink instead of copy, though `eww` isn't to happy about this and will log some errors, even though working just fine. +The previously used xml config is still included in this example in the `legacy_eww_xml_config` folder for reference. + +Previously (legacy xml configured) `eww` and `leftwm` failed to properly negotiate the `reserved` space for the `bar` windows, this fixed now though. To prevent windows from overlapping your bar please use the `gutter` setting in `theme.toml` to force this reserved space. +Here is a snippet of how such gutter configuration might look like, if your bar is 24px in height: +```toml +[[gutter]] +side = "Top" +value = 24 +``` + +Since `eww` is still rapidly changing, if stuff breaks please check their [github](https://github.com/elkowar/eww) for documentation on changes and existing issues. diff --git a/desktop/configs/leftwm/.config/leftwm/themes/test/background.jpg b/desktop/configs/leftwm/.config/leftwm/themes/test/background.jpg new file mode 100644 index 0000000..69fa9d0 Binary files /dev/null and b/desktop/configs/leftwm/.config/leftwm/themes/test/background.jpg differ diff --git a/desktop/configs/leftwm/.config/leftwm/themes/test/down b/desktop/configs/leftwm/.config/leftwm/themes/test/down new file mode 100755 index 0000000..53e7a2e --- /dev/null +++ b/desktop/configs/leftwm/.config/leftwm/themes/test/down @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" + +#set background +if [ -x "$(command -v feh)" ]; then + feh --bg-scale $SCRIPTPATH/down.jpg +fi + +echo "UnloadTheme" > $XDG_RUNTIME_DIR/leftwm/commands.pipe + +pkill compton +pkill picom +pkill polybar +pkill conky +if [ -x "$(command -v eww)" ]; then + eww kill +fi diff --git a/desktop/configs/leftwm/.config/leftwm/themes/test/down.jpg b/desktop/configs/leftwm/.config/leftwm/themes/test/down.jpg new file mode 100644 index 0000000..da757f7 Binary files /dev/null and b/desktop/configs/leftwm/.config/leftwm/themes/test/down.jpg differ diff --git a/desktop/configs/leftwm/.config/leftwm/themes/test/eww-bar/eww-bar.png b/desktop/configs/leftwm/.config/leftwm/themes/test/eww-bar/eww-bar.png new file mode 100644 index 0000000..e6de6a8 Binary files /dev/null and b/desktop/configs/leftwm/.config/leftwm/themes/test/eww-bar/eww-bar.png differ diff --git a/desktop/configs/leftwm/.config/leftwm/themes/test/eww-bar/eww.scss b/desktop/configs/leftwm/.config/leftwm/themes/test/eww-bar/eww.scss new file mode 100644 index 0000000..b171b8a --- /dev/null +++ b/desktop/configs/leftwm/.config/leftwm/themes/test/eww-bar/eww.scss @@ -0,0 +1,81 @@ +* { + all: unset; //Unsets everything so you can style everything from scratch +} + +//Global Styles +.bar0 { + background-color: #3a3a3a; + color: #b0b4bc; +} + +// Styles on classes (see eww.yuck for more information) + +.sidestuff slider { + all: unset; + color: #ffd5cd; +} + +.metric scale trough highlight { + all: unset; + background-color: #D35D6E; + color: #000000; + border-radius: 10px; +} +.metric scale trough { + all: unset; + background-color: #4e4e4e; + border-radius: 50px; + min-height: 3px; + min-width: 50px; + margin-left: 10px; + margin-right: 20px; +} +.metric scale trough highlight { + all: unset; + background-color: #D35D6E; + color: #000000; + border-radius: 10px; +} +.metric scale trough { + all: unset; + background-color: #4e4e4e; + border-radius: 50px; + min-height: 3px; + min-width: 50px; + margin-left: 10px; + margin-right: 20px; +} +.label-ram { + font-size: large; +} +.time { + margin-right: 30px; +} +.workspaces { + margin-left: 30px; +} +.workspaces button { + font-size: 24px; + padding: 6px; +} +.workspaces button:hover { + color: #D35D6E; +} +.ws-button-mine { + color: #4e4e4e; + background-color: #ffd5ca; +} +.ws-button-visible { + color: #D35D6E; + background-color: #4e4e4e; +} +.ws-button-urgent { + color: #ffd5ca; + background-color: #D35D6E; +} +.ws-button-busy { + color: #D35D6E; +} +.ws-button { + color: #b0b4bc; +} diff --git a/desktop/configs/leftwm/.config/leftwm/themes/test/eww-bar/eww.yuck b/desktop/configs/leftwm/.config/leftwm/themes/test/eww-bar/eww.yuck new file mode 100644 index 0000000..e8b3751 --- /dev/null +++ b/desktop/configs/leftwm/.config/leftwm/themes/test/eww-bar/eww.yuck @@ -0,0 +1,83 @@ +(defwidget bar [] + (centerbox :orientation "h" + (workspaces) + (music) + (sidestuff))) + +(defwidget sidestuff [] + (box :class "sidestuff" :orientation "h" :space-evenly false :halign "end" + (metric :label "🔊" + :value volume + :onchange "amixer -D pulse sset Master {}%") + (metric :label "" + :value '${EWW_RAM.used_mem_perc}' + :onchange "") + (metric :label "💾" + :value {round((1 - (EWW_DISK["/"].free / EWW_DISK["/"].total)) * 100, 0)} + :onchange "") + (time))) + +; eww is natively able to parse the JSON output of `leftwm-state` +; since eww also has the ability of `for` loops there is no need for a `liquid` template anymore +(defwidget workspaces [] + (box :class "workspaces" + :orientation "h" + :space-evenly true + :halign "start" + :spacing 10 + (box + (for tag in '${wmstate.workspaces[0].tags}' + (button + :class {tag.mine ? "ws-button-mine" : + tag.visible ? "ws-button-visible" : + tag.urgent ? "ws-button-urgent" : + tag.busy ? "ws-button-busy" : "ws-button"} + :onclick "leftwm-command \"SendWorkspaceToTag 0 ${tag.index}\"" + {!tag.mine && !tag.busy && !tag.visible && !tag.urgent ? "·" : "${tag.name}"}))))) + +(defwidget music [] + (box :class "music" + :orientation "h" + :space-evenly false + :halign "center" + {music != "" ? "🎵${music}" : ""})) + + +(defwidget metric [label value onchange] + (box :orientation "h" + :class "metric" + :space-evenly false + (box :class "label" label) + (scale :min 0 + :max 101 + :active {onchange != ""} + :value value + :onchange onchange))) + +(defwidget time [] + (box :class "time" {time})) + + +(deflisten music :initial "" + "playerctl --follow metadata --format '{{ artist }} - {{ title }}' || true") + +(defpoll volume :interval "1s" :initial "50" + "scripts/getvol") + +(defpoll time :interval "10s" + "date '+%H:%M %b %d, %Y'") + +(deflisten wmstate + :initial '{"workspaces":[{"layout":"","tags":[{"name":"","index":0,"mine":false,"busy":false,"visible":false,"urgent":false}]}]}' + "leftwm state") + +(defwindow bar0 + :monitor 0 + :windowtype "dock" + :geometry (geometry :x "0%" + :y "0%" + :width "90%" + :height "10px" + :anchor "top center") + :reserve (struts :side "top" :distance "4%") + (bar)) diff --git a/desktop/configs/leftwm/.config/leftwm/themes/test/eww-bar/scripts/getram b/desktop/configs/leftwm/.config/leftwm/themes/test/eww-bar/scripts/getram new file mode 100755 index 0000000..791a5a5 --- /dev/null +++ b/desktop/configs/leftwm/.config/leftwm/themes/test/eww-bar/scripts/getram @@ -0,0 +1,2 @@ +#!/bin/sh +printf "%.0f\n" $(free -m | grep Mem | awk '{print ($3/$2)*100}') diff --git a/desktop/configs/leftwm/.config/leftwm/themes/test/eww-bar/scripts/getvol b/desktop/configs/leftwm/.config/leftwm/themes/test/eww-bar/scripts/getvol new file mode 100755 index 0000000..5d7988a --- /dev/null +++ b/desktop/configs/leftwm/.config/leftwm/themes/test/eww-bar/scripts/getvol @@ -0,0 +1,6 @@ +#!/bin/sh +if [ -x "$(command -v amixer)" ]; then +amixer -D pulse sget Master | grep 'Left:' | awk -F'[][]' '{ print $2 }' | tr -d '%' | head -1 +elif [ -x "$(command -v pactl)" ]; then +pactl list sinks | grep left: | awk '{print $5}' | tr -d "%" | head -1 +fi diff --git a/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/eww-bar/eww-bar.png b/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/eww-bar/eww-bar.png new file mode 100644 index 0000000..e6de6a8 Binary files /dev/null and b/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/eww-bar/eww-bar.png differ diff --git a/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/eww-bar/eww.scss b/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/eww-bar/eww.scss new file mode 100644 index 0000000..139c3ee --- /dev/null +++ b/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/eww-bar/eww.scss @@ -0,0 +1,59 @@ +* { + all: unset; //Unsets everything so you can style everything from scratch +} + +//Global Styles +window { + background-color: #3a3a3a; + color: #b0b4bc; + font-family: CascadiaCode; +} + +// Styles on classes (see eww.xml for more information) + +.sidestuff slider { + all: unset; + color: #ffd5cd; +} + +.slider-vol scale trough highlight { + all: unset; + background-color: #D35D6E; + color: #000000; + border-radius: 10px; +} +.slider-vol scale trough { + all: unset; + background-color: #4e4e4e; + border-radius: 50px; + min-height: 3px; + min-width: 50px; + margin-left: 10px; + margin-right: 20px; +} +.slider-ram scale trough highlight { + all: unset; + background-color: #D35D6E; + color: #000000; + border-radius: 10px; +} +.slider-ram scale trough { + all: unset; + background-color: #4e4e4e; + border-radius: 50px; + min-height: 3px; + min-width: 50px; + margin-left: 10px; + margin-right: 20px; +} +.label-ram { + font-size: large; +} +.time { + padding-right: 10px; +} +.workspaces button:hover { + color: #D35D6E; +} + + diff --git a/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/eww-bar/eww.xml b/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/eww-bar/eww.xml new file mode 100644 index 0000000..b9d3993 --- /dev/null +++ b/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/eww-bar/eww.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +  {{music}} + + + + + + + + + + + + + + + + + + + {{hour}}:{{min}} {{month}} {{number_day}}, {{year_full}} + + + + + + + + + playerctl metadata --format '{{ artist }} - {{ title }}' + + + + + + ~/.config/eww/scripts/getvol + + + date "+%d" + date "+%b" + date "+%M" + date "+%H" + date "+%Y" + + + ~/.config/eww/scripts/getram + + + cat /sys/class/power_supply/BAT0/capacity + + + + leftwm-state -w 0 -t ~/.config/leftwm/themes/current/template.liquid + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/eww-bar/scripts/getram b/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/eww-bar/scripts/getram new file mode 100755 index 0000000..791a5a5 --- /dev/null +++ b/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/eww-bar/scripts/getram @@ -0,0 +1,2 @@ +#!/bin/sh +printf "%.0f\n" $(free -m | grep Mem | awk '{print ($3/$2)*100}') diff --git a/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/eww-bar/scripts/getvol b/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/eww-bar/scripts/getvol new file mode 100755 index 0000000..3c31607 --- /dev/null +++ b/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/eww-bar/scripts/getvol @@ -0,0 +1,2 @@ +#!/bin/sh +amixer -D pulse sget Master | grep 'Left:' | awk -F'[][]' '{ print $2 }' | tr -d '%' diff --git a/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/template.liquid b/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/template.liquid new file mode 100644 index 0000000..b77c33d --- /dev/null +++ b/desktop/configs/leftwm/.config/leftwm/themes/test/legacy_eww_xml_config/template.liquid @@ -0,0 +1,20 @@ +{% assign mine_open = '