mirror of
https://github.com/basecamp/omarchy.git
synced 2026-02-17 15:25:37 +00:00
Compare commits
19 Commits
remove-1pw
...
revert-185
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
796ef67ede | ||
|
|
076da663f5 | ||
|
|
b92ebff29b | ||
|
|
8e5b59995a | ||
|
|
d4b0ba5d94 | ||
|
|
4d9f932e6c | ||
|
|
38d536ba9d | ||
|
|
2df8c5f7e0 | ||
|
|
441ee10d70 | ||
|
|
45465d3e7c | ||
|
|
83ab85799b | ||
|
|
ffe7cd5099 | ||
|
|
cf41ecaaa5 | ||
|
|
9aef0ffab6 | ||
|
|
f6383fd3e9 | ||
|
|
e81994f182 | ||
|
|
7ca60bd590 | ||
|
|
dac34aa5e0 | ||
|
|
81165f1947 |
@@ -15,7 +15,7 @@ SCOPE="$1"
|
|||||||
AUDIO=$([[ $2 == "audio" ]] && echo "--audio")
|
AUDIO=$([[ $2 == "audio" ]] && echo "--audio")
|
||||||
|
|
||||||
start_screenrecording() {
|
start_screenrecording() {
|
||||||
filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
|
local filename="$OUTPUT_DIR/screenrecording-$(date +'%Y-%m-%d_%H-%M-%S').mp4"
|
||||||
|
|
||||||
if lspci | grep -qi 'nvidia'; then
|
if lspci | grep -qi 'nvidia'; then
|
||||||
wf-recorder $AUDIO -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@" &
|
wf-recorder $AUDIO -f "$filename" -c libx264 -p crf=23 -p preset=medium -p movflags=+faststart "$@" &
|
||||||
@@ -47,7 +47,8 @@ screenrecording_active() {
|
|||||||
if screenrecording_active; then
|
if screenrecording_active; then
|
||||||
stop_screenrecording
|
stop_screenrecording
|
||||||
elif [[ "$SCOPE" == "output" ]]; then
|
elif [[ "$SCOPE" == "output" ]]; then
|
||||||
start_screenrecording
|
output=$(slurp -o) || exit 1
|
||||||
|
start_screenrecording -g "$output"
|
||||||
else
|
else
|
||||||
region=$(slurp) || exit 1
|
region=$(slurp) || exit 1
|
||||||
start_screenrecording -g "$region"
|
start_screenrecording -g "$region"
|
||||||
|
|||||||
13
bin/omarchy-install-chromium-google-account
Executable file
13
bin/omarchy-install-chromium-google-account
Executable file
@@ -0,0 +1,13 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if [[ -f ~/.config/chromium-flags.conf ]]; then
|
||||||
|
CONF=~/.config/chromium-flags.conf
|
||||||
|
|
||||||
|
grep -qxF -- "--oauth2-client-id=77185425430.apps.googleusercontent.com" "$CONF" ||
|
||||||
|
echo "--oauth2-client-id=77185425430.apps.googleusercontent.com" >>"$CONF"
|
||||||
|
|
||||||
|
grep -qxF -- "--oauth2-client-secret=OTJgUOQcT7lO7GsGZq2G4IlT" "$CONF" ||
|
||||||
|
echo "--oauth2-client-secret=OTJgUOQcT7lO7GsGZq2G4IlT" >>"$CONF"
|
||||||
|
|
||||||
|
echo "Now you can login to your Google Account in Chromium."
|
||||||
|
fi
|
||||||
@@ -47,6 +47,7 @@ install_node() {
|
|||||||
case "$1" in
|
case "$1" in
|
||||||
ruby)
|
ruby)
|
||||||
echo -e "Installing Ruby on Rails...\n"
|
echo -e "Installing Ruby on Rails...\n"
|
||||||
|
omarchy-pkg-add libyaml
|
||||||
mise use --global ruby@latest
|
mise use --global ruby@latest
|
||||||
mise settings add idiomatic_version_file_enable_tools ruby
|
mise settings add idiomatic_version_file_enable_tools ruby
|
||||||
mise x ruby -- gem install rails --no-document
|
mise x ruby -- gem install rails --no-document
|
||||||
|
|||||||
@@ -249,10 +249,11 @@ show_install_menu() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
show_install_service_menu() {
|
show_install_service_menu() {
|
||||||
case $(menu "Install" " Dropbox\n Tailscale\n Bitwarden") in
|
case $(menu "Install" " Dropbox\n Tailscale\n Bitwarden\n Chromium Account") in
|
||||||
*Dropbox*) present_terminal omarchy-install-dropbox ;;
|
*Dropbox*) present_terminal omarchy-install-dropbox ;;
|
||||||
*Tailscale*) present_terminal omarchy-install-tailscale ;;
|
*Tailscale*) present_terminal omarchy-install-tailscale ;;
|
||||||
*Bitwarden*) install_and_launch "Bitwarden" "bitwarden bitwarden-cli" "bitwarden" ;;
|
*Bitwarden*) install_and_launch "Bitwarden" "bitwarden bitwarden-cli" "bitwarden" ;;
|
||||||
|
*Chromium*) present_terminal omarchy-install-chromium-google-account ;;
|
||||||
*) show_install_menu ;;
|
*) show_install_menu ;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,12 +3,5 @@
|
|||||||
case "$TERMINAL" in
|
case "$TERMINAL" in
|
||||||
"alacritty") touch ~/.config/alacritty/alacritty.toml ;;
|
"alacritty") touch ~/.config/alacritty/alacritty.toml ;;
|
||||||
"kitty") killall -SIGUSR1 kitty ;;
|
"kitty") killall -SIGUSR1 kitty ;;
|
||||||
"ghostty")
|
"ghostty") killall -SIGUSR2 ghostty ;;
|
||||||
# Use a default theme if none exists
|
|
||||||
if [[ ! -f ~/.config/omarchy/current/theme/ghostty.conf ]]; then
|
|
||||||
echo "theme = Spacegray" >~/.config/omarchy/current/theme/ghostty.conf
|
|
||||||
fi
|
|
||||||
|
|
||||||
killall -USRSIG2 ghostty
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ cat >"$DESKTOP_FILE" <<EOF
|
|||||||
Version=1.0
|
Version=1.0
|
||||||
Name=$APP_NAME
|
Name=$APP_NAME
|
||||||
Comment=$APP_NAME
|
Comment=$APP_NAME
|
||||||
Exec=$TERMINAL --class $APP_CLASS -e $APP_EXEC
|
Exec=\$TERMINAL --class=$APP_CLASS -e $APP_EXEC
|
||||||
Terminal=false
|
Terminal=false
|
||||||
Type=Application
|
Type=Application
|
||||||
Icon=$ICON_PATH
|
Icon=$ICON_PATH
|
||||||
|
|||||||
@@ -2,5 +2,3 @@
|
|||||||
--ozone-platform-hint=wayland
|
--ozone-platform-hint=wayland
|
||||||
--enable-features=TouchpadOverscrollHistoryNavigation
|
--enable-features=TouchpadOverscrollHistoryNavigation
|
||||||
--load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url
|
--load-extension=~/.local/share/omarchy/default/chromium/extensions/copy-url
|
||||||
--oauth2-client-id=77185425430.apps.googleusercontent.com
|
|
||||||
--oauth2-client-secret=OTJgUOQcT7lO7GsGZq2G4IlT
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
# Dynamic theme colors
|
# Dynamic theme colors
|
||||||
config-file = "~/.config/omarchy/current/theme/ghostty.conf"
|
config-file = ?"~/.config/omarchy/current/theme/ghostty.conf"
|
||||||
|
|
||||||
# Font
|
# Font
|
||||||
font-family = "CaskaydiaMono Nerd Font"
|
font-family = "CaskaydiaMono Nerd Font"
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
notify-send " Update System" "When you have internet, click to update the system." -t 30000
|
notify-send " Update System" "When you have internet, click to update the system." -u critical
|
||||||
notify-send "👋 Welcome to Omarchy" "You're in for a great computing adventure. Have fun!" -t 30000
|
notify-send "👋 Welcome to Omarchy" "You're in for a great computing adventure. Have fun!" -t 30000
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ fd
|
|||||||
ffmpegthumbnailer
|
ffmpegthumbnailer
|
||||||
fontconfig
|
fontconfig
|
||||||
fzf
|
fzf
|
||||||
gcc14
|
|
||||||
github-cli
|
github-cli
|
||||||
gnome-calculator
|
gnome-calculator
|
||||||
gnome-keyring
|
gnome-keyring
|
||||||
|
|||||||
0
migrations/1757021485.sh
Executable file → Normal file
0
migrations/1757021485.sh
Executable file → Normal file
@@ -1,3 +0,0 @@
|
|||||||
echo "Refresh chromium-flags.conf to add option of logging in to Google account for settings sync"
|
|
||||||
|
|
||||||
omarchy-refresh-config chromium-flags.conf
|
|
||||||
17
migrations/1758436991.sh
Normal file
17
migrations/1758436991.sh
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
echo "Fix Disk Usage and Docker TUIs"
|
||||||
|
|
||||||
|
APP_DIR="$HOME/.local/share/applications"
|
||||||
|
ICON_DIR="$APP_DIR/icons"
|
||||||
|
|
||||||
|
# Don't use omarchy-tui-remove to preserve icons
|
||||||
|
|
||||||
|
if [[ -f "$APP_DIR/Docker.desktop" ]]; then
|
||||||
|
rm "$APP_DIR/Docker.desktop"
|
||||||
|
omarchy-tui-install "Docker" "lazydocker" tile "$ICON_DIR/Docker.png"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -f "$APP_DIR/Disk Usage.desktop" ]]; then
|
||||||
|
rm "$APP_DIR/Disk Usage.desktop"
|
||||||
|
omarchy-tui-install "Disk Usage" "bash -c 'dust -r; read -n 1 -s'" float "$ICON_DIR/Disk Usage.png"
|
||||||
|
fi
|
||||||
|
|
||||||
@@ -1 +1,25 @@
|
|||||||
theme = TokyoNight
|
# primary
|
||||||
|
background = #111c18
|
||||||
|
foreground = #C1C497
|
||||||
|
cursor-color = #D7C995
|
||||||
|
cursor-text = #000000
|
||||||
|
|
||||||
|
# normal colors
|
||||||
|
palette = 0=#23372B
|
||||||
|
palette = 1=#FF5345
|
||||||
|
palette = 2=#549e6a
|
||||||
|
palette = 3=#459451
|
||||||
|
palette = 4=#509475
|
||||||
|
palette = 5=#D2689C
|
||||||
|
palette = 6=#2DD5B7
|
||||||
|
palette = 7=#F6F5DD
|
||||||
|
|
||||||
|
# bright colors
|
||||||
|
palette = 8=#53685B
|
||||||
|
palette = 9=#db9f9c
|
||||||
|
palette = 10=#143614
|
||||||
|
palette = 11=#E5C736
|
||||||
|
palette = 12=#ACD4CF
|
||||||
|
palette = 13=#75bbb3
|
||||||
|
palette = 14=#8CD3CB
|
||||||
|
palette = 15=#9eebb3
|
||||||
|
|||||||
Reference in New Issue
Block a user