diff --git a/bombadil.toml b/bombadil.toml index 5098c09..a86d25d 100644 --- a/bombadil.toml +++ b/bombadil.toml @@ -8,44 +8,43 @@ posthooks = [ ] [settings.dots] -templates = { source = "Templates", target = "Templates" } -scripts = { source = "scripts", target = "scripts" } +templates = { source = "Templates", target = "Templates", direct = true } +scripts = { source = "scripts", target = "scripts", direct = true } -editorconfig = { source = "home/.editorconfig", target = ".editorconfig" } +editorconfig = { source = "home/.editorconfig", target = ".editorconfig", direct = true } -electron = { source = "config/electron-flags.conf", target = ".config/electron-flags.conf" } -discord = { source = "config/electron-flags.conf", target = ".config/discord-flags.conf" } +electron = { source = "config/electron-flags.conf", target = ".config/electron-flags.conf", direct = true } +discord = { source = "config/electron-flags.conf", target = ".config/discord-flags.conf", direct = true } -1password = { source = "autostart/1password.desktop", target = ".config/autostart/1password.desktop" } -megasync = { source = "autostart/megasync.desktop", target = ".config/autostart/megasync.desktop" } - -git = { source = "git/config", target = ".config/git/config" } +1password = { source = "autostart/1password.desktop", target = ".config/autostart/1password.desktop", direct = true } +megasync = { source = "autostart/megasync.desktop", target = ".config/autostart/megasync.desktop", direct = true } # Also needs a one-time `systemctl --user enable --now eww-daemon.service eww-bars.service ip-geolocation.service sunset.timer swww-daemon.service' -eww-daemon = { source = "systemd/eww-daemon.service", target = ".config/systemd/user/eww-daemon.service" } +eww-daemon = { source = "systemd/eww-daemon.service", target = ".config/systemd/user/eww-daemon.service", direct = true } eww-bars = { source = "systemd/eww-bars.service", target = ".config/systemd/user/eww-bars.service" } -ip-geolocation = { source = "systemd/ip-geolocation.service", target = ".config/systemd/user/ip-geolocation.service" } -sunset-service = { source = "systemd/sunset.service", target = ".config/systemd/user/sunset.service" } -sunset-timer = { source = "systemd/sunset.timer", target = ".config/systemd/user/sunset.timer" } -swww-daemon = { source = "systemd/swww-daemon.service", target = ".config/systemd/user/swww-daemon.service" } +ip-geolocation = { source = "systemd/ip-geolocation.service", target = ".config/systemd/user/ip-geolocation.service", direct = true } +sunset-service = { source = "systemd/sunset.service", target = ".config/systemd/user/sunset.service", direct = true } +sunset-timer = { source = "systemd/sunset.timer", target = ".config/systemd/user/sunset.timer", direct = true } +swww-daemon = { source = "systemd/swww-daemon.service", target = ".config/systemd/user/swww-daemon.service", direct = true } -btop = { source = "btop", target = ".config/btop" } -dunst = { source = "dunst", target = ".config/dunst" } -eww = { source = "eww", target = ".config/eww"} -fastfetch = { source = "fastfetch", target = ".config/fastfetch" } -gtk2 = { source = "gtk/gtk-2.0", target = ".config/gtk-2.0" } -gtk3 = { source = "gtk/gtk-3.0", target = ".config/gtk-3.0" } +btop = { source = "btop", target = ".config/btop", direct = true } +dunst = { source = "dunst", target = ".config/dunst", direct = true } +eww = { source = "eww", target = ".config/eww", direct = true } +fastfetch = { source = "fastfetch", target = ".config/fastfetch", direct = true } +gtk2 = { source = "gtk/gtk-2.0", target = ".config/gtk-2.0", direct = true } +gtk3 = { source = "gtk/gtk-3.0", target = ".config/gtk-3.0", direct = true } +git = { source = "git/config", target = ".config/git/config", direct = true } hypr = { source = "hypr", target = ".config/hypr" } -kitty = { source = "kitty", target = ".config/kitty" } -lsd = { source = "lsd", target = ".config/lsd" } -nvim = { source = "nvim", target = ".config/nvim" } -rofi = { source = "rofi", target = ".config/rofi" } -steam = { source = "steam/steam_dev.cfg", target = ".steam/steam/steam_dev.cfg" } -swaylock = { source = "swaylock", target = ".config/swaylock" } +kitty = { source = "kitty", target = ".config/kitty", direct = true } +lsd = { source = "lsd", target = ".config/lsd", direct = true } +nvim = { source = "nvim", target = ".config/nvim", direct = true } +rofi = { source = "rofi", target = ".config/rofi", direct = true } +steam = { source = "steam/steam_dev.cfg", target = ".steam/steam/steam_dev.cfg", direct = true } +swaylock = { source = "swaylock", target = ".config/swaylock", direct = true } uwsm = { source = "uwsm", target = ".config/uwsm" } -vim = { source = "vim/vimrc", target = ".config/vim/vimrc" } -yazi = { source = "yazi", target = ".config/yazi" } -zsh = { source = "zsh", target = ".config/zsh" } +vim = { source = "vim/vimrc", target = ".config/vim/vimrc", direct = true } +yazi = { source = "yazi", target = ".config/yazi", direct = true } +zsh = { source = "zsh", target = ".config/zsh", direct = true } [profiles.chonk] vars = [ "chonk.toml" ] diff --git a/git/config b/git/config index bf1c118..a92be8c 100755 --- a/git/config +++ b/git/config @@ -3,9 +3,6 @@ email = michaelmbrad@gmail.com signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAVoIshBPg9X4mVzqEx75qXJiVoNC9mbj0bOAMq5ZUIw -[core] - editor = lvim - [init] defaultBranch = main diff --git a/kitty/kitty.conf b/kitty/kitty.conf index bbc35a9..b753efe 100755 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -1,4 +1,3 @@ -{% raw %} # vim:fileencoding=utf-8:foldmethod=marker #: Fonts {{{ @@ -2641,4 +2640,3 @@ wayland_enable_ime no #: }}} #: }}} -{% endraw %} diff --git a/scripts/lib/swww.py b/scripts/lib/swww.py index 9276dcb..7eb5650 100644 --- a/scripts/lib/swww.py +++ b/scripts/lib/swww.py @@ -33,7 +33,7 @@ def run_swww(monitor: str, image: Path, extra_args: list[str] | None = None) -> def get_wallpapers() -> list[Path]: - return list(Path("/usr/share/backgrounds/Wallpapers/").glob("*")) + return list(Path("~/Pictures/wallpapers/").expanduser().glob("*")) def sample_wallpapers(displays: list[str] | None = None) -> "zip[tuple[str, Path]]": diff --git a/zsh/.p10k-tty.zsh b/zsh/.p10k-tty.zsh index 8e5701a..5202b94 100755 --- a/zsh/.p10k-tty.zsh +++ b/zsh/.p10k-tty.zsh @@ -1,4 +1,3 @@ -{% raw %} # Generated by Powerlevel10k configuration wizard on 2023-01-09 at 19:29 EST. # Based on romkatv/powerlevel10k/config/p10k-lean-8colors.zsh, checksum 54735. # Wizard options: ascii, lean_8colors, 24h time, 2 lines, solid, white-ornaments, @@ -1650,4 +1649,3 @@ typeset -g POWERLEVEL9K_CONFIG_FILE=${${(%):-%x}:a} (( ${#p10k_config_opts} )) && setopt ${p10k_config_opts[@]} 'builtin' 'unset' 'p10k_config_opts' -{% endraw %} diff --git a/zsh/.p10k.zsh b/zsh/.p10k.zsh index 4764d82..c5dda32 100755 --- a/zsh/.p10k.zsh +++ b/zsh/.p10k.zsh @@ -1,4 +1,3 @@ -{% raw %} # Generated by Powerlevel10k configuration wizard on 2022-08-20 at 20:39 EDT. # Based on romkatv/powerlevel10k/config/p10k-classic.zsh, checksum 62739. # Wizard options: nerdfont-complete + powerline, small icons, classic, unicode, darkest, @@ -1651,4 +1650,3 @@ typeset -g POWERLEVEL9K_CONFIG_FILE=${${(%):-%x}:a} (( ${#p10k_config_opts} )) && setopt ${p10k_config_opts[@]} 'builtin' 'unset' 'p10k_config_opts' -{% endraw %}