Skip to content

Commit b7cbffc

Browse files
dhhdhh
authored
Merge pull request #383 from basecamp/dev
Omarchy v1.7.0
2 parents 51fe5bf + 9c5a29d commit b7cbffc

18 files changed

+229
-170
lines changed

‎bin/omarchy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ PATH="$PATH:$HOME/.local/share/omarchy/bin"
66
show_ascii_art() {
77
clear
88
tte -i ~/.local/share/omarchy/logo.txt --frame-rate 640 --no-color expand
9-
echo " $OMARCHY_VERSION"
9+
echo " $OMARCHY_VERSION"
1010
}
1111

1212
main_menu() {

‎bin/omarchy-cmd-screensaver

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/bin/bash
2+
3+
trap "exit" SIGINT
4+
5+
while true; do
6+
effect=$(tte 2>&1 | grep -oP '{\K[^}]+' | tr ',' ' ' | tr ' ' '\n' | sed -n '/^beams$/,$p' | sort -u | shuf -n1)
7+
tte -i ~/.local/share/omarchy/logo.txt \
8+
--frame-rate 240 --canvas-width 0 --canvas-height 0 --anchor-canvas c --anchor-text c \
9+
"$effect"
10+
done

‎bin/omarchy-launch-screensaver

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
pkill -f "alacritty --class Screensaver" ||
4+
alacritty --class Screensaver --title Screensaver -o 'colors.primary.background="#000000"' \
5+
-e ~/.local/share/omarchy/bin/omarchy-cmd-screensaver

‎bin/omarchy-refresh-walker

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ else
1010
fi
1111

1212
pkill walker
13-
uwsm app -- walker --gapplication-service &
13+
setsid uwsm app -- walker --gapplication-service &

‎bin/omarchy-theme-menu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ CURRENT_THEME_NAME=$(basename "$(realpath "$CURRENT_THEME_DIR")")
66

77
# Build themes list with pretty display names
88
mapfile -t themes < <(
9-
find "$THEMES_DIR" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) | while read -r path; do
9+
find "$THEMES_DIR" -mindepth 1 -maxdepth 1 \( -type d -o -type l \) | sort | while read -r path; do
1010
filename=$(basename "$path")
1111
display_name=$(echo "$filename" | sed -E 's/(^|-)([a-z])/\1\u\2/g; s/-/ /g')
1212
@@ -15,7 +15,7 @@ mapfile -t themes < <(
1515
else
1616
echo "$display_name"
1717
fi
18-
done | sort
18+
done
1919
)
2020

2121
# Show Walker menu

‎boot.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
#!/bin/bash
22

3-
ansi_art=' ▄██████▄ ▄▄▄▄███▄▄▄▄ ▄████████ ▄████████ ▄████████ ▄█ █▄ ▄██ ▄
4-
███ ███ ▄██▀▀▀███▀▀▀██▄ ███ ███ ███ ███ ███ ███ ███ ███ ███ ██▄
5-
███ ███ ███ ███ ███ ███ ███ ███ ███ ███ █▀ ███ ███ ███▄▄▄███
6-
███ ███ ███ ███ ███ ███ ███ ▄███▄▄▄▄██▀ ███ ▄███▄▄▄▄███▄▄ ▀▀▀▀▀▀███
7-
███ ███ ███ ███ ███ ▀███████████ ▀▀███▀▀▀▀▀ ███ ▀▀███▀▀▀▀███▀ ▄██ ███
8-
███ ███ ███ ███ ███ ███ ███ ▀███████████ ███ █▄ ███ ███ ███ ███
9-
███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███
10-
▀██████▀ ▀█ ███ █▀ ███ █▀ ███ ███ ████████▀ ███ █▀ ▀█████▀
11-
███ ███ '
3+
ansi_art=' ▄▄▄
4+
▄█████▄ ▄███████████▄ ▄███████ ▄███████ ▄███████ ▄█ █▄ ▄█ █▄
5+
███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███
6+
███ ███ ███ ███ ███ ███ ███ ███ ███ ███ █▀ ███ ███ ███ ███
7+
███ ███ ███ ███ ███ ▄███▄▄▄███ ▄███▄▄▄██▀ ███ ▄███▄▄▄███▄ ███▄▄▄███
8+
███ ███ ███ ███ ███ ▀███▀▀▀███ ▀███▀▀▀▀ ███ ▀▀███▀▀▀███ ▀▀▀▀▀▀███
9+
███ ███ ███ ███ ███ ███ ███ ██████████ ███ █▄ ███ ███ ▄██ ███
10+
███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███ ███
11+
▀█████▀ ▀█ ███ █▀ ███ █▀ ███ ███ ███████▀ ███ █▀ ▀█████▀
12+
███ █▀ '
1213

1314
clear
1415
echo -e "\n$ansi_art\n"

‎config/fastfetch/config.jsonc

Lines changed: 147 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -1,144 +1,149 @@
11
{
2-
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
3-
"logo": {
4-
"padding": {
5-
"top": 5,
6-
"right": 6
7-
}
8-
},
9-
"modules": [
10-
"break",
11-
{
12-
"type": "custom",
13-
"format": "\u001b[90m┌──────────────────────Hardware──────────────────────┐"
14-
},
15-
{
16-
"type": "host",
17-
"key": " PC",
18-
"keyColor": "green"
19-
},
20-
{
21-
"type": "cpu",
22-
"key": "│ ├",
23-
"showPeCoreCount": true,
24-
"keyColor": "green"
25-
},
26-
{
27-
"type": "gpu",
28-
"key": "│ ├",
29-
"detectionMethod": "pci",
30-
"keyColor": "green"
31-
},
32-
{
33-
"type": "display",
34-
"key": "│ ├󱄄",
35-
"keyColor": "green"
36-
},
37-
{
38-
"type": "disk",
39-
"key": "│ ├󰋊",
40-
"keyColor": "green"
41-
},
42-
{
43-
"type": "memory",
44-
"key": "│ ├",
45-
"keyColor": "green"
46-
},
47-
{
48-
"type": "swap",
49-
"key": "└ └󰓡 ",
50-
"keyColor": "green",
51-
},
52-
{
53-
"type": "custom",
54-
"format": "\u001b[90m└────────────────────────────────────────────────────┘"
55-
},
56-
"break",
57-
{
58-
"type": "custom",
59-
"format": "\u001b[90m┌──────────────────────Software──────────────────────┐"
60-
},
61-
{
62-
"type": "os",
63-
"key": " OS",
64-
"keyColor": "yellow"
65-
},
66-
{
67-
"type": "kernel",
68-
"key": "│ ├",
69-
"keyColor": "yellow"
70-
},
71-
{
72-
"type": "packages",
73-
"key": "│ ├󰏖",
74-
"keyColor": "yellow"
75-
},
76-
{
77-
"type": "shell",
78-
"key": "└ └",
79-
"keyColor": "yellow"
80-
},
81-
"break",
82-
{
83-
"type": "de",
84-
"key": " DE",
85-
"keyColor": "blue"
86-
},
87-
{
88-
"type": "wm",
89-
"key": "│ ├",
90-
"keyColor": "blue"
91-
},
92-
{
93-
"type": "wmtheme",
94-
"key": "│ ├󰉼",
95-
"keyColor": "blue"
96-
},
97-
{
98-
"type": "icons",
99-
"key": "│ ├󰀻",
100-
"keyColor": "blue",
101-
},
102-
{
103-
"type": "cursor",
104-
"key": "│ ├",
105-
"keyColor": "blue",
106-
},
107-
{
108-
"type": "terminalfont",
109-
"key": "│ ├",
110-
"keyColor": "blue",
111-
},
112-
{
113-
"type": "terminal",
114-
"key": "└ └",
115-
"keyColor": "blue"
116-
},
117-
{
118-
"type": "custom",
119-
"format": "\u001b[90m└────────────────────────────────────────────────────┘"
120-
},
121-
"break",
122-
{
123-
"type": "custom",
124-
"format": "\u001b[90m┌────────────────────Uptime / Age────────────────────┐"
125-
},
126-
{
127-
"type": "command",
128-
"key": " OS Age ",
129-
"keyColor": "magenta",
130-
"text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
131-
},
132-
{
133-
"type": "uptime",
134-
"key": " Uptime ",
135-
"keyColor": "magenta"
136-
},
137-
{
138-
"type": "custom",
139-
"format": "\u001b[90m└────────────────────────────────────────────────────┘"
140-
},
141-
"break",
142-
]
2+
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
3+
"logo": {
4+
"padding": {
5+
"top": 5,
6+
"right": 6
7+
}
8+
},
9+
"modules": [
10+
"break",
11+
{
12+
"type": "custom",
13+
"format": "\u001b[90m┌──────────────────────Hardware──────────────────────┐"
14+
},
15+
{
16+
"type": "host",
17+
"key": " PC",
18+
"keyColor": "green"
19+
},
20+
{
21+
"type": "cpu",
22+
"key": "│ ├",
23+
"showPeCoreCount": true,
24+
"keyColor": "green"
25+
},
26+
{
27+
"type": "gpu",
28+
"key": "│ ├",
29+
"detectionMethod": "pci",
30+
"keyColor": "green"
31+
},
32+
{
33+
"type": "display",
34+
"key": "│ ├󱄄",
35+
"keyColor": "green"
36+
},
37+
{
38+
"type": "disk",
39+
"key": "│ ├󰋊",
40+
"keyColor": "green"
41+
},
42+
{
43+
"type": "memory",
44+
"key": "│ ├",
45+
"keyColor": "green"
46+
},
47+
{
48+
"type": "swap",
49+
"key": "└ └󰓡 ",
50+
"keyColor": "green"
51+
},
52+
{
53+
"type": "custom",
54+
"format": "\u001b[90m└────────────────────────────────────────────────────┘"
55+
},
56+
"break",
57+
{
58+
"type": "custom",
59+
"format": "\u001b[90m┌──────────────────────Software──────────────────────┐"
60+
},
61+
{
62+
"type": "os",
63+
"key": " OS",
64+
"keyColor": "yellow"
65+
},
66+
{
67+
"type": "kernel",
68+
"key": "│ ├",
69+
"keyColor": "yellow"
70+
},
71+
{
72+
"type": "packages",
73+
"key": "│ ├󰏖",
74+
"keyColor": "yellow"
75+
},
76+
{
77+
"type": "shell",
78+
"key": "└ └",
79+
"keyColor": "yellow"
80+
},
81+
"break",
82+
{
83+
"type": "command",
84+
"key": "│ ├Ø",
85+
"keyColor": "blue",
86+
"text": "version=$(git -C ~/.local/share/omarchy describe --tags --abbrev=0 2>/dev/null); echo \"Omarchy $version\""
87+
},
88+
{
89+
"type": "de",
90+
"key": " DE",
91+
"keyColor": "blue"
92+
},
93+
{
94+
"type": "wm",
95+
"key": "│ ├",
96+
"keyColor": "blue"
97+
},
98+
{
99+
"type": "wmtheme",
100+
"key": "│ ├󰉼",
101+
"keyColor": "blue"
102+
},
103+
{
104+
"type": "icons",
105+
"key": "│ ├󰀻",
106+
"keyColor": "blue"
107+
},
108+
{
109+
"type": "cursor",
110+
"key": "│ ├",
111+
"keyColor": "blue"
112+
},
113+
{
114+
"type": "terminalfont",
115+
"key": "│ ├",
116+
"keyColor": "blue"
117+
},
118+
{
119+
"type": "terminal",
120+
"key": "└ └",
121+
"keyColor": "blue"
122+
},
123+
{
124+
"type": "custom",
125+
"format": "\u001b[90m└────────────────────────────────────────────────────┘"
126+
},
127+
"break",
128+
{
129+
"type": "custom",
130+
"format": "\u001b[90m┌────────────────────Uptime / Age────────────────────┐"
131+
},
132+
{
133+
"type": "command",
134+
"key": " OS Age ",
135+
"keyColor": "magenta",
136+
"text": "birth_install=$(stat -c %W /); current=$(date +%s); time_progression=$((current - birth_install)); days_difference=$((time_progression / 86400)); echo $days_difference days"
137+
},
138+
{
139+
"type": "uptime",
140+
"key": " Uptime ",
141+
"keyColor": "magenta"
142+
},
143+
{
144+
"type": "custom",
145+
"format": "\u001b[90m└────────────────────────────────────────────────────┘"
146+
},
147+
"break"
148+
]
143149
}
144-

‎config/hypr/monitors.conf

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
# See https://wiki.hyprland.org/Configuring/Monitors/
2+
# List current monitors and resolutions possible: hyprctl monitors
3+
# Format: monitor = [port], resolution, position, scale
4+
# You must relaunch Hyprland after changing any envs (use Super+Esc, then Relaunch)
25

3-
# Change to 1 if on a 1x display (then change last "auto" to 1 in monitor=)
4-
# Change to something like 1.75 for fractional scaling (can work well with 1.66667 monitor scaling)
5-
# Note: You must relaunch Hyprland after changing any env like this (use Super+Esc, then Relaunch)
6+
# Optimized for retina-class 2x displays, like 13" 2.8K, 27" 5K, 32" 6K.
67
env = GDK_SCALE,2
7-
8-
# Use single default monitor (see all monitors with: hyprctl monitors)
9-
# Format: monitor = [port], resolution, position, scale
108
monitor=,preferred,auto,auto
119

12-
# Exmaple for fractional scaling that works well with GDK_SCALE,1.75
10+
# Good compromise for 27" or 32" 4K monitors (but fractional!)
11+
# env = GDK_SCALE,1.75
1312
# monitor=,preferred,auto,1.666667
1413

14+
# Straight 1x setup for low-resolution displays like 1080p or 1440p
15+
# env = GDK_SCALE,1
16+
# monitor=,preferred,auto,1
17+
1518
# Example for Framework 13 w/ 6K XDR Apple display
16-
# monitor = DP-5, 6016x3384@60.00, auto, 2
17-
# monitor = eDP-1, 2880x1920@120.00, auto, 2
19+
# monitor = DP-5, 6016x3384@60, auto, 2
20+
# monitor = eDP-1, 2880x1920@120, auto, 2

0 commit comments

Comments
 (0)