Skip to content

Commit 75ea351

Browse files
authored
Fix 3.2 sync (#5)
* Fix(waybar migration issue) * Fix(do not disturb was not executable) * Add preview to monarch theme * Fix(Apply basecamp/omarchy#3492) * Remove useless configuration * Mute unalias if gau does not exists * Replace OMZ by Starship * Change keybinding to avoid conflict between copy/paste and window orientation * Fix capslock issue * Improve label on walker
1 parent 6b22834 commit 75ea351

File tree

29 files changed

+160
-276
lines changed

29 files changed

+160
-276
lines changed

.gitmodules

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +0,0 @@
1-
[submodule "default/zsh/omz"]
2-
path = default/zsh/omz
3-
url = https://github.com/ohmyzsh/ohmyzsh.git
4-
[submodule "default/zsh/custom/plugins/zsh-syntax-highlighting"]
5-
path = default/zsh/custom/plugins/zsh-syntax-highlighting
6-
url = https://github.com/zsh-users/zsh-syntax-highlighting.git
7-
[submodule "default/zsh/custom/plugins/zsh-completions"]
8-
path = default/zsh/custom/plugins/zsh-completions
9-
url = https://github.com/zsh-users/zsh-completions.git
10-
[submodule "default/zsh/custom/plugins/zsh-autosuggestions"]
11-
path = default/zsh/custom/plugins/zsh-autosuggestions
12-
url = https://github.com/zsh-users/zsh-autosuggestions.git

bin/monarch-refresh-limine

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
if [[ -f /boot/EFI/linux/monarch_linux.efi ]] && [[ -f /boot/EFI/linux/$(cat /etc/machine-id)_linux.efi ]]; then
3+
if [[ -f /boot/EFI/Linux/monarch_linux.efi ]] && [[ -f /boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi ]]; then
44
echo "Cleanup extra UKI"
55
sudo rm -f /boot/EFI/Linux/$(cat /etc/machine-id)_linux.efi
66
fi
@@ -31,4 +31,4 @@ term_background_bright: 24283b
3131
EOF
3232

3333
sudo limine-update
34-
sudo limine-snapper-sync
34+
sudo limine-snapper-sync

config/leviathan/modules/dns/subdomain.yaml

Lines changed: 0 additions & 30 deletions
This file was deleted.

config/leviathan/modules/dns/zonetransfer.yaml

Lines changed: 0 additions & 15 deletions
This file was deleted.

config/leviathan/modules/osint/domain_info.yaml

Lines changed: 0 additions & 15 deletions
This file was deleted.

config/leviathan/workflows/recon.yaml

Lines changed: 0 additions & 21 deletions
This file was deleted.

config/starship.toml

Lines changed: 60 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,73 @@
1-
add_newline = true
1+
add_newline = false
2+
palette = 'monarch'
23
command_timeout = 200
3-
format = "[$directory$git_branch$git_status]($style)$character"
4+
format = '$directory${custom.giturl}$git_branch$git_status$docker_context$python$rust$fill $status$username[@](grey)$hostname$line_break$character'
5+
6+
7+
[palettes.monarch]
8+
grey = '#444444'
49

510
[character]
6-
error_symbol = "[✗](bold cyan)"
7-
success_symbol = "[❯](bold cyan)"
11+
error_symbol = "[✗](bold red)"
12+
13+
[custom.giturl]
14+
description = "Display symbol for remote Git server"
15+
command = """
16+
GIT_REMOTE=$(command git ls-remote --get-url 2> /dev/null)
17+
if [[ "$GIT_REMOTE" =~ "github" ]]; then
18+
GIT_REMOTE_SYMBOL=""
19+
elif [[ "$GIT_REMOTE" =~ "gitlab" ]]; then
20+
GIT_REMOTE_SYMBOL=""
21+
else
22+
GIT_REMOTE_SYMBOL=""
23+
fi
24+
echo "$GIT_REMOTE_SYMBOL "
25+
"""
26+
when = 'git rev-parse --is-inside-work-tree 2> /dev/null'
827

928
[directory]
10-
truncation_length = 2
11-
truncation_symbol = "…/"
12-
repo_root_style = "bold cyan"
13-
repo_root_format = "[$repo_root]($repo_root_style)[$path]($style)[$read_only]($read_only_style) "
29+
format = '[$path]($style) [$read_only]($read_only_style) '
30+
home_symbol = "~"
31+
truncate_to_repo = false
32+
style = "bold italic blue"
33+
34+
[fill]
35+
symbol = '-'
36+
style = 'bold grey'
1437

1538
[git_branch]
16-
format = "[$branch]($style) "
17-
style = "italic cyan"
39+
format = '[$branch]($style) '
40+
style = "italic green"
1841

1942
[git_status]
20-
format = '[$all_status]($style)'
21-
style = "cyan"
22-
ahead = "⇡${count} "
23-
diverged = "⇕⇡${ahead_count}⇣${behind_count} "
24-
behind = "⇣${count} "
25-
conflicted = ""
26-
up_to_date = ""
27-
untracked = "? "
28-
modified = ""
43+
format = '[$all_status]($style) '
44+
ahead = "⇡${count}"
45+
diverged = "⇕⇡${ahead_count}⇣${behind_count}"
46+
behind = "⇣${count}"
47+
conflicted = "[](red)"
48+
up_to_date = "[](green)"
49+
untracked = "[?](yellow)"
50+
modified = "[](yellow)"
2951
stashed = ""
3052
staged = ""
3153
renamed = ""
3254
deleted = ""
55+
56+
[hostname]
57+
ssh_only = false
58+
format = '[$hostname](grey) '
59+
trim_at = '.companyname.com'
60+
disabled = false
61+
62+
[status]
63+
disabled = false
64+
symbol = ''
65+
format = '[$int $symbol]($style) '
66+
style = 'red'
67+
68+
[username]
69+
style_user = 'grey bold'
70+
style_root = 'red bold'
71+
format = '[$user]($style)'
72+
disabled = false
73+
show_always = true

default/bash/init

Lines changed: 0 additions & 24 deletions
This file was deleted.

default/bash/rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
source ~/.local/share/monarch/default/shells/init
12
source ~/.local/share/monarch/default/shells/aliases
23
source ~/.local/share/monarch/default/shells/functions
34
source ~/.local/share/monarch/default/shells/envs
45
source ~/.local/share/monarch/default/bash/shell
5-
source ~/.local/share/monarch/default/bash/init
66
[[ $- == *i* ]] && bind -f ~/.local/share/monarch/default/bash/inputrc
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Copy / Paste
2-
bindd = SUPER, C, Universal copy, sendshortcut, CTRL, Insert,
3-
bindd = SUPER, V, Universal paste, sendshortcut, SHIFT, Insert,
2+
bindd = SUPER CTRL, C, Universal copy, sendshortcut, CTRL, Insert,
3+
bindd = SUPER CTRL, V, Universal paste, sendshortcut, SHIFT, Insert,
44
bindd = SUPER, X, Universal cut, sendshortcut, CTRL, X,
5-
bindd = SUPER CTRL, V, Clipboard manager, exec, monarch-launch-walker -m clipboard
5+
bindd = SUPER SHIFT, V, Clipboard manager, exec, monarch-launch-walker -m clipboard

0 commit comments

Comments
 (0)