diff --git a/common/.Xresources b/.Xresources similarity index 100% rename from common/.Xresources rename to .Xresources diff --git a/common/.config/awesome/TODO.md b/.config/awesome/TODO.md similarity index 100% rename from common/.config/awesome/TODO.md rename to .config/awesome/TODO.md diff --git a/common/.config/awesome/ben/autostart.lua b/.config/awesome/ben/autostart.lua similarity index 100% rename from common/.config/awesome/ben/autostart.lua rename to .config/awesome/ben/autostart.lua diff --git a/common/.config/awesome/ben/backlight.lua b/.config/awesome/ben/backlight.lua similarity index 100% rename from common/.config/awesome/ben/backlight.lua rename to .config/awesome/ben/backlight.lua diff --git a/common/.config/awesome/ben/clickable-container.lua b/.config/awesome/ben/clickable-container.lua similarity index 100% rename from common/.config/awesome/ben/clickable-container.lua rename to .config/awesome/ben/clickable-container.lua diff --git a/common/.config/awesome/ben/init.lua b/.config/awesome/ben/init.lua similarity index 100% rename from common/.config/awesome/ben/init.lua rename to .config/awesome/ben/init.lua diff --git a/common/.config/awesome/ben/keymaps.lua b/.config/awesome/ben/keymaps.lua similarity index 100% rename from common/.config/awesome/ben/keymaps.lua rename to .config/awesome/ben/keymaps.lua diff --git a/common/.config/awesome/ben/volume.lua b/.config/awesome/ben/volume.lua similarity index 100% rename from common/.config/awesome/ben/volume.lua rename to .config/awesome/ben/volume.lua diff --git a/common/.config/awesome/ben/widgets.lua b/.config/awesome/ben/widgets.lua similarity index 100% rename from common/.config/awesome/ben/widgets.lua rename to .config/awesome/ben/widgets.lua diff --git a/common/.config/awesome/config/picom.conf b/.config/awesome/config/picom.conf similarity index 100% rename from common/.config/awesome/config/picom.conf rename to .config/awesome/config/picom.conf diff --git a/common/.config/awesome/core/bars.lua b/.config/awesome/core/bars.lua similarity index 100% rename from common/.config/awesome/core/bars.lua rename to .config/awesome/core/bars.lua diff --git a/common/.config/awesome/core/error_report.lua b/.config/awesome/core/error_report.lua similarity index 100% rename from common/.config/awesome/core/error_report.lua rename to .config/awesome/core/error_report.lua diff --git a/common/.config/awesome/core/layouts.lua b/.config/awesome/core/layouts.lua similarity index 100% rename from common/.config/awesome/core/layouts.lua rename to .config/awesome/core/layouts.lua diff --git a/common/.config/awesome/core/notifications.lua b/.config/awesome/core/notifications.lua similarity index 100% rename from common/.config/awesome/core/notifications.lua rename to .config/awesome/core/notifications.lua diff --git a/common/.config/awesome/core/rules.lua b/.config/awesome/core/rules.lua similarity index 100% rename from common/.config/awesome/core/rules.lua rename to .config/awesome/core/rules.lua diff --git a/common/.config/awesome/core/tags.lua b/.config/awesome/core/tags.lua similarity index 100% rename from common/.config/awesome/core/tags.lua rename to .config/awesome/core/tags.lua diff --git a/common/.config/awesome/core/theme.lua b/.config/awesome/core/theme.lua similarity index 100% rename from common/.config/awesome/core/theme.lua rename to .config/awesome/core/theme.lua diff --git a/common/.config/awesome/core/wallpapers.lua b/.config/awesome/core/wallpapers.lua similarity index 100% rename from common/.config/awesome/core/wallpapers.lua rename to .config/awesome/core/wallpapers.lua diff --git a/common/.config/awesome/core/xrandr.lua b/.config/awesome/core/xrandr.lua similarity index 100% rename from common/.config/awesome/core/xrandr.lua rename to .config/awesome/core/xrandr.lua diff --git a/common/.config/awesome/helpers.lua b/.config/awesome/helpers.lua similarity index 100% rename from common/.config/awesome/helpers.lua rename to .config/awesome/helpers.lua diff --git a/common/.config/awesome/icons/backlight/brightness-high.png b/.config/awesome/icons/backlight/brightness-high.png similarity index 100% rename from common/.config/awesome/icons/backlight/brightness-high.png rename to .config/awesome/icons/backlight/brightness-high.png diff --git a/common/.config/awesome/icons/backlight/brightness-high.svg b/.config/awesome/icons/backlight/brightness-high.svg similarity index 100% rename from common/.config/awesome/icons/backlight/brightness-high.svg rename to .config/awesome/icons/backlight/brightness-high.svg diff --git a/common/.config/awesome/icons/backlight/brightness-low.png b/.config/awesome/icons/backlight/brightness-low.png similarity index 100% rename from common/.config/awesome/icons/backlight/brightness-low.png rename to .config/awesome/icons/backlight/brightness-low.png diff --git a/common/.config/awesome/icons/backlight/brightness-low.svg b/.config/awesome/icons/backlight/brightness-low.svg similarity index 100% rename from common/.config/awesome/icons/backlight/brightness-low.svg rename to .config/awesome/icons/backlight/brightness-low.svg diff --git a/common/.config/awesome/icons/battery/battery-10.svg b/.config/awesome/icons/battery/battery-10.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-10.svg rename to .config/awesome/icons/battery/battery-10.svg diff --git a/common/.config/awesome/icons/battery/battery-20.svg b/.config/awesome/icons/battery/battery-20.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-20.svg rename to .config/awesome/icons/battery/battery-20.svg diff --git a/common/.config/awesome/icons/battery/battery-30.svg b/.config/awesome/icons/battery/battery-30.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-30.svg rename to .config/awesome/icons/battery/battery-30.svg diff --git a/common/.config/awesome/icons/battery/battery-40.svg b/.config/awesome/icons/battery/battery-40.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-40.svg rename to .config/awesome/icons/battery/battery-40.svg diff --git a/common/.config/awesome/icons/battery/battery-50.svg b/.config/awesome/icons/battery/battery-50.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-50.svg rename to .config/awesome/icons/battery/battery-50.svg diff --git a/common/.config/awesome/icons/battery/battery-60.svg b/.config/awesome/icons/battery/battery-60.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-60.svg rename to .config/awesome/icons/battery/battery-60.svg diff --git a/common/.config/awesome/icons/battery/battery-70.svg b/.config/awesome/icons/battery/battery-70.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-70.svg rename to .config/awesome/icons/battery/battery-70.svg diff --git a/common/.config/awesome/icons/battery/battery-80.svg b/.config/awesome/icons/battery/battery-80.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-80.svg rename to .config/awesome/icons/battery/battery-80.svg diff --git a/common/.config/awesome/icons/battery/battery-90.svg b/.config/awesome/icons/battery/battery-90.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-90.svg rename to .config/awesome/icons/battery/battery-90.svg diff --git a/common/.config/awesome/icons/battery/battery-charging-10.svg b/.config/awesome/icons/battery/battery-charging-10.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-charging-10.svg rename to .config/awesome/icons/battery/battery-charging-10.svg diff --git a/common/.config/awesome/icons/battery/battery-charging-100.svg b/.config/awesome/icons/battery/battery-charging-100.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-charging-100.svg rename to .config/awesome/icons/battery/battery-charging-100.svg diff --git a/common/.config/awesome/icons/battery/battery-charging-20.svg b/.config/awesome/icons/battery/battery-charging-20.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-charging-20.svg rename to .config/awesome/icons/battery/battery-charging-20.svg diff --git a/common/.config/awesome/icons/battery/battery-charging-30.svg b/.config/awesome/icons/battery/battery-charging-30.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-charging-30.svg rename to .config/awesome/icons/battery/battery-charging-30.svg diff --git a/common/.config/awesome/icons/battery/battery-charging-40.svg b/.config/awesome/icons/battery/battery-charging-40.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-charging-40.svg rename to .config/awesome/icons/battery/battery-charging-40.svg diff --git a/common/.config/awesome/icons/battery/battery-charging-50.svg b/.config/awesome/icons/battery/battery-charging-50.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-charging-50.svg rename to .config/awesome/icons/battery/battery-charging-50.svg diff --git a/common/.config/awesome/icons/battery/battery-charging-60.svg b/.config/awesome/icons/battery/battery-charging-60.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-charging-60.svg rename to .config/awesome/icons/battery/battery-charging-60.svg diff --git a/common/.config/awesome/icons/battery/battery-charging-70.svg b/.config/awesome/icons/battery/battery-charging-70.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-charging-70.svg rename to .config/awesome/icons/battery/battery-charging-70.svg diff --git a/common/.config/awesome/icons/battery/battery-charging-80.svg b/.config/awesome/icons/battery/battery-charging-80.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-charging-80.svg rename to .config/awesome/icons/battery/battery-charging-80.svg diff --git a/common/.config/awesome/icons/battery/battery-charging-90.svg b/.config/awesome/icons/battery/battery-charging-90.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-charging-90.svg rename to .config/awesome/icons/battery/battery-charging-90.svg diff --git a/common/.config/awesome/icons/battery/battery-charging-outline.svg b/.config/awesome/icons/battery/battery-charging-outline.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-charging-outline.svg rename to .config/awesome/icons/battery/battery-charging-outline.svg diff --git a/common/.config/awesome/icons/battery/battery-charging.svg b/.config/awesome/icons/battery/battery-charging.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-charging.svg rename to .config/awesome/icons/battery/battery-charging.svg diff --git a/common/.config/awesome/icons/battery/battery-outline.svg b/.config/awesome/icons/battery/battery-outline.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery-outline.svg rename to .config/awesome/icons/battery/battery-outline.svg diff --git a/common/.config/awesome/icons/battery/battery.svg b/.config/awesome/icons/battery/battery.svg similarity index 100% rename from common/.config/awesome/icons/battery/battery.svg rename to .config/awesome/icons/battery/battery.svg diff --git a/common/.config/awesome/icons/bluetooth/bluetooth-off.svg b/.config/awesome/icons/bluetooth/bluetooth-off.svg similarity index 100% rename from common/.config/awesome/icons/bluetooth/bluetooth-off.svg rename to .config/awesome/icons/bluetooth/bluetooth-off.svg diff --git a/common/.config/awesome/icons/bluetooth/bluetooth.svg b/.config/awesome/icons/bluetooth/bluetooth.svg similarity index 100% rename from common/.config/awesome/icons/bluetooth/bluetooth.svg rename to .config/awesome/icons/bluetooth/bluetooth.svg diff --git a/common/.config/awesome/icons/bluetooth/loading.svg b/.config/awesome/icons/bluetooth/loading.svg similarity index 100% rename from common/.config/awesome/icons/bluetooth/loading.svg rename to .config/awesome/icons/bluetooth/loading.svg diff --git a/common/.config/awesome/icons/exit-screen/lock.png b/.config/awesome/icons/exit-screen/lock.png similarity index 100% rename from common/.config/awesome/icons/exit-screen/lock.png rename to .config/awesome/icons/exit-screen/lock.png diff --git a/common/.config/awesome/icons/exit-screen/logout.png b/.config/awesome/icons/exit-screen/logout.png similarity index 100% rename from common/.config/awesome/icons/exit-screen/logout.png rename to .config/awesome/icons/exit-screen/logout.png diff --git a/common/.config/awesome/icons/exit-screen/power.png b/.config/awesome/icons/exit-screen/power.png similarity index 100% rename from common/.config/awesome/icons/exit-screen/power.png rename to .config/awesome/icons/exit-screen/power.png diff --git a/common/.config/awesome/icons/exit-screen/restart.png b/.config/awesome/icons/exit-screen/restart.png similarity index 100% rename from common/.config/awesome/icons/exit-screen/restart.png rename to .config/awesome/icons/exit-screen/restart.png diff --git a/common/.config/awesome/icons/exit-screen/sleep.png b/.config/awesome/icons/exit-screen/sleep.png similarity index 100% rename from common/.config/awesome/icons/exit-screen/sleep.png rename to .config/awesome/icons/exit-screen/sleep.png diff --git a/common/.config/awesome/icons/launcher/play.svg b/.config/awesome/icons/launcher/play.svg similarity index 100% rename from common/.config/awesome/icons/launcher/play.svg rename to .config/awesome/icons/launcher/play.svg diff --git a/common/.config/awesome/icons/network/connected_notification.svg b/.config/awesome/icons/network/connected_notification.svg similarity index 100% rename from common/.config/awesome/icons/network/connected_notification.svg rename to .config/awesome/icons/network/connected_notification.svg diff --git a/common/.config/awesome/icons/network/loading.svg b/.config/awesome/icons/network/loading.svg similarity index 100% rename from common/.config/awesome/icons/network/loading.svg rename to .config/awesome/icons/network/loading.svg diff --git a/common/.config/awesome/icons/network/wifi-strength-1-alert.svg b/.config/awesome/icons/network/wifi-strength-1-alert.svg similarity index 100% rename from common/.config/awesome/icons/network/wifi-strength-1-alert.svg rename to .config/awesome/icons/network/wifi-strength-1-alert.svg diff --git a/common/.config/awesome/icons/network/wifi-strength-1.svg b/.config/awesome/icons/network/wifi-strength-1.svg similarity index 100% rename from common/.config/awesome/icons/network/wifi-strength-1.svg rename to .config/awesome/icons/network/wifi-strength-1.svg diff --git a/common/.config/awesome/icons/network/wifi-strength-2-alert.svg b/.config/awesome/icons/network/wifi-strength-2-alert.svg similarity index 100% rename from common/.config/awesome/icons/network/wifi-strength-2-alert.svg rename to .config/awesome/icons/network/wifi-strength-2-alert.svg diff --git a/common/.config/awesome/icons/network/wifi-strength-2.svg b/.config/awesome/icons/network/wifi-strength-2.svg similarity index 100% rename from common/.config/awesome/icons/network/wifi-strength-2.svg rename to .config/awesome/icons/network/wifi-strength-2.svg diff --git a/common/.config/awesome/icons/network/wifi-strength-3-alert.svg b/.config/awesome/icons/network/wifi-strength-3-alert.svg similarity index 100% rename from common/.config/awesome/icons/network/wifi-strength-3-alert.svg rename to .config/awesome/icons/network/wifi-strength-3-alert.svg diff --git a/common/.config/awesome/icons/network/wifi-strength-3.svg b/.config/awesome/icons/network/wifi-strength-3.svg similarity index 100% rename from common/.config/awesome/icons/network/wifi-strength-3.svg rename to .config/awesome/icons/network/wifi-strength-3.svg diff --git a/common/.config/awesome/icons/network/wifi-strength-4-alert.svg b/.config/awesome/icons/network/wifi-strength-4-alert.svg similarity index 100% rename from common/.config/awesome/icons/network/wifi-strength-4-alert.svg rename to .config/awesome/icons/network/wifi-strength-4-alert.svg diff --git a/common/.config/awesome/icons/network/wifi-strength-4.svg b/.config/awesome/icons/network/wifi-strength-4.svg similarity index 100% rename from common/.config/awesome/icons/network/wifi-strength-4.svg rename to .config/awesome/icons/network/wifi-strength-4.svg diff --git a/common/.config/awesome/icons/network/wifi-strength-off.svg b/.config/awesome/icons/network/wifi-strength-off.svg similarity index 100% rename from common/.config/awesome/icons/network/wifi-strength-off.svg rename to .config/awesome/icons/network/wifi-strength-off.svg diff --git a/common/.config/awesome/icons/network/wired-alert.svg b/.config/awesome/icons/network/wired-alert.svg similarity index 100% rename from common/.config/awesome/icons/network/wired-alert.svg rename to .config/awesome/icons/network/wired-alert.svg diff --git a/common/.config/awesome/icons/network/wired-off.svg b/.config/awesome/icons/network/wired-off.svg similarity index 100% rename from common/.config/awesome/icons/network/wired-off.svg rename to .config/awesome/icons/network/wired-off.svg diff --git a/common/.config/awesome/icons/network/wired.svg b/.config/awesome/icons/network/wired.svg similarity index 100% rename from common/.config/awesome/icons/network/wired.svg rename to .config/awesome/icons/network/wired.svg diff --git a/common/.config/awesome/icons/titlebar/close_focus.svg b/.config/awesome/icons/titlebar/close_focus.svg similarity index 100% rename from common/.config/awesome/icons/titlebar/close_focus.svg rename to .config/awesome/icons/titlebar/close_focus.svg diff --git a/common/.config/awesome/icons/titlebar/close_focus_hover.svg b/.config/awesome/icons/titlebar/close_focus_hover.svg similarity index 100% rename from common/.config/awesome/icons/titlebar/close_focus_hover.svg rename to .config/awesome/icons/titlebar/close_focus_hover.svg diff --git a/common/.config/awesome/icons/titlebar/maximized_focus.svg b/.config/awesome/icons/titlebar/maximized_focus.svg similarity index 100% rename from common/.config/awesome/icons/titlebar/maximized_focus.svg rename to .config/awesome/icons/titlebar/maximized_focus.svg diff --git a/common/.config/awesome/icons/titlebar/maximized_focus_hover.svg b/.config/awesome/icons/titlebar/maximized_focus_hover.svg similarity index 100% rename from common/.config/awesome/icons/titlebar/maximized_focus_hover.svg rename to .config/awesome/icons/titlebar/maximized_focus_hover.svg diff --git a/common/.config/awesome/icons/titlebar/minimize_focus.svg b/.config/awesome/icons/titlebar/minimize_focus.svg similarity index 100% rename from common/.config/awesome/icons/titlebar/minimize_focus.svg rename to .config/awesome/icons/titlebar/minimize_focus.svg diff --git a/common/.config/awesome/icons/titlebar/minimize_focus_hover.svg b/.config/awesome/icons/titlebar/minimize_focus_hover.svg similarity index 100% rename from common/.config/awesome/icons/titlebar/minimize_focus_hover.svg rename to .config/awesome/icons/titlebar/minimize_focus_hover.svg diff --git a/common/.config/awesome/icons/titlebar/normal.svg b/.config/awesome/icons/titlebar/normal.svg similarity index 100% rename from common/.config/awesome/icons/titlebar/normal.svg rename to .config/awesome/icons/titlebar/normal.svg diff --git a/common/.config/awesome/icons/volume/volume-high.png b/.config/awesome/icons/volume/volume-high.png similarity index 100% rename from common/.config/awesome/icons/volume/volume-high.png rename to .config/awesome/icons/volume/volume-high.png diff --git a/common/.config/awesome/icons/volume/volume-high.svg b/.config/awesome/icons/volume/volume-high.svg similarity index 100% rename from common/.config/awesome/icons/volume/volume-high.svg rename to .config/awesome/icons/volume/volume-high.svg diff --git a/common/.config/awesome/icons/volume/volume-low.png b/.config/awesome/icons/volume/volume-low.png similarity index 100% rename from common/.config/awesome/icons/volume/volume-low.png rename to .config/awesome/icons/volume/volume-low.png diff --git a/common/.config/awesome/icons/volume/volume-low.svg b/.config/awesome/icons/volume/volume-low.svg similarity index 100% rename from common/.config/awesome/icons/volume/volume-low.svg rename to .config/awesome/icons/volume/volume-low.svg diff --git a/common/.config/awesome/icons/volume/volume-off.png b/.config/awesome/icons/volume/volume-off.png similarity index 100% rename from common/.config/awesome/icons/volume/volume-off.png rename to .config/awesome/icons/volume/volume-off.png diff --git a/common/.config/awesome/icons/volume/volume-off.svg b/.config/awesome/icons/volume/volume-off.svg similarity index 100% rename from common/.config/awesome/icons/volume/volume-off.svg rename to .config/awesome/icons/volume/volume-off.svg diff --git a/common/.config/awesome/json.lua b/.config/awesome/json.lua similarity index 100% rename from common/.config/awesome/json.lua rename to .config/awesome/json.lua diff --git a/common/.config/awesome/rc.lua b/.config/awesome/rc.lua similarity index 100% rename from common/.config/awesome/rc.lua rename to .config/awesome/rc.lua diff --git a/common/.config/btop/btop.conf b/.config/btop/btop.conf similarity index 100% rename from common/.config/btop/btop.conf rename to .config/btop/btop.conf diff --git a/common/.config/dunst/dunstrc b/.config/dunst/dunstrc similarity index 100% rename from common/.config/dunst/dunstrc rename to .config/dunst/dunstrc diff --git a/common/.config/eww/eww.scss b/.config/eww/eww.scss similarity index 100% rename from common/.config/eww/eww.scss rename to .config/eww/eww.scss diff --git a/common/.config/eww/eww.yuck b/.config/eww/eww.yuck similarity index 100% rename from common/.config/eww/eww.yuck rename to .config/eww/eww.yuck diff --git a/common/.config/eww/images/bg.png b/.config/eww/images/bg.png similarity index 100% rename from common/.config/eww/images/bg.png rename to .config/eww/images/bg.png diff --git a/common/.config/eww/images/fox.png b/.config/eww/images/fox.png similarity index 100% rename from common/.config/eww/images/fox.png rename to .config/eww/images/fox.png diff --git a/common/.config/eww/images/icons/code.svg b/.config/eww/images/icons/code.svg similarity index 100% rename from common/.config/eww/images/icons/code.svg rename to .config/eww/images/icons/code.svg diff --git a/common/.config/eww/images/icons/discord.svg b/.config/eww/images/icons/discord.svg similarity index 100% rename from common/.config/eww/images/icons/discord.svg rename to .config/eww/images/icons/discord.svg diff --git a/common/.config/eww/images/icons/files.svg b/.config/eww/images/icons/files.svg similarity index 100% rename from common/.config/eww/images/icons/files.svg rename to .config/eww/images/icons/files.svg diff --git a/common/.config/eww/images/icons/firefox.svg b/.config/eww/images/icons/firefox.svg similarity index 100% rename from common/.config/eww/images/icons/firefox.svg rename to .config/eww/images/icons/firefox.svg diff --git a/common/.config/eww/images/icons/geany.svg b/.config/eww/images/icons/geany.svg similarity index 100% rename from common/.config/eww/images/icons/geany.svg rename to .config/eww/images/icons/geany.svg diff --git a/common/.config/eww/images/icons/gimp.svg b/.config/eww/images/icons/gimp.svg similarity index 100% rename from common/.config/eww/images/icons/gimp.svg rename to .config/eww/images/icons/gimp.svg diff --git a/common/.config/eww/images/icons/krita.svg b/.config/eww/images/icons/krita.svg similarity index 100% rename from common/.config/eww/images/icons/krita.svg rename to .config/eww/images/icons/krita.svg diff --git a/common/.config/eww/images/icons/neovim.svg b/.config/eww/images/icons/neovim.svg similarity index 100% rename from common/.config/eww/images/icons/neovim.svg rename to .config/eww/images/icons/neovim.svg diff --git a/common/.config/eww/images/icons/obsidian.svg b/.config/eww/images/icons/obsidian.svg similarity index 100% rename from common/.config/eww/images/icons/obsidian.svg rename to .config/eww/images/icons/obsidian.svg diff --git a/common/.config/eww/images/icons/telegram.svg b/.config/eww/images/icons/telegram.svg similarity index 100% rename from common/.config/eww/images/icons/telegram.svg rename to .config/eww/images/icons/telegram.svg diff --git a/common/.config/eww/images/icons/terminal.svg b/.config/eww/images/icons/terminal.svg similarity index 100% rename from common/.config/eww/images/icons/terminal.svg rename to .config/eww/images/icons/terminal.svg diff --git a/common/.config/eww/images/icons/virtualbox.svg b/.config/eww/images/icons/virtualbox.svg similarity index 100% rename from common/.config/eww/images/icons/virtualbox.svg rename to .config/eww/images/icons/virtualbox.svg diff --git a/common/.config/eww/images/icons/vivaldi.svg b/.config/eww/images/icons/vivaldi.svg similarity index 100% rename from common/.config/eww/images/icons/vivaldi.svg rename to .config/eww/images/icons/vivaldi.svg diff --git a/common/.config/eww/images/music.png b/.config/eww/images/music.png similarity index 100% rename from common/.config/eww/images/music.png rename to .config/eww/images/music.png diff --git a/common/.config/eww/images/profile.jpg b/.config/eww/images/profile.jpg similarity index 100% rename from common/.config/eww/images/profile.jpg rename to .config/eww/images/profile.jpg diff --git a/common/.config/eww/images/spotify.jpg b/.config/eww/images/spotify.jpg similarity index 100% rename from common/.config/eww/images/spotify.jpg rename to .config/eww/images/spotify.jpg diff --git a/common/.config/eww/launch_eww b/.config/eww/launch_eww similarity index 100% rename from common/.config/eww/launch_eww rename to .config/eww/launch_eww diff --git a/common/.config/eww/launch_eww_cal b/.config/eww/launch_eww_cal similarity index 100% rename from common/.config/eww/launch_eww_cal rename to .config/eww/launch_eww_cal diff --git a/common/.config/eww/scripts/mails b/.config/eww/scripts/mails similarity index 100% rename from common/.config/eww/scripts/mails rename to .config/eww/scripts/mails diff --git a/common/.config/eww/scripts/music_info b/.config/eww/scripts/music_info similarity index 100% rename from common/.config/eww/scripts/music_info rename to .config/eww/scripts/music_info diff --git a/common/.config/eww/scripts/open_apps b/.config/eww/scripts/open_apps similarity index 100% rename from common/.config/eww/scripts/open_apps rename to .config/eww/scripts/open_apps diff --git a/common/.config/eww/scripts/open_folders b/.config/eww/scripts/open_folders similarity index 100% rename from common/.config/eww/scripts/open_folders rename to .config/eww/scripts/open_folders diff --git a/common/.config/eww/scripts/open_links b/.config/eww/scripts/open_links similarity index 100% rename from common/.config/eww/scripts/open_links rename to .config/eww/scripts/open_links diff --git a/common/.config/eww/scripts/sys_info b/.config/eww/scripts/sys_info similarity index 100% rename from common/.config/eww/scripts/sys_info rename to .config/eww/scripts/sys_info diff --git a/common/.config/eww/scripts/weather_info b/.config/eww/scripts/weather_info similarity index 100% rename from common/.config/eww/scripts/weather_info rename to .config/eww/scripts/weather_info diff --git a/.config/fish/config.fish b/.config/fish/config.fish new file mode 100644 index 0000000..1fd20b6 --- /dev/null +++ b/.config/fish/config.fish @@ -0,0 +1,7 @@ +if test -d /opt/homebrew/bin + fish_add_path /opt/homebrew/bin/ +end + +if status is-interactive + alias v 'nvim' +end diff --git a/.config/fish/fish_plugins b/.config/fish/fish_plugins new file mode 100644 index 0000000..594dfc0 --- /dev/null +++ b/.config/fish/fish_plugins @@ -0,0 +1 @@ +jorgebucaran/fisher diff --git a/common/.config/i3/catppuccin-macchiato b/.config/i3/catppuccin-macchiato similarity index 100% rename from common/.config/i3/catppuccin-macchiato rename to .config/i3/catppuccin-macchiato diff --git a/common/.config/i3/config b/.config/i3/config similarity index 100% rename from common/.config/i3/config rename to .config/i3/config diff --git a/common/.config/i3/i3-chrome-tab-dragging.py b/.config/i3/i3-chrome-tab-dragging.py similarity index 100% rename from common/.config/i3/i3-chrome-tab-dragging.py rename to .config/i3/i3-chrome-tab-dragging.py diff --git a/common/.config/i3blocks/config b/.config/i3blocks/config similarity index 100% rename from common/.config/i3blocks/config rename to .config/i3blocks/config diff --git a/common/.config/i3blocks/scripts/battery/README.md b/.config/i3blocks/scripts/battery/README.md similarity index 100% rename from common/.config/i3blocks/scripts/battery/README.md rename to .config/i3blocks/scripts/battery/README.md diff --git a/common/.config/i3blocks/scripts/battery/battery b/.config/i3blocks/scripts/battery/battery similarity index 100% rename from common/.config/i3blocks/scripts/battery/battery rename to .config/i3blocks/scripts/battery/battery diff --git a/common/.config/i3blocks/scripts/battery/battery.png b/.config/i3blocks/scripts/battery/battery.png similarity index 100% rename from common/.config/i3blocks/scripts/battery/battery.png rename to .config/i3blocks/scripts/battery/battery.png diff --git a/common/.config/i3blocks/scripts/battery/i3blocks.conf b/.config/i3blocks/scripts/battery/i3blocks.conf similarity index 100% rename from common/.config/i3blocks/scripts/battery/i3blocks.conf rename to .config/i3blocks/scripts/battery/i3blocks.conf diff --git a/common/.config/i3blocks/scripts/battery_better/battery_info.sh b/.config/i3blocks/scripts/battery_better/battery_info.sh similarity index 100% rename from common/.config/i3blocks/scripts/battery_better/battery_info.sh rename to .config/i3blocks/scripts/battery_better/battery_info.sh diff --git a/common/.config/i3blocks/scripts/cpu/cpu_info.sh b/.config/i3blocks/scripts/cpu/cpu_info.sh similarity index 100% rename from common/.config/i3blocks/scripts/cpu/cpu_info.sh rename to .config/i3blocks/scripts/cpu/cpu_info.sh diff --git a/common/.config/i3blocks/scripts/cpu_usage/README.md b/.config/i3blocks/scripts/cpu_usage/README.md similarity index 100% rename from common/.config/i3blocks/scripts/cpu_usage/README.md rename to .config/i3blocks/scripts/cpu_usage/README.md diff --git a/common/.config/i3blocks/scripts/cpu_usage/cpu_usage b/.config/i3blocks/scripts/cpu_usage/cpu_usage similarity index 100% rename from common/.config/i3blocks/scripts/cpu_usage/cpu_usage rename to .config/i3blocks/scripts/cpu_usage/cpu_usage diff --git a/common/.config/i3blocks/scripts/cpu_usage/cpu_usage.png b/.config/i3blocks/scripts/cpu_usage/cpu_usage.png similarity index 100% rename from common/.config/i3blocks/scripts/cpu_usage/cpu_usage.png rename to .config/i3blocks/scripts/cpu_usage/cpu_usage.png diff --git a/common/.config/i3blocks/scripts/cpu_usage/i3blocks.conf b/.config/i3blocks/scripts/cpu_usage/i3blocks.conf similarity index 100% rename from common/.config/i3blocks/scripts/cpu_usage/i3blocks.conf rename to .config/i3blocks/scripts/cpu_usage/i3blocks.conf diff --git a/common/.config/i3blocks/scripts/dunst/LICENSE b/.config/i3blocks/scripts/dunst/LICENSE similarity index 100% rename from common/.config/i3blocks/scripts/dunst/LICENSE rename to .config/i3blocks/scripts/dunst/LICENSE diff --git a/common/.config/i3blocks/scripts/dunst/README.md b/.config/i3blocks/scripts/dunst/README.md similarity index 100% rename from common/.config/i3blocks/scripts/dunst/README.md rename to .config/i3blocks/scripts/dunst/README.md diff --git a/common/.config/i3blocks/scripts/dunst/dunst b/.config/i3blocks/scripts/dunst/dunst similarity index 100% rename from common/.config/i3blocks/scripts/dunst/dunst rename to .config/i3blocks/scripts/dunst/dunst diff --git a/common/.config/i3blocks/scripts/dunst/dunst.gif b/.config/i3blocks/scripts/dunst/dunst.gif similarity index 100% rename from common/.config/i3blocks/scripts/dunst/dunst.gif rename to .config/i3blocks/scripts/dunst/dunst.gif diff --git a/common/.config/i3blocks/scripts/dunst/i3blocks.conf b/.config/i3blocks/scripts/dunst/i3blocks.conf similarity index 100% rename from common/.config/i3blocks/scripts/dunst/i3blocks.conf rename to .config/i3blocks/scripts/dunst/i3blocks.conf diff --git a/common/.config/i3blocks/scripts/gpu/gpu_info.sh b/.config/i3blocks/scripts/gpu/gpu_info.sh similarity index 100% rename from common/.config/i3blocks/scripts/gpu/gpu_info.sh rename to .config/i3blocks/scripts/gpu/gpu_info.sh diff --git a/common/.config/i3blocks/scripts/i3-focusedwindow/README.md b/.config/i3blocks/scripts/i3-focusedwindow/README.md similarity index 100% rename from common/.config/i3blocks/scripts/i3-focusedwindow/README.md rename to .config/i3blocks/scripts/i3-focusedwindow/README.md diff --git a/common/.config/i3blocks/scripts/i3-focusedwindow/i3-focusedwindow b/.config/i3blocks/scripts/i3-focusedwindow/i3-focusedwindow similarity index 100% rename from common/.config/i3blocks/scripts/i3-focusedwindow/i3-focusedwindow rename to .config/i3blocks/scripts/i3-focusedwindow/i3-focusedwindow diff --git a/common/.config/i3blocks/scripts/i3-focusedwindow/i3-focusedwindow.png b/.config/i3blocks/scripts/i3-focusedwindow/i3-focusedwindow.png similarity index 100% rename from common/.config/i3blocks/scripts/i3-focusedwindow/i3-focusedwindow.png rename to .config/i3blocks/scripts/i3-focusedwindow/i3-focusedwindow.png diff --git a/common/.config/i3blocks/scripts/jas/jas b/.config/i3blocks/scripts/jas/jas similarity index 100% rename from common/.config/i3blocks/scripts/jas/jas rename to .config/i3blocks/scripts/jas/jas diff --git a/common/.config/i3blocks/scripts/mediaplayer/README.md b/.config/i3blocks/scripts/mediaplayer/README.md similarity index 100% rename from common/.config/i3blocks/scripts/mediaplayer/README.md rename to .config/i3blocks/scripts/mediaplayer/README.md diff --git a/common/.config/i3blocks/scripts/mediaplayer/mediaplayer b/.config/i3blocks/scripts/mediaplayer/mediaplayer similarity index 100% rename from common/.config/i3blocks/scripts/mediaplayer/mediaplayer rename to .config/i3blocks/scripts/mediaplayer/mediaplayer diff --git a/common/.config/i3blocks/scripts/mediaplayer/mediaplayer.png b/.config/i3blocks/scripts/mediaplayer/mediaplayer.png similarity index 100% rename from common/.config/i3blocks/scripts/mediaplayer/mediaplayer.png rename to .config/i3blocks/scripts/mediaplayer/mediaplayer.png diff --git a/common/.config/i3blocks/scripts/memory/README.md b/.config/i3blocks/scripts/memory/README.md similarity index 100% rename from common/.config/i3blocks/scripts/memory/README.md rename to .config/i3blocks/scripts/memory/README.md diff --git a/common/.config/i3blocks/scripts/memory/i3blocks.conf b/.config/i3blocks/scripts/memory/i3blocks.conf similarity index 100% rename from common/.config/i3blocks/scripts/memory/i3blocks.conf rename to .config/i3blocks/scripts/memory/i3blocks.conf diff --git a/common/.config/i3blocks/scripts/memory/memory b/.config/i3blocks/scripts/memory/memory similarity index 100% rename from common/.config/i3blocks/scripts/memory/memory rename to .config/i3blocks/scripts/memory/memory diff --git a/common/.config/i3blocks/scripts/memory/memory.png b/.config/i3blocks/scripts/memory/memory.png similarity index 100% rename from common/.config/i3blocks/scripts/memory/memory.png rename to .config/i3blocks/scripts/memory/memory.png diff --git a/common/.config/i3blocks/scripts/rofi-calendar/README.md b/.config/i3blocks/scripts/rofi-calendar/README.md similarity index 100% rename from common/.config/i3blocks/scripts/rofi-calendar/README.md rename to .config/i3blocks/scripts/rofi-calendar/README.md diff --git a/common/.config/i3blocks/scripts/rofi-calendar/rofi-calendar b/.config/i3blocks/scripts/rofi-calendar/rofi-calendar similarity index 100% rename from common/.config/i3blocks/scripts/rofi-calendar/rofi-calendar rename to .config/i3blocks/scripts/rofi-calendar/rofi-calendar diff --git a/common/.config/i3blocks/scripts/rofi-calendar/screenshot.png b/.config/i3blocks/scripts/rofi-calendar/screenshot.png similarity index 100% rename from common/.config/i3blocks/scripts/rofi-calendar/screenshot.png rename to .config/i3blocks/scripts/rofi-calendar/screenshot.png diff --git a/common/.config/i3blocks/scripts/rofi-calendar/screenshot2.png b/.config/i3blocks/scripts/rofi-calendar/screenshot2.png similarity index 100% rename from common/.config/i3blocks/scripts/rofi-calendar/screenshot2.png rename to .config/i3blocks/scripts/rofi-calendar/screenshot2.png diff --git a/common/.config/i3blocks/scripts/rofi-wttr/LICENSE.md b/.config/i3blocks/scripts/rofi-wttr/LICENSE.md similarity index 100% rename from common/.config/i3blocks/scripts/rofi-wttr/LICENSE.md rename to .config/i3blocks/scripts/rofi-wttr/LICENSE.md diff --git a/common/.config/i3blocks/scripts/rofi-wttr/README.md b/.config/i3blocks/scripts/rofi-wttr/README.md similarity index 100% rename from common/.config/i3blocks/scripts/rofi-wttr/README.md rename to .config/i3blocks/scripts/rofi-wttr/README.md diff --git a/common/.config/i3blocks/scripts/rofi-wttr/i3blocks.conf b/.config/i3blocks/scripts/rofi-wttr/i3blocks.conf similarity index 100% rename from common/.config/i3blocks/scripts/rofi-wttr/i3blocks.conf rename to .config/i3blocks/scripts/rofi-wttr/i3blocks.conf diff --git a/common/.config/i3blocks/scripts/rofi-wttr/rofi-wttr b/.config/i3blocks/scripts/rofi-wttr/rofi-wttr similarity index 100% rename from common/.config/i3blocks/scripts/rofi-wttr/rofi-wttr rename to .config/i3blocks/scripts/rofi-wttr/rofi-wttr diff --git a/common/.config/i3blocks/scripts/rofi-wttr/rofi-wttr-detail.png b/.config/i3blocks/scripts/rofi-wttr/rofi-wttr-detail.png similarity index 100% rename from common/.config/i3blocks/scripts/rofi-wttr/rofi-wttr-detail.png rename to .config/i3blocks/scripts/rofi-wttr/rofi-wttr-detail.png diff --git a/common/.config/i3blocks/scripts/rofi-wttr/rofi-wttr-status-line.png b/.config/i3blocks/scripts/rofi-wttr/rofi-wttr-status-line.png similarity index 100% rename from common/.config/i3blocks/scripts/rofi-wttr/rofi-wttr-status-line.png rename to .config/i3blocks/scripts/rofi-wttr/rofi-wttr-status-line.png diff --git a/common/.config/i3blocks/scripts/shutdown_menu/README.md b/.config/i3blocks/scripts/shutdown_menu/README.md similarity index 100% rename from common/.config/i3blocks/scripts/shutdown_menu/README.md rename to .config/i3blocks/scripts/shutdown_menu/README.md diff --git a/common/.config/i3blocks/scripts/shutdown_menu/i3blocks.conf b/.config/i3blocks/scripts/shutdown_menu/i3blocks.conf similarity index 100% rename from common/.config/i3blocks/scripts/shutdown_menu/i3blocks.conf rename to .config/i3blocks/scripts/shutdown_menu/i3blocks.conf diff --git a/common/.config/i3blocks/scripts/shutdown_menu/rofi.png b/.config/i3blocks/scripts/shutdown_menu/rofi.png similarity index 100% rename from common/.config/i3blocks/scripts/shutdown_menu/rofi.png rename to .config/i3blocks/scripts/shutdown_menu/rofi.png diff --git a/common/.config/i3blocks/scripts/shutdown_menu/shutdown_menu b/.config/i3blocks/scripts/shutdown_menu/shutdown_menu similarity index 100% rename from common/.config/i3blocks/scripts/shutdown_menu/shutdown_menu rename to .config/i3blocks/scripts/shutdown_menu/shutdown_menu diff --git a/common/.config/i3blocks/scripts/shutdown_menu/zenity.png b/.config/i3blocks/scripts/shutdown_menu/zenity.png similarity index 100% rename from common/.config/i3blocks/scripts/shutdown_menu/zenity.png rename to .config/i3blocks/scripts/shutdown_menu/zenity.png diff --git a/common/.config/i3blocks/scripts/sound/sound_burst.sh b/.config/i3blocks/scripts/sound/sound_burst.sh similarity index 100% rename from common/.config/i3blocks/scripts/sound/sound_burst.sh rename to .config/i3blocks/scripts/sound/sound_burst.sh diff --git a/common/.config/i3blocks/scripts/sound/sound_info.sh b/.config/i3blocks/scripts/sound/sound_info.sh similarity index 100% rename from common/.config/i3blocks/scripts/sound/sound_info.sh rename to .config/i3blocks/scripts/sound/sound_info.sh diff --git a/common/.config/i3blocks/scripts/spotify/spotify.py b/.config/i3blocks/scripts/spotify/spotify.py similarity index 100% rename from common/.config/i3blocks/scripts/spotify/spotify.py rename to .config/i3blocks/scripts/spotify/spotify.py diff --git a/common/.config/i3blocks/scripts/time/LICENSE b/.config/i3blocks/scripts/time/LICENSE similarity index 100% rename from common/.config/i3blocks/scripts/time/LICENSE rename to .config/i3blocks/scripts/time/LICENSE diff --git a/common/.config/i3blocks/scripts/time/README.md b/.config/i3blocks/scripts/time/README.md similarity index 100% rename from common/.config/i3blocks/scripts/time/README.md rename to .config/i3blocks/scripts/time/README.md diff --git a/common/.config/i3blocks/scripts/time/i3blocks.conf b/.config/i3blocks/scripts/time/i3blocks.conf similarity index 100% rename from common/.config/i3blocks/scripts/time/i3blocks.conf rename to .config/i3blocks/scripts/time/i3blocks.conf diff --git a/common/.config/i3blocks/scripts/time/time b/.config/i3blocks/scripts/time/time similarity index 100% rename from common/.config/i3blocks/scripts/time/time rename to .config/i3blocks/scripts/time/time diff --git a/common/.config/i3blocks/scripts/time/time.png b/.config/i3blocks/scripts/time/time.png similarity index 100% rename from common/.config/i3blocks/scripts/time/time.png rename to .config/i3blocks/scripts/time/time.png diff --git a/common/.config/i3blocks/scripts/volume/README.md b/.config/i3blocks/scripts/volume/README.md similarity index 100% rename from common/.config/i3blocks/scripts/volume/README.md rename to .config/i3blocks/scripts/volume/README.md diff --git a/common/.config/i3blocks/scripts/volume/i3blocks.conf b/.config/i3blocks/scripts/volume/i3blocks.conf similarity index 100% rename from common/.config/i3blocks/scripts/volume/i3blocks.conf rename to .config/i3blocks/scripts/volume/i3blocks.conf diff --git a/common/.config/i3blocks/scripts/volume/volume b/.config/i3blocks/scripts/volume/volume similarity index 100% rename from common/.config/i3blocks/scripts/volume/volume rename to .config/i3blocks/scripts/volume/volume diff --git a/common/.config/i3blocks/scripts/volume/volume.png b/.config/i3blocks/scripts/volume/volume.png similarity index 100% rename from common/.config/i3blocks/scripts/volume/volume.png rename to .config/i3blocks/scripts/volume/volume.png diff --git a/common/.config/kitty/kitty.conf b/.config/kitty/kitty.conf similarity index 100% rename from common/.config/kitty/kitty.conf rename to .config/kitty/kitty.conf diff --git a/common/.config/manjaro-hello.json b/.config/manjaro-hello.json similarity index 100% rename from common/.config/manjaro-hello.json rename to .config/manjaro-hello.json diff --git a/common/.config/mimeapps.list b/.config/mimeapps.list similarity index 100% rename from common/.config/mimeapps.list rename to .config/mimeapps.list diff --git a/common/.config/nvim/assets/nvim-screenshot.png b/.config/nvim/assets/nvim-screenshot.png similarity index 100% rename from common/.config/nvim/assets/nvim-screenshot.png rename to .config/nvim/assets/nvim-screenshot.png diff --git a/common/.config/nvim/init.lua b/.config/nvim/init.lua similarity index 100% rename from common/.config/nvim/init.lua rename to .config/nvim/init.lua diff --git a/.config/nvim/lua/lsp-general.lua b/.config/nvim/lua/lsp-general.lua new file mode 100644 index 0000000..e6b63fe --- /dev/null +++ b/.config/nvim/lua/lsp-general.lua @@ -0,0 +1,372 @@ +local cmp = require('cmp') +local luasnip = require('luasnip') +local dap = require('dap') +local dapui = require('dapui') + +dap.configurations = { + cpp = { + { + name = "Launch", + type = "codelldb", + request = "launch", + program = function() + return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/build/', 'file') + end, + cwd = '${workspaceFolder}', + stopOnEntry = true, + }, + }, +} + +dap.adapters.codelldb = { + type = 'server', + port = '13000', + host = '127.0.0.1', + executable = { + command = vim.fn.stdpath('data') .. '/mason/bin/codelldb', + args = {"--port", "13000"} + } +} + +dapui.setup({ + icons = { expanded = "โžก๏ธ", collapsed = "โฌ‡๏ธ" }, + mappings = { + open = "o", + remove = "d", + edit = "e", + repl = "r", + toggle = "t", + }, + expand_lines = vim.fn.has("nvim-0.7"), + layouts = { + { + elements = { + "scopes", + "stacks", + "watches" + }, + size = 0.17, + position = "left" + }, + { + elements = { + "repl", + "console", + "breakpoints", + }, + size = 0.15, + position = "bottom", + }, + }, + floating = { + max_height = nil, + max_width = nil, + border = "single", + mappings = { + close = { "q", "" }, + }, + }, + windows = { indent = 1 }, + render = { + max_type_length = nil, + }, +}) + +dap.listeners.after.event_initialized["dapui_config"]=function() + dapui.open() +end +dap.listeners.before.event_terminated["dapui_config"]=function() + dapui.close() +end +dap.listeners.before.event_exited["dapui_config"]=function() + dapui.close() +end +vim.keymap.set("n", "ds", function() + dap.continue() + dapui.toggle({}) +end) +vim.keymap.set("n", "de", function() + dapui.toggle({}) + dap.terminate() + require("notify")("Debugger session ended", "warn") +end) +vim.keymap.set("n", "dC", function() + require('dap').clear_breakpoints() + require("notify")("Cleared breakpoints", "warn") +end) +vim.fn.sign_define('DapBreakpoint',{ text ='๐Ÿ”ด', texthl ='', linehl ='', numhl =''}) +vim.fn.sign_define('DapStopped',{ text ='โ–ถ๏ธ', texthl ='', linehl ='', numhl =''}) + +-- LSP keymaps via LspAttach autocmd (native 0.11+ way) +vim.api.nvim_create_autocmd('LspAttach', { + callback = function(ev) + local opts = { buffer = ev.buf } + vim.keymap.set('n', 'gD', 'lua vim.lsp.buf.definition()', opts) + vim.keymap.set('n', 'gT', 'lua vim.lsp.buf.type_definition()', opts) + vim.keymap.set('n', 'gR', 'lua vim.lsp.buf.references()', opts) + + -- diagnostics + vim.keymap.set('n', 'gn', 'lua vim.diagnostic.goto_next()', opts) + vim.keymap.set('n', 'gN', 'lua vim.diagnostic.goto_prev()', opts) + + -- action & rename + vim.keymap.set('n', '', 'Lspsaga code_action', opts) + vim.keymap.set('n', 'gr', 'Lspsaga rename', opts) + + -- overwrite the defaults + vim.keymap.set('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) + vim.keymap.set('n', 'K', 'Lspsaga hover_doc', opts) + + -- jump forward/backward up/down the call list + vim.keymap.set('n', 'gI', 'Lspsaga incoming_calls', opts) + vim.keymap.set('n', 'gO', 'Lspsaga outgoing_calls', opts) + + -- Sexy LSP + vim.keymap.set('n', 'gd', 'Lspsaga peek_definition', opts) + vim.keymap.set('n', 'gt', 'Lspsaga peek_type_definition', opts) + vim.keymap.set('n', 'gr', 'Lspsaga lsp_finder', opts) + + -- Format with conform (falls back to LSP) + vim.keymap.set('n', 'gf', function() + require('conform').format({ bufnr = ev.buf, lsp_fallback = true }) + end, opts) + vim.keymap.set('n', 'gg', function() + local params = { uri = vim.uri_from_bufnr(ev.buf) } + local client = vim.lsp.get_clients({ bufnr = ev.buf, name = 'clangd' })[1] + if not client then return vim.notify('No clangd client', vim.log.levels.WARN) end + client:request('textDocument/switchSourceHeader', params, function(err, result) + if result then vim.cmd.edit(vim.uri_to_fname(result)) end + end, ev.buf) + end, opts) + vim.keymap.set('n', 'gw', 'StripWhitespace', opts) + end, +}) + +-- Shared config for all LSP servers (capabilities from nvim-cmp) +vim.lsp.config('*', { + capabilities = require('cmp_nvim_lsp').default_capabilities(), +}) + +-- C/C++ โ€” custom clangd binary +vim.lsp.config('clangd', { + cmd = { + vim.fn.expand('~/bin/clangd'), + '--background-index', + '--limit-results=100', + '-j=4', + }, +}) + +-- Auto-restart clangd on crash โ€” retries forever, use :ClangdStop to give up +do + local crash_count = 0 + local last_crash = 0 + local stopped = false + + vim.api.nvim_create_user_command('ClangdStop', function() + stopped = true + for _, client in ipairs(vim.lsp.get_clients({ name = 'clangd' })) do + client:stop() + end + vim.notify('clangd auto-restart disabled. Use :ClangdStart to re-enable.', vim.log.levels.INFO) + end, {}) + + vim.api.nvim_create_user_command('ClangdStart', function() + stopped = false + crash_count = 0 + for _, buf in ipairs(vim.api.nvim_list_bufs()) do + if vim.api.nvim_buf_is_loaded(buf) then + local ft = vim.bo[buf].filetype + if ft == 'c' or ft == 'cpp' or ft == 'objc' or ft == 'objcpp' or ft == 'cuda' then + vim.api.nvim_exec_autocmds('FileType', { buffer = buf }) + break + end + end + end + vim.notify('clangd auto-restart enabled.', vim.log.levels.INFO) + end, {}) + + vim.api.nvim_create_autocmd('LspDetach', { + callback = function(args) + local client = vim.lsp.get_client_by_id(args.data.client_id) + if not client or client.name ~= 'clangd' then return end + if stopped then return end + + -- Wait a tick for all LspDetach events to settle, then check if clangd is truly gone + vim.defer_fn(function() + if stopped then return end + local clients = vim.lsp.get_clients({ name = 'clangd' }) + if #clients > 0 then return end + + -- Reset counter after 5 minutes of stability + local now = vim.uv.now() + if now - last_crash > 300000 then + crash_count = 0 + end + + crash_count = crash_count + 1 + last_crash = now + + vim.notify( + 'clangd crashed, restarting... (crash #' .. crash_count .. ', :ClangdStop to give up)', + vim.log.levels.WARN + ) + + -- Re-trigger FileType on C/C++ buffers so vim.lsp.enable kicks in + for _, buf in ipairs(vim.api.nvim_list_bufs()) do + if vim.api.nvim_buf_is_loaded(buf) then + local ft = vim.bo[buf].filetype + if ft == 'c' or ft == 'cpp' or ft == 'objc' or ft == 'objcpp' or ft == 'cuda' then + vim.api.nvim_exec_autocmds('FileType', { buffer = buf }) + end + end + end + end, 500) + end, + }) +end + +-- Lua (Neovim config) +vim.lsp.config('lua_ls', { + settings = { + Lua = { + diagnostics = { globals = { 'vim' } }, + workspace = { + library = { + [vim.fn.expand('$VIMRUNTIME/lua')] = true, + [vim.fn.expand('$VIMRUNTIME/lua/vim/lsp')] = true, + }, + }, + }, + }, +}) + +-- Enable all servers โ€” just need the binaries on PATH +-- (rust_analyzer is managed by rustaceanvim) +vim.lsp.enable({ + 'clangd', + 'lua_ls', + 'ts_ls', + 'pyright', + 'cssls', + 'html', + 'jsonls', + 'bashls', + 'cmake', +}) + +local cmp_kinds = { + Text = "", + Method = "", + Function = "", + Constructor = "", + Field = "๏ดฒ", + Variable = "", + Class = "", + Interface = "๏ฐฎ", + Module = "", + Property = "่ฅ", + Unit = "", + Value = "", + Enum = "็ทด", + Keyword = "", + Snippet = "", + Color = "", + File = "", + Reference = "", + Folder = "", + EnumMember = "", + Constant = "๏ฒ€", + Struct = "๏ณค", + Event = "", + Operator = "", + TypeParameter = "" +} + +cmp.setup({ + sources = { + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + { name = 'buffer' }, + { name = 'path' }, + }, + window = { + completion = cmp.config.window.bordered(), + documentation = cmp.config.window.bordered() + }, + completion = { + completeopt = "menu,menuone,preview,noselect", + }, + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) + end, + }, + formatting = { + fields = { "kind", "abbr", "menu" }, + format = function(entry, vim_item) + vim_item.menu = ({ + buffer = "", + nvim_lsp = "", + })[entry.source.name] + local kind = vim_item.kind + vim_item.kind = " " .. (cmp_kinds[kind] or "?") .. "" + local source = entry.source.name + vim_item.menu = "[" .. source .. "]" + return vim_item + end, + }, + sorting = { + priority_weight = 1.0, + }, + matching = { + disallow_fuzzy_matching = true, + disallow_fullfuzzy_matching = true, + disallow_partial_fuzzy_matching = true, + disallow_partial_matching = false, + disallow_prefix_unmatching = true, + }, + performance = { + max_view_entries = 20, + }, + mapping = { + [""] = cmp.mapping(function(fallback) + if (cmp.visible()) then + cmp.select_next_item(cmp_mode) + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + else + fallback() + end + cmp.mapping.select_next_item(cmp_mode) + end, { 'i', 's' }), + [""] = cmp.mapping.select_prev_item(cmp_mode), + [""] = nil, + [""] = nil + }, +}) + +cmp.setup.cmdline('/', { + sources = { + { name = 'buffer' } + } +}) + +cmp.setup.cmdline(':', { + sources = cmp.config.sources({ + { name = 'path' } + }, { + { name = 'cmdline' } + }) +}) + +vim.api.nvim_set_hl(0, "CmpItemMenu", { italic = true }) +vim.diagnostic.config({ + virtual_text = true, + signs = { + [vim.diagnostic.severity.ERROR] = '', + [vim.diagnostic.severity.WARN] = '', + [vim.diagnostic.severity.HINT] = '', + [vim.diagnostic.severity.INFO] = '' + } +}) diff --git a/common/.config/nvim/lua/plugin-config/gitsigns.lua b/.config/nvim/lua/plugin-config/gitsigns.lua similarity index 100% rename from common/.config/nvim/lua/plugin-config/gitsigns.lua rename to .config/nvim/lua/plugin-config/gitsigns.lua diff --git a/common/.config/nvim/lua/plugin-config/nvim-treesitter.lua b/.config/nvim/lua/plugin-config/nvim-treesitter.lua similarity index 100% rename from common/.config/nvim/lua/plugin-config/nvim-treesitter.lua rename to .config/nvim/lua/plugin-config/nvim-treesitter.lua diff --git a/common/.config/nvim/lua/plugin-config/smart-splits.lua b/.config/nvim/lua/plugin-config/smart-splits.lua similarity index 100% rename from common/.config/nvim/lua/plugin-config/smart-splits.lua rename to .config/nvim/lua/plugin-config/smart-splits.lua diff --git a/common/.config/nvim/lua/plugin-config/telescope.lua b/.config/nvim/lua/plugin-config/telescope.lua similarity index 100% rename from common/.config/nvim/lua/plugin-config/telescope.lua rename to .config/nvim/lua/plugin-config/telescope.lua diff --git a/common/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua similarity index 77% rename from common/.config/nvim/lua/plugins.lua rename to .config/nvim/lua/plugins.lua index bf48e6a..d7a6b5b 100644 --- a/common/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -4,7 +4,6 @@ return { lazy = false, priority = 1000, config = function() - vim.cmd('colorscheme kanagawa') require('kanagawa').setup({ transparent = true, undercurl = true, @@ -21,6 +20,7 @@ return { } end }) + vim.cmd('colorscheme kanagawa') end }, -- QUALITY OF LIFE INTEGRATIONS @@ -32,7 +32,8 @@ return { lazy = true, }, { - 'folke/snacks.nvim' + 'folke/snacks.nvim', + lazy = false, }, { 'tzachar/local-highlight.nvim', @@ -65,7 +66,6 @@ return { }, { 'lewis6991/gitsigns.nvim', - dependencies = { 'nvim-lua/plenary.nvim' }, config = function() require('plugin-config/gitsigns') end @@ -80,7 +80,7 @@ return { }, { -- colourise colour codes - 'norcalli/nvim-colorizer.lua', + 'NvChad/nvim-colorizer.lua', lazy = false, opts = {} }, @@ -291,17 +291,10 @@ return { build = "make install_jsregexp" }, { - 'VonHeikemen/lsp-zero.nvim', + 'neovim/nvim-lspconfig', dependencies = { - -- LSP Support { 'nvim-neotest/nvim-nio' }, - { 'neovim/nvim-lspconfig' }, - { 'williamboman/mason.nvim' }, { 'mfussenegger/nvim-dap' }, - { 'jay-babu/mason-nvim-dap.nvim' }, - { 'williamboman/mason-lspconfig.nvim' }, - - { 'simrat39/rust-tools.nvim' }, -- Autocompletion { 'hrsh7th/nvim-cmp' }, @@ -367,6 +360,91 @@ return { virtual_lines = false, }) end, - } + }, + -- Rust (replaces rust-tools.nvim) + { + 'mrcjkb/rustaceanvim', + version = '^5', + lazy = false, + }, + -- LSP progress indicator + { + 'j-hui/fidget.nvim', + opts = {}, + }, + -- Treesitter text objects (select/move by function, class, parameter) + { + 'nvim-treesitter/nvim-treesitter-textobjects', + dependencies = { 'nvim-treesitter/nvim-treesitter' }, + config = function() + require('nvim-treesitter.configs').setup({ + textobjects = { + select = { + enable = true, + lookahead = true, + keymaps = { + ['af'] = '@function.outer', + ['if'] = '@function.inner', + ['ac'] = '@class.outer', + ['ic'] = '@class.inner', + ['aa'] = '@parameter.outer', + ['ia'] = '@parameter.inner', + }, + }, + move = { + enable = true, + set_jumps = true, + goto_next_start = { + [']m'] = '@function.outer', + [']]'] = '@class.outer', + }, + goto_previous_start = { + ['[m'] = '@function.outer', + ['[['] = '@class.outer', + }, + }, + swap = { + enable = true, + swap_next = { ['a'] = '@parameter.inner' }, + swap_previous = { ['A'] = '@parameter.inner' }, + }, + }, + }) + end, + }, + -- Format on save / manual format (clang-format, prettier, etc.) + { + 'stevearc/conform.nvim', + opts = { + formatters_by_ft = { + c = { 'clang-format' }, + cpp = { 'clang-format' }, + javascript = { 'prettier' }, + typescript = { 'prettier' }, + html = { 'prettier' }, + css = { 'prettier' }, + json = { 'prettier' }, + yaml = { 'prettier' }, + lua = { 'stylua' }, + python = { 'black' }, + rust = { 'rustfmt' }, + }, + }, + }, + -- Better diff/merge UI + { + 'sindrets/diffview.nvim', + keys = { + { 'gd', 'DiffviewOpen', desc = 'Open diffview' }, + { 'gh', 'DiffviewFileHistory %', desc = 'File history' }, + { 'gq', 'DiffviewClose', desc = 'Close diffview' }, + }, + }, + -- Keybinding cheat sheet + { + 'folke/which-key.nvim', + event = 'VeryLazy', + opts = {}, + }, } diff --git a/common/.config/nvim/neovim.vim b/.config/nvim/neovim.vim similarity index 100% rename from common/.config/nvim/neovim.vim rename to .config/nvim/neovim.vim diff --git a/common/.config/pavucontrol.ini b/.config/pavucontrol.ini similarity index 100% rename from common/.config/pavucontrol.ini rename to .config/pavucontrol.ini diff --git a/common/.config/picom.conf b/.config/picom.conf similarity index 100% rename from common/.config/picom.conf rename to .config/picom.conf diff --git a/common/.config/polybar/colors.ini b/.config/polybar/colors.ini similarity index 100% rename from common/.config/polybar/colors.ini rename to .config/polybar/colors.ini diff --git a/common/.config/polybar/config.ini b/.config/polybar/config.ini similarity index 100% rename from common/.config/polybar/config.ini rename to .config/polybar/config.ini diff --git a/common/.config/polybar/fonts.ini b/.config/polybar/fonts.ini similarity index 100% rename from common/.config/polybar/fonts.ini rename to .config/polybar/fonts.ini diff --git a/common/.config/polybar/launch.sh b/.config/polybar/launch.sh similarity index 100% rename from common/.config/polybar/launch.sh rename to .config/polybar/launch.sh diff --git a/common/.config/polybar/main-bar.ini b/.config/polybar/main-bar.ini similarity index 100% rename from common/.config/polybar/main-bar.ini rename to .config/polybar/main-bar.ini diff --git a/common/.config/polybar/modules.ini b/.config/polybar/modules.ini similarity index 100% rename from common/.config/polybar/modules.ini rename to .config/polybar/modules.ini diff --git a/common/.config/polybar/openweathermap-simple b/.config/polybar/openweathermap-simple similarity index 100% rename from common/.config/polybar/openweathermap-simple rename to .config/polybar/openweathermap-simple diff --git a/common/.config/polybar/pacman-aurhelper.sh b/.config/polybar/pacman-aurhelper.sh similarity index 100% rename from common/.config/polybar/pacman-aurhelper.sh rename to .config/polybar/pacman-aurhelper.sh diff --git a/common/.config/polybar/scripts/__pycache__/speedtest.cpython-311.pyc b/.config/polybar/scripts/__pycache__/speedtest.cpython-311.pyc similarity index 100% rename from common/.config/polybar/scripts/__pycache__/speedtest.cpython-311.pyc rename to .config/polybar/scripts/__pycache__/speedtest.cpython-311.pyc diff --git a/common/.config/polybar/scripts/cpu.sh b/.config/polybar/scripts/cpu.sh similarity index 100% rename from common/.config/polybar/scripts/cpu.sh rename to .config/polybar/scripts/cpu.sh diff --git a/common/.config/polybar/scripts/gpu.sh b/.config/polybar/scripts/gpu.sh similarity index 100% rename from common/.config/polybar/scripts/gpu.sh rename to .config/polybar/scripts/gpu.sh diff --git a/common/.config/polybar/scripts/speedtest-cli b/.config/polybar/scripts/speedtest-cli similarity index 100% rename from common/.config/polybar/scripts/speedtest-cli rename to .config/polybar/scripts/speedtest-cli diff --git a/common/.config/polybar/scripts/speedtest.sh b/.config/polybar/scripts/speedtest.sh similarity index 100% rename from common/.config/polybar/scripts/speedtest.sh rename to .config/polybar/scripts/speedtest.sh diff --git a/common/.config/polybar/scripts/tray.sh b/.config/polybar/scripts/tray.sh similarity index 100% rename from common/.config/polybar/scripts/tray.sh rename to .config/polybar/scripts/tray.sh diff --git a/common/.config/polybar/settings.ini b/.config/polybar/settings.ini similarity index 100% rename from common/.config/polybar/settings.ini rename to .config/polybar/settings.ini diff --git a/common/.config/polybar/spotify-status.py b/.config/polybar/spotify-status.py similarity index 100% rename from common/.config/polybar/spotify-status.py rename to .config/polybar/spotify-status.py diff --git a/common/.config/rofi/README.md b/.config/rofi/README.md similarity index 100% rename from common/.config/rofi/README.md rename to .config/rofi/README.md diff --git a/common/.config/rofi/bin/launcher b/.config/rofi/bin/launcher similarity index 100% rename from common/.config/rofi/bin/launcher rename to .config/rofi/bin/launcher diff --git a/common/.config/rofi/bin/powermenu b/.config/rofi/bin/powermenu similarity index 100% rename from common/.config/rofi/bin/powermenu rename to .config/rofi/bin/powermenu diff --git a/common/.config/rofi/bin/runner b/.config/rofi/bin/runner similarity index 100% rename from common/.config/rofi/bin/runner rename to .config/rofi/bin/runner diff --git a/common/.config/rofi/bin/screenshot b/.config/rofi/bin/screenshot similarity index 100% rename from common/.config/rofi/bin/screenshot rename to .config/rofi/bin/screenshot diff --git a/common/.config/rofi/config.rasi b/.config/rofi/config.rasi similarity index 100% rename from common/.config/rofi/config.rasi rename to .config/rofi/config.rasi diff --git a/common/.config/rofi/config/askpass.rasi b/.config/rofi/config/askpass.rasi similarity index 100% rename from common/.config/rofi/config/askpass.rasi rename to .config/rofi/config/askpass.rasi diff --git a/common/.config/rofi/config/bluetooth.rasi b/.config/rofi/config/bluetooth.rasi similarity index 100% rename from common/.config/rofi/config/bluetooth.rasi rename to .config/rofi/config/bluetooth.rasi diff --git a/common/.config/rofi/config/colors.rasi b/.config/rofi/config/colors.rasi similarity index 100% rename from common/.config/rofi/config/colors.rasi rename to .config/rofi/config/colors.rasi diff --git a/common/.config/rofi/config/confirm.rasi b/.config/rofi/config/confirm.rasi similarity index 100% rename from common/.config/rofi/config/confirm.rasi rename to .config/rofi/config/confirm.rasi diff --git a/common/.config/rofi/config/font.rasi b/.config/rofi/config/font.rasi similarity index 100% rename from common/.config/rofi/config/font.rasi rename to .config/rofi/config/font.rasi diff --git a/common/.config/rofi/config/launcher.rasi b/.config/rofi/config/launcher.rasi similarity index 100% rename from common/.config/rofi/config/launcher.rasi rename to .config/rofi/config/launcher.rasi diff --git a/common/.config/rofi/config/mpd.rasi b/.config/rofi/config/mpd.rasi similarity index 100% rename from common/.config/rofi/config/mpd.rasi rename to .config/rofi/config/mpd.rasi diff --git a/common/.config/rofi/config/network.rasi b/.config/rofi/config/network.rasi similarity index 100% rename from common/.config/rofi/config/network.rasi rename to .config/rofi/config/network.rasi diff --git a/common/.config/rofi/config/networkmenu.rasi b/.config/rofi/config/networkmenu.rasi similarity index 100% rename from common/.config/rofi/config/networkmenu.rasi rename to .config/rofi/config/networkmenu.rasi diff --git a/common/.config/rofi/config/powermenu.rasi b/.config/rofi/config/powermenu.rasi similarity index 100% rename from common/.config/rofi/config/powermenu.rasi rename to .config/rofi/config/powermenu.rasi diff --git a/common/.config/rofi/config/runner.rasi b/.config/rofi/config/runner.rasi similarity index 100% rename from common/.config/rofi/config/runner.rasi rename to .config/rofi/config/runner.rasi diff --git a/common/.config/rofi/config/screenshot.rasi b/.config/rofi/config/screenshot.rasi similarity index 100% rename from common/.config/rofi/config/screenshot.rasi rename to .config/rofi/config/screenshot.rasi diff --git a/common/.config/stalonetrayrc b/.config/stalonetrayrc similarity index 100% rename from common/.config/stalonetrayrc rename to .config/stalonetrayrc diff --git a/common/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua similarity index 50% rename from common/.config/wezterm/wezterm.lua rename to .config/wezterm/wezterm.lua index da6cf04..46b0164 100644 --- a/common/.config/wezterm/wezterm.lua +++ b/.config/wezterm/wezterm.lua @@ -6,22 +6,27 @@ if wezterm.config_builder then config = wezterm.config_builder() end +local is_macos = wezterm.target_triple:find('darwin') ~= nil + +-- Shell โ€” fish via Homebrew on macOS, system fish on Linux +if is_macos then + config.default_prog = { '/opt/homebrew/bin/fish' } + config.set_environment_variables = { + PATH = '/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin', + } +else + config.default_prog = { '/usr/bin/fish' } + config.enable_wayland = true + config.kde_window_background_blur = true +end config.hide_tab_bar_if_only_one_tab = true -config.font = wezterm.font("Source Code Pro", { weight = "DemiBold" }) config.font_size = 10.0 -config.line_height = 1.2 - +config.line_height = 1.0 config.adjust_window_size_when_changing_font_size = false +config.animation_fps = 60 -config.color_scheme = 'Catppuccin Macchiato' - -config.enable_wayland = true -config.window_background_opacity = 0.60 -config.text_background_opacity = 0.80 - -config.macos_window_background_blur = 20 -config.kde_window_background_blur = true +config.color_scheme = 'Catppuccin Mocha' config.colors = { cursor_bg = '#c6a0f6', @@ -36,15 +41,11 @@ config.window_padding = { bottom = 0, } -config.default_prog = { "/usr/bin/zsh" } -config.line_height = 1 -config.animation_fps = 60 ---config.cursor_blink_ease_in = "Linear" ---config.cursor_blink_ease_out = "Linear" +if is_macos then + config.macos_window_background_blur = 70 +end config.keys = { - -- Turn off the default CMD-m Hide action, allowing CMD-m to - -- be potentially recognized and handled by the tab { key = 'Enter', mods = 'ALT', @@ -53,4 +54,3 @@ config.keys = { } return config - diff --git a/.gitignore b/.gitignore index d16b6de..243e653 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,7 @@ packer_compiled.lua +lazy-lock.json flameshot.ini - - - -# Added by cargo - +.config/nvim/lazy-lock.json +node_modules/ /target +.DS_Store diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 20e4656..0000000 --- a/.gitmodules +++ /dev/null @@ -1,21 +0,0 @@ -[submodule "common/.config/awesome/awesome-wm-widgets"] - path = common/.config/awesome/awesome-wm-widgets - url = https://github.com/streetturtle/awesome-wm-widgets/ -[submodule "common/.config/awesome/plugins/rubato"] - path = common/.config/awesome/plugins/rubato - url = https://github.com/andOrlando/rubato -[submodule "common/.config/awesome/json.lua"] - path = common/.config/awesome/json/ - url = https://github.com/rxi/json.lua -[submodule "common/.config/awesome/json"] - path = common/.config/awesome/json - url = https://github.com/rxi/json.lua -[submodule "common/.config/awesome/plugins/bling"] - path = common/.config/awesome/plugins/bling - url = https://github.com/BlingCorp/bling -[submodule "common/.config/awesome/plugins/nice"] - path = common/.config/awesome/plugins/nice - url = https://github.com/AlphaKeks/awesome-wm-nice -[submodule "common/.config/awesome/plugins/udisks2"] - path = common/.config/awesome/plugins/udisks2 - url = https://github.com/mireq/awesome-udisks2-mount diff --git a/common/.gtkrc-2.0 b/.gtkrc-2.0 similarity index 100% rename from common/.gtkrc-2.0 rename to .gtkrc-2.0 diff --git a/common/.local/share/rofi/themes/catppuccin-frappe.rasi b/.local/share/rofi/themes/catppuccin-frappe.rasi similarity index 100% rename from common/.local/share/rofi/themes/catppuccin-frappe.rasi rename to .local/share/rofi/themes/catppuccin-frappe.rasi diff --git a/common/.local/share/rofi/themes/catppuccin-latte.rasi b/.local/share/rofi/themes/catppuccin-latte.rasi similarity index 100% rename from common/.local/share/rofi/themes/catppuccin-latte.rasi rename to .local/share/rofi/themes/catppuccin-latte.rasi diff --git a/common/.local/share/rofi/themes/catppuccin-macchiato.rasi b/.local/share/rofi/themes/catppuccin-macchiato.rasi similarity index 100% rename from common/.local/share/rofi/themes/catppuccin-macchiato.rasi rename to .local/share/rofi/themes/catppuccin-macchiato.rasi diff --git a/common/.local/share/rofi/themes/catppuccin-mocha.rasi b/.local/share/rofi/themes/catppuccin-mocha.rasi similarity index 100% rename from common/.local/share/rofi/themes/catppuccin-mocha.rasi rename to .local/share/rofi/themes/catppuccin-mocha.rasi diff --git a/common/.oh-my-zsh/themes/ben.zsh-theme b/.oh-my-zsh/themes/ben.zsh-theme similarity index 100% rename from common/.oh-my-zsh/themes/ben.zsh-theme rename to .oh-my-zsh/themes/ben.zsh-theme diff --git a/common/.ssh/config b/.ssh/config similarity index 100% rename from common/.ssh/config rename to .ssh/config diff --git a/common/.tmux.conf b/.tmux.conf similarity index 69% rename from common/.tmux.conf rename to .tmux.conf index 281e569..303ad14 100644 --- a/common/.tmux.conf +++ b/.tmux.conf @@ -1,16 +1,17 @@ -set-option -g default-shell /bin/zsh - set -s extended-keys on set -as terminal-features 'xterm*:extkeys' set -ga terminal-overrides ",xterm*:Tc" set -sg escape-time 0 set -g history-limit 50000 -# fix tmux being a pain in the fucking ass and pass through C-CR to vim -#bind C-Enter send-keys -t $PANE_ID C-Enter +# Detect fish โ€” Homebrew on macOS, system on Linux +if-shell "test -x /opt/homebrew/bin/fish" \ + "set-option -g default-shell /opt/homebrew/bin/fish; set-option -g default-command /opt/homebrew/bin/fish" \ + "set-option -g default-shell /usr/bin/fish; set-option -g default-command /usr/bin/fish" + unbind C-Enter -# smart pane switching with awareness of vim splits +# smart pane switching bind h select-pane -L bind j select-pane -D bind k select-pane -U @@ -39,6 +40,6 @@ set -g pane-active-border-style "bg=default fg=#f5bde6" set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-continuum' set -g @resurrect-strategy-nvim 'session' +set -g @plugin 'tmux-plugins/tmux-yank' run '~/.tmux/plugins/tpm/tpm' - diff --git a/common/.vimrc b/.vimrc similarity index 100% rename from common/.vimrc rename to .vimrc diff --git a/common/.zshrc b/.zshrc similarity index 100% rename from common/.zshrc rename to .zshrc diff --git a/README.md b/README.md index 08c5d53..0440c45 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,18 @@ # Dotfiles -## Ben's Amazing Dotfile Installer +Mirrors `$HOME`. Symlinked via `bootstrap.sh`. -NOTE THIS ONLY WORKS IF THE USERNAME IS benk +``` +git clone git@github.com:benkyd/dotfiles.git ~/dotfiles +cd ~/dotfiles +./bootstrap.sh +``` -ALSO BEN NEEDS TO GET HIS NEOVIM CONFIG TO BOOTSTRAP ON A NEW MACHINE! - -It appears Ben doesn't want to do this, so this message should remain until he does. - -The only prerequisite for Ben's Amazing Dotfile Installer is to install nodejs - -`node bootstrap.js [--os[-o] ubuntu/arch] [--host[-h] host/laptop]` - -NOTE: This will install and set up everything but it will not source tmux for example, you must `I` in order to do that +The bootstrap script will: +1. Detect your OS (macOS or Arch Linux) +2. Optionally install packages (Homebrew on macOS, yay on Arch) +3. Install tmux plugin manager and fisher (fish plugin manager) +4. Symlink all dotfiles into `$HOME` (existing files backed up to `~/dotfiles.bak/`) +5. Optionally copy system configs from `etc/` to `/etc/` (with sudo, prompted) +Works on both macOS and Linux โ€” wezterm, tmux, and fish auto-detect the platform. diff --git a/add-dotfile.js b/add-dotfile.js deleted file mode 100644 index e69de29..0000000 diff --git a/arch-installer/.gitignore b/arch-installer/.gitignore deleted file mode 100644 index dc0d833..0000000 --- a/arch-installer/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -target/ - diff --git a/arch-installer/Cargo.lock b/arch-installer/Cargo.lock deleted file mode 100644 index ac70930..0000000 --- a/arch-installer/Cargo.lock +++ /dev/null @@ -1,7 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "arch-installer" -version = "0.1.0" diff --git a/arch-installer/Cargo.toml b/arch-installer/Cargo.toml deleted file mode 100644 index 7797480..0000000 --- a/arch-installer/Cargo.toml +++ /dev/null @@ -1,8 +0,0 @@ -[package] -name = "arch-installer" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] diff --git a/arch-installer/src/main.rs b/arch-installer/src/main.rs deleted file mode 100644 index c28cc10..0000000 --- a/arch-installer/src/main.rs +++ /dev/null @@ -1,5 +0,0 @@ - -fn main() { - println!("Hello, world!"); -} - diff --git a/arch-installer/target/.rustc_info.json b/arch-installer/target/.rustc_info.json deleted file mode 100644 index 2aaf194..0000000 --- a/arch-installer/target/.rustc_info.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc_fingerprint":4211202014750124613,"outputs":{"15729799797837862367":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/home/benk/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\noverflow_checks\npanic=\"unwind\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_has_atomic_equal_alignment=\"16\"\ntarget_has_atomic_equal_alignment=\"32\"\ntarget_has_atomic_equal_alignment=\"64\"\ntarget_has_atomic_equal_alignment=\"8\"\ntarget_has_atomic_equal_alignment=\"ptr\"\ntarget_has_atomic_load_store\ntarget_has_atomic_load_store=\"16\"\ntarget_has_atomic_load_store=\"32\"\ntarget_has_atomic_load_store=\"64\"\ntarget_has_atomic_load_store=\"8\"\ntarget_has_atomic_load_store=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_thread_local\ntarget_vendor=\"unknown\"\nunix\n","stderr":""},"14371922958718593042":{"success":true,"status":"","code":0,"stdout":"___\nlib___.rlib\nlib___.so\nlib___.so\nlib___.a\nlib___.so\n/home/benk/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu\noff\npacked\nunpacked\n___\ndebug_assertions\noverflow_checks\npanic=\"unwind\"\nproc_macro\ntarget_abi=\"\"\ntarget_arch=\"x86_64\"\ntarget_endian=\"little\"\ntarget_env=\"gnu\"\ntarget_family=\"unix\"\ntarget_feature=\"fxsr\"\ntarget_feature=\"sse\"\ntarget_feature=\"sse2\"\ntarget_has_atomic\ntarget_has_atomic=\"16\"\ntarget_has_atomic=\"32\"\ntarget_has_atomic=\"64\"\ntarget_has_atomic=\"8\"\ntarget_has_atomic=\"ptr\"\ntarget_has_atomic_equal_alignment=\"16\"\ntarget_has_atomic_equal_alignment=\"32\"\ntarget_has_atomic_equal_alignment=\"64\"\ntarget_has_atomic_equal_alignment=\"8\"\ntarget_has_atomic_equal_alignment=\"ptr\"\ntarget_has_atomic_load_store\ntarget_has_atomic_load_store=\"16\"\ntarget_has_atomic_load_store=\"32\"\ntarget_has_atomic_load_store=\"64\"\ntarget_has_atomic_load_store=\"8\"\ntarget_has_atomic_load_store=\"ptr\"\ntarget_os=\"linux\"\ntarget_pointer_width=\"64\"\ntarget_thread_local\ntarget_vendor=\"unknown\"\nunix\n","stderr":""},"4614504638168534921":{"success":true,"status":"","code":0,"stdout":"rustc 1.71.0-nightly (5ea3f0ae0 2023-05-23)\nbinary: rustc\ncommit-hash: 5ea3f0ae08c07472239a94ce55601e9b63eb1f45\ncommit-date: 2023-05-23\nhost: x86_64-unknown-linux-gnu\nrelease: 1.71.0-nightly\nLLVM version: 16.0.4\n","stderr":""}},"successes":{}} \ No newline at end of file diff --git a/arch-installer/target/CACHEDIR.TAG b/arch-installer/target/CACHEDIR.TAG deleted file mode 100644 index 20d7c31..0000000 --- a/arch-installer/target/CACHEDIR.TAG +++ /dev/null @@ -1,3 +0,0 @@ -Signature: 8a477f597d28d172789f06886806bc55 -# This file is a cache directory tag created by cargo. -# For information about cache directory tags see https://bford.info/cachedir/ diff --git a/arch-installer/target/debug/.cargo-lock b/arch-installer/target/debug/.cargo-lock deleted file mode 100644 index e69de29..0000000 diff --git a/arch-installer/target/debug/.fingerprint/arch-installer-056fe2d5dde1f706/bin-arch-installer b/arch-installer/target/debug/.fingerprint/arch-installer-056fe2d5dde1f706/bin-arch-installer deleted file mode 100644 index 155d329..0000000 --- a/arch-installer/target/debug/.fingerprint/arch-installer-056fe2d5dde1f706/bin-arch-installer +++ /dev/null @@ -1 +0,0 @@ -e59d1462709270be \ No newline at end of file diff --git a/arch-installer/target/debug/.fingerprint/arch-installer-056fe2d5dde1f706/bin-arch-installer.json b/arch-installer/target/debug/.fingerprint/arch-installer-056fe2d5dde1f706/bin-arch-installer.json deleted file mode 100644 index 0d597a1..0000000 --- a/arch-installer/target/debug/.fingerprint/arch-installer-056fe2d5dde1f706/bin-arch-installer.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc":4936231744503104448,"features":"[]","target":3400825955169654745,"profile":7309141686862299243,"path":1684066648322511884,"deps":[],"local":[{"CheckDepInfo":{"dep_info":"debug/.fingerprint/arch-installer-056fe2d5dde1f706/dep-bin-arch-installer"}}],"rustflags":[],"metadata":7797948686568424061,"config":2202906307356721367,"compile_kind":0} \ No newline at end of file diff --git a/arch-installer/target/debug/.fingerprint/arch-installer-056fe2d5dde1f706/dep-bin-arch-installer b/arch-installer/target/debug/.fingerprint/arch-installer-056fe2d5dde1f706/dep-bin-arch-installer deleted file mode 100644 index 5fdf103..0000000 Binary files a/arch-installer/target/debug/.fingerprint/arch-installer-056fe2d5dde1f706/dep-bin-arch-installer and /dev/null differ diff --git a/arch-installer/target/debug/.fingerprint/arch-installer-056fe2d5dde1f706/invoked.timestamp b/arch-installer/target/debug/.fingerprint/arch-installer-056fe2d5dde1f706/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/arch-installer/target/debug/.fingerprint/arch-installer-056fe2d5dde1f706/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/arch-installer/target/debug/.fingerprint/arch-installer-97c981ca69cc9ded/dep-test-bin-arch-installer b/arch-installer/target/debug/.fingerprint/arch-installer-97c981ca69cc9ded/dep-test-bin-arch-installer deleted file mode 100644 index 5fdf103..0000000 Binary files a/arch-installer/target/debug/.fingerprint/arch-installer-97c981ca69cc9ded/dep-test-bin-arch-installer and /dev/null differ diff --git a/arch-installer/target/debug/.fingerprint/arch-installer-97c981ca69cc9ded/invoked.timestamp b/arch-installer/target/debug/.fingerprint/arch-installer-97c981ca69cc9ded/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/arch-installer/target/debug/.fingerprint/arch-installer-97c981ca69cc9ded/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/arch-installer/target/debug/.fingerprint/arch-installer-97c981ca69cc9ded/test-bin-arch-installer b/arch-installer/target/debug/.fingerprint/arch-installer-97c981ca69cc9ded/test-bin-arch-installer deleted file mode 100644 index 1b9b4a4..0000000 --- a/arch-installer/target/debug/.fingerprint/arch-installer-97c981ca69cc9ded/test-bin-arch-installer +++ /dev/null @@ -1 +0,0 @@ -2cc37faa52debce5 \ No newline at end of file diff --git a/arch-installer/target/debug/.fingerprint/arch-installer-97c981ca69cc9ded/test-bin-arch-installer.json b/arch-installer/target/debug/.fingerprint/arch-installer-97c981ca69cc9ded/test-bin-arch-installer.json deleted file mode 100644 index 727f04b..0000000 --- a/arch-installer/target/debug/.fingerprint/arch-installer-97c981ca69cc9ded/test-bin-arch-installer.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc":4936231744503104448,"features":"[]","target":3400825955169654745,"profile":1021633075455700787,"path":1684066648322511884,"deps":[],"local":[{"CheckDepInfo":{"dep_info":"debug/.fingerprint/arch-installer-97c981ca69cc9ded/dep-test-bin-arch-installer"}}],"rustflags":[],"metadata":7797948686568424061,"config":2202906307356721367,"compile_kind":0} \ No newline at end of file diff --git a/arch-installer/target/debug/.fingerprint/arch-installer-c43bb0bd1c69f361/bin-arch-installer b/arch-installer/target/debug/.fingerprint/arch-installer-c43bb0bd1c69f361/bin-arch-installer deleted file mode 100644 index 2428d45..0000000 --- a/arch-installer/target/debug/.fingerprint/arch-installer-c43bb0bd1c69f361/bin-arch-installer +++ /dev/null @@ -1 +0,0 @@ -d3bf99b02c482e5f \ No newline at end of file diff --git a/arch-installer/target/debug/.fingerprint/arch-installer-c43bb0bd1c69f361/bin-arch-installer.json b/arch-installer/target/debug/.fingerprint/arch-installer-c43bb0bd1c69f361/bin-arch-installer.json deleted file mode 100644 index d96b0df..0000000 --- a/arch-installer/target/debug/.fingerprint/arch-installer-c43bb0bd1c69f361/bin-arch-installer.json +++ /dev/null @@ -1 +0,0 @@ -{"rustc":4936231744503104448,"features":"[]","target":3400825955169654745,"profile":9251013656241001069,"path":1684066648322511884,"deps":[],"local":[{"CheckDepInfo":{"dep_info":"debug/.fingerprint/arch-installer-c43bb0bd1c69f361/dep-bin-arch-installer"}}],"rustflags":[],"metadata":7797948686568424061,"config":2202906307356721367,"compile_kind":0} \ No newline at end of file diff --git a/arch-installer/target/debug/.fingerprint/arch-installer-c43bb0bd1c69f361/dep-bin-arch-installer b/arch-installer/target/debug/.fingerprint/arch-installer-c43bb0bd1c69f361/dep-bin-arch-installer deleted file mode 100644 index 5fdf103..0000000 Binary files a/arch-installer/target/debug/.fingerprint/arch-installer-c43bb0bd1c69f361/dep-bin-arch-installer and /dev/null differ diff --git a/arch-installer/target/debug/.fingerprint/arch-installer-c43bb0bd1c69f361/invoked.timestamp b/arch-installer/target/debug/.fingerprint/arch-installer-c43bb0bd1c69f361/invoked.timestamp deleted file mode 100644 index e00328d..0000000 --- a/arch-installer/target/debug/.fingerprint/arch-installer-c43bb0bd1c69f361/invoked.timestamp +++ /dev/null @@ -1 +0,0 @@ -This file has an mtime of when this was started. \ No newline at end of file diff --git a/arch-installer/target/debug/arch-installer b/arch-installer/target/debug/arch-installer deleted file mode 100755 index e0e3904..0000000 Binary files a/arch-installer/target/debug/arch-installer and /dev/null differ diff --git a/arch-installer/target/debug/arch-installer.d b/arch-installer/target/debug/arch-installer.d deleted file mode 100644 index a5ecfad..0000000 --- a/arch-installer/target/debug/arch-installer.d +++ /dev/null @@ -1 +0,0 @@ -/home/benk/dotfiles/arch-installer/target/debug/arch-installer: /home/benk/dotfiles/arch-installer/src/main.rs diff --git a/arch-installer/target/debug/deps/arch_installer-056fe2d5dde1f706.d b/arch-installer/target/debug/deps/arch_installer-056fe2d5dde1f706.d deleted file mode 100644 index ac43295..0000000 --- a/arch-installer/target/debug/deps/arch_installer-056fe2d5dde1f706.d +++ /dev/null @@ -1,5 +0,0 @@ -/home/benk/dotfiles/arch-installer/target/debug/deps/arch_installer-056fe2d5dde1f706.rmeta: src/main.rs - -/home/benk/dotfiles/arch-installer/target/debug/deps/arch_installer-056fe2d5dde1f706.d: src/main.rs - -src/main.rs: diff --git a/arch-installer/target/debug/deps/arch_installer-97c981ca69cc9ded.d b/arch-installer/target/debug/deps/arch_installer-97c981ca69cc9ded.d deleted file mode 100644 index abfdc69..0000000 --- a/arch-installer/target/debug/deps/arch_installer-97c981ca69cc9ded.d +++ /dev/null @@ -1,5 +0,0 @@ -/home/benk/dotfiles/arch-installer/target/debug/deps/arch_installer-97c981ca69cc9ded.rmeta: src/main.rs - -/home/benk/dotfiles/arch-installer/target/debug/deps/arch_installer-97c981ca69cc9ded.d: src/main.rs - -src/main.rs: diff --git a/arch-installer/target/debug/deps/arch_installer-c43bb0bd1c69f361 b/arch-installer/target/debug/deps/arch_installer-c43bb0bd1c69f361 deleted file mode 100755 index e0e3904..0000000 Binary files a/arch-installer/target/debug/deps/arch_installer-c43bb0bd1c69f361 and /dev/null differ diff --git a/arch-installer/target/debug/deps/arch_installer-c43bb0bd1c69f361.d b/arch-installer/target/debug/deps/arch_installer-c43bb0bd1c69f361.d deleted file mode 100644 index a0076a6..0000000 --- a/arch-installer/target/debug/deps/arch_installer-c43bb0bd1c69f361.d +++ /dev/null @@ -1,5 +0,0 @@ -/home/benk/dotfiles/arch-installer/target/debug/deps/arch_installer-c43bb0bd1c69f361: src/main.rs - -/home/benk/dotfiles/arch-installer/target/debug/deps/arch_installer-c43bb0bd1c69f361.d: src/main.rs - -src/main.rs: diff --git a/arch-installer/target/debug/deps/libarch_installer-056fe2d5dde1f706.rmeta b/arch-installer/target/debug/deps/libarch_installer-056fe2d5dde1f706.rmeta deleted file mode 100644 index e69de29..0000000 diff --git a/arch-installer/target/debug/deps/libarch_installer-97c981ca69cc9ded.rmeta b/arch-installer/target/debug/deps/libarch_installer-97c981ca69cc9ded.rmeta deleted file mode 100644 index e69de29..0000000 diff --git a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/2e5ztlcoqibf0q65.o b/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/2e5ztlcoqibf0q65.o deleted file mode 100644 index fa7c69c..0000000 Binary files a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/2e5ztlcoqibf0q65.o and /dev/null differ diff --git a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/3331bjb970tjf07c.o b/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/3331bjb970tjf07c.o deleted file mode 100644 index 9b1caa0..0000000 Binary files a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/3331bjb970tjf07c.o and /dev/null differ diff --git a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/3dc01pt0616ej9bq.o b/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/3dc01pt0616ej9bq.o deleted file mode 100644 index a39b300..0000000 Binary files a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/3dc01pt0616ej9bq.o and /dev/null differ diff --git a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/4oj29l4wg7nioh63.o b/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/4oj29l4wg7nioh63.o deleted file mode 100644 index 7cfdb46..0000000 Binary files a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/4oj29l4wg7nioh63.o and /dev/null differ diff --git a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/4r3moqv5dsjx1wnq.o b/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/4r3moqv5dsjx1wnq.o deleted file mode 100644 index 54d0d29..0000000 Binary files a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/4r3moqv5dsjx1wnq.o and /dev/null differ diff --git a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/589fmzqkhoptymio.o b/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/589fmzqkhoptymio.o deleted file mode 100644 index 3fb28ae..0000000 Binary files a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/589fmzqkhoptymio.o and /dev/null differ diff --git a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/dep-graph.bin b/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/dep-graph.bin deleted file mode 100644 index b0c6d2b..0000000 Binary files a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/dep-graph.bin and /dev/null differ diff --git a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/query-cache.bin b/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/query-cache.bin deleted file mode 100644 index 2998bbd..0000000 Binary files a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/query-cache.bin and /dev/null differ diff --git a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/work-products.bin b/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/work-products.bin deleted file mode 100644 index 5b936f0..0000000 Binary files a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn-2e12n325draq7/work-products.bin and /dev/null differ diff --git a/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn.lock b/arch-installer/target/debug/incremental/arch_installer-12r6z9wzrhjrs/s-gkqtbb1c7s-4kisxn.lock deleted file mode 100644 index e69de29..0000000 diff --git a/arch-installer/target/debug/incremental/arch_installer-1pniyh95mkkkh/s-gkqux70b73-lngkcu-1ordsk72ibb81/dep-graph.bin b/arch-installer/target/debug/incremental/arch_installer-1pniyh95mkkkh/s-gkqux70b73-lngkcu-1ordsk72ibb81/dep-graph.bin deleted file mode 100644 index 2d1099f..0000000 Binary files a/arch-installer/target/debug/incremental/arch_installer-1pniyh95mkkkh/s-gkqux70b73-lngkcu-1ordsk72ibb81/dep-graph.bin and /dev/null differ diff --git a/arch-installer/target/debug/incremental/arch_installer-1pniyh95mkkkh/s-gkqux70b73-lngkcu-1ordsk72ibb81/query-cache.bin b/arch-installer/target/debug/incremental/arch_installer-1pniyh95mkkkh/s-gkqux70b73-lngkcu-1ordsk72ibb81/query-cache.bin deleted file mode 100644 index 652b63f..0000000 Binary files a/arch-installer/target/debug/incremental/arch_installer-1pniyh95mkkkh/s-gkqux70b73-lngkcu-1ordsk72ibb81/query-cache.bin and /dev/null differ diff --git a/arch-installer/target/debug/incremental/arch_installer-1pniyh95mkkkh/s-gkqux70b73-lngkcu-1ordsk72ibb81/work-products.bin b/arch-installer/target/debug/incremental/arch_installer-1pniyh95mkkkh/s-gkqux70b73-lngkcu-1ordsk72ibb81/work-products.bin deleted file mode 100644 index 894946b..0000000 Binary files a/arch-installer/target/debug/incremental/arch_installer-1pniyh95mkkkh/s-gkqux70b73-lngkcu-1ordsk72ibb81/work-products.bin and /dev/null differ diff --git a/arch-installer/target/debug/incremental/arch_installer-1pniyh95mkkkh/s-gkqux70b73-lngkcu.lock b/arch-installer/target/debug/incremental/arch_installer-1pniyh95mkkkh/s-gkqux70b73-lngkcu.lock deleted file mode 100644 index e69de29..0000000 diff --git a/arch-installer/target/debug/incremental/arch_installer-vt3m7qp53dvi/s-gkqux70bhr-1pn0yxz-19r9pg6v9a4uo/dep-graph.bin b/arch-installer/target/debug/incremental/arch_installer-vt3m7qp53dvi/s-gkqux70bhr-1pn0yxz-19r9pg6v9a4uo/dep-graph.bin deleted file mode 100644 index e7611a9..0000000 Binary files a/arch-installer/target/debug/incremental/arch_installer-vt3m7qp53dvi/s-gkqux70bhr-1pn0yxz-19r9pg6v9a4uo/dep-graph.bin and /dev/null differ diff --git a/arch-installer/target/debug/incremental/arch_installer-vt3m7qp53dvi/s-gkqux70bhr-1pn0yxz-19r9pg6v9a4uo/query-cache.bin b/arch-installer/target/debug/incremental/arch_installer-vt3m7qp53dvi/s-gkqux70bhr-1pn0yxz-19r9pg6v9a4uo/query-cache.bin deleted file mode 100644 index 9fc7a5e..0000000 Binary files a/arch-installer/target/debug/incremental/arch_installer-vt3m7qp53dvi/s-gkqux70bhr-1pn0yxz-19r9pg6v9a4uo/query-cache.bin and /dev/null differ diff --git a/arch-installer/target/debug/incremental/arch_installer-vt3m7qp53dvi/s-gkqux70bhr-1pn0yxz-19r9pg6v9a4uo/work-products.bin b/arch-installer/target/debug/incremental/arch_installer-vt3m7qp53dvi/s-gkqux70bhr-1pn0yxz-19r9pg6v9a4uo/work-products.bin deleted file mode 100644 index 894946b..0000000 Binary files a/arch-installer/target/debug/incremental/arch_installer-vt3m7qp53dvi/s-gkqux70bhr-1pn0yxz-19r9pg6v9a4uo/work-products.bin and /dev/null differ diff --git a/arch-installer/target/debug/incremental/arch_installer-vt3m7qp53dvi/s-gkqux70bhr-1pn0yxz.lock b/arch-installer/target/debug/incremental/arch_installer-vt3m7qp53dvi/s-gkqux70bhr-1pn0yxz.lock deleted file mode 100644 index e69de29..0000000 diff --git a/arch.os b/arch.os deleted file mode 100755 index 1118805..0000000 --- a/arch.os +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -# -# Dev utilsv -yay -S neovim-git nvm wezterm ranger ripgrep zsh zsh-vi-mode curl exa -sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" - -# WM Deps -yay -S awesome-git i3 betterlockscreen polybar-git eww xss-lock ttf-material-design-icons ttf-unifont polybar -yay -S picom-ftlabs-git dunst alternating-layouts-git stalonetray -yay -S i3exit arc-icon-theme ttf-twemoji xorg-xbacklight xidlehook sysstat i3blocks mpris-ctl flameshot perl rofi -yay -S ttf-dejavu-nerd - -# Tmux -yay -S tmux -git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm -tmux source ~/.tmux.conf - -git clone https://gist.github.com/fa6258f3ff7b17747ee3.git -cd ./fa6258f3ff7b17747ee3 -chmod +x sp -# This widget will work by default if the binary is in the system PATH -sudo cp ./sp /usr/local/bin/ - -# Audio -yay -S pulseaudio-equalizer-ladspa mpris-ctl - diff --git a/archinstall-creds.json b/archinstall-creds.json deleted file mode 100644 index 181a2b6..0000000 --- a/archinstall-creds.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "!root-password": "password", - "!superusers": { - "root": { "!password": "password" }, - "benk": { "!password": "password" } - }, - "!users": { - "benk": { "!password": "password" } - } -} diff --git a/archinstall.json b/archinstall.json deleted file mode 100644 index 970cefd..0000000 --- a/archinstall.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "audio": "pulseaudio", - "bootloader": "grub-install", - "custom-commands": [ - ], - "filesystem": "ext4", - "gfx_driver": "Intel (open-source)", - "swap": true, - "hostname": "benk", - "kernels": [ - "linux" - ], - "keyboard-language": "uk", - "mirror-region": "United Kingdom", - "nic": { - "NetworkManager": true - }, - "ntp": true, - "packages": [ - "yay" - ], - "services": [ - ], - "sys-encoding": "utf-8", - "sys-language": "en_GB", - "timezone": "Europe/London" -} diff --git a/archpackages.json b/archpackages.json deleted file mode 100644 index e7f8236..0000000 --- a/archpackages.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "packages": [ - "fakeroot", - "sudo", - "vim", - "man", - "man-db", - "yay", - "git", - "wget", - "curl", - "zsh", - "zsh-vi-mode", - "base-devel", - "rust-git", - "cmake-git", - "exa", - "bluez", - "bluez-utils", - "blueman", - "wireless_tools", - "wpa_supplicant", - "gparted", - "network-manager-applet-git", - "xfce4-power-manager", - "volumeicon", - "pulseaudio-equalizer-ladspa", - "neovim-git", - "mpris-cli", - "wezterm", - "tmux", - "ranger", - "xorg-server", - "xorg-xbacklight", - "xidlehook", - "lightdm", - "lightdm-gtk-greeter", - "awesome-git", - "picom-git", - "i3lock-git", - "i3exit", - "arc-icon-theme", - "ttf-dejavu-sans-mono-powerline-git", - "flameshot", - "rofi", - "google-chrome-unstable", - "darktable-git", - "ktira" - ] -} diff --git a/bootstrap.js b/bootstrap.js deleted file mode 100755 index ec5ac9e..0000000 --- a/bootstrap.js +++ /dev/null @@ -1,155 +0,0 @@ -// Ben's amazing dotfiles installer! -// it would be super cool if it did stuff like notice a new hostname -// and respond by backing up the current dotfiles in a new host file -// TODO: -// - Util scripts to add dotfiles -// - this could even be extended to auto profile the host & move -// stuff accordingly -// - .zshrc, .profile etc should create a new file and append -// "source .zshrc.laptop" to the current one, in order to not mess -// up specific environments -// -// FEATURES: -// - Backup current dotfiles to dotfiles.bak/ -// - Create symlinks between dotfiles and the actual dotfiles - -import fs from 'fs'; -import { readdir } from 'fs/promises'; -import opsys from 'os'; -import path from 'path'; -import { parseArgs } from 'node:util'; -import subProcess from 'child_process'; - -const HOME = opsys.homedir() + '/'; - -const VERSION_MAJOR = 1; -const VERSION_MINOR = 0; -const VERSION_PATCH = 1; - -console.log('Ben\'s amazing dotfiles installer!'); -console.log(`Version v${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}`); - -const { - values: { - host, os - } -} = parseArgs({ - options: { - host: { - type: 'string', - short: 'h', - }, - os: { - type: 'string', - short: 'o', - }, - }, -}); - -const panic = (error) => { - console.error('Error: ' + error); - console.error('usage: bootstrap -h -o '); - process.exit(0); -} - -if (!host) { - panic('Incorrect usage'); -} - -if (os) { - // check we have the host - const dir = fs.readdirSync('.', { withFileTypes: true }).filter(d => d.isDirectory() && !d.name.startsWith('.')).map(d => d.name); - if (!dir.includes(host)) { - panic(`Host ${host} does not exist`); - } - - // install the packages that the dotfiles need to function properly - const targetInstallScript = os + '.os'; - const installScripts = fs.readdirSync('.').filter(f => f.endsWith('.os')); - if (!installScripts.includes(targetInstallScript)) { - panic(`OS ${os} does not exist`); - } - - console.log('Installing dependencies...'); - subProcess.spawnSync('./' + targetInstallScript, [], { - stdio: 'inherit', - }); - - console.log('Successfully installed OS deps...'); -} - -// we want to create a symlink between common/ & {host}/ to ~/ -// for every file stored in this repo, so we need -// to create a .bak/ of the origionals as this might -// well cause some issues... - -const deepReadDir = async (dirPath) => await Promise.all( - (await readdir(dirPath, {withFileTypes: true})).map(async (dirent) => { - const currentPath = path.join(dirPath, dirent.name) - return dirent.isDirectory() ? await deepReadDir(currentPath) : currentPath; - }), -) - -const parentDir = 'common/'; -const childDir = host + '/'; -const basePaths = (await deepReadDir(parentDir)).flat(999); -const childPaths = (await deepReadDir(childDir)).flat(999); - -// start by making the backup -const backupDir = HOME + 'dotfiles.bak/'; // TODO: make this a cmd option -console.log(`Backing up current dotfiles to ${backupDir}`); - -// delete current backupDir first, we might want to warn the user of this Y/n -if (fs.existsSync(backupDir)) - fs.rmSync(backupDir, { recursive: true }); -if (!fs.existsSync(backupDir)) - fs.mkdirSync(backupDir); - -const anonBasePaths = basePaths.map(e => e.split('/').slice(1).join('/')); -const anonChildPaths = childPaths.map(e => e.split('/').slice(1).join('/')); -const allAnonPaths = Array.from(new Set(anonBasePaths.concat(anonChildPaths))); - -for (const path of allAnonPaths) { - const copyTarget = HOME + path; - if (!fs.existsSync(copyTarget)) { - console.log(`Not backing up ${copyTarget}... it does not exist...`); - continue; - } - - const backupTarget = backupDir + path; - const backupTargetDir = backupTarget.substring(0, backupTarget.lastIndexOf('/') + 1); - - console.log(`Moving ${copyTarget} to ${backupTarget}`); - if (!fs.existsSync(backupTargetDir)) { - console.log(`${backupTargetDir} does not exist... creating`); - fs.mkdirSync(backupTargetDir, { recursive: true }); - } - fs.copyFileSync(copyTarget, backupTarget); -} - -// we prioritise targetDir over parentDir -// we first need to make a list that includes both the -// base and childPaths without the base if child exists -let symLinks = basePaths.filter(e => { - return !anonChildPaths.includes(e.split('/').slice(1).join('/')) -}); -symLinks = symLinks.concat(childPaths); - -for (const symLink of symLinks) { - const targetSymLink = HOME + (symLink.split('/').slice(1).join('/')) - const sourceSymLink = process.cwd() + '/' + symLink; - console.log(`Creating symlink between ${sourceSymLink} to ${targetSymLink}`); - - if (!fs.existsSync(targetSymLink.substring(0, targetSymLink.lastIndexOf('/')))) { - fs.mkdirSync(targetSymLink.substring(0, targetSymLink.lastIndexOf('/')), { recursive: true }); - } - - if (fs.existsSync(targetSymLink)) { - fs.rmSync(targetSymLink); - } - - fs.symlinkSync(sourceSymLink, targetSymLink); -} - -console.log('Done!'); - diff --git a/bootstrap.sh b/bootstrap.sh new file mode 100755 index 0000000..9e28650 --- /dev/null +++ b/bootstrap.sh @@ -0,0 +1,160 @@ +#!/usr/bin/env bash +set -euo pipefail + +DOTFILES_DIR="$(cd "$(dirname "$0")" && pwd)" +HOME_DIR="$HOME" +BACKUP_DIR="$HOME/dotfiles.bak" + +echo "Ben's dotfiles" +echo "==============" +echo "Dotfiles dir: $DOTFILES_DIR" +echo "Home dir: $HOME_DIR" +echo "" + +# --- Detect OS --- +OS="unknown" +if [[ "$(uname)" == "Darwin" ]]; then + OS="macos" +elif [[ -f /etc/arch-release ]]; then + OS="arch" +elif [[ -f /etc/os-release ]]; then + OS="linux" +fi +echo "Detected OS: $OS" +echo "" + +# --- Package installation --- +install_packages() { + case "$OS" in + macos) + if ! command -v brew &>/dev/null; then + echo "==> Installing Homebrew..." + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + eval "$(/opt/homebrew/bin/brew shellenv)" + fi + echo "==> Installing packages via brew..." + xargs brew install < "$DOTFILES_DIR/packages/brew.txt" + ;; + arch) + if ! command -v yay &>/dev/null; then + echo "==> Installing yay..." + sudo pacman -S --needed --noconfirm git base-devel + tmpdir=$(mktemp -d) + git clone https://aur.archlinux.org/yay.git "$tmpdir/yay" + cd "$tmpdir/yay" && makepkg -si --noconfirm + cd "$DOTFILES_DIR" + rm -rf "$tmpdir" + fi + echo "==> Installing packages via yay..." + xargs yay -S --needed --noconfirm < "$DOTFILES_DIR/packages/arch.txt" + ;; + *) + echo " Unknown OS, skipping package install." + echo " Install packages manually from packages/*.txt" + ;; + esac +} + +read -p "Install packages? [y/N] " -n 1 -r +echo "" +if [[ $REPLY =~ ^[Yy]$ ]]; then + install_packages +fi +echo "" + +# --- tmux plugin manager --- +if [ ! -d "$HOME/.tmux/plugins/tpm" ]; then + echo "==> Installing tmux plugin manager..." + git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm + echo " Done. Run I in tmux to install plugins." + echo "" +fi + +# --- fish plugin manager --- +if command -v fish &>/dev/null; then + if ! fish -c "type -q fisher" 2>/dev/null; then + echo "==> Installing fisher (fish plugin manager)..." + fish -c "curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher" + echo "" + fi +fi + +# --- $HOME symlinks --- +echo "==> Symlinking home files..." + +find "$DOTFILES_DIR" -maxdepth 1 -name '.*' -not -name '.git' -not -name '.gitignore' -not -name '.gitmodules' | while read -r src; do + item="$(basename "$src")" + dst="$HOME_DIR/$item" + + if [ -L "$dst" ] && [ "$(readlink "$dst")" = "$src" ]; then + echo " ok $item" + continue + fi + + if [ -e "$dst" ] || [ -L "$dst" ]; then + backup="$BACKUP_DIR/$item" + mkdir -p "$(dirname "$backup")" + mv "$dst" "$backup" + echo " bak $item -> dotfiles.bak/$item" + fi + + ln -s "$src" "$dst" + echo " ln $item" +done + +if [ -d "$DOTFILES_DIR/pictures" ]; then + dst="$HOME_DIR/pictures" + src="$DOTFILES_DIR/pictures" + if [ -L "$dst" ] && [ "$(readlink "$dst")" = "$src" ]; then + echo " ok pictures" + else + if [ -e "$dst" ] || [ -L "$dst" ]; then + mv "$dst" "$BACKUP_DIR/pictures" + echo " bak pictures -> dotfiles.bak/pictures" + fi + ln -s "$src" "$dst" + echo " ln pictures" + fi +fi + +echo "" + +# --- /etc copies --- +if [ -d "$DOTFILES_DIR/etc" ]; then + etc_files=$(find "$DOTFILES_DIR/etc" -type f 2>/dev/null) + if [ -n "$etc_files" ]; then + echo "==> System config files found in etc/" + + echo "$etc_files" | while read -r src; do + rel="${src#$DOTFILES_DIR/}" + echo " /$rel" + done + + echo "" + read -p "Copy system configs to /etc? This requires sudo. [y/N] " -n 1 -r + echo "" + + if [[ $REPLY =~ ^[Yy]$ ]]; then + echo "$etc_files" | while read -r src; do + rel="${src#$DOTFILES_DIR/}" + dst="/$rel" + + if [ -f "$dst" ]; then + backup="$BACKUP_DIR/$rel" + sudo mkdir -p "$(dirname "$backup")" + sudo cp "$dst" "$backup" + echo " bak /$rel -> dotfiles.bak/$rel" + fi + + sudo mkdir -p "$(dirname "$dst")" + sudo cp "$src" "$dst" + echo " cp $rel" + done + else + echo " Skipped." + fi + fi +fi + +echo "" +echo "Done. Backup at ~/dotfiles.bak/ (if anything was moved)" diff --git a/common/.config/awesome/awesome-wm-widgets b/common/.config/awesome/awesome-wm-widgets deleted file mode 160000 index c8388f4..0000000 --- a/common/.config/awesome/awesome-wm-widgets +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c8388f484e72c8eaef2d9562b2dc1ff293518782 diff --git a/common/.config/awesome/json b/common/.config/awesome/json deleted file mode 160000 index dbf4b2d..0000000 --- a/common/.config/awesome/json +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dbf4b2dd2eb7c23be2773c89eb059dadd6436f94 diff --git a/common/.config/awesome/plugins/bling b/common/.config/awesome/plugins/bling deleted file mode 160000 index 6779170..0000000 --- a/common/.config/awesome/plugins/bling +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 677917056d118d02feaa5c21ecf5a50375ef123d diff --git a/common/.config/awesome/plugins/nice b/common/.config/awesome/plugins/nice deleted file mode 160000 index 34862a3..0000000 --- a/common/.config/awesome/plugins/nice +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 34862a301cb3bec3819b4633b79d1fbde33388b6 diff --git a/common/.config/awesome/plugins/rubato b/common/.config/awesome/plugins/rubato deleted file mode 160000 index a918170..0000000 --- a/common/.config/awesome/plugins/rubato +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a9181708863265eb4a36c722f664978ee50fe8a0 diff --git a/common/.config/awesome/plugins/udisks2 b/common/.config/awesome/plugins/udisks2 deleted file mode 160000 index 55301d1..0000000 --- a/common/.config/awesome/plugins/udisks2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 55301d16e25aecd938c2b476924ac4af81a7eab0 diff --git a/common/.config/nvim/lua/lsp-general.lua b/common/.config/nvim/lua/lsp-general.lua deleted file mode 100644 index fcee30c..0000000 --- a/common/.config/nvim/lua/lsp-general.lua +++ /dev/null @@ -1,274 +0,0 @@ -local lsp = require('lsp-zero'); -local cmp = require('cmp') -local luasnip = require('luasnip') -local dap = require('dap') -local dapui = require('dapui') - -dap.configurations = { - cpp = { - { - name = "Launch", - type = "codelldb", - request = "launch", - program = function() - return vim.fn.input('Path to executable: ', vim.fn.getcwd() .. '/build/', 'file') - end, - cwd = '${workspaceFolder}', - stopOnEntry = true, - }, - }, -} - -dap.adapters.codelldb = { - type = 'server', - port = '13000', - host = '127.0.0.1', - executable = { - command = vim.fn.stdpath('data') .. '/mason/bin/codelldb', - args = {"--port", "13000"} - } -} - -dapui.setup({ - icons = { expanded = "โžก๏ธ", collapsed = "โฌ‡๏ธ" }, - mappings = { - open = "o", - remove = "d", - edit = "e", - repl = "r", - toggle = "t", - }, - expand_lines = vim.fn.has("nvim-0.7"), - layouts = { - { - elements = { - "scopes", - "stacks", - "watches" - }, - size = 0.17, - position = "left" - }, - { - elements = { - "repl", - "console", - "breakpoints", - }, - size = 0.15, - position = "bottom", - }, - }, - floating = { - max_height = nil, - max_width = nil, - border = "single", - mappings = { - close = { "q", "" }, - }, - }, - windows = { indent = 1 }, - render = { - max_type_length = nil, - }, -}) - -dap.listeners.after.event_initialized["dapui_config"]=function() - dapui.open() -end -dap.listeners.before.event_terminated["dapui_config"]=function() - dapui.close() -end -dap.listeners.before.event_exited["dapui_config"]=function() - dapui.close() -end -vim.keymap.set("n", "ds", function() - dap.continue() - dapui.toggle({}) -end) -vim.keymap.set("n", "de", function() - dapui.toggle({}) - dap.terminate() - require("notify")("Debugger session ended", "warn") -end) -vim.keymap.set("n", "dC", function() - require('dap').clear_breakpoints() - require("notify")("Cleared breakpoints", "warn") -end) -vim.fn.sign_define('DapBreakpoint',{ text ='๐Ÿ”ด', texthl ='', linehl ='', numhl =''}) -vim.fn.sign_define('DapStopped',{ text ='โ–ถ๏ธ', texthl ='', linehl ='', numhl =''}) - -lsp.configure('clangd', { - capabilities = { - offsetEncoding = { "utf-16" } - } -}) - --- lsp.setup_nvim_cmp({ --- preselect = require('cmp').PreselectMode.None, --- completion = { --- completeopt = 'menu,menuone,noinsert,noselect' --- }, --- mapping = cmp_mappings, --- }) - -lsp.on_attach(function(client, bufnr) - local opts = { buffer = bufnr } - vim.keymap.set('n', 'gD', 'lua vim.lsp.buf.definition()', opts) - vim.keymap.set('n', 'gT', 'lua vim.lsp.buf.type_definition()', opts) - vim.keymap.set('n', 'gR', 'lua vim.lsp.buf.references()', opts) - - -- diagnostics - vim.keymap.set('n', 'gn', 'lua vim.diagnostic.goto_next()', opts) - vim.keymap.set('n', 'gN', 'lua vim.diagnostic.goto_prev()', opts) - - -- action & rename - vim.keymap.set('n', '', 'Lspsaga code_action', opts) - vim.keymap.set('n', 'gr', 'Lspsaga rename', opts) - - -- overwrite the defaults - vim.keymap.set('n', 'gi', 'lua vim.lsp.buf.implementation()', opts) - vim.keymap.set('n', 'K', 'Lspsaga hover_doc', opts) - - -- jump forward/backward up/down the call list - vim.keymap.set('n', 'gI', 'Lspsaga incoming_calls', opts) - vim.keymap.set('n', 'gO', 'Lspsaga outgoing_calls', opts) - - -- Sexy LSP - vim.keymap.set('n', 'gd', 'Lspsaga peek_definition', opts) - vim.keymap.set('n', 'gt', 'Lspsaga peek_type_definition', opts) - vim.keymap.set('n', 'gr', 'Lspsaga lsp_finder', opts) - - -- CLANGFORMATTTTT - vim.keymap.set('n', 'gf', 'lua vim.lsp.buf.format()', opts) - vim.keymap.set('n', 'gg', 'ClangdSwitchSourceHeader', opts) - vim.keymap.set('n', 'gw', 'StripWhitespace', opts) -end) - - -lsp.setup() - -local cmp_kinds = { - Text = "๏’ž", - Method = "๏šฆ", - Function = "๏ž”", - Constructor = "๏ฅ", - Field = "๏ดฒ", - Variable = "๎œ–", - Class = "๏ –", - Interface = "๏ฐฎ", - Module = "๏™จ", - Property = "๏ชถ", - Unit = "๏‘ต", - Value = "๏ขŸ", - Enum = "๏ฉ—", - Keyword = "๏ Š", - Snippet = "๏ƒ„", - Color = "๏ฃ—", - File = "๏œ“", - Reference = "๏œœ", - Folder = "๏Š", - EnumMember = "๏…", - Constant = "๏ฒ€", - Struct = "๏ณค", - Event = "๏ƒง", - Operator = "๏—ซ", - TypeParameter = "๏žƒ" -} - - -require('mason').setup({}) -require('mason-lspconfig').setup({ - handlers = { - lsp.default_setup, - }, -}) - -cmp.setup({ - sources = { - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - { name = 'buffer' }, - { name = 'path' }, - }, - window = { - completion = cmp.config.window.bordered(), - documentation = cmp.config.window.bordered() - }, - completion = { - completeopt = "menu,menuone,preview,noselect", - }, - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - formatting = { - fields = { "kind", "abbr", "menu" }, - format = function(entry, vim_item) - vim_item.menu = ({ - buffer = "๏œ“", - nvim_lsp = "๏ฅ", - })[entry.source.name] - local kind = vim_item.kind - vim_item.kind = " " .. (cmp_kinds[kind] or "?") .. "" - local source = entry.source.name - vim_item.menu = "[" .. source .. "]" - return vim_item - end, - }, - sorting = { - priority_weight = 1.0, - }, - matching = { - disallow_fuzzy_matching = true, - disallow_fullfuzzy_matching = true, - disallow_partial_fuzzy_matching = true, - disallow_partial_matching = false, - disallow_prefix_unmatching = true, - }, - performance = { - max_view_entries = 20, - }, - mapping = { - [""] = cmp.mapping(function(fallback) - if (cmp.visible()) then - cmp.select_next_item(cmp_mode) - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - else - fallback() - end - cmp.mapping.select_next_item(cmp_mode) - end, { 'i', 's' }), - [""] = cmp.mapping.select_prev_item(cmp_mode), - [""] = nil, - [""] = nil - }, -}) - -cmp.setup.cmdline('/', { - sources = { - { name = 'buffer' } - } -}) - -cmp.setup.cmdline(':', { - sources = cmp.config.sources({ - { name = 'path' } - }, { - { name = 'cmdline' } - }) -}) - -vim.api.nvim_set_hl(0, "CmpItemMenu", { italic = true }) -vim.diagnostic.config({ - virtual_text = true, - signs = { - [vim.diagnostic.severity.ERROR] = '๏—', - [vim.diagnostic.severity.WARN] = '๏ฑ', - [vim.diagnostic.severity.HINT] = '๏ ต', - [vim.diagnostic.severity.INFO] = '๏š' - } -}) - diff --git a/common/.config/nvim/lua/lsp-server-config/lua.lua b/common/.config/nvim/lua/lsp-server-config/lua.lua deleted file mode 100644 index ca99ab5..0000000 --- a/common/.config/nvim/lua/lsp-server-config/lua.lua +++ /dev/null @@ -1,18 +0,0 @@ -local opts = { - settings = { - Lua = { - diagnostics = { - globals = { "vim" }, - }, - workspace = { - library = { - [vim.fn.expand "$VIMRUNTIME/lua"] = true, - [vim.fn.expand "$VIMRUNTIME/lua/vim/lsp"] = true, - }, - maxPreload = 100000, - preloadFileSize = 10000, - }, - }, - }, -} -return opts diff --git a/common/.config/nvim/lua/plugin-config/dressing.lua b/common/.config/nvim/lua/plugin-config/dressing.lua deleted file mode 100644 index 5927678..0000000 --- a/common/.config/nvim/lua/plugin-config/dressing.lua +++ /dev/null @@ -1,159 +0,0 @@ -require('dressing').setup({ - input = { - -- Set to false to disable the vim.ui.input implementation - enabled = true, - - -- Default prompt string - default_prompt = "Input:", - - -- Can be 'left', 'right', or 'center' - prompt_align = "center", - - -- When true, will close the modal - insert_only = true, - - -- When true, input will start in insert mode. - start_in_insert = true, - - -- These are passed to nvim_open_win - anchor = "SW", - border = "rounded", - -- 'editor' and 'win' will default to being centered - relative = "cursor", - - -- These can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) - prefer_width = 40, - width = nil, - -- min_width and max_width can be a list of mixed types. - -- min_width = {20, 0.2} means "the greater of 20 columns or 20% of total" - max_width = { 140, 0.9 }, - min_width = { 20, 0.2 }, - - buf_options = {}, - win_options = { - -- Window transparency (0-100) - winblend = 10, - -- Disable line wrapping - wrap = false, - }, - - -- Set to `false` to disable - mappings = { - n = { - [""] = "Close", - [""] = "Confirm", - }, - i = { - [""] = "Close", - [""] = "Confirm", - [""] = "HistoryPrev", - [""] = "HistoryNext", - }, - }, - - override = function(conf) - -- This is the config that will be passed to nvim_open_win. - -- Change values here to customize the layout - return conf - end, - - -- see :help dressing_get_config - get_config = nil, - }, - select = { - -- Set to false to disable the vim.ui.select implementation - enabled = true, - - -- Priority list of preferred vim.select implementations - backend = { "telescope", "fzf_lua", "fzf", "builtin", "nui" }, - - -- Trim trailing `:` from prompt - trim_prompt = true, - - -- Options for telescope selector - -- These are passed into the telescope picker directly. Can be used like: - -- telescope = require('telescope.themes').get_ivy({...}) - telescope = nil, - - -- Options for fzf selector - fzf = { - window = { - width = 0.5, - height = 0.4, - }, - }, - - -- Options for fzf_lua selector - fzf_lua = { - winopts = { - width = 0.5, - height = 0.4, - }, - }, - - -- Options for nui Menu - nui = { - position = "50%", - size = nil, - relative = "editor", - border = { - style = "rounded", - }, - buf_options = { - swapfile = false, - filetype = "DressingSelect", - }, - win_options = { - winblend = 10, - }, - max_width = 80, - max_height = 40, - min_width = 40, - min_height = 10, - }, - - -- Options for built-in selector - builtin = { - -- These are passed to nvim_open_win - anchor = "NW", - border = "rounded", - -- 'editor' and 'win' will default to being centered - relative = "editor", - - buf_options = {}, - win_options = { - -- Window transparency (0-100) - winblend = 10, - }, - - -- These can be integers or a float between 0 and 1 (e.g. 0.4 for 40%) - -- the min_ and max_ options can be a list of mixed types. - -- max_width = {140, 0.8} means "the lesser of 140 columns or 80% of total" - width = nil, - max_width = { 140, 0.8 }, - min_width = { 40, 0.2 }, - height = nil, - max_height = 0.9, - min_height = { 10, 0.2 }, - - -- Set to `false` to disable - mappings = { - [""] = "Close", - [""] = "Close", - [""] = "Confirm", - }, - - override = function(conf) - -- This is the config that will be passed to nvim_open_win. - -- Change values here to customize the layout - return conf - end, - }, - - -- Used to override format_item. See :help dressing-format - format_item_override = {}, - - -- see :help dressing_get_config - get_config = nil, - }, -}) diff --git a/common/.config/nvim/lua/plugin-config/feline.lua b/common/.config/nvim/lua/plugin-config/feline.lua deleted file mode 100644 index 5eb487b..0000000 --- a/common/.config/nvim/lua/plugin-config/feline.lua +++ /dev/null @@ -1,233 +0,0 @@ -local line_ok, feline = pcall(require, "feline") -if not line_ok then - return -end - -local one_monokai = { - fg = "#abb2bf", - bg = "#1e2024", - green = "#98c379", - yellow = "#e5c07b", - purple = "#c678dd", - orange = "#d19a66", - peanut = "#f6d5a4", - red = "#e06c75", - aqua = "#61afef", - darkblue = "#282c34", - dark_red = "#f75f5f", -} - -local vi_mode_colors = { - NORMAL = "green", - OP = "green", - INSERT = "yellow", - VISUAL = "purple", - LINES = "orange", - BLOCK = "dark_red", - REPLACE = "red", - COMMAND = "aqua", -} - -local c = { - vim_mode = { - provider = { - name = "vi_mode", - opts = { - show_mode_name = true, - -- padding = "center", -- Uncomment for extra padding. - }, - }, - hl = function() - return { - fg = require("feline.providers.vi_mode").get_mode_color(), - bg = "darkblue", - style = "bold", - name = "NeovimModeHLColor", - } - end, - left_sep = "block", - right_sep = "block", - }, - gitBranch = { - provider = "git_branch", - hl = { - fg = "peanut", - bg = "darkblue", - style = "bold", - }, - left_sep = "block", - right_sep = "block", - }, - gitDiffAdded = { - provider = "git_diff_added", - hl = { - fg = "green", - bg = "darkblue", - }, - left_sep = "block", - right_sep = "block", - }, - gitDiffRemoved = { - provider = "git_diff_removed", - hl = { - fg = "red", - bg = "darkblue", - }, - left_sep = "block", - right_sep = "block", - }, - gitDiffChanged = { - provider = "git_diff_changed", - hl = { - fg = "fg", - bg = "darkblue", - }, - left_sep = "block", - right_sep = "right_filled", - }, - separator = { - provider = "", - }, - fileinfo = { - provider = { - name = "file_info", - opts = { - type = "relative-short", - }, - }, - hl = { - style = "bold", - }, - left_sep = " ", - right_sep = " ", - }, - diagnostic_errors = { - provider = "diagnostic_errors", - hl = { - fg = "red", - }, - }, - diagnostic_warnings = { - provider = "diagnostic_warnings", - hl = { - fg = "yellow", - }, - }, - diagnostic_hints = { - provider = "diagnostic_hints", - hl = { - fg = "aqua", - }, - }, - diagnostic_info = { - provider = "diagnostic_info", - }, - lsp_client_names = { - provider = "lsp_client_names", - hl = { - fg = "purple", - bg = "darkblue", - style = "bold", - }, - left_sep = "left_filled", - right_sep = "block", - }, - file_type = { - provider = { - name = "file_type", - opts = { - filetype_icon = true, - case = "titlecase", - }, - }, - hl = { - fg = "red", - bg = "darkblue", - style = "bold", - }, - left_sep = "block", - right_sep = "block", - }, - file_encoding = { - provider = "file_encoding", - hl = { - fg = "orange", - bg = "darkblue", - style = "italic", - }, - left_sep = "block", - right_sep = "block", - }, - position = { - provider = "position", - hl = { - fg = "green", - bg = "darkblue", - style = "bold", - }, - left_sep = "block", - right_sep = "block", - }, - line_percentage = { - provider = "line_percentage", - hl = { - fg = "aqua", - bg = "darkblue", - style = "bold", - }, - left_sep = "block", - right_sep = "block", - }, - scroll_bar = { - provider = "scroll_bar", - hl = { - fg = "yellow", - style = "bold", - }, - }, -} - -local left = { - c.vim_mode, - c.gitBranch, - c.gitDiffAdded, - c.gitDiffRemoved, - c.gitDiffChanged, - c.separator, -} - -local middle = { - c.fileinfo, - c.diagnostic_errors, - c.diagnostic_warnings, - c.diagnostic_info, - c.diagnostic_hints, -} - -local right = { - c.lsp_client_names, - c.file_type, - c.file_encoding, - c.position, - c.line_percentage, - c.scroll_bar, -} - -local components = { - active = { - left, - middle, - right, - }, - inactive = { - left, - middle, - right, - }, -} - -feline.setup({ - components = components, - theme = one_monokai, - vi_mode_colors = vi_mode_colors, -}) diff --git a/common/.config/nvim/lua/plugin-config/lsp-colors.lua b/common/.config/nvim/lua/plugin-config/lsp-colors.lua deleted file mode 100644 index 949bfa3..0000000 --- a/common/.config/nvim/lua/plugin-config/lsp-colors.lua +++ /dev/null @@ -1,7 +0,0 @@ --- Lua -require('lsp-colors').setup({ - Error = '#F44747', - Warning = '#FF8800', - Hint = '#4FC1FF', - Information = '#FFCC66' -}) diff --git a/common/.config/nvim/lua/plugin-config/lsp-trouble.lua b/common/.config/nvim/lua/plugin-config/lsp-trouble.lua deleted file mode 100644 index b75c421..0000000 --- a/common/.config/nvim/lua/plugin-config/lsp-trouble.lua +++ /dev/null @@ -1,40 +0,0 @@ -local opts = {silent = true, noremap = true} -vim.api.nvim_set_keymap("n", "xx", "TroubleToggle", opts) -require('trouble').setup{ - position = "bottom", -- position of the list can be: bottom, top, left, right - icons = true, -- use devicons for filenames - mode = "document_diagnostics", -- "workspace_diagnostics", "document_diagnostics", "quickfix", "lsp_references", "loclist" - fold_open = "๏‘ผ", -- icon used for open folds - fold_closed = "๏‘ ", -- icon used for closed folds - group = true, -- group results by file - padding = true, -- add an extra new line on top of the list - action_keys = { -- key mappings for actions in the trouble list - close = "q", -- close the list - cancel = {"ฤ‡", "ฤ†"}, -- cancel the preview and get back to your last window / buffer / cursor - refresh = "r", -- manually refresh - jump = {"", ""}, -- jump to the diagnostic or open / close folds - toggle_mode = "m", -- toggle between "workspace" and "document" diagnostics mode - toggle_preview = "P", -- toggle auto_preview - hover = "H", -- opens a small popup with the full multiline message - preview = "p", -- preview the diagnostic location - close_folds = {"zM", "zm"}, -- close all folds - open_folds = {"zR", "zr"}, -- open all folds - toggle_fold = {"zA", "za"}, -- toggle fold of current file - previous = "l", -- preview item - next = "k" -- next item - }, - indent_lines = true, -- add an indent guide below the fold icons - auto_open = false, -- automatically open the list when you have diagnostics - auto_close = false, -- automatically close the list when you have no diagnostics - auto_preview = true, -- automatically preview the location of the diagnostic. to close preview and go back to last window - auto_fold = false, -- automatically fold a file trouble list at creation - signs = { - -- icons / text used for a diagnostic - error = "๏™™", - warning = "๏”ฉ", - hint = "๏ ต", - information = "๏‘‰", - other = "๏ซ " - }, - use_diagnostic_signs = true -- enabling this will use the signs defined in your lsp client -} diff --git a/common/.config/nvim/lua/plugin-config/ministarter.lua b/common/.config/nvim/lua/plugin-config/ministarter.lua deleted file mode 100644 index 92bb4ce..0000000 --- a/common/.config/nvim/lua/plugin-config/ministarter.lua +++ /dev/null @@ -1,39 +0,0 @@ ---local status, starter = pcall(require, "mini.starter") ---if not status then - --return ---end - ---starter.setup({ - --content_hooks = { - --starter.gen_hook.adding_bullet(""), - --starter.gen_hook.aligning("center", "center"), - --}, - --evaluate_single = true, - --footer = os.date(), - --header = table.concat({ - --[[โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•—โ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ–ˆโ•—]], - --[[โ–ˆโ–ˆโ•”โ•โ•โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•”โ•โ•โ•โ•โ•โ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ–ˆโ–ˆโ•‘]], - --[[โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•”โ•โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•”โ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘ โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•”โ–ˆโ–ˆโ–ˆโ–ˆโ•”โ–ˆโ–ˆโ•‘]], - --[[โ–ˆโ–ˆโ•”โ•โ•โ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•”โ•โ•โ• โ–ˆโ–ˆโ•‘โ•šโ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•‘โ•šโ–ˆโ–ˆโ•— โ–ˆโ–ˆโ•”โ•โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘โ•šโ–ˆโ–ˆโ•”โ•โ–ˆโ–ˆโ•‘]], - --[[โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•”โ•โ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ–ˆโ•—โ–ˆโ–ˆโ•‘ โ•šโ–ˆโ–ˆโ–ˆโ–ˆโ•‘ โ•šโ–ˆโ–ˆโ–ˆโ–ˆโ•”โ• โ–ˆโ–ˆโ•‘โ–ˆโ–ˆโ•‘ โ•šโ•โ• โ–ˆโ–ˆโ•‘]], - --[[โ•šโ•โ•โ•โ•โ•โ• โ•šโ•โ•โ•โ•โ•โ•โ•โ•šโ•โ• โ•šโ•โ•โ•โ• โ•šโ•โ•โ•โ• โ•šโ•โ•โ•šโ•โ• โ•šโ•โ•]], - --[[โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€โ”€]], - --}, "\n"), - --query_updaters = [[abcdefghilmoqrstuvwxyz0123456789_-,.ABCDEFGHIJKLMOQRSTUVWXYZ]], - --items = { - --{ action = "PackerSync", name = "U: Update Plugins", section = "Plugins" }, - --{ action = "PackerCompile", name = "R: Recompile Packer", section = "Plugins" }, - --{ action = "enew", name = "E: New Buffer", section = "Builtin actions" }, - --{ action = "qall!", name = "Q: Quit Neovim", section = "Builtin actions" }, - --}, ---}) - ---vim.cmd([[ - --augroup MiniStarterJK - --au! - --au User MiniStarterOpened nmap j lua MiniStarter.update_current_item('next') - --au User MiniStarterOpened nmap k lua MiniStarter.update_current_item('prev') - --au User MiniStarterOpened nmap Telescope find_files - --au User MiniStarterOpened nmap Telescope file_browser - --augroup END ---]]) diff --git a/common/.config/nvim/lua/plugin-config/nvim-tree.lua b/common/.config/nvim/lua/plugin-config/nvim-tree.lua deleted file mode 100644 index d5cb62e..0000000 --- a/common/.config/nvim/lua/plugin-config/nvim-tree.lua +++ /dev/null @@ -1,20 +0,0 @@ - ---require("nvim-tree").setup({ - --hijack_unnamed_buffer_when_opening = true, - ----open_on_setup = false, - ----open_on_setup_file = false, - --update_focused_file = { - --enable = true, - --}, - --view = { - --width = 35, - --side = "right", - --}, - --git = { - --ignore = false, - --}, - --filters = { - --dotfiles = false, - --} ---}) - diff --git a/common/.config/nvim/lua/plugin-config/obsidian.lua b/common/.config/nvim/lua/plugin-config/obsidian.lua deleted file mode 100644 index abbcc37..0000000 --- a/common/.config/nvim/lua/plugin-config/obsidian.lua +++ /dev/null @@ -1,19 +0,0 @@ -require('obsidian').setup({ - dir = '~/Obsidian', - completion = { - nvim_cmp = true, -- if using nvim-cmp, otherwise set to false - }, - follow_url_func = function(url) - -- Open the URL in the default web browser. - vim.fn.jobstart({'xdg-open', url}) -- linux - end, -}) - -vim.keymap.set('n', 'go', function() - if require('obsidian').util.cursor_on_markdown_link() then - return 'ObsidianFollowLink' - else - return 'go' - end -end, { noremap = false, expr = true }) - diff --git a/common/.config/nvim/lua/post-plugin-basics.lua b/common/.config/nvim/lua/post-plugin-basics.lua deleted file mode 100644 index 2456dd5..0000000 --- a/common/.config/nvim/lua/post-plugin-basics.lua +++ /dev/null @@ -1,5 +0,0 @@ -vsm.o.termguicolors = true -vim.o.background = 'light' - -vim.cmd("colorscheme kanagawa-lotus") - diff --git a/etc/fstab b/etc/fstab new file mode 100644 index 0000000..a021ab5 --- /dev/null +++ b/etc/fstab @@ -0,0 +1,11 @@ +# /etc/fstab: static file system information. +# +# +# / was on /dev/sda1 during installation +UUID=CHANGEME / ext4 errors=remount-ro 0 1 + +# swap +#UUID=CHANGEME none swap sw 0 0 + +# tmpfs for /tmp +tmpfs /tmp tmpfs defaults,noatime,mode=1777 0 0 diff --git a/etc/nginx/nginx.conf b/etc/nginx/nginx.conf new file mode 100644 index 0000000..700c60a --- /dev/null +++ b/etc/nginx/nginx.conf @@ -0,0 +1,29 @@ +user www-data; +worker_processes auto; +pid /run/nginx.pid; +include /etc/nginx/modules-enabled/*.conf; + +events { + worker_connections 768; +} + +http { + sendfile on; + tcp_nopush on; + types_hash_max_size 2048; + server_tokens off; + + include /etc/nginx/mime.types; + default_type application/octet-stream; + + ssl_protocols TLSv1.2 TLSv1.3; + ssl_prefer_server_ciphers on; + + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + + gzip on; + + include /etc/nginx/conf.d/*.conf; + include /etc/nginx/sites-enabled/*; +} diff --git a/grep b/grep deleted file mode 100644 index 07f6603..0000000 --- a/grep +++ /dev/null @@ -1,507 +0,0 @@ -# Configuration file for locale-gen -# -# lists of locales that are to be generated by the locale-gen command. -# -# Each line is of the form: -# -# -# -# where is one of the locales given in /usr/share/i18n/locales -# and is one of the character sets listed in /usr/share/i18n/charmaps -# -# The locale-gen command will generate all the locales, -# placing them in /usr/lib/locale. -# -# A list of supported locales is given in /usr/share/i18n/SUPPORTED -# and is included in this file. Uncomment the needed locales below. -# -#aa_DJ.UTF-8 UTF-8 -#aa_DJ ISO-8859-1 -#aa_ER UTF-8 -#aa_ER@saaho UTF-8 -#aa_ET UTF-8 -#af_ZA.UTF-8 UTF-8 -#af_ZA ISO-8859-1 -#agr_PE UTF-8 -#ak_GH UTF-8 -#am_ET UTF-8 -#an_ES.UTF-8 UTF-8 -#an_ES ISO-8859-15 -#anp_IN UTF-8 -#ar_AE.UTF-8 UTF-8 -#ar_AE ISO-8859-6 -#ar_BH.UTF-8 UTF-8 -#ar_BH ISO-8859-6 -#ar_DZ.UTF-8 UTF-8 -#ar_DZ ISO-8859-6 -#ar_EG.UTF-8 UTF-8 -#ar_EG ISO-8859-6 -#ar_IN UTF-8 -#ar_IQ.UTF-8 UTF-8 -#ar_IQ ISO-8859-6 -#ar_JO.UTF-8 UTF-8 -#ar_JO ISO-8859-6 -#ar_KW.UTF-8 UTF-8 -#ar_KW ISO-8859-6 -#ar_LB.UTF-8 UTF-8 -#ar_LB ISO-8859-6 -#ar_LY.UTF-8 UTF-8 -#ar_LY ISO-8859-6 -#ar_MA.UTF-8 UTF-8 -#ar_MA ISO-8859-6 -#ar_OM.UTF-8 UTF-8 -#ar_OM ISO-8859-6 -#ar_QA.UTF-8 UTF-8 -#ar_QA ISO-8859-6 -#ar_SA.UTF-8 UTF-8 -#ar_SA ISO-8859-6 -#ar_SD.UTF-8 UTF-8 -#ar_SD ISO-8859-6 -#ar_SS UTF-8 -#ar_SY.UTF-8 UTF-8 -#ar_SY ISO-8859-6 -#ar_TN.UTF-8 UTF-8 -#ar_TN ISO-8859-6 -#ar_YE.UTF-8 UTF-8 -#ar_YE ISO-8859-6 -#ayc_PE UTF-8 -#az_AZ UTF-8 -#az_IR UTF-8 -#as_IN UTF-8 -#ast_ES.UTF-8 UTF-8 -#ast_ES ISO-8859-15 -#be_BY.UTF-8 UTF-8 -#be_BY CP1251 -#be_BY@latin UTF-8 -#bem_ZM UTF-8 -#ber_DZ UTF-8 -#ber_MA UTF-8 -#bg_BG.UTF-8 UTF-8 -#bg_BG CP1251 -#bhb_IN.UTF-8 UTF-8 -#bho_IN UTF-8 -#bho_NP UTF-8 -#bi_VU UTF-8 -#bn_BD UTF-8 -#bn_IN UTF-8 -#bo_CN UTF-8 -#bo_IN UTF-8 -#br_FR.UTF-8 UTF-8 -#br_FR ISO-8859-1 -#br_FR@euro ISO-8859-15 -#brx_IN UTF-8 -#bs_BA.UTF-8 UTF-8 -#bs_BA ISO-8859-2 -#byn_ER UTF-8 -#ca_AD.UTF-8 UTF-8 -#ca_AD ISO-8859-15 -#ca_ES.UTF-8 UTF-8 -#ca_ES ISO-8859-1 -#ca_ES@euro ISO-8859-15 -#ca_ES@valencia UTF-8 -#ca_FR.UTF-8 UTF-8 -#ca_FR ISO-8859-15 -#ca_IT.UTF-8 UTF-8 -#ca_IT ISO-8859-15 -#ce_RU UTF-8 -#chr_US UTF-8 -#ckb_IQ UTF-8 -#cmn_TW UTF-8 -#crh_UA UTF-8 -#cs_CZ.UTF-8 UTF-8 -#cs_CZ ISO-8859-2 -#csb_PL UTF-8 -#cv_RU UTF-8 -#cy_GB.UTF-8 UTF-8 -#cy_GB ISO-8859-14 -#da_DK.UTF-8 UTF-8 -#da_DK ISO-8859-1 -#de_AT.UTF-8 UTF-8 -#de_AT ISO-8859-1 -#de_AT@euro ISO-8859-15 -#de_BE.UTF-8 UTF-8 -#de_BE ISO-8859-1 -#de_BE@euro ISO-8859-15 -#de_CH.UTF-8 UTF-8 -#de_CH ISO-8859-1 -#de_DE.UTF-8 UTF-8 -#de_DE ISO-8859-1 -#de_DE@euro ISO-8859-15 -#de_IT.UTF-8 UTF-8 -#de_IT ISO-8859-1 -#de_LI.UTF-8 UTF-8 -#de_LU.UTF-8 UTF-8 -#de_LU ISO-8859-1 -#de_LU@euro ISO-8859-15 -#doi_IN UTF-8 -#dsb_DE UTF-8 -#dv_MV UTF-8 -#dz_BT UTF-8 -#el_GR.UTF-8 UTF-8 -#el_GR ISO-8859-7 -#el_GR@euro ISO-8859-7 -#el_CY.UTF-8 UTF-8 -#el_CY ISO-8859-7 -#en_AG UTF-8 -#en_AU.UTF-8 UTF-8 -#en_AU ISO-8859-1 -#en_BW.UTF-8 UTF-8 -#en_BW ISO-8859-1 -#en_CA.UTF-8 UTF-8 -#en_CA ISO-8859-1 -#en_DK.UTF-8 UTF-8 -#en_DK ISO-8859-1 -en_GB.UTF-8 UTF-8 -#en_GB ISO-8859-1 -#en_HK.UTF-8 UTF-8 -#en_HK ISO-8859-1 -#en_IE.UTF-8 UTF-8 -#en_IE ISO-8859-1 -#en_IE@euro ISO-8859-15 -#en_IL UTF-8 -#en_IN UTF-8 -#en_NG UTF-8 -#en_NZ.UTF-8 UTF-8 -#en_NZ ISO-8859-1 -#en_PH.UTF-8 UTF-8 -#en_PH ISO-8859-1 -#en_SC.UTF-8 UTF-8 -#en_SG.UTF-8 UTF-8 -#en_SG ISO-8859-1 -eu_US.UTF-8 UTF-8 -#en_US ISO-8859-1 -#en_ZA.UTF-8 UTF-8 -#en_ZA ISO-8859-1 -#en_ZM UTF-8 -#en_ZW.UTF-8 UTF-8 -#en_ZW ISO-8859-1 -#eo UTF-8 -#es_AR.UTF-8 UTF-8 -#es_AR ISO-8859-1 -#es_BO.UTF-8 UTF-8 -#es_BO ISO-8859-1 -#es_CL.UTF-8 UTF-8 -#es_CL ISO-8859-1 -#es_CO.UTF-8 UTF-8 -#es_CO ISO-8859-1 -#es_CR.UTF-8 UTF-8 -#es_CR ISO-8859-1 -#es_CU UTF-8 -#es_DO.UTF-8 UTF-8 -#es_DO ISO-8859-1 -#es_EC.UTF-8 UTF-8 -#es_EC ISO-8859-1 -#es_ES.UTF-8 UTF-8 -#es_ES ISO-8859-1 -#es_ES@euro ISO-8859-15 -#es_GT.UTF-8 UTF-8 -#es_GT ISO-8859-1 -#es_HN.UTF-8 UTF-8 -#es_HN ISO-8859-1 -#es_MX.UTF-8 UTF-8 -#es_MX ISO-8859-1 -#es_NI.UTF-8 UTF-8 -#es_NI ISO-8859-1 -#es_PA.UTF-8 UTF-8 -#es_PA ISO-8859-1 -#es_PE.UTF-8 UTF-8 -#es_PE ISO-8859-1 -#es_PR.UTF-8 UTF-8 -#es_PR ISO-8859-1 -#es_PY.UTF-8 UTF-8 -#es_PY ISO-8859-1 -#es_SV.UTF-8 UTF-8 -#es_SV ISO-8859-1 -#es_US.UTF-8 UTF-8 -#es_US ISO-8859-1 -#es_UY.UTF-8 UTF-8 -#es_UY ISO-8859-1 -#es_VE.UTF-8 UTF-8 -#es_VE ISO-8859-1 -#et_EE.UTF-8 UTF-8 -#et_EE ISO-8859-1 -#et_EE.ISO-8859-15 ISO-8859-15 -#eu_ES.UTF-8 UTF-8 -#eu_ES ISO-8859-1 -#eu_ES@euro ISO-8859-15 -#fa_IR UTF-8 -#ff_SN UTF-8 -#fi_FI.UTF-8 UTF-8 -#fi_FI ISO-8859-1 -#fi_FI@euro ISO-8859-15 -#fil_PH UTF-8 -#fo_FO.UTF-8 UTF-8 -#fo_FO ISO-8859-1 -#fr_BE.UTF-8 UTF-8 -#fr_BE ISO-8859-1 -#fr_BE@euro ISO-8859-15 -#fr_CA.UTF-8 UTF-8 -#fr_CA ISO-8859-1 -#fr_CH.UTF-8 UTF-8 -#fr_CH ISO-8859-1 -#fr_FR.UTF-8 UTF-8 -#fr_FR ISO-8859-1 -#fr_FR@euro ISO-8859-15 -#fr_LU.UTF-8 UTF-8 -#fr_LU ISO-8859-1 -#fr_LU@euro ISO-8859-15 -#fur_IT UTF-8 -#fy_NL UTF-8 -#fy_DE UTF-8 -#ga_IE.UTF-8 UTF-8 -#ga_IE ISO-8859-1 -#ga_IE@euro ISO-8859-15 -#gd_GB.UTF-8 UTF-8 -#gd_GB ISO-8859-15 -#gez_ER UTF-8 -#gez_ER@abegede UTF-8 -#gez_ET UTF-8 -#gez_ET@abegede UTF-8 -#gl_ES.UTF-8 UTF-8 -#gl_ES ISO-8859-1 -#gl_ES@euro ISO-8859-15 -#gu_IN UTF-8 -#gv_GB.UTF-8 UTF-8 -#gv_GB ISO-8859-1 -#ha_NG UTF-8 -#hak_TW UTF-8 -#he_IL.UTF-8 UTF-8 -#he_IL ISO-8859-8 -#hi_IN UTF-8 -#hif_FJ UTF-8 -#hne_IN UTF-8 -#hr_HR.UTF-8 UTF-8 -#hr_HR ISO-8859-2 -#hsb_DE ISO-8859-2 -#hsb_DE.UTF-8 UTF-8 -#ht_HT UTF-8 -#hu_HU.UTF-8 UTF-8 -#hu_HU ISO-8859-2 -#hy_AM UTF-8 -#hy_AM.ARMSCII-8 ARMSCII-8 -#ia_FR UTF-8 -#id_ID.UTF-8 UTF-8 -#id_ID ISO-8859-1 -#ig_NG UTF-8 -#ik_CA UTF-8 -#is_IS.UTF-8 UTF-8 -#is_IS ISO-8859-1 -#it_CH.UTF-8 UTF-8 -#it_CH ISO-8859-1 -#it_IT.UTF-8 UTF-8 -#it_IT ISO-8859-1 -#it_IT@euro ISO-8859-15 -#iu_CA UTF-8 -#ja_JP.EUC-JP EUC-JP -#ja_JP.UTF-8 UTF-8 -#ka_GE.UTF-8 UTF-8 -#ka_GE GEORGIAN-PS -#kab_DZ UTF-8 -#kk_KZ.UTF-8 UTF-8 -#kk_KZ PT154 -#kl_GL.UTF-8 UTF-8 -#kl_GL ISO-8859-1 -#km_KH UTF-8 -#kn_IN UTF-8 -#ko_KR.EUC-KR EUC-KR -#ko_KR.UTF-8 UTF-8 -#kok_IN UTF-8 -#ks_IN UTF-8 -#ks_IN@devanagari UTF-8 -#ku_TR.UTF-8 UTF-8 -#ku_TR ISO-8859-9 -#kw_GB.UTF-8 UTF-8 -#kw_GB ISO-8859-1 -#ky_KG UTF-8 -#lb_LU UTF-8 -#lg_UG.UTF-8 UTF-8 -#lg_UG ISO-8859-10 -#li_BE UTF-8 -#li_NL UTF-8 -#lij_IT UTF-8 -#ln_CD UTF-8 -#lo_LA UTF-8 -#lt_LT.UTF-8 UTF-8 -#lt_LT ISO-8859-13 -#lv_LV.UTF-8 UTF-8 -#lv_LV ISO-8859-13 -#lzh_TW UTF-8 -#mag_IN UTF-8 -#mai_IN UTF-8 -#mai_NP UTF-8 -#mfe_MU UTF-8 -#mg_MG.UTF-8 UTF-8 -#mg_MG ISO-8859-15 -#mhr_RU UTF-8 -#mi_NZ.UTF-8 UTF-8 -#mi_NZ ISO-8859-13 -#miq_NI UTF-8 -#mjw_IN UTF-8 -#mk_MK.UTF-8 UTF-8 -#mk_MK ISO-8859-5 -#ml_IN UTF-8 -#mn_MN UTF-8 -#mni_IN UTF-8 -#mnw_MM UTF-8 -#mr_IN UTF-8 -#ms_MY.UTF-8 UTF-8 -#ms_MY ISO-8859-1 -#mt_MT.UTF-8 UTF-8 -#mt_MT ISO-8859-3 -#my_MM UTF-8 -#nan_TW UTF-8 -#nan_TW@latin UTF-8 -#nb_NO.UTF-8 UTF-8 -#nb_NO ISO-8859-1 -#nds_DE UTF-8 -#nds_NL UTF-8 -#ne_NP UTF-8 -#nhn_MX UTF-8 -#niu_NU UTF-8 -#niu_NZ UTF-8 -#nl_AW UTF-8 -#nl_BE.UTF-8 UTF-8 -#nl_BE ISO-8859-1 -#nl_BE@euro ISO-8859-15 -#nl_NL.UTF-8 UTF-8 -#nl_NL ISO-8859-1 -#nl_NL@euro ISO-8859-15 -#nn_NO.UTF-8 UTF-8 -#nn_NO ISO-8859-1 -#nr_ZA UTF-8 -#nso_ZA UTF-8 -#oc_FR.UTF-8 UTF-8 -#oc_FR ISO-8859-1 -#om_ET UTF-8 -#om_KE.UTF-8 UTF-8 -#om_KE ISO-8859-1 -#or_IN UTF-8 -#os_RU UTF-8 -#pa_IN UTF-8 -#pa_PK UTF-8 -#pap_AW UTF-8 -#pap_CW UTF-8 -#pl_PL.UTF-8 UTF-8 -#pl_PL ISO-8859-2 -#ps_AF UTF-8 -#pt_BR.UTF-8 UTF-8 -#pt_BR ISO-8859-1 -#pt_PT.UTF-8 UTF-8 -#pt_PT ISO-8859-1 -#pt_PT@euro ISO-8859-15 -#quz_PE UTF-8 -#raj_IN UTF-8 -#rif_MA UTF-8 -#ro_RO.UTF-8 UTF-8 -#ro_RO ISO-8859-2 -#ru_RU.KOI8-R KOI8-R -#ru_RU.UTF-8 UTF-8 -#ru_RU ISO-8859-5 -#ru_UA.UTF-8 UTF-8 -#ru_UA KOI8-U -#rw_RW UTF-8 -#sa_IN UTF-8 -#sah_RU UTF-8 -#sat_IN UTF-8 -#sc_IT UTF-8 -#sd_IN UTF-8 -#sd_IN@devanagari UTF-8 -#se_NO UTF-8 -#sgs_LT UTF-8 -#shn_MM UTF-8 -#shs_CA UTF-8 -#si_LK UTF-8 -#sid_ET UTF-8 -#sk_SK.UTF-8 UTF-8 -#sk_SK ISO-8859-2 -#sl_SI.UTF-8 UTF-8 -#sl_SI ISO-8859-2 -#sm_WS UTF-8 -#so_DJ.UTF-8 UTF-8 -#so_DJ ISO-8859-1 -#so_ET UTF-8 -#so_KE.UTF-8 UTF-8 -#so_KE ISO-8859-1 -#so_SO.UTF-8 UTF-8 -#so_SO ISO-8859-1 -#sq_AL.UTF-8 UTF-8 -#sq_AL ISO-8859-1 -#sq_MK UTF-8 -#sr_ME UTF-8 -#sr_RS UTF-8 -#sr_RS@latin UTF-8 -#ss_ZA UTF-8 -#st_ZA.UTF-8 UTF-8 -#st_ZA ISO-8859-1 -#sv_FI.UTF-8 UTF-8 -#sv_FI ISO-8859-1 -#sv_FI@euro ISO-8859-15 -#sv_SE.UTF-8 UTF-8 -#sv_SE ISO-8859-1 -#sw_KE UTF-8 -#sw_TZ UTF-8 -#syr UTF-8 -#szl_PL UTF-8 -#ta_IN UTF-8 -#ta_LK UTF-8 -#tcy_IN.UTF-8 UTF-8 -#te_IN UTF-8 -#tg_TJ.UTF-8 UTF-8 -#tg_TJ KOI8-T -#th_TH.UTF-8 UTF-8 -#th_TH TIS-620 -#the_NP UTF-8 -#ti_ER UTF-8 -#ti_ET UTF-8 -#tig_ER UTF-8 -#tk_TM UTF-8 -#tl_PH.UTF-8 UTF-8 -#tl_PH ISO-8859-1 -#tn_ZA UTF-8 -#to_TO UTF-8 -#tpi_PG UTF-8 -#tr_CY.UTF-8 UTF-8 -#tr_CY ISO-8859-9 -#tr_TR.UTF-8 UTF-8 -#tr_TR ISO-8859-9 -#ts_ZA UTF-8 -#tt_RU UTF-8 -#tt_RU@iqtelif UTF-8 -#ug_CN UTF-8 -#uk_UA.UTF-8 UTF-8 -#uk_UA KOI8-U -#unm_US UTF-8 -#ur_IN UTF-8 -#ur_PK UTF-8 -#uz_UZ.UTF-8 UTF-8 -#uz_UZ ISO-8859-1 -#uz_UZ@cyrillic UTF-8 -#ve_ZA UTF-8 -#vi_VN UTF-8 -#wa_BE ISO-8859-1 -#wa_BE@euro ISO-8859-15 -#wa_BE.UTF-8 UTF-8 -#wae_CH UTF-8 -#wal_ET UTF-8 -#wo_SN UTF-8 -#xh_ZA.UTF-8 UTF-8 -#xh_ZA ISO-8859-1 -#yi_US.UTF-8 UTF-8 -#yi_US CP1255 -#yo_NG UTF-8 -#yue_HK UTF-8 -#yuw_PG UTF-8 -#zh_CN.GB18030 GB18030 -#zh_CN.GBK GBK -#zh_CN.UTF-8 UTF-8 -#zh_CN GB2312 -#zh_HK.UTF-8 UTF-8 -#zh_HK BIG5-HKSCS -#zh_SG.UTF-8 UTF-8 -#zh_SG.GBK GBK -#zh_SG GB2312 -#zh_TW.EUC-TW EUC-TW -#zh_TW.UTF-8 UTF-8 -#zh_TW BIG5 -#zu_ZA.UTF-8 UTF-8 -#zu_ZA ISO-8859-1 diff --git a/host-seperation.js b/host-seperation.js deleted file mode 100644 index e69de29..0000000 diff --git a/laptop/.config/i3blocks/battery/battery_info.sh b/laptop/.config/i3blocks/battery/battery_info.sh deleted file mode 100755 index 3ff37cc..0000000 --- a/laptop/.config/i3blocks/battery/battery_info.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh - -# If ACPI was not installed, this probably is a battery-less computer. -ACPI_RES=$(acpi -b) -ACPI_CODE=$? -if [ $ACPI_CODE -eq 0 ] -then - # Get essential information. Due to som bug with some versions of acpi it is - # worth filtering the ACPI result from all lines containing "unavailable". - BAT_LEVEL_ALL=$(echo "$ACPI_RES" | grep -E -o "[0-9][0-9]?[0-9]?%") - BAT_LEVEL=$(echo "$BAT_LEVEL_ALL" | awk -F"%" 'BEGIN{tot=0;i=0} {i++; tot+=$1} END{printf("%d%%\n", tot/i)}') - TIME_LEFT=$(echo "$ACPI_RES" | grep -E -o "[0-9]{2}:[0-9]{2}:[0-9]{2}") - IS_CHARGING=$(echo "$ACPI_RES" | awk '{ printf("%s\n", substr($3, 0, length($3)-1) ) }') - - # If there is no 'time left' information (when almost fully charged) we - # provide information ourselvs. - if [ -z "$TIME_LEFT" ] - then - TIME_LEFT="00:00:00" - fi - - # Print full text. The charging data. - TIME_LEFT=$(echo $TIME_LEFT | awk '{ printf("%s\n", substr($1, 0, 5)) }') - echo "๐Ÿ”‹$BAT_LEVEL โณ$TIME_LEFT " - - # Print the short text. - echo "BAT: $BAT_LEVEL" - - # Change the font color, depending on the situation. - if [ "$IS_CHARGING" = "Charging" ] - then - # Charging yellow color. - echo "#D0D000" - else - if [ "${BAT_LEVEL%?}" -le 15 ] - then - # Battery very low. Red color. - echo "#FA1E44" - else - # Battery not charging but at decent level. Green color. - echo "#007872" - fi - fi -fi diff --git a/laptop/.config/i3blocks/config b/laptop/.config/i3blocks/config deleted file mode 100644 index 1e5036a..0000000 --- a/laptop/.config/i3blocks/config +++ /dev/null @@ -1,28 +0,0 @@ -[NOW_PLAYING] -command=mpris-ctl info '๐ŸŽถ %player_name: %track_name - %artist_name' -interval=1 -color=#1DB954 - -[DISK] -command=df -h / | awk '/\//{ printf(" ๐Ÿ’พ %sB \n", $4) }' -interval=10 -color=#C9E3DB - -[BATTERY] -command=~/.config/i3blocks/battery/battery_info.sh -interval=2 - -[CPU] -full_text= CPU: 0.00% @ +00.0ยฐC -command=~/.config/i3blocks/cpu/cpu_info.sh -interval=2 -color=#0071C5 - -[MEM] -command=free -h | awk '/Mem:/ { printf(" %5s/%s \n", $3, $2) }' -interval=5 -color=#FEC925 - -[TIME_DATE] -command=date +" %a, %d %b - %H:%M:%S" -interval=1 diff --git a/laptop/.config/i3blocks/cpu/cpu_info.sh b/laptop/.config/i3blocks/cpu/cpu_info.sh deleted file mode 100755 index c276aec..0000000 --- a/laptop/.config/i3blocks/cpu/cpu_info.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -TEMP=$(sensors | grep 'Package id 0:\|Tdie' | grep ':[ ]*+[0-9]*.[0-9]*ยฐC' -o | grep '[0-9]*.[0-9]*ยฐC' -o) -CPU_USAGE=$(mpstat 1 1 | awk '/Average:/ {printf("%i\n", $(NF-9))}') -echo "$CPU_USAGE $TEMP" | awk '{ printf(" CPU:%3s% @ %s \n"), $1, $2 }' diff --git a/laptop/.config/i3blocks/sound/sound_burst.sh b/laptop/.config/i3blocks/sound/sound_burst.sh deleted file mode 100755 index 330f395..0000000 --- a/laptop/.config/i3blocks/sound/sound_burst.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -for i in $(seq 1 5) -do - sleep 0.2 - pkill -RTMIN+1 i3blocks -done diff --git a/laptop/.config/i3blocks/sound/sound_info.sh b/laptop/.config/i3blocks/sound/sound_info.sh deleted file mode 100755 index a5fd505..0000000 --- a/laptop/.config/i3blocks/sound/sound_info.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -VOLUME_MUTE="๐Ÿ”‡" -VOLUME_LOW="๐Ÿ”ˆ" -VOLUME_MID="๐Ÿ”‰" -VOLUME_HIGH="๐Ÿ”Š" -SOUND_LEVEL=$(amixer -M get Master | awk -F"[][]" '/%/ { print $2 }' | awk -F"%" 'BEGIN{tot=0; i=0} {i++; tot+=$1} END{printf("%s\n", tot/i) }') -MUTED=$(amixer get Master | awk ' /%/{print ($NF=="[off]" ? 1 : 0); exit;}') - -ICON=$VOLUME_MUTE -if [ "$MUTED" = "1" ] -then - ICON="$VOLUME_MUTE" -else - if [ "$SOUND_LEVEL" -lt 34 ] - then - ICON="$VOLUME_LOW" - elif [ "$SOUND_LEVEL" -lt 67 ] - then - ICON="$VOLUME_MID" - else - ICON="$VOLUME_HIGH" - fi -fi - -echo "$ICON" "$SOUND_LEVEL" | awk '{ printf(" %s:%3s%% \n", $1, $2) }' - diff --git a/laptop/.gitkeep b/laptop/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/node_modules/.cache/custom-elements-language-server/custom-elements.json b/node_modules/.cache/custom-elements-language-server/custom-elements.json deleted file mode 100644 index 3b9ccb5..0000000 --- a/node_modules/.cache/custom-elements-language-server/custom-elements.json +++ /dev/null @@ -1 +0,0 @@ -{"schemaVersion":"1.0.0","readme":"","modules":[{"kind":"javascript-module","path":"add-dotfile.js","declarations":[],"exports":[]},{"kind":"javascript-module","path":"bootstrap.js","declarations":[],"exports":[]},{"kind":"javascript-module","path":"host-seperation.js","declarations":[],"exports":[]}]} \ No newline at end of file diff --git a/package.json b/package.json deleted file mode 100644 index ecae911..0000000 --- a/package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "dotfiles", - "type": "module", - "version": "1.0.0", - "description": "", - "main": "bootstrap.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/benkyd/dotfiles.git" - }, - "author": "", - "license": "MIT", - "bugs": { - "url": "https://github.com/benkyd/dotfiles/issues" - }, - "homepage": "https://github.com/benkyd/dotfiles#readme" -} diff --git a/packages/arch.txt b/packages/arch.txt new file mode 100644 index 0000000..1ec6fda --- /dev/null +++ b/packages/arch.txt @@ -0,0 +1,19 @@ +fish +tmux +neovim +wezterm +btop +ripgrep +fd +git +curl +wget +lua-language-server +typescript-language-server +pyright +bash-language-server +cmake +nodejs +python +nginx +base-devel diff --git a/packages/brew.txt b/packages/brew.txt new file mode 100644 index 0000000..e511531 --- /dev/null +++ b/packages/brew.txt @@ -0,0 +1,17 @@ +fish +tmux +nvim +wezterm +btop +ripgrep +fd +git +curl +wget +lua-language-server +typescript-language-server +pyright +bash-language-server +cmake +node +python3 diff --git a/pc/.config/i3blocks/gpu/gpu_info.sh b/pc/.config/i3blocks/gpu/gpu_info.sh deleted file mode 100755 index 4acabb6..0000000 --- a/pc/.config/i3blocks/gpu/gpu_info.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -GPU_TEMP=$(nvidia-settings -q GPUCoreTemp | grep -m1 GPU | perl -ne 'print $1 if /: (\d+)\./') -GPU_USAGE=$(nvidia-settings -q GPUUtilization -q GPUCoreTemp | grep -oP 'graphics=\K\w+') -echo "$GPU_USAGE $GPU_TEMP.0ยฐC" | awk '{ printf(" GPU:%3s% @ %s \n"), $1, $2 }' diff --git a/pc/.gitkeep b/pc/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/common/pictures/Wallpapers/68747470733a2f2f6d69722d73332d63646e2d63662e626568616e63652e6e65742f70726f6a6563745f6d6f64756c65732f66732f36323561653139343139363131372e356537636132356639313330392e6a7067.jpeg b/pictures/Wallpapers/68747470733a2f2f6d69722d73332d63646e2d63662e626568616e63652e6e65742f70726f6a6563745f6d6f64756c65732f66732f36323561653139343139363131372e356537636132356639313330392e6a7067.jpeg similarity index 100% rename from common/pictures/Wallpapers/68747470733a2f2f6d69722d73332d63646e2d63662e626568616e63652e6e65742f70726f6a6563745f6d6f64756c65732f66732f36323561653139343139363131372e356537636132356639313330392e6a7067.jpeg rename to pictures/Wallpapers/68747470733a2f2f6d69722d73332d63646e2d63662e626568616e63652e6e65742f70726f6a6563745f6d6f64756c65732f66732f36323561653139343139363131372e356537636132356639313330392e6a7067.jpeg diff --git a/common/pictures/Wallpapers/Portal_2_concept_art.jpg b/pictures/Wallpapers/Portal_2_concept_art.jpg similarity index 100% rename from common/pictures/Wallpapers/Portal_2_concept_art.jpg rename to pictures/Wallpapers/Portal_2_concept_art.jpg diff --git a/common/pictures/Wallpapers/Street.jpg b/pictures/Wallpapers/Street.jpg similarity index 100% rename from common/pictures/Wallpapers/Street.jpg rename to pictures/Wallpapers/Street.jpg diff --git a/common/pictures/Wallpapers/buttons.png b/pictures/Wallpapers/buttons.png similarity index 100% rename from common/pictures/Wallpapers/buttons.png rename to pictures/Wallpapers/buttons.png diff --git a/common/pictures/Wallpapers/cat-sound.png b/pictures/Wallpapers/cat-sound.png similarity index 100% rename from common/pictures/Wallpapers/cat-sound.png rename to pictures/Wallpapers/cat-sound.png diff --git a/common/pictures/Wallpapers/catppuccin_triangle.png b/pictures/Wallpapers/catppuccin_triangle.png similarity index 100% rename from common/pictures/Wallpapers/catppuccin_triangle.png rename to pictures/Wallpapers/catppuccin_triangle.png diff --git a/common/pictures/Wallpapers/hashtags-black.png b/pictures/Wallpapers/hashtags-black.png similarity index 100% rename from common/pictures/Wallpapers/hashtags-black.png rename to pictures/Wallpapers/hashtags-black.png diff --git a/common/pictures/Wallpapers/mandelbrot_gap_lavender.png b/pictures/Wallpapers/mandelbrot_gap_lavender.png similarity index 100% rename from common/pictures/Wallpapers/mandelbrot_gap_lavender.png rename to pictures/Wallpapers/mandelbrot_gap_lavender.png diff --git a/common/pictures/Wallpapers/portal2.jpg b/pictures/Wallpapers/portal2.jpg similarity index 100% rename from common/pictures/Wallpapers/portal2.jpg rename to pictures/Wallpapers/portal2.jpg diff --git a/common/pictures/Wallpapers/portal2.png b/pictures/Wallpapers/portal2.png similarity index 100% rename from common/pictures/Wallpapers/portal2.png rename to pictures/Wallpapers/portal2.png diff --git a/common/pictures/Wallpapers/tetris.png b/pictures/Wallpapers/tetris.png similarity index 100% rename from common/pictures/Wallpapers/tetris.png rename to pictures/Wallpapers/tetris.png diff --git a/common/pictures/Wallpapers/waves_right_colored.png b/pictures/Wallpapers/waves_right_colored.png similarity index 100% rename from common/pictures/Wallpapers/waves_right_colored.png rename to pictures/Wallpapers/waves_right_colored.png diff --git a/ubuntu.os b/ubuntu.os deleted file mode 100755 index 087709d..0000000 --- a/ubuntu.os +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# Dev utils -sudo apt install kitty ranger ripgrep curl zsh -curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash -sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" - -curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim.appimage -chmod u+x nvim.appimage -./nvim.appimage --appimage-extract -./squashfs-root/AppRun --version -sudo mv squashfs-root / -sudo ln -s /squashfs-root/AppRun /usr/bin/nvim - -yay -S flameshot -git clone --filter=blob:none --sparse git@github.com:ryanoasis/nerd-fonts -source nerdfonts/install.sh - -sudo apt update - -mkdir -p ~/.local/share/fonts -cd ~/.local/share/fonts -curl -fLo "Droid Sans Mono for Powerline Nerd Font Complete.otf" https://github.com/ryanoasis/nerd-fonts/raw/HEAD/patched-fonts/DroidSansMono/complete/Droid%20Sans%20Mono%20Nerd%20Font%20Complete.otf -cd ~ - -# Tmux -sudo apt install tmux -git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm -tmux source ~/.tmux.conf