Compare commits
2 commits
main
...
stable-2.5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
13f5e8f65f | ||
|
|
91ab6a5451 |
2 changed files with 23 additions and 22 deletions
|
|
@ -234,7 +234,7 @@ else
|
|||
fi
|
||||
|
||||
print_header "Cloning ZaneyOS Repository"
|
||||
git clone https://gitlab.com/zaney/zaneyos.git -b main --depth=1 ~/zaneyos
|
||||
git clone https://gitlab.com/zaney/zaneyos.git -b stable-2.5.5 --depth=1 ~/zaneyos
|
||||
cd ~/zaneyos || exit 1
|
||||
|
||||
print_header "Git Configuration"
|
||||
|
|
@ -291,9 +291,10 @@ print_header "Keyboard Variant Configuration"
|
|||
# Suggest a variant when user typed a variant-like layout
|
||||
variant_suggestion=""
|
||||
case "$keyboardLayout" in
|
||||
dvorak|colemak|workman|intl|us-intl)
|
||||
variant_suggestion="$keyboardLayout";;
|
||||
*) ;;
|
||||
dvorak | colemak | workman | intl | us-intl)
|
||||
variant_suggestion="$keyboardLayout"
|
||||
;;
|
||||
*) ;;
|
||||
esac
|
||||
read -rp "Enter your keyboard variant (e.g., dvorak) [ $variant_suggestion ]: " keyboardVariant
|
||||
keyboardVariant="${keyboardVariant:-$variant_suggestion}"
|
||||
|
|
@ -305,15 +306,15 @@ keyboardLayout=$(echo "$keyboardLayout" | tr '[:upper:]' '[:lower:]')
|
|||
keyboardVariant=$(echo "$keyboardVariant" | tr '[:upper:]' '[:lower:]')
|
||||
|
||||
case "$keyboardLayout" in
|
||||
us-intl|intl)
|
||||
keyboardLayout="us"
|
||||
if [ -z "$keyboardVariant" ]; then keyboardVariant="intl"; fi
|
||||
;;
|
||||
dvorak|colemak|workman)
|
||||
if [ -z "$keyboardVariant" ]; then keyboardVariant="$keyboardLayout"; fi
|
||||
keyboardLayout="us"
|
||||
;;
|
||||
*) ;;
|
||||
us-intl | intl)
|
||||
keyboardLayout="us"
|
||||
if [ -z "$keyboardVariant" ]; then keyboardVariant="intl"; fi
|
||||
;;
|
||||
dvorak | colemak | workman)
|
||||
if [ -z "$keyboardVariant" ]; then keyboardVariant="$keyboardLayout"; fi
|
||||
keyboardLayout="us"
|
||||
;;
|
||||
*) ;;
|
||||
esac
|
||||
|
||||
# If a layout accidentally ended up in the variant field, fix it
|
||||
|
|
@ -387,23 +388,23 @@ rm ./flake.nix.bak
|
|||
|
||||
# Update timezone in system.nix
|
||||
cp ./modules/core/system.nix ./modules/core/system.nix.bak
|
||||
awk -v newtz="$timezone" '/^ time\.timeZone = / { sub(/"[^"]*"/, "\"" newtz "\""); } { print }' ./modules/core/system.nix.bak > ./modules/core/system.nix
|
||||
awk -v newtz="$timezone" '/^ time\.timeZone = / { sub(/"[^"]*"/, "\"" newtz "\""); } { print }' ./modules/core/system.nix.bak >./modules/core/system.nix
|
||||
rm ./modules/core/system.nix.bak
|
||||
|
||||
# Update variables in host file (do all keys in one pass to avoid quoting issues)
|
||||
cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak
|
||||
awk -v v_user="$gitUsername" \
|
||||
-v v_email="$gitEmail" \
|
||||
-v v_kb="$keyboardLayout" \
|
||||
-v v_kv="$keyboardVariant" \
|
||||
-v v_ckm="$consoleKeyMap" '
|
||||
-v v_email="$gitEmail" \
|
||||
-v v_kb="$keyboardLayout" \
|
||||
-v v_kv="$keyboardVariant" \
|
||||
-v v_ckm="$consoleKeyMap" '
|
||||
/^ gitUsername = / { sub(/"[^"]*"/, "\"" v_user "\"") }
|
||||
/^ gitEmail = / { sub(/"[^"]*"/, "\"" v_email "\"") }
|
||||
/^ keyboardLayout = / { sub(/"[^"]*"/, "\"" v_kb "\"") }
|
||||
/^ keyboardVariant = / { sub(/"[^"]*"/, "\"" v_kv "\"") }
|
||||
/^ consoleKeyMap = / { sub(/"[^"]*"/, "\"" v_ckm "\"") }
|
||||
{ print }
|
||||
' ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix
|
||||
' ./hosts/$hostName/variables.nix.bak >./hosts/$hostName/variables.nix
|
||||
rm ./hosts/$hostName/variables.nix.bak
|
||||
|
||||
echo "Configuration files updated successfully!"
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
"$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle"
|
||||
"$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle"
|
||||
"$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend"
|
||||
"$modifier SHIFT,Y, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle"
|
||||
"$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle"
|
||||
"$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle"
|
||||
"$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle"
|
||||
"$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle"
|
||||
|
|
@ -55,8 +55,8 @@ in {
|
|||
"$modifier CTRL,C, Cheatsheets Viewer, exec, qs-cheatsheets"
|
||||
"$modifier SHIFT,K, Legacy Keybinds Menu, exec, list-keybinds"
|
||||
"$modifier SHIFT,D, Discord, exec, discord"
|
||||
"$modifier SHIFT,W, Web Search, exec, web-search"
|
||||
"$modifier ALT,W, Wallpaper Setter, exec, wallsetter"
|
||||
"$modifier ALT,W, Web Search, exec, web-search"
|
||||
"$modifier SHIFT,W, QS Wallpaper Setter, exec, qs-wallpapers-apply"
|
||||
"$modifier SHIFT,N, Notification Reset, exec, swaync-client -rs"
|
||||
"$modifier,W, Web Browser, exec, ${browser}"
|
||||
"$modifier,Y, File Manager, exec, kitty -e yazi"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue