Merge pull request #177 from ublue-os/main

[pull] main from ublue-os:main

Containerfile

@@ -27,7 +27,8 @@ RUN if [ ${FEDORA_MAJOR_VERSION} -ge "39" ]; then \
         --experimental \
         --from repo=copr:copr.fedorainfracloud.org:kylegospo:prompt \
             vte291 \
-            vte-profile && \
+            vte-profile \
+            libadwaita && \
         rpm-ostree install \
             prompt && \
         rm -f /etc/yum.repos.d/_copr_kylegospo-prompt.repo && \

just/custom.just

@@ -250,11 +250,11 @@ atuin:
     shell=$(basename $SHELL) 
     if test $shell = "fish"; then 
         echo "Adding atuin to your config.fish"
-        printf '\nif status is-interactive\n    atuin init fish | source\nend\n' >> ${XDG_CONFIG_HOME:-$HOME/.config}/fish/config.fish
+        printf '\nif status is-interactive\n\tif type -q atuin\n\t\tatuin init fish | source\n\tend\nend\n' >> ${XDG_CONFIG_HOME:-$HOME/.config}/fish/config.fish
     elif test $shell = "zsh"; then 
         echo "Adding atuin to your .zshrc"
-        printf '\neval "$(atuin init zsh)"\n' >> ${ZDOTDIR:-$HOME}/.zshrc 
+        printf '\n[[ "$(command -v atuin)" ]] && eval "$(atuin init zsh)"\n' >> ${ZDOTDIR:-$HOME}/.zshrc 
     elif test $shell = "bash"; then 
         echo "Adding bash-prexec and atuin to your .bashrc" 
-        printf '\n[[ -f /usr/share/bash-prexec ]] && source /usr/share/bash-prexec\neval "$(atuin init bash)"\n' >> ~/.bashrc
+        printf '\n[[ -f /usr/share/bash-prexec ]] && source /usr/share/bash-prexec\n[[ "$(command -v atuin)" ]] && eval "$(atuin init bash)"\n' >> ~/.bashrc
     fi

usr/etc/dconf/db/local.d/01-ublue

@@ -57,21 +57,31 @@ min-alpha=0.5
 
 [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0]
 binding='<Control><Alt>t'
-command='xdg-terminal-exec'
-name='Prompt'
+command='prompt --tab-with-profile=2871e8027773ae74d6c87a5f659bbc74'
+name='Host Prompt'
 
 [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1]
 binding='<Control><Alt>u'
-command='xdg-terminal-exec -- distrobox enter ubuntu'
+command='prompt --tab-with-profile=4741cb2eb3614750b79edc5c4b8c08b3'
 name='Ubuntu Prompt'
 
 [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2]
 binding='<Control><Shift>Escape'
 command="flatpak run io.missioncenter.MissionCenter"
 name='mission-center'
 
+[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom3]
+binding='<Control><Alt>Enter'
+command="prompt --tab-with-profile=a21a910811504857bea4c96b3d937b93"
+name='Bluefin Prompt'
+
+[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom4]
+binding='<Control><Alt>f'
+command="prompt --tab-with-profile=d6fe45489ed74fada5d95d715449ce7e"
+name='Fedora Prompt'
+
 [org/gnome/settings-daemon/plugins/media-keys]
-custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2/']
+custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom2/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom3/', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom4/']
 home=['<Super>e']
 
 [org/gnome/settings-daemon/plugins/power]
@@ -86,16 +96,6 @@ sort-directories-first=true
 [org/gnome/mutter]
 experimental-features=['scale-monitor-framebuffer']
 
-[com/raggesilver/BlackBox]
-command-as-login-shell=true
-use-custom-command=false
-custom-shell-command='distrobox enter ubuntu'
-theme-dark="Yaru"
-style-preference=2
-font="Ubuntu Mono 16"
-window-width=975
-window-height=650
-
 [org/gnome/software]
 allow-updates=false
 download-updates=false