mirror of
https://github.com/basecamp/omarchy.git
synced 2026-02-17 15:25:37 +00:00
Dir updates
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
# FIXME: Update behavior
|
||||||
cd ~/.local/share/omarchy
|
cd ~/.local/share/omarchy
|
||||||
migration_file="$HOME/.local/share/omarchy/migrations/$(git log -1 --format=%cd --date=unix).sh"
|
migration_file="$HOME/.local/share/omarchy/migrations/$(git log -1 --format=%cd --date=unix).sh"
|
||||||
touch $migration_file
|
touch $migration_file
|
||||||
|
|||||||
@@ -89,7 +89,6 @@ dynamic_bindings() {
|
|||||||
jq -r '.[] | {modmask, key, keycode, description, dispatcher, arg} | "\(.modmask),\(.key)@\(.keycode),\(.description),\(.dispatcher),\(.arg)"' |
|
jq -r '.[] | {modmask, key, keycode, description, dispatcher, arg} | "\(.modmask),\(.key)@\(.keycode),\(.description),\(.dispatcher),\(.arg)"' |
|
||||||
sed -r \
|
sed -r \
|
||||||
-e 's/null//' \
|
-e 's/null//' \
|
||||||
-e 's,~/.local/share/omarchy/bin/,,' \
|
|
||||||
-e 's,uwsm app -- ,,' \
|
-e 's,uwsm app -- ,,' \
|
||||||
-e 's,uwsm-app -- ,,' \
|
-e 's,uwsm-app -- ,,' \
|
||||||
-e 's/@0//' \
|
-e 's/@0//' \
|
||||||
|
|||||||
@@ -2,6 +2,6 @@
|
|||||||
|
|
||||||
clear
|
clear
|
||||||
echo -e "\033[32m"
|
echo -e "\033[32m"
|
||||||
cat <~/.local/share/omarchy/logo.txt
|
cat < /usr/share/omarchy/logo.txt
|
||||||
echo -e "\033[0m"
|
echo -e "\033[0m"
|
||||||
echo
|
echo
|
||||||
|
|||||||
19
boot.sh
19
boot.sh
@@ -19,21 +19,4 @@ echo -e "\n$ansi_art\n"
|
|||||||
|
|
||||||
sudo pacman -Syu --noconfirm --needed git
|
sudo pacman -Syu --noconfirm --needed git
|
||||||
|
|
||||||
# Use custom repo if specified, otherwise default to basecamp/omarchy
|
# FIXME: Update behavior or remove
|
||||||
OMARCHY_REPO="${OMARCHY_REPO:-basecamp/omarchy}"
|
|
||||||
|
|
||||||
echo -e "\nCloning Omarchy from: https://github.com/${OMARCHY_REPO}.git"
|
|
||||||
rm -rf ~/.local/share/omarchy/
|
|
||||||
git clone "https://github.com/${OMARCHY_REPO}.git" ~/.local/share/omarchy >/dev/null
|
|
||||||
|
|
||||||
# Use custom branch if instructed, otherwise default to master
|
|
||||||
OMARCHY_REF="${OMARCHY_REF:-master}"
|
|
||||||
if [[ $OMARCHY_REF != "master" ]]; then
|
|
||||||
echo -e "\e[32mUsing branch: $OMARCHY_REF\e[0m"
|
|
||||||
cd ~/.local/share/omarchy
|
|
||||||
git fetch origin "${OMARCHY_REF}" && git checkout "${OMARCHY_REF}"
|
|
||||||
cd -
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo -e "\nInstallation starting..."
|
|
||||||
source ~/.local/share/omarchy/install.sh
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
force_keyboard_focus = true # forces keyboard forcus to stay in Walker
|
force_keyboard_focus = true # forces keyboard forcus to stay in Walker
|
||||||
selection_wrap = true # wrap list if at bottom or top
|
selection_wrap = true # wrap list if at bottom or top
|
||||||
theme = "omarchy-default" # theme to use
|
theme = "omarchy-default" # theme to use
|
||||||
additional_theme_location = "~/.local/share/omarchy/default/walker/themes/"
|
additional_theme_location = "/usr/share/omarchy/default/walker/themes/"
|
||||||
|
|
||||||
[placeholders]
|
[placeholders]
|
||||||
"default" = { input = " Search...", list = "No Results" } # placeholders for input and empty list, key is the providers name, so f.e. "desktopapplications" or "menus:other"
|
"default" = { input = " Search...", list = "No Results" } # placeholders for input and empty list, key is the providers name, so f.e. "desktopapplications" or "menus:other"
|
||||||
|
|||||||
@@ -8,4 +8,4 @@ windowrule = opacity 0.97 0.9, class:.*
|
|||||||
windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
|
windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
|
||||||
|
|
||||||
# App-specific tweaks
|
# App-specific tweaks
|
||||||
source = ~/.local/share/omarchy/default/hypr/apps.conf
|
source = /usr/share/omarchy/default/hypr/apps.conf
|
||||||
|
|||||||
@@ -122,6 +122,7 @@ catch_errors() {
|
|||||||
|
|
||||||
case "$choice" in
|
case "$choice" in
|
||||||
"Retry installation")
|
"Retry installation")
|
||||||
|
# FIXME: Update based on final setup
|
||||||
bash ~/.local/share/omarchy/install.sh
|
bash ~/.local/share/omarchy/install.sh
|
||||||
break
|
break
|
||||||
;;
|
;;
|
||||||
|
|||||||
Reference in New Issue
Block a user