diff --git a/.bash_profile b/.bash_profile new file mode 120000 index 0000000..6b30db3 --- /dev/null +++ b/.bash_profile @@ -0,0 +1 @@ +config/fish/.bash_profile \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index f8dd825..b82c9db 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "assets/backgrounds"] - path = assets/backgrounds + path = config/misc/Pictures/backgrounds url = https://github.com/Uyanide/backgrounds.git diff --git a/README.md b/README.md index 32815b8..370845e 100644 --- a/README.md +++ b/README.md @@ -111,11 +111,7 @@ including: > [!TIP] > -> Most scripts are placed in the `scripts` folder. - -- `config-sync` - - creates symlinks in `~/.config/` referring to files and directories in `config` folder. If there is already a file or directorie or whatever with the same name in `~/config/`, it will be moved to `~/.config/config-backup/$(date +%Y%m%d-%H%M%S)/` before a new symlink is created. +> Most scripts are placed in the [config/scripts](https://github.com/Uyanide/dotfiles/tree/main/config/scripts) folder. - `config-switch` @@ -131,7 +127,7 @@ including: - `ssh-init` - ensures that there is only one valid ssh-agent running at the same time. Useful when creating ssh-agent somewhere else than the login shell scripts or across sessions. + ensures there is only one valid ssh-agent running at the same time. Useful when creating ssh-agent somewhere else than the login shell scripts or across sessions. - `screenshot` @@ -139,4 +135,4 @@ including: - `record-script` - records the screen based on wf-recorder and using av1_nvenc as the video encoder. The default codec parameters will generate a fairly large video file (80 Mbps), a later transcoding is definitly required in this case. + records the screen based on wf-recorder and using av1_nvenc as the video encoder. The default codec parameters will generate a fairly large video file (80 Mbps), a later transcoding is definitly required in such case. diff --git a/grub/background.psd b/assets/grub/background.psd similarity index 100% rename from grub/background.psd rename to assets/grub/background.psd diff --git a/grub/theme/MapleMono-CN-Regular.pf2 b/assets/grub/theme/MapleMono-CN-Regular.pf2 similarity index 100% rename from grub/theme/MapleMono-CN-Regular.pf2 rename to assets/grub/theme/MapleMono-CN-Regular.pf2 diff --git a/grub/theme/background.png b/assets/grub/theme/background.png similarity index 100% rename from grub/theme/background.png rename to assets/grub/theme/background.png diff --git a/grub/theme/icons/4MLinux.png b/assets/grub/theme/icons/4MLinux.png similarity index 100% rename from grub/theme/icons/4MLinux.png rename to assets/grub/theme/icons/4MLinux.png diff --git a/grub/theme/icons/AlpineLinux.png b/assets/grub/theme/icons/AlpineLinux.png similarity index 100% rename from grub/theme/icons/AlpineLinux.png rename to assets/grub/theme/icons/AlpineLinux.png diff --git a/grub/theme/icons/Manjaro.i686.png b/assets/grub/theme/icons/Manjaro.i686.png similarity index 100% rename from grub/theme/icons/Manjaro.i686.png rename to assets/grub/theme/icons/Manjaro.i686.png diff --git a/grub/theme/icons/Manjaro.x86_64.png b/assets/grub/theme/icons/Manjaro.x86_64.png similarity index 100% rename from grub/theme/icons/Manjaro.x86_64.png rename to assets/grub/theme/icons/Manjaro.x86_64.png diff --git a/grub/theme/icons/SystemRescueCD.png b/assets/grub/theme/icons/SystemRescueCD.png similarity index 100% rename from grub/theme/icons/SystemRescueCD.png rename to assets/grub/theme/icons/SystemRescueCD.png diff --git a/grub/theme/icons/android.png b/assets/grub/theme/icons/android.png similarity index 100% rename from grub/theme/icons/android.png rename to assets/grub/theme/icons/android.png diff --git a/grub/theme/icons/anonymous.png b/assets/grub/theme/icons/anonymous.png similarity index 100% rename from grub/theme/icons/anonymous.png rename to assets/grub/theme/icons/anonymous.png diff --git a/grub/theme/icons/antergos.png b/assets/grub/theme/icons/antergos.png similarity index 100% rename from grub/theme/icons/antergos.png rename to assets/grub/theme/icons/antergos.png diff --git a/grub/theme/icons/arch.png b/assets/grub/theme/icons/arch.png similarity index 100% rename from grub/theme/icons/arch.png rename to assets/grub/theme/icons/arch.png diff --git a/grub/theme/icons/archcraft.png b/assets/grub/theme/icons/archcraft.png similarity index 100% rename from grub/theme/icons/archcraft.png rename to assets/grub/theme/icons/archcraft.png diff --git a/grub/theme/icons/archlinux.png b/assets/grub/theme/icons/archlinux.png similarity index 100% rename from grub/theme/icons/archlinux.png rename to assets/grub/theme/icons/archlinux.png diff --git a/grub/theme/icons/arcolinux.png b/assets/grub/theme/icons/arcolinux.png similarity index 100% rename from grub/theme/icons/arcolinux.png rename to assets/grub/theme/icons/arcolinux.png diff --git a/grub/theme/icons/artix.png b/assets/grub/theme/icons/artix.png similarity index 100% rename from grub/theme/icons/artix.png rename to assets/grub/theme/icons/artix.png diff --git a/grub/theme/icons/brunch-settings.png b/assets/grub/theme/icons/brunch-settings.png similarity index 100% rename from grub/theme/icons/brunch-settings.png rename to assets/grub/theme/icons/brunch-settings.png diff --git a/grub/theme/icons/brunch.png b/assets/grub/theme/icons/brunch.png similarity index 100% rename from grub/theme/icons/brunch.png rename to assets/grub/theme/icons/brunch.png diff --git a/grub/theme/icons/cachyos.png b/assets/grub/theme/icons/cachyos.png similarity index 100% rename from grub/theme/icons/cachyos.png rename to assets/grub/theme/icons/cachyos.png diff --git a/grub/theme/icons/cancel.png b/assets/grub/theme/icons/cancel.png similarity index 100% rename from grub/theme/icons/cancel.png rename to assets/grub/theme/icons/cancel.png diff --git a/grub/theme/icons/chakra.png b/assets/grub/theme/icons/chakra.png similarity index 100% rename from grub/theme/icons/chakra.png rename to assets/grub/theme/icons/chakra.png diff --git a/grub/theme/icons/chimera.png b/assets/grub/theme/icons/chimera.png similarity index 100% rename from grub/theme/icons/chimera.png rename to assets/grub/theme/icons/chimera.png diff --git a/grub/theme/icons/debian.png b/assets/grub/theme/icons/debian.png similarity index 100% rename from grub/theme/icons/debian.png rename to assets/grub/theme/icons/debian.png diff --git a/grub/theme/icons/deepin.png b/assets/grub/theme/icons/deepin.png similarity index 100% rename from grub/theme/icons/deepin.png rename to assets/grub/theme/icons/deepin.png diff --git a/grub/theme/icons/devuan.png b/assets/grub/theme/icons/devuan.png similarity index 100% rename from grub/theme/icons/devuan.png rename to assets/grub/theme/icons/devuan.png diff --git a/grub/theme/icons/driver.png b/assets/grub/theme/icons/driver.png similarity index 100% rename from grub/theme/icons/driver.png rename to assets/grub/theme/icons/driver.png diff --git a/grub/theme/icons/edit.png b/assets/grub/theme/icons/edit.png similarity index 100% rename from grub/theme/icons/edit.png rename to assets/grub/theme/icons/edit.png diff --git a/grub/theme/icons/efi.png b/assets/grub/theme/icons/efi.png similarity index 100% rename from grub/theme/icons/efi.png rename to assets/grub/theme/icons/efi.png diff --git a/grub/theme/icons/elementary.png b/assets/grub/theme/icons/elementary.png similarity index 100% rename from grub/theme/icons/elementary.png rename to assets/grub/theme/icons/elementary.png diff --git a/grub/theme/icons/endeavouros.png b/assets/grub/theme/icons/endeavouros.png similarity index 100% rename from grub/theme/icons/endeavouros.png rename to assets/grub/theme/icons/endeavouros.png diff --git a/grub/theme/icons/fedora.png b/assets/grub/theme/icons/fedora.png similarity index 100% rename from grub/theme/icons/fedora.png rename to assets/grub/theme/icons/fedora.png diff --git a/grub/theme/icons/find.efi.png b/assets/grub/theme/icons/find.efi.png similarity index 100% rename from grub/theme/icons/find.efi.png rename to assets/grub/theme/icons/find.efi.png diff --git a/grub/theme/icons/find.none.png b/assets/grub/theme/icons/find.none.png similarity index 100% rename from grub/theme/icons/find.none.png rename to assets/grub/theme/icons/find.none.png diff --git a/grub/theme/icons/freebsd.png b/assets/grub/theme/icons/freebsd.png similarity index 100% rename from grub/theme/icons/freebsd.png rename to assets/grub/theme/icons/freebsd.png diff --git a/grub/theme/icons/gentoo.png b/assets/grub/theme/icons/gentoo.png similarity index 100% rename from grub/theme/icons/gentoo.png rename to assets/grub/theme/icons/gentoo.png diff --git a/grub/theme/icons/gnu-linux.png b/assets/grub/theme/icons/gnu-linux.png similarity index 100% rename from grub/theme/icons/gnu-linux.png rename to assets/grub/theme/icons/gnu-linux.png diff --git a/grub/theme/icons/gpart.png b/assets/grub/theme/icons/gpart.png similarity index 100% rename from grub/theme/icons/gpart.png rename to assets/grub/theme/icons/gpart.png diff --git a/grub/theme/icons/haiku.png b/assets/grub/theme/icons/haiku.png similarity index 100% rename from grub/theme/icons/haiku.png rename to assets/grub/theme/icons/haiku.png diff --git a/grub/theme/icons/help.png b/assets/grub/theme/icons/help.png similarity index 100% rename from grub/theme/icons/help.png rename to assets/grub/theme/icons/help.png diff --git a/grub/theme/icons/kali.png b/assets/grub/theme/icons/kali.png similarity index 100% rename from grub/theme/icons/kali.png rename to assets/grub/theme/icons/kali.png diff --git a/grub/theme/icons/kaos.png b/assets/grub/theme/icons/kaos.png similarity index 100% rename from grub/theme/icons/kaos.png rename to assets/grub/theme/icons/kaos.png diff --git a/grub/theme/icons/kbd.png b/assets/grub/theme/icons/kbd.png similarity index 100% rename from grub/theme/icons/kbd.png rename to assets/grub/theme/icons/kbd.png diff --git a/grub/theme/icons/kernel.png b/assets/grub/theme/icons/kernel.png similarity index 100% rename from grub/theme/icons/kernel.png rename to assets/grub/theme/icons/kernel.png diff --git a/grub/theme/icons/korora.png b/assets/grub/theme/icons/korora.png similarity index 100% rename from grub/theme/icons/korora.png rename to assets/grub/theme/icons/korora.png diff --git a/grub/theme/icons/kubuntu.png b/assets/grub/theme/icons/kubuntu.png similarity index 100% rename from grub/theme/icons/kubuntu.png rename to assets/grub/theme/icons/kubuntu.png diff --git a/grub/theme/icons/lang.png b/assets/grub/theme/icons/lang.png similarity index 100% rename from grub/theme/icons/lang.png rename to assets/grub/theme/icons/lang.png diff --git a/grub/theme/icons/lfs.png b/assets/grub/theme/icons/lfs.png similarity index 100% rename from grub/theme/icons/lfs.png rename to assets/grub/theme/icons/lfs.png diff --git a/grub/theme/icons/linux.png b/assets/grub/theme/icons/linux.png similarity index 100% rename from grub/theme/icons/linux.png rename to assets/grub/theme/icons/linux.png diff --git a/grub/theme/icons/linuxmint.png b/assets/grub/theme/icons/linuxmint.png similarity index 100% rename from grub/theme/icons/linuxmint.png rename to assets/grub/theme/icons/linuxmint.png diff --git a/grub/theme/icons/lubuntu.png b/assets/grub/theme/icons/lubuntu.png similarity index 100% rename from grub/theme/icons/lubuntu.png rename to assets/grub/theme/icons/lubuntu.png diff --git a/grub/theme/icons/macosx.png b/assets/grub/theme/icons/macosx.png similarity index 100% rename from grub/theme/icons/macosx.png rename to assets/grub/theme/icons/macosx.png diff --git a/grub/theme/icons/mageia.png b/assets/grub/theme/icons/mageia.png similarity index 100% rename from grub/theme/icons/mageia.png rename to assets/grub/theme/icons/mageia.png diff --git a/grub/theme/icons/manjaro.png b/assets/grub/theme/icons/manjaro.png similarity index 100% rename from grub/theme/icons/manjaro.png rename to assets/grub/theme/icons/manjaro.png diff --git a/grub/theme/icons/manjarolinux.png b/assets/grub/theme/icons/manjarolinux.png similarity index 100% rename from grub/theme/icons/manjarolinux.png rename to assets/grub/theme/icons/manjarolinux.png diff --git a/grub/theme/icons/memtest.png b/assets/grub/theme/icons/memtest.png similarity index 100% rename from grub/theme/icons/memtest.png rename to assets/grub/theme/icons/memtest.png diff --git a/grub/theme/icons/mx-linux.png b/assets/grub/theme/icons/mx-linux.png similarity index 100% rename from grub/theme/icons/mx-linux.png rename to assets/grub/theme/icons/mx-linux.png diff --git a/grub/theme/icons/neon.png b/assets/grub/theme/icons/neon.png similarity index 100% rename from grub/theme/icons/neon.png rename to assets/grub/theme/icons/neon.png diff --git a/grub/theme/icons/nixos.png b/assets/grub/theme/icons/nixos.png similarity index 100% rename from grub/theme/icons/nixos.png rename to assets/grub/theme/icons/nixos.png diff --git a/grub/theme/icons/opensuse.png b/assets/grub/theme/icons/opensuse.png similarity index 100% rename from grub/theme/icons/opensuse.png rename to assets/grub/theme/icons/opensuse.png diff --git a/grub/theme/icons/parrot.png b/assets/grub/theme/icons/parrot.png similarity index 100% rename from grub/theme/icons/parrot.png rename to assets/grub/theme/icons/parrot.png diff --git a/grub/theme/icons/pop-os.png b/assets/grub/theme/icons/pop-os.png similarity index 100% rename from grub/theme/icons/pop-os.png rename to assets/grub/theme/icons/pop-os.png diff --git a/grub/theme/icons/pop.png b/assets/grub/theme/icons/pop.png similarity index 100% rename from grub/theme/icons/pop.png rename to assets/grub/theme/icons/pop.png diff --git a/grub/theme/icons/recovery.png b/assets/grub/theme/icons/recovery.png similarity index 100% rename from grub/theme/icons/recovery.png rename to assets/grub/theme/icons/recovery.png diff --git a/grub/theme/icons/regolith.png b/assets/grub/theme/icons/regolith.png similarity index 100% rename from grub/theme/icons/regolith.png rename to assets/grub/theme/icons/regolith.png diff --git a/grub/theme/icons/restart.png b/assets/grub/theme/icons/restart.png similarity index 100% rename from grub/theme/icons/restart.png rename to assets/grub/theme/icons/restart.png diff --git a/grub/theme/icons/shutdown.png b/assets/grub/theme/icons/shutdown.png similarity index 100% rename from grub/theme/icons/shutdown.png rename to assets/grub/theme/icons/shutdown.png diff --git a/grub/theme/icons/siduction.png b/assets/grub/theme/icons/siduction.png similarity index 100% rename from grub/theme/icons/siduction.png rename to assets/grub/theme/icons/siduction.png diff --git a/grub/theme/icons/solus.png b/assets/grub/theme/icons/solus.png similarity index 100% rename from grub/theme/icons/solus.png rename to assets/grub/theme/icons/solus.png diff --git a/grub/theme/icons/steamos.png b/assets/grub/theme/icons/steamos.png similarity index 100% rename from grub/theme/icons/steamos.png rename to assets/grub/theme/icons/steamos.png diff --git a/grub/theme/icons/submenu.png b/assets/grub/theme/icons/submenu.png similarity index 100% rename from grub/theme/icons/submenu.png rename to assets/grub/theme/icons/submenu.png diff --git a/grub/theme/icons/type.png b/assets/grub/theme/icons/type.png similarity index 100% rename from grub/theme/icons/type.png rename to assets/grub/theme/icons/type.png diff --git a/grub/theme/icons/tz.png b/assets/grub/theme/icons/tz.png similarity index 100% rename from grub/theme/icons/tz.png rename to assets/grub/theme/icons/tz.png diff --git a/grub/theme/icons/ubuntu.png b/assets/grub/theme/icons/ubuntu.png similarity index 100% rename from grub/theme/icons/ubuntu.png rename to assets/grub/theme/icons/ubuntu.png diff --git a/grub/theme/icons/ubuntuDDE.png b/assets/grub/theme/icons/ubuntuDDE.png similarity index 100% rename from grub/theme/icons/ubuntuDDE.png rename to assets/grub/theme/icons/ubuntuDDE.png diff --git a/grub/theme/icons/unknown.png b/assets/grub/theme/icons/unknown.png similarity index 100% rename from grub/theme/icons/unknown.png rename to assets/grub/theme/icons/unknown.png diff --git a/grub/theme/icons/unset.png b/assets/grub/theme/icons/unset.png similarity index 100% rename from grub/theme/icons/unset.png rename to assets/grub/theme/icons/unset.png diff --git a/grub/theme/icons/void.png b/assets/grub/theme/icons/void.png similarity index 100% rename from grub/theme/icons/void.png rename to assets/grub/theme/icons/void.png diff --git a/grub/theme/icons/windows.png b/assets/grub/theme/icons/windows.png similarity index 100% rename from grub/theme/icons/windows.png rename to assets/grub/theme/icons/windows.png diff --git a/grub/theme/icons/xubuntu.png b/assets/grub/theme/icons/xubuntu.png similarity index 100% rename from grub/theme/icons/xubuntu.png rename to assets/grub/theme/icons/xubuntu.png diff --git a/grub/theme/icons/zorin.png b/assets/grub/theme/icons/zorin.png similarity index 100% rename from grub/theme/icons/zorin.png rename to assets/grub/theme/icons/zorin.png diff --git a/grub/theme/select_c.png b/assets/grub/theme/select_c.png similarity index 100% rename from grub/theme/select_c.png rename to assets/grub/theme/select_c.png diff --git a/grub/theme/select_e.png b/assets/grub/theme/select_e.png similarity index 100% rename from grub/theme/select_e.png rename to assets/grub/theme/select_e.png diff --git a/grub/theme/select_w.png b/assets/grub/theme/select_w.png similarity index 100% rename from grub/theme/select_w.png rename to assets/grub/theme/select_w.png diff --git a/grub/theme/terminus-12.pf2 b/assets/grub/theme/terminus-12.pf2 similarity index 100% rename from grub/theme/terminus-12.pf2 rename to assets/grub/theme/terminus-12.pf2 diff --git a/grub/theme/terminus-14.pf2 b/assets/grub/theme/terminus-14.pf2 similarity index 100% rename from grub/theme/terminus-14.pf2 rename to assets/grub/theme/terminus-14.pf2 diff --git a/grub/theme/terminus-16.pf2 b/assets/grub/theme/terminus-16.pf2 similarity index 100% rename from grub/theme/terminus-16.pf2 rename to assets/grub/theme/terminus-16.pf2 diff --git a/grub/theme/terminus-18.pf2 b/assets/grub/theme/terminus-18.pf2 similarity index 100% rename from grub/theme/terminus-18.pf2 rename to assets/grub/theme/terminus-18.pf2 diff --git a/grub/theme/theme.txt b/assets/grub/theme/theme.txt similarity index 100% rename from grub/theme/theme.txt rename to assets/grub/theme/theme.txt diff --git a/config/cava/config b/config/cava/.config/cava/config similarity index 100% rename from config/cava/config rename to config/cava/.config/cava/config diff --git a/config/cava/shaders/bar_spectrum.frag b/config/cava/.config/cava/shaders/bar_spectrum.frag similarity index 100% rename from config/cava/shaders/bar_spectrum.frag rename to config/cava/.config/cava/shaders/bar_spectrum.frag diff --git a/config/cava/shaders/eye_of_phi.frag b/config/cava/.config/cava/shaders/eye_of_phi.frag similarity index 100% rename from config/cava/shaders/eye_of_phi.frag rename to config/cava/.config/cava/shaders/eye_of_phi.frag diff --git a/config/cava/shaders/northern_lights.frag b/config/cava/.config/cava/shaders/northern_lights.frag similarity index 100% rename from config/cava/shaders/northern_lights.frag rename to config/cava/.config/cava/shaders/northern_lights.frag diff --git a/config/cava/shaders/pass_through.vert b/config/cava/.config/cava/shaders/pass_through.vert similarity index 100% rename from config/cava/shaders/pass_through.vert rename to config/cava/.config/cava/shaders/pass_through.vert diff --git a/config/cava/shaders/spectrogram.frag b/config/cava/.config/cava/shaders/spectrogram.frag similarity index 100% rename from config/cava/shaders/spectrogram.frag rename to config/cava/.config/cava/shaders/spectrogram.frag diff --git a/config/cava/shaders/winamp_line_style_spectrum.frag b/config/cava/.config/cava/shaders/winamp_line_style_spectrum.frag similarity index 100% rename from config/cava/shaders/winamp_line_style_spectrum.frag rename to config/cava/.config/cava/shaders/winamp_line_style_spectrum.frag diff --git a/config/cava/themes/solarized_dark b/config/cava/.config/cava/themes/solarized_dark similarity index 100% rename from config/cava/themes/solarized_dark rename to config/cava/.config/cava/themes/solarized_dark diff --git a/config/cava/themes/tricolor b/config/cava/.config/cava/themes/tricolor similarity index 100% rename from config/cava/themes/tricolor rename to config/cava/.config/cava/themes/tricolor diff --git a/.clang-format b/config/clang/.clang-format similarity index 100% rename from .clang-format rename to config/clang/.clang-format diff --git a/config/eww/Lyrics/eww.scss b/config/eww/.config/eww/Lyrics/eww.scss similarity index 100% rename from config/eww/Lyrics/eww.scss rename to config/eww/.config/eww/Lyrics/eww.scss diff --git a/config/eww/Lyrics/eww.yuck b/config/eww/.config/eww/Lyrics/eww.yuck similarity index 100% rename from config/eww/Lyrics/eww.yuck rename to config/eww/.config/eww/Lyrics/eww.yuck diff --git a/config/eww/Lyrics/scripts/colorize.sh b/config/eww/.config/eww/Lyrics/scripts/colorize.sh similarity index 100% rename from config/eww/Lyrics/scripts/colorize.sh rename to config/eww/.config/eww/Lyrics/scripts/colorize.sh diff --git a/config/eww/Lyrics/scripts/lyric-clear.sh b/config/eww/.config/eww/Lyrics/scripts/lyric-clear.sh similarity index 100% rename from config/eww/Lyrics/scripts/lyric-clear.sh rename to config/eww/.config/eww/Lyrics/scripts/lyric-clear.sh diff --git a/config/eww/Lyrics/scripts/lyric-offset.py b/config/eww/.config/eww/Lyrics/scripts/lyric-offset.py similarity index 100% rename from config/eww/Lyrics/scripts/lyric-offset.py rename to config/eww/.config/eww/Lyrics/scripts/lyric-offset.py diff --git a/config/eww/Lyrics/scripts/lyric-show.sh b/config/eww/.config/eww/Lyrics/scripts/lyric-show.sh similarity index 100% rename from config/eww/Lyrics/scripts/lyric-show.sh rename to config/eww/.config/eww/Lyrics/scripts/lyric-show.sh diff --git a/config/eww/Main/eww.scss b/config/eww/.config/eww/Main/eww.scss similarity index 100% rename from config/eww/Main/eww.scss rename to config/eww/.config/eww/Main/eww.scss diff --git a/config/eww/Main/eww.yuck b/config/eww/.config/eww/Main/eww.yuck similarity index 100% rename from config/eww/Main/eww.yuck rename to config/eww/.config/eww/Main/eww.yuck diff --git a/config/eww/Main/images/default-music-blur.png b/config/eww/.config/eww/Main/images/default-music-blur.png similarity index 100% rename from config/eww/Main/images/default-music-blur.png rename to config/eww/.config/eww/Main/images/default-music-blur.png diff --git a/config/eww/Main/images/default-music.svg b/config/eww/.config/eww/Main/images/default-music.svg similarity index 100% rename from config/eww/Main/images/default-music.svg rename to config/eww/.config/eww/Main/images/default-music.svg diff --git a/config/eww/Main/images/profile.png b/config/eww/.config/eww/Main/images/profile.png similarity index 100% rename from config/eww/Main/images/profile.png rename to config/eww/.config/eww/Main/images/profile.png diff --git a/config/eww/Main/scripts/cava b/config/eww/.config/eww/Main/scripts/cava similarity index 100% rename from config/eww/Main/scripts/cava rename to config/eww/.config/eww/Main/scripts/cava diff --git a/config/eww/Main/scripts/details b/config/eww/.config/eww/Main/scripts/details similarity index 100% rename from config/eww/Main/scripts/details rename to config/eww/.config/eww/Main/scripts/details diff --git a/config/eww/Main/scripts/fortune-split b/config/eww/.config/eww/Main/scripts/fortune-split similarity index 100% rename from config/eww/Main/scripts/fortune-split rename to config/eww/.config/eww/Main/scripts/fortune-split diff --git a/config/eww/Main/scripts/music-album b/config/eww/.config/eww/Main/scripts/music-album similarity index 100% rename from config/eww/Main/scripts/music-album rename to config/eww/.config/eww/Main/scripts/music-album diff --git a/config/eww/Main/scripts/music-art b/config/eww/.config/eww/Main/scripts/music-art similarity index 100% rename from config/eww/Main/scripts/music-art rename to config/eww/.config/eww/Main/scripts/music-art diff --git a/config/eww/Main/scripts/music-art-blur b/config/eww/.config/eww/Main/scripts/music-art-blur similarity index 100% rename from config/eww/Main/scripts/music-art-blur rename to config/eww/.config/eww/Main/scripts/music-art-blur diff --git a/config/eww/Main/scripts/music-artist b/config/eww/.config/eww/Main/scripts/music-artist similarity index 100% rename from config/eww/Main/scripts/music-artist rename to config/eww/.config/eww/Main/scripts/music-artist diff --git a/config/eww/Main/scripts/music-length b/config/eww/.config/eww/Main/scripts/music-length similarity index 100% rename from config/eww/Main/scripts/music-length rename to config/eww/.config/eww/Main/scripts/music-length diff --git a/config/eww/Main/scripts/music-length-info b/config/eww/.config/eww/Main/scripts/music-length-info similarity index 100% rename from config/eww/Main/scripts/music-length-info rename to config/eww/.config/eww/Main/scripts/music-length-info diff --git a/config/eww/Main/scripts/music-position b/config/eww/.config/eww/Main/scripts/music-position similarity index 100% rename from config/eww/Main/scripts/music-position rename to config/eww/.config/eww/Main/scripts/music-position diff --git a/config/eww/Main/scripts/music-title b/config/eww/.config/eww/Main/scripts/music-title similarity index 100% rename from config/eww/Main/scripts/music-title rename to config/eww/.config/eww/Main/scripts/music-title diff --git a/config/eww/Main/scripts/player b/config/eww/.config/eww/Main/scripts/player similarity index 100% rename from config/eww/Main/scripts/player rename to config/eww/.config/eww/Main/scripts/player diff --git a/config/eww/Main/scripts/system b/config/eww/.config/eww/Main/scripts/system similarity index 100% rename from config/eww/Main/scripts/system rename to config/eww/.config/eww/Main/scripts/system diff --git a/config/eww/Main/scripts/weather b/config/eww/.config/eww/Main/scripts/weather similarity index 100% rename from config/eww/Main/scripts/weather rename to config/eww/.config/eww/Main/scripts/weather diff --git a/config/eww/apply-color b/config/eww/.config/eww/apply-color similarity index 66% rename from config/eww/apply-color rename to config/eww/.config/eww/apply-color index f48d427..bc58a3d 100755 --- a/config/eww/apply-color +++ b/config/eww/.config/eww/apply-color @@ -1,7 +1,11 @@ #!/bin/bash path=$(dirname "$(readlink -f "$0")") -. "$path"/../../utils/apply-color-helper +[ -f "$HOME/.local/snippets/apply-color-helper" ] || { + echo "Missing helper script: $HOME/.local/snippets/apply-color-helper" + exit 1 +} +. "$HOME/.local/snippets/apply-color-helper" file="$path"/eww.scss diff --git a/config/eww/eww.scss b/config/eww/.config/eww/eww.scss similarity index 100% rename from config/eww/eww.scss rename to config/eww/.config/eww/eww.scss diff --git a/config/eww/eww.yuck b/config/eww/.config/eww/eww.yuck similarity index 100% rename from config/eww/eww.yuck rename to config/eww/.config/eww/eww.yuck diff --git a/config/fastfetch/.config/fastfetch/apply-color b/config/fastfetch/.config/fastfetch/apply-color new file mode 100755 index 0000000..6077c26 --- /dev/null +++ b/config/fastfetch/.config/fastfetch/apply-color @@ -0,0 +1,18 @@ +#!/bin/bash + +path=$(dirname "$(readlink -f "$0")") +[ -f "$HOME/.local/snippets/apply-color-helper" ] || { + echo "Missing helper script: $HOME/.local/snippets/apply-color-helper" + exit 1 +} +. "$HOME/.local/snippets/apply-color-helper" + +file="$HOME/.config/fish/post.d/fetch.fish" + +sed -i -E "s/(set -g fetch_color\s+\"#)([0-9a-fA-F]{6})(\")/\1${colorHex}\3/" "$file" || { + log_error "Failed to edit ${file}" + exit 1 +} + +log_success "fastfetch" + diff --git a/config/fastfetch/brief.jsonc b/config/fastfetch/.config/fastfetch/brief.jsonc similarity index 100% rename from config/fastfetch/brief.jsonc rename to config/fastfetch/.config/fastfetch/brief.jsonc diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/.config/fastfetch/config.jsonc similarity index 100% rename from config/fastfetch/config.jsonc rename to config/fastfetch/.config/fastfetch/config.jsonc diff --git a/config/fastfetch/logo_gg/24x.sixel b/config/fastfetch/.config/fastfetch/logo_gg/24x.sixel similarity index 100% rename from config/fastfetch/logo_gg/24x.sixel rename to config/fastfetch/.config/fastfetch/logo_gg/24x.sixel diff --git a/config/fastfetch/logo_gg/24x.symbols b/config/fastfetch/.config/fastfetch/logo_gg/24x.symbols similarity index 100% rename from config/fastfetch/logo_gg/24x.symbols rename to config/fastfetch/.config/fastfetch/logo_gg/24x.symbols diff --git a/config/fastfetch/logo_gg/ButaNeko.png b/config/fastfetch/.config/fastfetch/logo_gg/ButaNeko.png similarity index 100% rename from config/fastfetch/logo_gg/ButaNeko.png rename to config/fastfetch/.config/fastfetch/logo_gg/ButaNeko.png diff --git a/config/fastfetch/logo_mugi/24x.sixel b/config/fastfetch/.config/fastfetch/logo_mugi/24x.sixel similarity index 100% rename from config/fastfetch/logo_mugi/24x.sixel rename to config/fastfetch/.config/fastfetch/logo_mugi/24x.sixel diff --git a/config/fastfetch/logo_mugi/24x.symbols b/config/fastfetch/.config/fastfetch/logo_mugi/24x.symbols similarity index 100% rename from config/fastfetch/logo_mugi/24x.symbols rename to config/fastfetch/.config/fastfetch/logo_mugi/24x.symbols diff --git a/config/fastfetch/logo_mugi/32x.sixel b/config/fastfetch/.config/fastfetch/logo_mugi/32x.sixel similarity index 100% rename from config/fastfetch/logo_mugi/32x.sixel rename to config/fastfetch/.config/fastfetch/logo_mugi/32x.sixel diff --git a/config/fastfetch/logo_mugi/32x.symbols b/config/fastfetch/.config/fastfetch/logo_mugi/32x.symbols similarity index 100% rename from config/fastfetch/logo_mugi/32x.symbols rename to config/fastfetch/.config/fastfetch/logo_mugi/32x.symbols diff --git a/config/fastfetch/logo_mugi/mugi_1.png b/config/fastfetch/.config/fastfetch/logo_mugi/mugi_1.png similarity index 100% rename from config/fastfetch/logo_mugi/mugi_1.png rename to config/fastfetch/.config/fastfetch/logo_mugi/mugi_1.png diff --git a/config/fastfetch/logo_mugi/mugi_2.png b/config/fastfetch/.config/fastfetch/logo_mugi/mugi_2.png similarity index 100% rename from config/fastfetch/logo_mugi/mugi_2.png rename to config/fastfetch/.config/fastfetch/logo_mugi/mugi_2.png diff --git a/config/fastfetch/logo_mugi/mugi_3.png b/config/fastfetch/.config/fastfetch/logo_mugi/mugi_3.png similarity index 100% rename from config/fastfetch/logo_mugi/mugi_3.png rename to config/fastfetch/.config/fastfetch/logo_mugi/mugi_3.png diff --git a/config/fastfetch/logo_ros/24x.sixel b/config/fastfetch/.config/fastfetch/logo_ros/24x.sixel similarity index 100% rename from config/fastfetch/logo_ros/24x.sixel rename to config/fastfetch/.config/fastfetch/logo_ros/24x.sixel diff --git a/config/fastfetch/logo_ros/24x.symbols b/config/fastfetch/.config/fastfetch/logo_ros/24x.symbols similarity index 100% rename from config/fastfetch/logo_ros/24x.symbols rename to config/fastfetch/.config/fastfetch/logo_ros/24x.symbols diff --git a/config/fastfetch/logo_ros/28x.sixel b/config/fastfetch/.config/fastfetch/logo_ros/28x.sixel similarity index 100% rename from config/fastfetch/logo_ros/28x.sixel rename to config/fastfetch/.config/fastfetch/logo_ros/28x.sixel diff --git a/config/fastfetch/logo_ros/28x.symbols b/config/fastfetch/.config/fastfetch/logo_ros/28x.symbols similarity index 100% rename from config/fastfetch/logo_ros/28x.symbols rename to config/fastfetch/.config/fastfetch/logo_ros/28x.symbols diff --git a/config/fastfetch/logo_ros/32x.sixel b/config/fastfetch/.config/fastfetch/logo_ros/32x.sixel similarity index 100% rename from config/fastfetch/logo_ros/32x.sixel rename to config/fastfetch/.config/fastfetch/logo_ros/32x.sixel diff --git a/config/fastfetch/logo_ros/32x.symbols b/config/fastfetch/.config/fastfetch/logo_ros/32x.symbols similarity index 100% rename from config/fastfetch/logo_ros/32x.symbols rename to config/fastfetch/.config/fastfetch/logo_ros/32x.symbols diff --git a/config/fastfetch/logo_ros/42x.sixel b/config/fastfetch/.config/fastfetch/logo_ros/42x.sixel similarity index 100% rename from config/fastfetch/logo_ros/42x.sixel rename to config/fastfetch/.config/fastfetch/logo_ros/42x.sixel diff --git a/config/fastfetch/logo_ros/42x.symbols b/config/fastfetch/.config/fastfetch/logo_ros/42x.symbols similarity index 100% rename from config/fastfetch/logo_ros/42x.symbols rename to config/fastfetch/.config/fastfetch/logo_ros/42x.symbols diff --git a/config/fastfetch/logo_ros/ros.png b/config/fastfetch/.config/fastfetch/logo_ros/ros.png similarity index 100% rename from config/fastfetch/logo_ros/ros.png rename to config/fastfetch/.config/fastfetch/logo_ros/ros.png diff --git a/config/fastfetch/apply-color b/config/fastfetch/apply-color deleted file mode 100755 index 0219601..0000000 --- a/config/fastfetch/apply-color +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -path=$(dirname "$(readlink -f "$0")") -. "$path"/../../utils/apply-color-helper - -file="$path"/../fish/post.d/fetch.fish - -sed -i -E "s/(set -g fetch_color\s+\"#)([0-9a-fA-F]{6})(\")/\1${colorHex}\3/" "$file" || { - log_error "Failed to edit ${file}" - exit 1 -} - -log_success "fastfetch" \ No newline at end of file diff --git a/config/fish/.bash_profile b/config/fish/.bash_profile new file mode 100644 index 0000000..a847b43 --- /dev/null +++ b/config/fish/.bash_profile @@ -0,0 +1,14 @@ +[ -d "$HOME/.local/bin" ] && export PATH="$HOME/.local/bin:$PATH" +[ -d "$HOME/.local/scripts" ] && export PATH="$HOME/.local/scripts:$PATH" +[ -d "$HOME/.cargo/bin" ] && export PATH="$HOME/.cargo/bin:$PATH" +[ -d "$HOME/go/bin" ] && export PATH="$HOME/go/bin:$PATH" + +[ -x "$HOME/.local/scripts/ssh-init" ] && eval "$(ssh-init)" + +command -v nvim >/dev/null 2>&1 && { + export EDITOR=nvim + export VISUAL=nvim +} + +[ -f "$HOME/.profile" ] && . "$HOME/.profile" +[ -f "$HOME/.bashrc" ] && . "$HOME/.bashrc" diff --git a/config/fish/.gitignore b/config/fish/.config/fish/.gitignore similarity index 100% rename from config/fish/.gitignore rename to config/fish/.config/fish/.gitignore diff --git a/config/fish/apply-color-kvantum b/config/fish/.config/fish/apply-color-kvantum similarity index 53% rename from config/fish/apply-color-kvantum rename to config/fish/.config/fish/apply-color-kvantum index 64d49e8..fd6dbb9 100755 --- a/config/fish/apply-color-kvantum +++ b/config/fish/.config/fish/apply-color-kvantum @@ -1,7 +1,11 @@ #!/bin/bash path=$(dirname "$(readlink -f "$0")") -. "$path"/../../utils/apply-color-helper +[ -f "$HOME/.local/snippets/apply-color-helper" ] || { + echo "Missing helper script: $HOME/.local/snippets/apply-color-helper" + exit 1 +} +. "$HOME/.local/snippets/apply-color-helper" kvantummanager --set catppuccin-mocha-"$colorName" || { log_error "Failed to set kvantum theme to catppuccin-mocha-${colorName}" diff --git a/config/fish/apply-color-nwg-look b/config/fish/.config/fish/apply-color-nwg-look similarity index 60% rename from config/fish/apply-color-nwg-look rename to config/fish/.config/fish/apply-color-nwg-look index 1768109..e015995 100755 --- a/config/fish/apply-color-nwg-look +++ b/config/fish/.config/fish/apply-color-nwg-look @@ -1,7 +1,11 @@ #!/bin/bash path=$(dirname "$(readlink -f "$0")") -. "$path"/../../utils/apply-color-helper +[ -f "$HOME/.local/snippets/apply-color-helper" ] || { + echo "Missing helper script: $HOME/.local/snippets/apply-color-helper" + exit 1 +} +. "$HOME/.local/snippets/apply-color-helper" file="$HOME/.local/share/nwg-look/gsettings" diff --git a/config/fish/apply-color-omp b/config/fish/.config/fish/apply-color-omp similarity index 88% rename from config/fish/apply-color-omp rename to config/fish/.config/fish/apply-color-omp index e22f24d..f80bacc 100755 --- a/config/fish/apply-color-omp +++ b/config/fish/.config/fish/apply-color-omp @@ -1,7 +1,11 @@ #!/bin/bash path=$(dirname "$(readlink -f "$0")") -. "$path"/../../utils/apply-color-helper +[ -f "$HOME/.local/snippets/apply-color-helper" ] || { + echo "Missing helper script: $HOME/.local/snippets/apply-color-helper" + exit 1 +} +. "$HOME/.local/snippets/apply-color-helper" file="$path"/../posh_theme.omp.json diff --git a/config/fish/config.fish b/config/fish/.config/fish/config.fish similarity index 100% rename from config/fish/config.fish rename to config/fish/.config/fish/config.fish diff --git a/config/fish/functions/__bass.py b/config/fish/.config/fish/functions/__bass.py similarity index 100% rename from config/fish/functions/__bass.py rename to config/fish/.config/fish/functions/__bass.py diff --git a/config/fish/functions/bass.fish b/config/fish/.config/fish/functions/bass.fish similarity index 100% rename from config/fish/functions/bass.fish rename to config/fish/.config/fish/functions/bass.fish diff --git a/config/fish/post.d/.gitignore b/config/fish/.config/fish/post.d/.gitignore similarity index 100% rename from config/fish/post.d/.gitignore rename to config/fish/.config/fish/post.d/.gitignore diff --git a/config/fish/post.d/fetch.fish b/config/fish/.config/fish/post.d/fetch.fish similarity index 100% rename from config/fish/post.d/fetch.fish rename to config/fish/.config/fish/post.d/fetch.fish diff --git a/config/fish/post.d/sshs.fish b/config/fish/.config/fish/post.d/sshs.fish similarity index 100% rename from config/fish/post.d/sshs.fish rename to config/fish/.config/fish/post.d/sshs.fish diff --git a/config/fish/prev.d/.gitignore b/config/fish/.config/fish/prev.d/.gitignore similarity index 100% rename from config/fish/prev.d/.gitignore rename to config/fish/.config/fish/prev.d/.gitignore diff --git a/config/fish/prev.d/alias.fish b/config/fish/.config/fish/prev.d/alias.fish similarity index 100% rename from config/fish/prev.d/alias.fish rename to config/fish/.config/fish/prev.d/alias.fish diff --git a/config/fish/prev.d/env.fish b/config/fish/.config/fish/prev.d/env.fish similarity index 100% rename from config/fish/prev.d/env.fish rename to config/fish/.config/fish/prev.d/env.fish diff --git a/config/fish/prev.d/prompt.fish b/config/fish/.config/fish/prev.d/prompt.fish similarity index 100% rename from config/fish/prev.d/prompt.fish rename to config/fish/.config/fish/prev.d/prompt.fish diff --git a/config/fish/prev.d/theme.fish b/config/fish/.config/fish/prev.d/theme.fish similarity index 100% rename from config/fish/prev.d/theme.fish rename to config/fish/.config/fish/prev.d/theme.fish diff --git a/config/fish/themes/Catppuccin Frappe.theme b/config/fish/.config/fish/themes/Catppuccin Frappe.theme similarity index 100% rename from config/fish/themes/Catppuccin Frappe.theme rename to config/fish/.config/fish/themes/Catppuccin Frappe.theme diff --git a/config/fish/themes/Catppuccin Latte.theme b/config/fish/.config/fish/themes/Catppuccin Latte.theme similarity index 100% rename from config/fish/themes/Catppuccin Latte.theme rename to config/fish/.config/fish/themes/Catppuccin Latte.theme diff --git a/config/fish/themes/Catppuccin Macchiato.theme b/config/fish/.config/fish/themes/Catppuccin Macchiato.theme similarity index 100% rename from config/fish/themes/Catppuccin Macchiato.theme rename to config/fish/.config/fish/themes/Catppuccin Macchiato.theme diff --git a/config/fish/themes/Catppuccin Mocha.theme b/config/fish/.config/fish/themes/Catppuccin Mocha.theme similarity index 100% rename from config/fish/themes/Catppuccin Mocha.theme rename to config/fish/.config/fish/themes/Catppuccin Mocha.theme diff --git a/config/posh_theme.omp.json b/config/fish/.config/posh_theme.omp.json similarity index 100% rename from config/posh_theme.omp.json rename to config/fish/.config/posh_theme.omp.json diff --git a/config/fuzzel/apply-color b/config/fuzzel/.config/fuzzel/apply-color similarity index 65% rename from config/fuzzel/apply-color rename to config/fuzzel/.config/fuzzel/apply-color index 1e4ac2f..d09cdf4 100755 --- a/config/fuzzel/apply-color +++ b/config/fuzzel/.config/fuzzel/apply-color @@ -1,12 +1,16 @@ #!/bin/bash path=$(dirname "$(readlink -f "$0")") -. "$path"/../../utils/apply-color-helper +[ -f "$HOME/.local/snippets/apply-color-helper" ] || { + echo "Missing helper script: $HOME/.local/snippets/apply-color-helper" + exit 1 +} +. "$HOME/.local/snippets/apply-color-helper" file="$path"/fuzzel.ini entries="match selection-match border" -if pgrep -x "fuzzel" -u "$USER" > /dev/null; then +if pgrep -x "fuzzel" -u "$USER" >/dev/null; then pkill -x fuzzel || log_error "Failed to kill fuzzel process" # and move on fi @@ -19,4 +23,5 @@ for entry in $entries; do } done -log_success "fuzzel" \ No newline at end of file +log_success "fuzzel" + diff --git a/config/fuzzel/fuzzel.ini b/config/fuzzel/.config/fuzzel/fuzzel.ini similarity index 100% rename from config/fuzzel/fuzzel.ini rename to config/fuzzel/.config/fuzzel/fuzzel.ini diff --git a/config/ghostty-niri/.gitignore b/config/ghostty-niri/.config/ghostty/.gitignore similarity index 100% rename from config/ghostty-niri/.gitignore rename to config/ghostty-niri/.config/ghostty/.gitignore diff --git a/config/ghostty-niri/config b/config/ghostty-niri/.config/ghostty/config similarity index 100% rename from config/ghostty-niri/config rename to config/ghostty-niri/.config/ghostty/config diff --git a/config/ghostty-niri/cursor-shaders/cursor-smear.glsl b/config/ghostty-niri/.config/ghostty/cursor-shaders/cursor-smear.glsl similarity index 100% rename from config/ghostty-niri/cursor-shaders/cursor-smear.glsl rename to config/ghostty-niri/.config/ghostty/cursor-shaders/cursor-smear.glsl diff --git a/config/ghostty/.gitignore b/config/ghostty/.config/ghostty/.gitignore similarity index 100% rename from config/ghostty/.gitignore rename to config/ghostty/.config/ghostty/.gitignore diff --git a/config/ghostty/config b/config/ghostty/.config/ghostty/config similarity index 100% rename from config/ghostty/config rename to config/ghostty/.config/ghostty/config diff --git a/config/ghostty/cursor-shaders/cursor-smear.glsl b/config/ghostty/.config/ghostty/cursor-shaders/cursor-smear.glsl similarity index 100% rename from config/ghostty/cursor-shaders/cursor-smear.glsl rename to config/ghostty/.config/ghostty/cursor-shaders/cursor-smear.glsl diff --git a/config/hypr/.gitignore b/config/hypr/.config/hypr/.gitignore similarity index 100% rename from config/hypr/.gitignore rename to config/hypr/.config/hypr/.gitignore diff --git a/config/hypr/apply-color b/config/hypr/.config/hypr/apply-color similarity index 68% rename from config/hypr/apply-color rename to config/hypr/.config/hypr/apply-color index 294de69..711b9d9 100755 --- a/config/hypr/apply-color +++ b/config/hypr/.config/hypr/apply-color @@ -1,7 +1,11 @@ #!/bin/bash path=$(dirname "$(readlink -f "$0")") -. "$path"/../../utils/apply-color-helper +[ -f "$HOME/.local/snippets/apply-color-helper" ] || { + echo "Missing helper script: $HOME/.local/snippets/apply-color-helper" + exit 1 +} +. "$HOME/.local/snippets/apply-color-helper" file="$path"/hyprland/colors.conf @@ -15,11 +19,12 @@ sed -i -E "s/^(\s*col\.inactive_border\s*=\s*rgba\()([0-9A-Fa-f]{6})([0-9A-Fa-f] exit 1 } -if pgrep -x "hyprland" -u "$USER" > /dev/null; then +if pgrep -x "hyprland" -u "$USER" >/dev/null; then hyprctl reload || { log_error "Failed to reload Hyprland" exit 1 } fi -log_success "hyprland" \ No newline at end of file +log_success "hyprland" + diff --git a/config/hypr/hypridle.conf b/config/hypr/.config/hypr/hypridle.conf similarity index 100% rename from config/hypr/hypridle.conf rename to config/hypr/.config/hypr/hypridle.conf diff --git a/config/hypr/hyprland.conf b/config/hypr/.config/hypr/hyprland.conf similarity index 100% rename from config/hypr/hyprland.conf rename to config/hypr/.config/hypr/hyprland.conf diff --git a/config/hypr/hyprland/colors.conf b/config/hypr/.config/hypr/hyprland/colors.conf similarity index 100% rename from config/hypr/hyprland/colors.conf rename to config/hypr/.config/hypr/hyprland/colors.conf diff --git a/config/hypr/hyprland/env.conf b/config/hypr/.config/hypr/hyprland/env.conf similarity index 100% rename from config/hypr/hyprland/env.conf rename to config/hypr/.config/hypr/hyprland/env.conf diff --git a/config/hypr/hyprland/execs.conf b/config/hypr/.config/hypr/hyprland/execs.conf similarity index 100% rename from config/hypr/hyprland/execs.conf rename to config/hypr/.config/hypr/hyprland/execs.conf diff --git a/config/hypr/hyprland/general.conf b/config/hypr/.config/hypr/hyprland/general.conf similarity index 100% rename from config/hypr/hyprland/general.conf rename to config/hypr/.config/hypr/hyprland/general.conf diff --git a/config/hypr/hyprland/keybinds.conf b/config/hypr/.config/hypr/hyprland/keybinds.conf similarity index 100% rename from config/hypr/hyprland/keybinds.conf rename to config/hypr/.config/hypr/hyprland/keybinds.conf diff --git a/config/hypr/hyprland/monitors.conf b/config/hypr/.config/hypr/hyprland/monitors.conf similarity index 100% rename from config/hypr/hyprland/monitors.conf rename to config/hypr/.config/hypr/hyprland/monitors.conf diff --git a/config/hypr/hyprland/rules.conf b/config/hypr/.config/hypr/hyprland/rules.conf similarity index 100% rename from config/hypr/hyprland/rules.conf rename to config/hypr/.config/hypr/hyprland/rules.conf diff --git a/config/hypr/hyprlandd.conf b/config/hypr/.config/hypr/hyprlandd.conf similarity index 100% rename from config/hypr/hyprlandd.conf rename to config/hypr/.config/hypr/hyprlandd.conf diff --git a/config/hypr/hyprlock.conf b/config/hypr/.config/hypr/hyprlock.conf similarity index 100% rename from config/hypr/hyprlock.conf rename to config/hypr/.config/hypr/hyprlock.conf diff --git a/config/hypr/hyprlock/status.sh b/config/hypr/.config/hypr/hyprlock/status.sh similarity index 100% rename from config/hypr/hyprlock/status.sh rename to config/hypr/.config/hypr/hyprlock/status.sh diff --git a/config/kitty-niri/Catppuccin-Mocha.conf b/config/kitty-niri/.config/kitty/Catppuccin-Mocha.conf similarity index 100% rename from config/kitty-niri/Catppuccin-Mocha.conf rename to config/kitty-niri/.config/kitty/Catppuccin-Mocha.conf diff --git a/config/kitty-niri/kitty.conf b/config/kitty-niri/.config/kitty/kitty.conf similarity index 100% rename from config/kitty-niri/kitty.conf rename to config/kitty-niri/.config/kitty/kitty.conf diff --git a/config/kitty/Catppuccin-Mocha.conf b/config/kitty/.config/kitty/Catppuccin-Mocha.conf similarity index 100% rename from config/kitty/Catppuccin-Mocha.conf rename to config/kitty/.config/kitty/Catppuccin-Mocha.conf diff --git a/config/kitty/kitty.conf b/config/kitty/.config/kitty/kitty.conf similarity index 100% rename from config/kitty/kitty.conf rename to config/kitty/.config/kitty/kitty.conf diff --git a/config/mako/apply-color b/config/mako/.config/mako/apply-color similarity index 56% rename from config/mako/apply-color rename to config/mako/.config/mako/apply-color index 9938f41..d3c7d55 100755 --- a/config/mako/apply-color +++ b/config/mako/.config/mako/apply-color @@ -1,7 +1,11 @@ #!/bin/bash path=$(dirname "$(readlink -f "$0")") -. "$path"/../../utils/apply-color-helper +[ -f "$HOME/.local/snippets/apply-color-helper" ] || { + echo "Missing helper script: $HOME/.local/snippets/apply-color-helper" + exit 1 +} +. "$HOME/.local/snippets/apply-color-helper" file="$path"/config entry="border-color" @@ -11,11 +15,12 @@ sed -i -E "0,/^($entry\s*=\s*#)([0-9A-Fa-f]{6})/s//\1${colorHex}/" "$file" || { exit 1 } -if pgrep -x "mako" -u "$USER" > /dev/null; then +if pgrep -x "mako" -u "$USER" >/dev/null; then makoctl reload || { log_error "Failed to reload mako" exit 1 } fi -log_success "mako" \ No newline at end of file +log_success "mako" + diff --git a/config/mako/config b/config/mako/.config/mako/config similarity index 100% rename from config/mako/config rename to config/mako/.config/mako/config diff --git a/assets/backgrounds b/config/misc/Pictures/backgrounds similarity index 100% rename from assets/backgrounds rename to config/misc/Pictures/backgrounds diff --git a/config/code-flags.conf b/config/misc/code-flags.conf similarity index 100% rename from config/code-flags.conf rename to config/misc/code-flags.conf diff --git a/config/qq-electron-flags.conf b/config/misc/qq-electron-flags.conf similarity index 100% rename from config/qq-electron-flags.conf rename to config/misc/qq-electron-flags.conf diff --git a/config/qq-flags.conf b/config/misc/qq-flags.conf similarity index 100% rename from config/qq-flags.conf rename to config/misc/qq-flags.conf diff --git a/config/mpv/.gitignore b/config/mpv/.config/mpv/.gitignore similarity index 100% rename from config/mpv/.gitignore rename to config/mpv/.config/mpv/.gitignore diff --git a/config/mpv/LICENSE b/config/mpv/.config/mpv/LICENSE similarity index 100% rename from config/mpv/LICENSE rename to config/mpv/.config/mpv/LICENSE diff --git a/config/mpv/README.md b/config/mpv/.config/mpv/README.md similarity index 100% rename from config/mpv/README.md rename to config/mpv/.config/mpv/README.md diff --git a/config/mpv/fonts/Netflix Sans Bold.otf b/config/mpv/.config/mpv/fonts/Netflix Sans Bold.otf similarity index 100% rename from config/mpv/fonts/Netflix Sans Bold.otf rename to config/mpv/.config/mpv/fonts/Netflix Sans Bold.otf diff --git a/config/mpv/fonts/Netflix Sans Light.otf b/config/mpv/.config/mpv/fonts/Netflix Sans Light.otf similarity index 100% rename from config/mpv/fonts/Netflix Sans Light.otf rename to config/mpv/.config/mpv/fonts/Netflix Sans Light.otf diff --git a/config/mpv/fonts/Netflix Sans Medium.otf b/config/mpv/.config/mpv/fonts/Netflix Sans Medium.otf similarity index 100% rename from config/mpv/fonts/Netflix Sans Medium.otf rename to config/mpv/.config/mpv/fonts/Netflix Sans Medium.otf diff --git a/config/mpv/fonts/fluent-system-icons.ttf b/config/mpv/.config/mpv/fonts/fluent-system-icons.ttf similarity index 100% rename from config/mpv/fonts/fluent-system-icons.ttf rename to config/mpv/.config/mpv/fonts/fluent-system-icons.ttf diff --git a/config/mpv/input.conf b/config/mpv/.config/mpv/input.conf similarity index 100% rename from config/mpv/input.conf rename to config/mpv/.config/mpv/input.conf diff --git a/config/mpv/mpv.conf b/config/mpv/.config/mpv/mpv.conf similarity index 100% rename from config/mpv/mpv.conf rename to config/mpv/.config/mpv/mpv.conf diff --git a/config/mpv/script-opts/gif.conf b/config/mpv/.config/mpv/script-opts/gif.conf similarity index 100% rename from config/mpv/script-opts/gif.conf rename to config/mpv/.config/mpv/script-opts/gif.conf diff --git a/config/mpv/script-opts/modernz.conf b/config/mpv/.config/mpv/script-opts/modernz.conf similarity index 100% rename from config/mpv/script-opts/modernz.conf rename to config/mpv/.config/mpv/script-opts/modernz.conf diff --git a/config/mpv/script-opts/thumbfast.conf b/config/mpv/.config/mpv/script-opts/thumbfast.conf similarity index 100% rename from config/mpv/script-opts/thumbfast.conf rename to config/mpv/.config/mpv/script-opts/thumbfast.conf diff --git a/config/mpv/scripts/audio-visualizer.lua b/config/mpv/.config/mpv/scripts/audio-visualizer.lua similarity index 100% rename from config/mpv/scripts/audio-visualizer.lua rename to config/mpv/.config/mpv/scripts/audio-visualizer.lua diff --git a/config/mpv/scripts/autoload.lua b/config/mpv/.config/mpv/scripts/autoload.lua similarity index 100% rename from config/mpv/scripts/autoload.lua rename to config/mpv/.config/mpv/scripts/autoload.lua diff --git a/config/mpv/scripts/copy-time.lua b/config/mpv/.config/mpv/scripts/copy-time.lua similarity index 100% rename from config/mpv/scripts/copy-time.lua rename to config/mpv/.config/mpv/scripts/copy-time.lua diff --git a/config/mpv/scripts/cycle-commands.lua b/config/mpv/.config/mpv/scripts/cycle-commands.lua similarity index 100% rename from config/mpv/scripts/cycle-commands.lua rename to config/mpv/.config/mpv/scripts/cycle-commands.lua diff --git a/config/mpv/scripts/cycle-profile.lua b/config/mpv/.config/mpv/scripts/cycle-profile.lua similarity index 100% rename from config/mpv/scripts/cycle-profile.lua rename to config/mpv/.config/mpv/scripts/cycle-profile.lua diff --git a/config/mpv/scripts/modernz.lua b/config/mpv/.config/mpv/scripts/modernz.lua similarity index 100% rename from config/mpv/scripts/modernz.lua rename to config/mpv/.config/mpv/scripts/modernz.lua diff --git a/config/mpv/scripts/mpv-gif.lua b/config/mpv/.config/mpv/scripts/mpv-gif.lua similarity index 100% rename from config/mpv/scripts/mpv-gif.lua rename to config/mpv/.config/mpv/scripts/mpv-gif.lua diff --git a/config/mpv/scripts/playlistmanager.lua b/config/mpv/.config/mpv/scripts/playlistmanager.lua similarity index 100% rename from config/mpv/scripts/playlistmanager.lua rename to config/mpv/.config/mpv/scripts/playlistmanager.lua diff --git a/config/mpv/scripts/seek-to.lua b/config/mpv/.config/mpv/scripts/seek-to.lua similarity index 100% rename from config/mpv/scripts/seek-to.lua rename to config/mpv/.config/mpv/scripts/seek-to.lua diff --git a/config/mpv/scripts/sponsorblock-minimal.lua b/config/mpv/.config/mpv/scripts/sponsorblock-minimal.lua similarity index 100% rename from config/mpv/scripts/sponsorblock-minimal.lua rename to config/mpv/.config/mpv/scripts/sponsorblock-minimal.lua diff --git a/config/mpv/scripts/thumbfast.lua b/config/mpv/.config/mpv/scripts/thumbfast.lua similarity index 100% rename from config/mpv/scripts/thumbfast.lua rename to config/mpv/.config/mpv/scripts/thumbfast.lua diff --git a/config/mpv/shaders/ArtCNN_C4F32.glsl b/config/mpv/.config/mpv/shaders/ArtCNN_C4F32.glsl similarity index 100% rename from config/mpv/shaders/ArtCNN_C4F32.glsl rename to config/mpv/.config/mpv/shaders/ArtCNN_C4F32.glsl diff --git a/config/mpv/shaders/nnedi3-nns128-win8x4.hook b/config/mpv/.config/mpv/shaders/nnedi3-nns128-win8x4.hook similarity index 100% rename from config/mpv/shaders/nnedi3-nns128-win8x4.hook rename to config/mpv/.config/mpv/shaders/nnedi3-nns128-win8x4.hook diff --git a/config/niri/apply-color b/config/niri/.config/niri/apply-color similarity index 51% rename from config/niri/apply-color rename to config/niri/.config/niri/apply-color index c834911..2e713ae 100755 --- a/config/niri/apply-color +++ b/config/niri/.config/niri/apply-color @@ -1,7 +1,11 @@ #!/bin/bash path=$(dirname "$(readlink -f "$0")") -. "$path"/../../utils/apply-color-helper +[ -f "$HOME/.local/snippets/apply-color-helper" ] || { + echo "Missing helper script: $HOME/.local/snippets/apply-color-helper" + exit 1 +} +. "$HOME/.local/snippets/apply-color-helper" file="$path"/config.kdl @@ -10,4 +14,5 @@ sed -i -E "s/^(\s*active-color\s+\"#)([0-9A-Fa-f]{6})(\")/\1${colorHex}\3/" "$fi exit 1 } -log_success "niri" \ No newline at end of file +log_success "niri" + diff --git a/config/niri/config.kdl b/config/niri/.config/niri/config.kdl similarity index 100% rename from config/niri/config.kdl rename to config/niri/.config/niri/config.kdl diff --git a/config/nvim/.gitignore b/config/nvim/.config/nvim/.gitignore similarity index 100% rename from config/nvim/.gitignore rename to config/nvim/.config/nvim/.gitignore diff --git a/config/nvim/.neoconf.json b/config/nvim/.config/nvim/.neoconf.json similarity index 100% rename from config/nvim/.neoconf.json rename to config/nvim/.config/nvim/.neoconf.json diff --git a/config/nvim/init.lua b/config/nvim/.config/nvim/init.lua similarity index 100% rename from config/nvim/init.lua rename to config/nvim/.config/nvim/init.lua diff --git a/config/nvim/lazyvim.json b/config/nvim/.config/nvim/lazyvim.json similarity index 100% rename from config/nvim/lazyvim.json rename to config/nvim/.config/nvim/lazyvim.json diff --git a/config/nvim/lua/config/autocmds.lua b/config/nvim/.config/nvim/lua/config/autocmds.lua similarity index 100% rename from config/nvim/lua/config/autocmds.lua rename to config/nvim/.config/nvim/lua/config/autocmds.lua diff --git a/config/nvim/lua/config/keymaps.lua b/config/nvim/.config/nvim/lua/config/keymaps.lua similarity index 100% rename from config/nvim/lua/config/keymaps.lua rename to config/nvim/.config/nvim/lua/config/keymaps.lua diff --git a/config/nvim/lua/config/lazy.lua b/config/nvim/.config/nvim/lua/config/lazy.lua similarity index 100% rename from config/nvim/lua/config/lazy.lua rename to config/nvim/.config/nvim/lua/config/lazy.lua diff --git a/config/nvim/lua/config/options.lua b/config/nvim/.config/nvim/lua/config/options.lua similarity index 100% rename from config/nvim/lua/config/options.lua rename to config/nvim/.config/nvim/lua/config/options.lua diff --git a/config/nvim/lua/plugins/colorscheme.lua b/config/nvim/.config/nvim/lua/plugins/colorscheme.lua similarity index 100% rename from config/nvim/lua/plugins/colorscheme.lua rename to config/nvim/.config/nvim/lua/plugins/colorscheme.lua diff --git a/config/nvim/lua/plugins/example.lua b/config/nvim/.config/nvim/lua/plugins/example.lua similarity index 100% rename from config/nvim/lua/plugins/example.lua rename to config/nvim/.config/nvim/lua/plugins/example.lua diff --git a/config/nvim/lua/plugins/kitty.lua b/config/nvim/.config/nvim/lua/plugins/kitty.lua similarity index 100% rename from config/nvim/lua/plugins/kitty.lua rename to config/nvim/.config/nvim/lua/plugins/kitty.lua diff --git a/config/nvim/lua/plugins/snacks.lua b/config/nvim/.config/nvim/lua/plugins/snacks.lua similarity index 100% rename from config/nvim/lua/plugins/snacks.lua rename to config/nvim/.config/nvim/lua/plugins/snacks.lua diff --git a/config/nvim/lua/plugins/tree.lua b/config/nvim/.config/nvim/lua/plugins/tree.lua similarity index 100% rename from config/nvim/lua/plugins/tree.lua rename to config/nvim/.config/nvim/lua/plugins/tree.lua diff --git a/config/nvim/stylua.toml b/config/nvim/.config/nvim/stylua.toml similarity index 100% rename from config/nvim/stylua.toml rename to config/nvim/.config/nvim/stylua.toml diff --git a/config/quickshell/Assets/Config/.gitignore b/config/quickshell/.config/quickshell/Assets/Config/.gitignore similarity index 100% rename from config/quickshell/Assets/Config/.gitignore rename to config/quickshell/.config/quickshell/Assets/Config/.gitignore diff --git a/config/quickshell/Assets/Config/LyricsOffset.txt b/config/quickshell/.config/quickshell/Assets/Config/LyricsOffset.txt similarity index 100% rename from config/quickshell/Assets/Config/LyricsOffset.txt rename to config/quickshell/.config/quickshell/Assets/Config/LyricsOffset.txt diff --git a/config/quickshell/Assets/Config/Settings.json b/config/quickshell/.config/quickshell/Assets/Config/Settings.json similarity index 100% rename from config/quickshell/Assets/Config/Settings.json rename to config/quickshell/.config/quickshell/Assets/Config/Settings.json diff --git a/config/quickshell/Assets/Fonts/tabler/tabler-icons-license.txt b/config/quickshell/.config/quickshell/Assets/Fonts/tabler/tabler-icons-license.txt similarity index 100% rename from config/quickshell/Assets/Fonts/tabler/tabler-icons-license.txt rename to config/quickshell/.config/quickshell/Assets/Fonts/tabler/tabler-icons-license.txt diff --git a/config/quickshell/Assets/Fonts/tabler/tabler-icons.ttf b/config/quickshell/.config/quickshell/Assets/Fonts/tabler/tabler-icons.ttf similarity index 100% rename from config/quickshell/Assets/Fonts/tabler/tabler-icons.ttf rename to config/quickshell/.config/quickshell/Assets/Fonts/tabler/tabler-icons.ttf diff --git a/config/quickshell/Assets/Images/Avatar.jpg b/config/quickshell/.config/quickshell/Assets/Images/Avatar.jpg similarity index 100% rename from config/quickshell/Assets/Images/Avatar.jpg rename to config/quickshell/.config/quickshell/Assets/Images/Avatar.jpg diff --git a/config/quickshell/Constants/Color.qml b/config/quickshell/.config/quickshell/Constants/Color.qml similarity index 100% rename from config/quickshell/Constants/Color.qml rename to config/quickshell/.config/quickshell/Constants/Color.qml diff --git a/config/quickshell/Constants/Colors.qml b/config/quickshell/.config/quickshell/Constants/Colors.qml similarity index 100% rename from config/quickshell/Constants/Colors.qml rename to config/quickshell/.config/quickshell/Constants/Colors.qml diff --git a/config/quickshell/Constants/Fonts.qml b/config/quickshell/.config/quickshell/Constants/Fonts.qml similarity index 100% rename from config/quickshell/Constants/Fonts.qml rename to config/quickshell/.config/quickshell/Constants/Fonts.qml diff --git a/config/quickshell/Constants/Icons.qml b/config/quickshell/.config/quickshell/Constants/Icons.qml similarity index 100% rename from config/quickshell/Constants/Icons.qml rename to config/quickshell/.config/quickshell/Constants/Icons.qml diff --git a/config/quickshell/Constants/Style.qml b/config/quickshell/.config/quickshell/Constants/Style.qml similarity index 100% rename from config/quickshell/Constants/Style.qml rename to config/quickshell/.config/quickshell/Constants/Style.qml diff --git a/config/quickshell/Constants/TablerIcons.qml b/config/quickshell/.config/quickshell/Constants/TablerIcons.qml similarity index 100% rename from config/quickshell/Constants/TablerIcons.qml rename to config/quickshell/.config/quickshell/Constants/TablerIcons.qml diff --git a/config/quickshell/Modules/Bar/Bar.qml b/config/quickshell/.config/quickshell/Modules/Bar/Bar.qml similarity index 100% rename from config/quickshell/Modules/Bar/Bar.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Bar.qml diff --git a/config/quickshell/Modules/Bar/Components/Battery.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/Battery.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/Battery.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/Battery.qml diff --git a/config/quickshell/Modules/Bar/Components/Brightness.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/Brightness.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/Brightness.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/Brightness.qml diff --git a/config/quickshell/Modules/Bar/Components/CavaBar.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/CavaBar.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/CavaBar.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/CavaBar.qml diff --git a/config/quickshell/Modules/Bar/Components/CpuTemp.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/CpuTemp.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/CpuTemp.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/CpuTemp.qml diff --git a/config/quickshell/Modules/Bar/Components/CpuUsage.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/CpuUsage.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/CpuUsage.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/CpuUsage.qml diff --git a/config/quickshell/Modules/Bar/Components/FocusedWindow.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/FocusedWindow.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/FocusedWindow.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/FocusedWindow.qml diff --git a/config/quickshell/Modules/Bar/Components/Ip.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/Ip.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/Ip.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/Ip.qml diff --git a/config/quickshell/Modules/Bar/Components/LyricsBar.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/LyricsBar.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/LyricsBar.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/LyricsBar.qml diff --git a/config/quickshell/Modules/Bar/Components/MemUsage.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/MemUsage.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/MemUsage.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/MemUsage.qml diff --git a/config/quickshell/Modules/Bar/Components/NetworkSpeed.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/NetworkSpeed.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/NetworkSpeed.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/NetworkSpeed.qml diff --git a/config/quickshell/Modules/Bar/Components/RecordIndicator.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/RecordIndicator.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/RecordIndicator.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/RecordIndicator.qml diff --git a/config/quickshell/Modules/Bar/Components/Separator.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/Separator.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/Separator.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/Separator.qml diff --git a/config/quickshell/Modules/Bar/Components/Time.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/Time.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/Time.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/Time.qml diff --git a/config/quickshell/Modules/Bar/Components/TrayExpander.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/TrayExpander.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/TrayExpander.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/TrayExpander.qml diff --git a/config/quickshell/Modules/Bar/Components/Volume.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/Volume.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/Volume.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/Volume.qml diff --git a/config/quickshell/Modules/Bar/Components/Workspace.qml b/config/quickshell/.config/quickshell/Modules/Bar/Components/Workspace.qml similarity index 100% rename from config/quickshell/Modules/Bar/Components/Workspace.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Components/Workspace.qml diff --git a/config/quickshell/Modules/Bar/Misc/MonitorItem.qml b/config/quickshell/.config/quickshell/Modules/Bar/Misc/MonitorItem.qml similarity index 100% rename from config/quickshell/Modules/Bar/Misc/MonitorItem.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Misc/MonitorItem.qml diff --git a/config/quickshell/Modules/Bar/Misc/SymbolButton.qml b/config/quickshell/.config/quickshell/Modules/Bar/Misc/SymbolButton.qml similarity index 100% rename from config/quickshell/Modules/Bar/Misc/SymbolButton.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Misc/SymbolButton.qml diff --git a/config/quickshell/Modules/Bar/Misc/SystemTray.qml b/config/quickshell/.config/quickshell/Modules/Bar/Misc/SystemTray.qml similarity index 100% rename from config/quickshell/Modules/Bar/Misc/SystemTray.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Misc/SystemTray.qml diff --git a/config/quickshell/Modules/Bar/Misc/TrayMenu.qml b/config/quickshell/.config/quickshell/Modules/Bar/Misc/TrayMenu.qml similarity index 100% rename from config/quickshell/Modules/Bar/Misc/TrayMenu.qml rename to config/quickshell/.config/quickshell/Modules/Bar/Misc/TrayMenu.qml diff --git a/config/quickshell/Modules/Misc/Corner.qml b/config/quickshell/.config/quickshell/Modules/Misc/Corner.qml similarity index 100% rename from config/quickshell/Modules/Misc/Corner.qml rename to config/quickshell/.config/quickshell/Modules/Misc/Corner.qml diff --git a/config/quickshell/Modules/Misc/Corners.qml b/config/quickshell/.config/quickshell/Modules/Misc/Corners.qml similarity index 100% rename from config/quickshell/Modules/Misc/Corners.qml rename to config/quickshell/.config/quickshell/Modules/Misc/Corners.qml diff --git a/config/quickshell/Modules/Misc/Notification.qml b/config/quickshell/.config/quickshell/Modules/Misc/Notification.qml similarity index 100% rename from config/quickshell/Modules/Misc/Notification.qml rename to config/quickshell/.config/quickshell/Modules/Misc/Notification.qml diff --git a/config/quickshell/Modules/Panel/BluetoothPanel.qml b/config/quickshell/.config/quickshell/Modules/Panel/BluetoothPanel.qml similarity index 100% rename from config/quickshell/Modules/Panel/BluetoothPanel.qml rename to config/quickshell/.config/quickshell/Modules/Panel/BluetoothPanel.qml diff --git a/config/quickshell/Modules/Panel/CalendarPanel.qml b/config/quickshell/.config/quickshell/Modules/Panel/CalendarPanel.qml similarity index 100% rename from config/quickshell/Modules/Panel/CalendarPanel.qml rename to config/quickshell/.config/quickshell/Modules/Panel/CalendarPanel.qml diff --git a/config/quickshell/Modules/Panel/Cards/LyricsCard.qml b/config/quickshell/.config/quickshell/Modules/Panel/Cards/LyricsCard.qml similarity index 100% rename from config/quickshell/Modules/Panel/Cards/LyricsCard.qml rename to config/quickshell/.config/quickshell/Modules/Panel/Cards/LyricsCard.qml diff --git a/config/quickshell/Modules/Panel/Cards/LyricsControl.qml b/config/quickshell/.config/quickshell/Modules/Panel/Cards/LyricsControl.qml similarity index 100% rename from config/quickshell/Modules/Panel/Cards/LyricsControl.qml rename to config/quickshell/.config/quickshell/Modules/Panel/Cards/LyricsControl.qml diff --git a/config/quickshell/Modules/Panel/Cards/MediaCard.qml b/config/quickshell/.config/quickshell/Modules/Panel/Cards/MediaCard.qml similarity index 100% rename from config/quickshell/Modules/Panel/Cards/MediaCard.qml rename to config/quickshell/.config/quickshell/Modules/Panel/Cards/MediaCard.qml diff --git a/config/quickshell/Modules/Panel/Cards/SystemMonitorCard.qml b/config/quickshell/.config/quickshell/Modules/Panel/Cards/SystemMonitorCard.qml similarity index 100% rename from config/quickshell/Modules/Panel/Cards/SystemMonitorCard.qml rename to config/quickshell/.config/quickshell/Modules/Panel/Cards/SystemMonitorCard.qml diff --git a/config/quickshell/Modules/Panel/Cards/TopLeftCard.qml b/config/quickshell/.config/quickshell/Modules/Panel/Cards/TopLeftCard.qml similarity index 100% rename from config/quickshell/Modules/Panel/Cards/TopLeftCard.qml rename to config/quickshell/.config/quickshell/Modules/Panel/Cards/TopLeftCard.qml diff --git a/config/quickshell/Modules/Panel/ControlCenterPanel.qml b/config/quickshell/.config/quickshell/Modules/Panel/ControlCenterPanel.qml similarity index 100% rename from config/quickshell/Modules/Panel/ControlCenterPanel.qml rename to config/quickshell/.config/quickshell/Modules/Panel/ControlCenterPanel.qml diff --git a/config/quickshell/Modules/Panel/Misc/BluetoothDevicesList.qml b/config/quickshell/.config/quickshell/Modules/Panel/Misc/BluetoothDevicesList.qml similarity index 100% rename from config/quickshell/Modules/Panel/Misc/BluetoothDevicesList.qml rename to config/quickshell/.config/quickshell/Modules/Panel/Misc/BluetoothDevicesList.qml diff --git a/config/quickshell/Modules/Panel/Misc/MonitorSlider.qml b/config/quickshell/.config/quickshell/Modules/Panel/Misc/MonitorSlider.qml similarity index 100% rename from config/quickshell/Modules/Panel/Misc/MonitorSlider.qml rename to config/quickshell/.config/quickshell/Modules/Panel/Misc/MonitorSlider.qml diff --git a/config/quickshell/Modules/Panel/NotificationHistoryPanel.qml b/config/quickshell/.config/quickshell/Modules/Panel/NotificationHistoryPanel.qml similarity index 100% rename from config/quickshell/Modules/Panel/NotificationHistoryPanel.qml rename to config/quickshell/.config/quickshell/Modules/Panel/NotificationHistoryPanel.qml diff --git a/config/quickshell/Modules/Panel/WiFiPanel.qml b/config/quickshell/.config/quickshell/Modules/Panel/WiFiPanel.qml similarity index 100% rename from config/quickshell/Modules/Panel/WiFiPanel.qml rename to config/quickshell/.config/quickshell/Modules/Panel/WiFiPanel.qml diff --git a/config/quickshell/Noctalia/NBox.qml b/config/quickshell/.config/quickshell/Noctalia/NBox.qml similarity index 100% rename from config/quickshell/Noctalia/NBox.qml rename to config/quickshell/.config/quickshell/Noctalia/NBox.qml diff --git a/config/quickshell/Noctalia/NBusyIndicator.qml b/config/quickshell/.config/quickshell/Noctalia/NBusyIndicator.qml similarity index 100% rename from config/quickshell/Noctalia/NBusyIndicator.qml rename to config/quickshell/.config/quickshell/Noctalia/NBusyIndicator.qml diff --git a/config/quickshell/Noctalia/NButton.qml b/config/quickshell/.config/quickshell/Noctalia/NButton.qml similarity index 100% rename from config/quickshell/Noctalia/NButton.qml rename to config/quickshell/.config/quickshell/Noctalia/NButton.qml diff --git a/config/quickshell/Noctalia/NCircleStat.qml b/config/quickshell/.config/quickshell/Noctalia/NCircleStat.qml similarity index 100% rename from config/quickshell/Noctalia/NCircleStat.qml rename to config/quickshell/.config/quickshell/Noctalia/NCircleStat.qml diff --git a/config/quickshell/Noctalia/NContextMenu.qml b/config/quickshell/.config/quickshell/Noctalia/NContextMenu.qml similarity index 100% rename from config/quickshell/Noctalia/NContextMenu.qml rename to config/quickshell/.config/quickshell/Noctalia/NContextMenu.qml diff --git a/config/quickshell/Noctalia/NDivider.qml b/config/quickshell/.config/quickshell/Noctalia/NDivider.qml similarity index 100% rename from config/quickshell/Noctalia/NDivider.qml rename to config/quickshell/.config/quickshell/Noctalia/NDivider.qml diff --git a/config/quickshell/Noctalia/NIcon.qml b/config/quickshell/.config/quickshell/Noctalia/NIcon.qml similarity index 100% rename from config/quickshell/Noctalia/NIcon.qml rename to config/quickshell/.config/quickshell/Noctalia/NIcon.qml diff --git a/config/quickshell/Noctalia/NIconButton.qml b/config/quickshell/.config/quickshell/Noctalia/NIconButton.qml similarity index 100% rename from config/quickshell/Noctalia/NIconButton.qml rename to config/quickshell/.config/quickshell/Noctalia/NIconButton.qml diff --git a/config/quickshell/Noctalia/NImageCircled.qml b/config/quickshell/.config/quickshell/Noctalia/NImageCircled.qml similarity index 100% rename from config/quickshell/Noctalia/NImageCircled.qml rename to config/quickshell/.config/quickshell/Noctalia/NImageCircled.qml diff --git a/config/quickshell/Noctalia/NImageRounded.qml b/config/quickshell/.config/quickshell/Noctalia/NImageRounded.qml similarity index 100% rename from config/quickshell/Noctalia/NImageRounded.qml rename to config/quickshell/.config/quickshell/Noctalia/NImageRounded.qml diff --git a/config/quickshell/Noctalia/NLabel.qml b/config/quickshell/.config/quickshell/Noctalia/NLabel.qml similarity index 100% rename from config/quickshell/Noctalia/NLabel.qml rename to config/quickshell/.config/quickshell/Noctalia/NLabel.qml diff --git a/config/quickshell/Noctalia/NListView.qml b/config/quickshell/.config/quickshell/Noctalia/NListView.qml similarity index 100% rename from config/quickshell/Noctalia/NListView.qml rename to config/quickshell/.config/quickshell/Noctalia/NListView.qml diff --git a/config/quickshell/Noctalia/NPanel.qml b/config/quickshell/.config/quickshell/Noctalia/NPanel.qml similarity index 100% rename from config/quickshell/Noctalia/NPanel.qml rename to config/quickshell/.config/quickshell/Noctalia/NPanel.qml diff --git a/config/quickshell/Noctalia/NScrollView.qml b/config/quickshell/.config/quickshell/Noctalia/NScrollView.qml similarity index 100% rename from config/quickshell/Noctalia/NScrollView.qml rename to config/quickshell/.config/quickshell/Noctalia/NScrollView.qml diff --git a/config/quickshell/Noctalia/NSlider.qml b/config/quickshell/.config/quickshell/Noctalia/NSlider.qml similarity index 100% rename from config/quickshell/Noctalia/NSlider.qml rename to config/quickshell/.config/quickshell/Noctalia/NSlider.qml diff --git a/config/quickshell/Noctalia/NText.qml b/config/quickshell/.config/quickshell/Noctalia/NText.qml similarity index 100% rename from config/quickshell/Noctalia/NText.qml rename to config/quickshell/.config/quickshell/Noctalia/NText.qml diff --git a/config/quickshell/Noctalia/NToggle.qml b/config/quickshell/.config/quickshell/Noctalia/NToggle.qml similarity index 100% rename from config/quickshell/Noctalia/NToggle.qml rename to config/quickshell/.config/quickshell/Noctalia/NToggle.qml diff --git a/config/quickshell/Services/AudioService.qml b/config/quickshell/.config/quickshell/Services/AudioService.qml similarity index 100% rename from config/quickshell/Services/AudioService.qml rename to config/quickshell/.config/quickshell/Services/AudioService.qml diff --git a/config/quickshell/Services/BluetoothService.qml b/config/quickshell/.config/quickshell/Services/BluetoothService.qml similarity index 100% rename from config/quickshell/Services/BluetoothService.qml rename to config/quickshell/.config/quickshell/Services/BluetoothService.qml diff --git a/config/quickshell/Services/BrightnessService.qml b/config/quickshell/.config/quickshell/Services/BrightnessService.qml similarity index 100% rename from config/quickshell/Services/BrightnessService.qml rename to config/quickshell/.config/quickshell/Services/BrightnessService.qml diff --git a/config/quickshell/Services/CacheService.qml b/config/quickshell/.config/quickshell/Services/CacheService.qml similarity index 100% rename from config/quickshell/Services/CacheService.qml rename to config/quickshell/.config/quickshell/Services/CacheService.qml diff --git a/config/quickshell/Services/Caffeine.qml b/config/quickshell/.config/quickshell/Services/Caffeine.qml similarity index 100% rename from config/quickshell/Services/Caffeine.qml rename to config/quickshell/.config/quickshell/Services/Caffeine.qml diff --git a/config/quickshell/Services/IPCService.qml b/config/quickshell/.config/quickshell/Services/IPCService.qml similarity index 100% rename from config/quickshell/Services/IPCService.qml rename to config/quickshell/.config/quickshell/Services/IPCService.qml diff --git a/config/quickshell/Services/IpService.qml b/config/quickshell/.config/quickshell/Services/IpService.qml similarity index 100% rename from config/quickshell/Services/IpService.qml rename to config/quickshell/.config/quickshell/Services/IpService.qml diff --git a/config/quickshell/Services/LocationService.qml b/config/quickshell/.config/quickshell/Services/LocationService.qml similarity index 100% rename from config/quickshell/Services/LocationService.qml rename to config/quickshell/.config/quickshell/Services/LocationService.qml diff --git a/config/quickshell/Services/LyricsService.qml b/config/quickshell/.config/quickshell/Services/LyricsService.qml similarity index 100% rename from config/quickshell/Services/LyricsService.qml rename to config/quickshell/.config/quickshell/Services/LyricsService.qml diff --git a/config/quickshell/Services/MusicManager.qml b/config/quickshell/.config/quickshell/Services/MusicManager.qml similarity index 100% rename from config/quickshell/Services/MusicManager.qml rename to config/quickshell/.config/quickshell/Services/MusicManager.qml diff --git a/config/quickshell/Services/NetworkFetch.qml b/config/quickshell/.config/quickshell/Services/NetworkFetch.qml similarity index 100% rename from config/quickshell/Services/NetworkFetch.qml rename to config/quickshell/.config/quickshell/Services/NetworkFetch.qml diff --git a/config/quickshell/Services/NetworkService.qml b/config/quickshell/.config/quickshell/Services/NetworkService.qml similarity index 100% rename from config/quickshell/Services/NetworkService.qml rename to config/quickshell/.config/quickshell/Services/NetworkService.qml diff --git a/config/quickshell/Services/Niri.qml b/config/quickshell/.config/quickshell/Services/Niri.qml similarity index 100% rename from config/quickshell/Services/Niri.qml rename to config/quickshell/.config/quickshell/Services/Niri.qml diff --git a/config/quickshell/Services/NotificationService.qml b/config/quickshell/.config/quickshell/Services/NotificationService.qml similarity index 100% rename from config/quickshell/Services/NotificationService.qml rename to config/quickshell/.config/quickshell/Services/NotificationService.qml diff --git a/config/quickshell/Services/NukeKded6.qml b/config/quickshell/.config/quickshell/Services/NukeKded6.qml similarity index 100% rename from config/quickshell/Services/NukeKded6.qml rename to config/quickshell/.config/quickshell/Services/NukeKded6.qml diff --git a/config/quickshell/Services/PanelService.qml b/config/quickshell/.config/quickshell/Services/PanelService.qml similarity index 100% rename from config/quickshell/Services/PanelService.qml rename to config/quickshell/.config/quickshell/Services/PanelService.qml diff --git a/config/quickshell/Services/PowerProfileService.qml b/config/quickshell/.config/quickshell/Services/PowerProfileService.qml similarity index 100% rename from config/quickshell/Services/PowerProfileService.qml rename to config/quickshell/.config/quickshell/Services/PowerProfileService.qml diff --git a/config/quickshell/Services/RecordService.qml b/config/quickshell/.config/quickshell/Services/RecordService.qml similarity index 100% rename from config/quickshell/Services/RecordService.qml rename to config/quickshell/.config/quickshell/Services/RecordService.qml diff --git a/config/quickshell/Services/SendNotification.qml b/config/quickshell/.config/quickshell/Services/SendNotification.qml similarity index 100% rename from config/quickshell/Services/SendNotification.qml rename to config/quickshell/.config/quickshell/Services/SendNotification.qml diff --git a/config/quickshell/Services/SettingsService.qml b/config/quickshell/.config/quickshell/Services/SettingsService.qml similarity index 100% rename from config/quickshell/Services/SettingsService.qml rename to config/quickshell/.config/quickshell/Services/SettingsService.qml diff --git a/config/quickshell/Services/SystemStatService.qml b/config/quickshell/.config/quickshell/Services/SystemStatService.qml similarity index 100% rename from config/quickshell/Services/SystemStatService.qml rename to config/quickshell/.config/quickshell/Services/SystemStatService.qml diff --git a/config/quickshell/Services/ThemeIcons.qml b/config/quickshell/.config/quickshell/Services/ThemeIcons.qml similarity index 100% rename from config/quickshell/Services/ThemeIcons.qml rename to config/quickshell/.config/quickshell/Services/ThemeIcons.qml diff --git a/config/quickshell/Services/TimeService.qml b/config/quickshell/.config/quickshell/Services/TimeService.qml similarity index 100% rename from config/quickshell/Services/TimeService.qml rename to config/quickshell/.config/quickshell/Services/TimeService.qml diff --git a/config/quickshell/Services/WorkspaceManager.qml b/config/quickshell/.config/quickshell/Services/WorkspaceManager.qml similarity index 100% rename from config/quickshell/Services/WorkspaceManager.qml rename to config/quickshell/.config/quickshell/Services/WorkspaceManager.qml diff --git a/config/quickshell/Services/WriteClipboard.qml b/config/quickshell/.config/quickshell/Services/WriteClipboard.qml similarity index 100% rename from config/quickshell/Services/WriteClipboard.qml rename to config/quickshell/.config/quickshell/Services/WriteClipboard.qml diff --git a/config/quickshell/Shaders/qsb/circled_image.frag.qsb b/config/quickshell/.config/quickshell/Shaders/qsb/circled_image.frag.qsb similarity index 100% rename from config/quickshell/Shaders/qsb/circled_image.frag.qsb rename to config/quickshell/.config/quickshell/Shaders/qsb/circled_image.frag.qsb diff --git a/config/quickshell/Shaders/qsb/rounded_image.frag.qsb b/config/quickshell/.config/quickshell/Shaders/qsb/rounded_image.frag.qsb similarity index 100% rename from config/quickshell/Shaders/qsb/rounded_image.frag.qsb rename to config/quickshell/.config/quickshell/Shaders/qsb/rounded_image.frag.qsb diff --git a/config/quickshell/Utils/Cava.qml b/config/quickshell/.config/quickshell/Utils/Cava.qml similarity index 100% rename from config/quickshell/Utils/Cava.qml rename to config/quickshell/.config/quickshell/Utils/Cava.qml diff --git a/config/quickshell/Utils/CavaColorList.qml b/config/quickshell/.config/quickshell/Utils/CavaColorList.qml similarity index 100% rename from config/quickshell/Utils/CavaColorList.qml rename to config/quickshell/.config/quickshell/Utils/CavaColorList.qml diff --git a/config/quickshell/Utils/Logger.qml b/config/quickshell/.config/quickshell/Utils/Logger.qml similarity index 100% rename from config/quickshell/Utils/Logger.qml rename to config/quickshell/.config/quickshell/Utils/Logger.qml diff --git a/config/quickshell/Utils/Time.qml b/config/quickshell/.config/quickshell/Utils/Time.qml similarity index 100% rename from config/quickshell/Utils/Time.qml rename to config/quickshell/.config/quickshell/Utils/Time.qml diff --git a/config/quickshell/Utils/sha256.js b/config/quickshell/.config/quickshell/Utils/sha256.js similarity index 100% rename from config/quickshell/Utils/sha256.js rename to config/quickshell/.config/quickshell/Utils/sha256.js diff --git a/config/quickshell/apply-color b/config/quickshell/.config/quickshell/apply-color similarity index 64% rename from config/quickshell/apply-color rename to config/quickshell/.config/quickshell/apply-color index cc08f31..ab15d41 100755 --- a/config/quickshell/apply-color +++ b/config/quickshell/.config/quickshell/apply-color @@ -1,7 +1,11 @@ #!/bin/bash path=$(dirname "$(readlink -f "$0")") -. "$path"/../../utils/apply-color-helper +[ -f "$HOME/.local/snippets/apply-color-helper" ] || { + echo "Missing helper script: $HOME/.local/snippets/apply-color-helper" + exit 1 +} +. "$HOME/.local/snippets/apply-color-helper" if pgrep -x "quickshell" -u "$USER" >/dev/null; then qs ipc call colors setPrimary ${colorHex} || { @@ -13,4 +17,5 @@ if pgrep -x "quickshell" -u "$USER" >/dev/null; then else log_error "quickshell is not running. Cannot apply color." exit 1 -fi \ No newline at end of file +fi + diff --git a/config/quickshell/shell.qml b/config/quickshell/.config/quickshell/shell.qml similarity index 100% rename from config/quickshell/shell.qml rename to config/quickshell/.config/quickshell/shell.qml diff --git a/config/rofi/apply-color b/config/rofi/.config/rofi/apply-color similarity index 53% rename from config/rofi/apply-color rename to config/rofi/.config/rofi/apply-color index 344720a..044378c 100755 --- a/config/rofi/apply-color +++ b/config/rofi/.config/rofi/apply-color @@ -1,11 +1,15 @@ #!/bin/bash path=$(dirname "$(readlink -f "$0")") -. "$path"/../../utils/apply-color-helper +[ -f "$HOME/.local/snippets/apply-color-helper" ] || { + echo "Missing helper script: $HOME/.local/snippets/apply-color-helper" + exit 1 +} +. "$HOME/.local/snippets/apply-color-helper" file="$path"/config.rasi -if pgrep -x "rofi" -u "$USER" > /dev/null; then +if pgrep -x "rofi" -u "$USER" >/dev/null; then pkill -x rofi || log_error "Failed to kill rofi process" # and move on fi @@ -15,4 +19,5 @@ sed -i -E "s/^(\s*primary:\s*#)([0-9A-Fa-f]{6})(;)/\1${colorHex}\3/" "$file" || exit 1 } -log_success "rofi" \ No newline at end of file +log_success "rofi" + diff --git a/config/rofi/config.rasi b/config/rofi/.config/rofi/config.rasi similarity index 100% rename from config/rofi/config.rasi rename to config/rofi/.config/rofi/config.rasi diff --git a/config/rofi/dmenu.rasi b/config/rofi/.config/rofi/dmenu.rasi similarity index 100% rename from config/rofi/dmenu.rasi rename to config/rofi/.config/rofi/dmenu.rasi diff --git a/scripts/change-colortheme b/config/scripts/.local/scripts/change-colortheme similarity index 98% rename from scripts/change-colortheme rename to config/scripts/.local/scripts/change-colortheme index 84604d6..daeaacc 100755 --- a/scripts/change-colortheme +++ b/config/scripts/.local/scripts/change-colortheme @@ -24,8 +24,7 @@ PALETTES = { }, } -# CONFIG_DIR = ${dotfiles_root}/config -CONFIG_DIR = Path(__file__).resolve().parent.resolve().parent.resolve() / "config" +CONFIG_DIR = Path("~/.config").expanduser() # An application may have multiple scripts (e.g. due to config-switch) SCRIPTS = { diff --git a/scripts/change-wallpaper b/config/scripts/.local/scripts/change-wallpaper similarity index 100% rename from scripts/change-wallpaper rename to config/scripts/.local/scripts/change-wallpaper diff --git a/scripts/config-switch b/config/scripts/.local/scripts/config-switch similarity index 55% rename from scripts/config-switch rename to config/scripts/.local/scripts/config-switch index 2427a22..9526548 100755 --- a/scripts/config-switch +++ b/config/scripts/.local/scripts/config-switch @@ -8,19 +8,20 @@ else desktop="$1" fi +config_path="$path/../../.." + for item in "kitty" "ghostty" "wlogout"; do for target in "$item" "$item-niri"; do - if [ -L "$HOME/.config/$target" ]; then - rm -v "$HOME/.config/$target" - elif [ -e "$HOME/.config/$target" ]; then + if [ ! -L "$HOME/.config/$target" ] && [ -e "$HOME/.config/$target" ]; then echo "Error: $HOME/.config/$target exists and is not a symlink." >&2 exit 1 fi + stow -t "$HOME" -d "$config_path" -D "$target" done if [ "$desktop" = "niri" ] || [ "$desktop" = "GNOME" ]; then - ln -sv "$(realpath --relative-to="$HOME/.config" "$path/../config/$item-niri")" "$HOME/.config/$item" + stow -t "$HOME" -d "$config_path" "$item-niri" else - ln -sv "$(realpath --relative-to="$HOME/.config" "$path/../config/$item")" "$HOME/.config/$item" + stow -t "$HOME" -d "$config_path" "$item" fi done \ No newline at end of file diff --git a/scripts/config-sync b/config/scripts/.local/scripts/config-sync similarity index 100% rename from scripts/config-sync rename to config/scripts/.local/scripts/config-sync diff --git a/scripts/fetch-weather b/config/scripts/.local/scripts/fetch-weather similarity index 100% rename from scripts/fetch-weather rename to config/scripts/.local/scripts/fetch-weather diff --git a/scripts/hypr-sdrbrightness b/config/scripts/.local/scripts/hypr-sdrbrightness similarity index 100% rename from scripts/hypr-sdrbrightness rename to config/scripts/.local/scripts/hypr-sdrbrightness diff --git a/scripts/issu b/config/scripts/.local/scripts/issu similarity index 100% rename from scripts/issu rename to config/scripts/.local/scripts/issu diff --git a/scripts/lyrics-widgets b/config/scripts/.local/scripts/lyrics-widgets similarity index 100% rename from scripts/lyrics-widgets rename to config/scripts/.local/scripts/lyrics-widgets diff --git a/scripts/mpv-hdr b/config/scripts/.local/scripts/mpv-hdr similarity index 100% rename from scripts/mpv-hdr rename to config/scripts/.local/scripts/mpv-hdr diff --git a/scripts/mpv-sm b/config/scripts/.local/scripts/mpv-sm similarity index 100% rename from scripts/mpv-sm rename to config/scripts/.local/scripts/mpv-sm diff --git a/scripts/pacman-reflector b/config/scripts/.local/scripts/pacman-reflector similarity index 100% rename from scripts/pacman-reflector rename to config/scripts/.local/scripts/pacman-reflector diff --git a/scripts/record-script b/config/scripts/.local/scripts/record-script similarity index 100% rename from scripts/record-script rename to config/scripts/.local/scripts/record-script diff --git a/scripts/rofi-cliphist b/config/scripts/.local/scripts/rofi-cliphist similarity index 100% rename from scripts/rofi-cliphist rename to config/scripts/.local/scripts/rofi-cliphist diff --git a/scripts/rofi-emoji b/config/scripts/.local/scripts/rofi-emoji similarity index 100% rename from scripts/rofi-emoji rename to config/scripts/.local/scripts/rofi-emoji diff --git a/scripts/screenshot b/config/scripts/.local/scripts/screenshot similarity index 100% rename from scripts/screenshot rename to config/scripts/.local/scripts/screenshot diff --git a/scripts/smb-mount b/config/scripts/.local/scripts/smb-mount similarity index 100% rename from scripts/smb-mount rename to config/scripts/.local/scripts/smb-mount diff --git a/scripts/smb-unmount b/config/scripts/.local/scripts/smb-unmount similarity index 100% rename from scripts/smb-unmount rename to config/scripts/.local/scripts/smb-unmount diff --git a/scripts/ssh-init b/config/scripts/.local/scripts/ssh-init similarity index 100% rename from scripts/ssh-init rename to config/scripts/.local/scripts/ssh-init diff --git a/scripts/truecolor-test b/config/scripts/.local/scripts/truecolor-test similarity index 100% rename from scripts/truecolor-test rename to config/scripts/.local/scripts/truecolor-test diff --git a/scripts/wallpaper-daemon b/config/scripts/.local/scripts/wallpaper-daemon similarity index 100% rename from scripts/wallpaper-daemon rename to config/scripts/.local/scripts/wallpaper-daemon diff --git a/scripts/waybar-toggle b/config/scripts/.local/scripts/waybar-toggle similarity index 100% rename from scripts/waybar-toggle rename to config/scripts/.local/scripts/waybar-toggle diff --git a/scripts/waydroid-reload b/config/scripts/.local/scripts/waydroid-reload similarity index 100% rename from scripts/waydroid-reload rename to config/scripts/.local/scripts/waydroid-reload diff --git a/scripts/workspace-new b/config/scripts/.local/scripts/workspace-new similarity index 100% rename from scripts/workspace-new rename to config/scripts/.local/scripts/workspace-new diff --git a/scripts/wp-vol b/config/scripts/.local/scripts/wp-vol similarity index 100% rename from scripts/wp-vol rename to config/scripts/.local/scripts/wp-vol diff --git a/scripts/wsl-mount b/config/scripts/.local/scripts/wsl-mount similarity index 100% rename from scripts/wsl-mount rename to config/scripts/.local/scripts/wsl-mount diff --git a/scripts/wsl-unmount b/config/scripts/.local/scripts/wsl-unmount similarity index 100% rename from scripts/wsl-unmount rename to config/scripts/.local/scripts/wsl-unmount diff --git a/scripts/xdph-nuclear b/config/scripts/.local/scripts/xdph-nuclear similarity index 100% rename from scripts/xdph-nuclear rename to config/scripts/.local/scripts/xdph-nuclear diff --git a/utils/apply-color-helper b/config/scripts/.local/snippets/apply-color-helper similarity index 100% rename from utils/apply-color-helper rename to config/scripts/.local/snippets/apply-color-helper diff --git a/utils/fetch-weather.service b/config/scripts/.local/snippets/fetch-weather.service similarity index 100% rename from utils/fetch-weather.service rename to config/scripts/.local/snippets/fetch-weather.service diff --git a/utils/fetch-weather.timer b/config/scripts/.local/snippets/fetch-weather.timer similarity index 100% rename from utils/fetch-weather.timer rename to config/scripts/.local/snippets/fetch-weather.timer diff --git a/utils/set_display b/config/scripts/.local/snippets/set_display similarity index 100% rename from utils/set_display rename to config/scripts/.local/snippets/set_display diff --git a/utils/set_nv_env b/config/scripts/.local/snippets/set_nv_env similarity index 100% rename from utils/set_nv_env rename to config/scripts/.local/snippets/set_nv_env diff --git a/utils/unset_nv_env b/config/scripts/.local/snippets/unset_nv_env similarity index 100% rename from utils/unset_nv_env rename to config/scripts/.local/snippets/unset_nv_env diff --git a/config/waybar/apply-color b/config/waybar/.config/waybar/apply-color similarity index 52% rename from config/waybar/apply-color rename to config/waybar/.config/waybar/apply-color index bad78e9..30c1213 100755 --- a/config/waybar/apply-color +++ b/config/waybar/.config/waybar/apply-color @@ -1,7 +1,11 @@ #!/bin/bash path=$(dirname "$(readlink -f "$0")") -. "$path"/../../utils/apply-color-helper +[ -f "$HOME/.local/snippets/apply-color-helper" ] || { + echo "Missing helper script: $HOME/.local/snippets/apply-color-helper" + exit 1 +} +. "$HOME/.local/snippets/apply-color-helper" file="$path"/style.css @@ -10,8 +14,9 @@ sed -i -E "s/^(@define-color\s+flavor\s+#)([0-9A-Fa-f]{6})(;)/\1${colorHex}\3/" exit 1 } -if pgrep -x "waybar" -u "$USER" > /dev/null; then +if pgrep -x "waybar" -u "$USER" >/dev/null; then waybar-toggle restart || log_error "Failed to restart waybar" fi -log_success "waybar" \ No newline at end of file +log_success "waybar" + diff --git a/config/waybar/config.jsonc b/config/waybar/.config/waybar/config.jsonc similarity index 100% rename from config/waybar/config.jsonc rename to config/waybar/.config/waybar/config.jsonc diff --git a/config/waybar/mocha.css b/config/waybar/.config/waybar/mocha.css similarity index 100% rename from config/waybar/mocha.css rename to config/waybar/.config/waybar/mocha.css diff --git a/config/waybar/modules/.gitignore b/config/waybar/.config/waybar/modules/.gitignore similarity index 100% rename from config/waybar/modules/.gitignore rename to config/waybar/.config/waybar/modules/.gitignore diff --git a/config/waybar/modules/mediaplayer.py b/config/waybar/.config/waybar/modules/mediaplayer.py similarity index 100% rename from config/waybar/modules/mediaplayer.py rename to config/waybar/.config/waybar/modules/mediaplayer.py diff --git a/config/waybar/modules/publicip.sh b/config/waybar/.config/waybar/modules/publicip.sh similarity index 100% rename from config/waybar/modules/publicip.sh rename to config/waybar/.config/waybar/modules/publicip.sh diff --git a/config/waybar/style.css b/config/waybar/.config/waybar/style.css similarity index 100% rename from config/waybar/style.css rename to config/waybar/.config/waybar/style.css diff --git a/config/waybar/waybar.sh b/config/waybar/.config/waybar/waybar.sh similarity index 100% rename from config/waybar/waybar.sh rename to config/waybar/.config/waybar/waybar.sh diff --git a/config/wlogout/apply-color b/config/wlogout-niri/.config/wlogout/apply-color similarity index 65% rename from config/wlogout/apply-color rename to config/wlogout-niri/.config/wlogout/apply-color index b1a6abb..fbfee15 100755 --- a/config/wlogout/apply-color +++ b/config/wlogout-niri/.config/wlogout/apply-color @@ -1,7 +1,11 @@ #!/bin/bash path=$(dirname "$(readlink -f "$0")") -. "$path"/../../utils/apply-color-helper +[ -f "$HOME/.local/snippets/apply-color-helper" ] || { + echo "Missing helper script: $HOME/.local/snippets/apply-color-helper" + exit 1 +} +. "$HOME/.local/snippets/apply-color-helper" for file in "$path"/icons/*.svg; do [ -f "$file" ] || continue @@ -18,4 +22,5 @@ sed -i -E "s/(border-color:\s*#)([0-9A-Fa-f]{6})(;)/\1${colorHex}\3/" "$file" || exit 1 } -log_success "wlogout" \ No newline at end of file +log_success "wlogout (niri version)" + diff --git a/config/wlogout-niri/icons/hibernate.svg b/config/wlogout-niri/.config/wlogout/icons/hibernate.svg similarity index 100% rename from config/wlogout-niri/icons/hibernate.svg rename to config/wlogout-niri/.config/wlogout/icons/hibernate.svg diff --git a/config/wlogout-niri/icons/lock.svg b/config/wlogout-niri/.config/wlogout/icons/lock.svg similarity index 100% rename from config/wlogout-niri/icons/lock.svg rename to config/wlogout-niri/.config/wlogout/icons/lock.svg diff --git a/config/wlogout-niri/icons/logout.svg b/config/wlogout-niri/.config/wlogout/icons/logout.svg similarity index 100% rename from config/wlogout-niri/icons/logout.svg rename to config/wlogout-niri/.config/wlogout/icons/logout.svg diff --git a/config/wlogout-niri/icons/reboot.svg b/config/wlogout-niri/.config/wlogout/icons/reboot.svg similarity index 100% rename from config/wlogout-niri/icons/reboot.svg rename to config/wlogout-niri/.config/wlogout/icons/reboot.svg diff --git a/config/wlogout-niri/icons/shutdown.svg b/config/wlogout-niri/.config/wlogout/icons/shutdown.svg similarity index 100% rename from config/wlogout-niri/icons/shutdown.svg rename to config/wlogout-niri/.config/wlogout/icons/shutdown.svg diff --git a/config/wlogout-niri/icons/suspend.svg b/config/wlogout-niri/.config/wlogout/icons/suspend.svg similarity index 100% rename from config/wlogout-niri/icons/suspend.svg rename to config/wlogout-niri/.config/wlogout/icons/suspend.svg diff --git a/config/wlogout-niri/layout b/config/wlogout-niri/.config/wlogout/layout similarity index 100% rename from config/wlogout-niri/layout rename to config/wlogout-niri/.config/wlogout/layout diff --git a/config/wlogout-niri/style.css b/config/wlogout-niri/.config/wlogout/style.css similarity index 100% rename from config/wlogout-niri/style.css rename to config/wlogout-niri/.config/wlogout/style.css diff --git a/config/wlogout-niri/apply-color b/config/wlogout/.config/wlogout/apply-color similarity index 67% rename from config/wlogout-niri/apply-color rename to config/wlogout/.config/wlogout/apply-color index 2a7df38..b2bbec6 100755 --- a/config/wlogout-niri/apply-color +++ b/config/wlogout/.config/wlogout/apply-color @@ -1,8 +1,11 @@ #!/bin/bash path=$(dirname "$(readlink -f "$0")") -. "$path"/../../utils/apply-color-helper - +[ -f "$HOME/.local/snippets/apply-color-helper" ] || { + echo "Missing helper script: $HOME/.local/snippets/apply-color-helper" + exit 1 +} +. "$HOME/.local/snippets/apply-color-helper" for file in "$path"/icons/*.svg; do [ -f "$file" ] || continue @@ -19,4 +22,5 @@ sed -i -E "s/(border-color:\s*#)([0-9A-Fa-f]{6})(;)/\1${colorHex}\3/" "$file" || exit 1 } -log_success "wlogout (niri version)" \ No newline at end of file +log_success "wlogout" + diff --git a/config/wlogout/icons/hibernate.svg b/config/wlogout/.config/wlogout/icons/hibernate.svg similarity index 100% rename from config/wlogout/icons/hibernate.svg rename to config/wlogout/.config/wlogout/icons/hibernate.svg diff --git a/config/wlogout/icons/lock.svg b/config/wlogout/.config/wlogout/icons/lock.svg similarity index 100% rename from config/wlogout/icons/lock.svg rename to config/wlogout/.config/wlogout/icons/lock.svg diff --git a/config/wlogout/icons/logout.svg b/config/wlogout/.config/wlogout/icons/logout.svg similarity index 100% rename from config/wlogout/icons/logout.svg rename to config/wlogout/.config/wlogout/icons/logout.svg diff --git a/config/wlogout/icons/reboot.svg b/config/wlogout/.config/wlogout/icons/reboot.svg similarity index 100% rename from config/wlogout/icons/reboot.svg rename to config/wlogout/.config/wlogout/icons/reboot.svg diff --git a/config/wlogout/icons/shutdown.svg b/config/wlogout/.config/wlogout/icons/shutdown.svg similarity index 100% rename from config/wlogout/icons/shutdown.svg rename to config/wlogout/.config/wlogout/icons/shutdown.svg diff --git a/config/wlogout/icons/suspend.svg b/config/wlogout/.config/wlogout/icons/suspend.svg similarity index 100% rename from config/wlogout/icons/suspend.svg rename to config/wlogout/.config/wlogout/icons/suspend.svg diff --git a/config/wlogout/layout b/config/wlogout/.config/wlogout/layout similarity index 100% rename from config/wlogout/layout rename to config/wlogout/.config/wlogout/layout diff --git a/config/wlogout/style.css b/config/wlogout/.config/wlogout/style.css similarity index 100% rename from config/wlogout/style.css rename to config/wlogout/.config/wlogout/style.css diff --git a/config/yazi/.config/yazi/apply-color b/config/yazi/.config/yazi/apply-color new file mode 100755 index 0000000..1921629 --- /dev/null +++ b/config/yazi/.config/yazi/apply-color @@ -0,0 +1,16 @@ +#!/bin/bash + +path=$(dirname "$(readlink -f "$0")") +[ -f "$HOME/.local/snippets/apply-color-helper" ] || { + echo "Missing helper script: $HOME/.local/snippets/apply-color-helper" + exit 1 +} +. "$HOME/.local/snippets/apply-color-helper" + +cp -f "$path"/../../../../assets/yazi-themes/catppuccin-mocha-"$colorName".toml "$path"/../yazi/theme.toml || { + log_error "Failed to copy theme file" + exit 1 +} + +log_success "yazi" + diff --git a/config/yazi/bookmark b/config/yazi/.config/yazi/bookmark similarity index 100% rename from config/yazi/bookmark rename to config/yazi/.config/yazi/bookmark diff --git a/config/yazi/.config/yazi/code-flags.conf b/config/yazi/.config/yazi/code-flags.conf new file mode 100644 index 0000000..c9c1cf9 --- /dev/null +++ b/config/yazi/.config/yazi/code-flags.conf @@ -0,0 +1,5 @@ +--password-store=gnome-libsecret +--enable-features=UseOzonePlatform +--ozone-platform=wayland +--use-gl=desktop +--enable-wayland-ime diff --git a/config/yazi/init.lua b/config/yazi/.config/yazi/init.lua similarity index 100% rename from config/yazi/init.lua rename to config/yazi/.config/yazi/init.lua diff --git a/config/yazi/keymap.toml b/config/yazi/.config/yazi/keymap.toml similarity index 100% rename from config/yazi/keymap.toml rename to config/yazi/.config/yazi/keymap.toml diff --git a/config/yazi/keymap.toml-1748477627476447 b/config/yazi/.config/yazi/keymap.toml-1748477627476447 similarity index 100% rename from config/yazi/keymap.toml-1748477627476447 rename to config/yazi/.config/yazi/keymap.toml-1748477627476447 diff --git a/config/yazi/flavors/onedark.yazi/LICENSE b/config/yazi/.config/yazi/onedark.yazi/LICENSE similarity index 100% rename from config/yazi/flavors/onedark.yazi/LICENSE rename to config/yazi/.config/yazi/onedark.yazi/LICENSE diff --git a/config/yazi/flavors/onedark.yazi/LICENSE-tmtheme b/config/yazi/.config/yazi/onedark.yazi/LICENSE-tmtheme similarity index 100% rename from config/yazi/flavors/onedark.yazi/LICENSE-tmtheme rename to config/yazi/.config/yazi/onedark.yazi/LICENSE-tmtheme diff --git a/config/yazi/flavors/onedark.yazi/README.md b/config/yazi/.config/yazi/onedark.yazi/README.md similarity index 100% rename from config/yazi/flavors/onedark.yazi/README.md rename to config/yazi/.config/yazi/onedark.yazi/README.md diff --git a/config/yazi/flavors/onedark.yazi/flavor.toml b/config/yazi/.config/yazi/onedark.yazi/flavor.toml similarity index 100% rename from config/yazi/flavors/onedark.yazi/flavor.toml rename to config/yazi/.config/yazi/onedark.yazi/flavor.toml diff --git a/config/yazi/flavors/onedark.yazi/preview.png b/config/yazi/.config/yazi/onedark.yazi/preview.png similarity index 100% rename from config/yazi/flavors/onedark.yazi/preview.png rename to config/yazi/.config/yazi/onedark.yazi/preview.png diff --git a/config/yazi/flavors/onedark.yazi/tmtheme.xml b/config/yazi/.config/yazi/onedark.yazi/tmtheme.xml similarity index 100% rename from config/yazi/flavors/onedark.yazi/tmtheme.xml rename to config/yazi/.config/yazi/onedark.yazi/tmtheme.xml diff --git a/config/yazi/package.toml b/config/yazi/.config/yazi/package.toml similarity index 100% rename from config/yazi/package.toml rename to config/yazi/.config/yazi/package.toml diff --git a/config/yazi/plugins/compress.yazi/LICENSE b/config/yazi/.config/yazi/plugins/compress.yazi/LICENSE similarity index 100% rename from config/yazi/plugins/compress.yazi/LICENSE rename to config/yazi/.config/yazi/plugins/compress.yazi/LICENSE diff --git a/config/yazi/plugins/compress.yazi/README.md b/config/yazi/.config/yazi/plugins/compress.yazi/README.md similarity index 100% rename from config/yazi/plugins/compress.yazi/README.md rename to config/yazi/.config/yazi/plugins/compress.yazi/README.md diff --git a/config/yazi/plugins/compress.yazi/main.lua b/config/yazi/.config/yazi/plugins/compress.yazi/main.lua similarity index 100% rename from config/yazi/plugins/compress.yazi/main.lua rename to config/yazi/.config/yazi/plugins/compress.yazi/main.lua diff --git a/config/yazi/plugins/git.yazi/LICENSE b/config/yazi/.config/yazi/plugins/git.yazi/LICENSE similarity index 100% rename from config/yazi/plugins/git.yazi/LICENSE rename to config/yazi/.config/yazi/plugins/git.yazi/LICENSE diff --git a/config/yazi/plugins/git.yazi/README.md b/config/yazi/.config/yazi/plugins/git.yazi/README.md similarity index 100% rename from config/yazi/plugins/git.yazi/README.md rename to config/yazi/.config/yazi/plugins/git.yazi/README.md diff --git a/config/yazi/plugins/git.yazi/main.lua b/config/yazi/.config/yazi/plugins/git.yazi/main.lua similarity index 100% rename from config/yazi/plugins/git.yazi/main.lua rename to config/yazi/.config/yazi/plugins/git.yazi/main.lua diff --git a/config/yazi/plugins/smart-enter.yazi/LICENSE b/config/yazi/.config/yazi/plugins/smart-enter.yazi/LICENSE similarity index 100% rename from config/yazi/plugins/smart-enter.yazi/LICENSE rename to config/yazi/.config/yazi/plugins/smart-enter.yazi/LICENSE diff --git a/config/yazi/plugins/smart-enter.yazi/README.md b/config/yazi/.config/yazi/plugins/smart-enter.yazi/README.md similarity index 100% rename from config/yazi/plugins/smart-enter.yazi/README.md rename to config/yazi/.config/yazi/plugins/smart-enter.yazi/README.md diff --git a/config/yazi/plugins/smart-enter.yazi/main.lua b/config/yazi/.config/yazi/plugins/smart-enter.yazi/main.lua similarity index 100% rename from config/yazi/plugins/smart-enter.yazi/main.lua rename to config/yazi/.config/yazi/plugins/smart-enter.yazi/main.lua diff --git a/config/yazi/plugins/yamb.yazi/LICENSE b/config/yazi/.config/yazi/plugins/yamb.yazi/LICENSE similarity index 100% rename from config/yazi/plugins/yamb.yazi/LICENSE rename to config/yazi/.config/yazi/plugins/yamb.yazi/LICENSE diff --git a/config/yazi/plugins/yamb.yazi/README.md b/config/yazi/.config/yazi/plugins/yamb.yazi/README.md similarity index 100% rename from config/yazi/plugins/yamb.yazi/README.md rename to config/yazi/.config/yazi/plugins/yamb.yazi/README.md diff --git a/config/yazi/plugins/yamb.yazi/main.lua b/config/yazi/.config/yazi/plugins/yamb.yazi/main.lua similarity index 100% rename from config/yazi/plugins/yamb.yazi/main.lua rename to config/yazi/.config/yazi/plugins/yamb.yazi/main.lua diff --git a/config/yazi/plugins/yaziline.yazi/LICENSE b/config/yazi/.config/yazi/plugins/yaziline.yazi/LICENSE similarity index 100% rename from config/yazi/plugins/yaziline.yazi/LICENSE rename to config/yazi/.config/yazi/plugins/yaziline.yazi/LICENSE diff --git a/config/yazi/plugins/yaziline.yazi/README.md b/config/yazi/.config/yazi/plugins/yaziline.yazi/README.md similarity index 100% rename from config/yazi/plugins/yaziline.yazi/README.md rename to config/yazi/.config/yazi/plugins/yaziline.yazi/README.md diff --git a/config/yazi/plugins/yaziline.yazi/main.lua b/config/yazi/.config/yazi/plugins/yaziline.yazi/main.lua similarity index 100% rename from config/yazi/plugins/yaziline.yazi/main.lua rename to config/yazi/.config/yazi/plugins/yaziline.yazi/main.lua diff --git a/config/yazi/.config/yazi/posh_theme.omp.json b/config/yazi/.config/yazi/posh_theme.omp.json new file mode 100755 index 0000000..f2b7457 --- /dev/null +++ b/config/yazi/.config/yazi/posh_theme.omp.json @@ -0,0 +1,97 @@ +{ + "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json", + "blocks": [ + { + "alignment": "left", + "segments": [ + { + "foreground": "#89b4fa", + "properties": { + "windows": "\ue62a" + }, + "style": "plain", + "template": "{{.Icon}}", + "type": "os" + }, + { + "foreground": "#89b4fa", + "style": "plain", + "template": " {{.UserName}}", + "type": "session" + }, + { + "foreground": "#89b4fa", + "style": "plain", + "template": "@{{.HostName}}", + "type": "session" + }, + { + "foreground": "#94e2d5", + "properties": { + "folder_separator_icon": "/", + "style": "letter" + }, + "style": "powerline", + "template": " \uf07b {{ .Path }} ", + "type": "path" + }, + { + "foreground": "#a6e3a1", + "powerline_symbol": "\ue0b1", + "properties": { + "branch_icon": " ", + "fetch_stash_count": true, + "fetch_status": true, + "fetch_upstream_icon": true, + "fetch_worktree_count": true + }, + "style": "powerline", + "template": " {{ .UpstreamIcon }} {{ .HEAD }}{{if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }} \uf044 {{ .Working.String }}{{ end }}{{ if and (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }} \uf046 {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }} \ueb4b {{ .StashCount }}{{ end }} ", + "type": "git" + }, + { + "foreground": "#f9e2af", + "powerline_symbol": "\ue0b1", + "template": " \ue235 {{ if .Error }}{{ .Error }}{{ else }}{{ if .Venv }}{{ .Venv }} {{ end }}{{ .Full }}{{ end }} ", + "style": "powerline", + "type": "python" + } + ], + "type": "prompt" + }, + { + "alignment": "left", + "newline": true, + "segments": [ + { + "foreground": "#fab387", + "style": "plain", + "template": "\ue3bf ", + "type": "root" + }, + { + "foreground": "#89b4fa", + "foreground_templates": [ + "{{ if gt .Code 0 }}#f38ba8{{ end }}" + ], + "properties": { + "always_enabled": true + }, + "style": "plain", + "template": "{{ if gt .Code 0 }}{{ .Code }} {{ end }}# ", + "type": "status" + } + ], + "type": "prompt" + } + ], + "transient_prompt": { + "background": "transparent", + "foreground_templates": [ + "{{ if gt .Code 0 }}#f38ba8{{ end }}" + ], + "foreground": "#89b4fa", + "template": "# " + }, + "version": 3 +} \ No newline at end of file diff --git a/config/yazi/.config/yazi/qq-electron-flags.conf b/config/yazi/.config/yazi/qq-electron-flags.conf new file mode 100644 index 0000000..5629f6a --- /dev/null +++ b/config/yazi/.config/yazi/qq-electron-flags.conf @@ -0,0 +1,2 @@ +--ozone-platform-hint=auto +--enable-wayland-ime diff --git a/config/yazi/.config/yazi/qq-flags.conf b/config/yazi/.config/yazi/qq-flags.conf new file mode 100644 index 0000000..5629f6a --- /dev/null +++ b/config/yazi/.config/yazi/qq-flags.conf @@ -0,0 +1,2 @@ +--ozone-platform-hint=auto +--enable-wayland-ime diff --git a/config/yazi/starship.toml b/config/yazi/.config/yazi/starship.toml similarity index 100% rename from config/yazi/starship.toml rename to config/yazi/.config/yazi/starship.toml diff --git a/config/yazi/theme.toml b/config/yazi/.config/yazi/theme.toml similarity index 100% rename from config/yazi/theme.toml rename to config/yazi/.config/yazi/theme.toml diff --git a/config/yazi/theme.toml-1748477627539223 b/config/yazi/.config/yazi/theme.toml-1748477627539223 similarity index 100% rename from config/yazi/theme.toml-1748477627539223 rename to config/yazi/.config/yazi/theme.toml-1748477627539223 diff --git a/config/yazi/yazi.toml b/config/yazi/.config/yazi/yazi.toml similarity index 100% rename from config/yazi/yazi.toml rename to config/yazi/.config/yazi/yazi.toml diff --git a/config/yazi/yazi.toml-1748477627471979 b/config/yazi/.config/yazi/yazi.toml-1748477627471979 similarity index 100% rename from config/yazi/yazi.toml-1748477627471979 rename to config/yazi/.config/yazi/yazi.toml-1748477627471979 diff --git a/config/yazi/apply-color b/config/yazi/apply-color deleted file mode 100755 index c43155f..0000000 --- a/config/yazi/apply-color +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -path=$(dirname "$(readlink -f "$0")") -. "$path"/../../utils/apply-color-helper - -cp -f "$path"/../../assets/yazi-themes/catppuccin-mocha-"$colorName".toml "$path"/../yazi/theme.toml || { - log_error "Failed to copy theme file" - exit 1 -} - -log_success "yazi" \ No newline at end of file