Compare commits

...
Sign in to create a new pull request.

4 commits

Author SHA1 Message Date
Don Williams
8645ad3201 Typo in filename 2025-12-14 18:14:45 -05:00
dwilliams
8ec77b2909 Syncing main to stable 2.5.6
On branch stable-2.5.6
 Your branch is up to date with 'origin/stable-2.5.6'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   modules/home/terminals/ghostty.nix
2025-12-14 18:06:07 -05:00
Don Williams
82bca9fd51 Updated git clone branch 2025-12-14 15:51:28 -05:00
Don Williams
3ad95cf28f Updated ZOS version 2025-12-14 15:49:29 -05:00
6 changed files with 45 additions and 23 deletions

View file

@ -14,6 +14,11 @@
- `--diff-always` to `nh` rebuilds
- Removed extra `Ghz` in `fastfetch` output
- Fixed hard coded directory for cheatsheets path
- Removed hard coded title
- Focus follows mouse
- Consistent with hyprland
- Turned off resize overlay
- Added curosr wrap shader
- Thanks to Steven Scott for the fixes
#### 📅 **Updated: December 12th, 2025**

View file

@ -1,8 +1,8 @@
[English](FAQ.md) | [Español](FAQ.es.md)
# 💬 Preguntas frecuentes de ZaneyOS para v2.5.5
# 💬 Preguntas frecuentes de ZaneyOS para v2.5.6
- **Fecha:** 12 de deciembre de 2025
- **Fecha:** 14 de deciembre de 2025
**⌨ ¿Dónde puedo ver los atajos de teclado de Hyprland?**
@ -387,9 +387,9 @@ Edita la línea `extraMonitorSettings`. **Ejemplos:**
- Monitor Único: `extraMonitorSettings = "monitor=eDP-1,1920x1080@60,auto,1";`
- Monitores Múltiples:
`extraMonitorSettings = "
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
- Para configuraciones multi-monitor más complejas, puedes usar la aplicación
GUI, `nwg-displays` Esta mostrará tus monitores conectados actualmente

16
FAQ.md
View file

@ -1,8 +1,8 @@
[English](FAQ.md) | [Español](FAQ.es.md)
# 💬 ZaneyOS FAQ for v2.5.5
# 💬 ZaneyOS FAQ for v2.5.6
- **Date:** 12-Decemnber-2025
- **Date:** 14-Decemnber-2025
**⌨ Where can I see the Hyprland keybindings?**
@ -375,9 +375,9 @@ Edit the `extraMonitorSettings` line. **Examples:**
- Single Monitor: `extraMonitorSettings = "monitor=eDP-1,1920x1080@60,auto,1";`
- Multiple Monitors:
`extraMonitorSettings = "
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
- For more complex, multi-monitor configurations, you may wish to use the GUI
application, `nwg-displays` This will show your currently connected monitors
@ -1570,9 +1570,9 @@ Edit the `extraMonitorSettings` line. **Examples:**
- Single Monitor: `extraMonitorSettings = "monitor=eDP-1,1920x1080@60,auto,1";`
- Multiple Monitors:
`extraMonitorSettings = "
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
- For more complex, multi-monitor configurations, you may wish to use the GUI
application, `nwg-displays` This will show your currently connected monitors

View file

@ -234,7 +234,7 @@ else
fi
print_header "Cloning ZaneyOS Repository"
git clone https://gitlab.com/zaney/zaneyos.git -b stable-2.5.5 --depth=1 ~/zaneyos
git clone https://gitlab.com/zaney/zaneyos.git -b stable-2.5.6 --depth=1 ~/zaneyos
cd ~/zaneyos || exit 1
print_header "Git Configuration"

View file

@ -29,7 +29,7 @@ in {
};
environment.variables = {
NIXOS_OZONE_WL = "1";
ZANEYOS_VERSION = "2.5.5";
ZANEYOS_VERSION = "2.5.6";
ZANEYOS = "true";
};
console.keyMap = "${consoleKeyMap}";

View file

@ -2,21 +2,34 @@
pkgs,
config,
...
}: {
}: let
ghostHome = "${config.xdg.configHome}/ghostty";
shaderFile = "${ghostHome}/shaders/shader.glsl";
in {
# Install Ghostty theme(s) so referenced names resolve even if the package's share/themes doesn't include them
home.file = {
".config/ghostty/themes/catppuccin-mocha".source = ./ghostty-themes/catppuccin-mocha;
"${ghostHome}/themes/catppuccin-mocha".source = ./ghostty-themes/catppuccin-mocha;
# Optional: dedicated background overlay config for reference (CLI overrides are used at runtime)
"${config.xdg.configHome}/ghostty/ghostty-bg.conf".text = ''
"${ghostHome}/ghostty-bg.conf".text = ''
# Overlay for background image; the wrapper passes these via CLI as well
# Keep the main config untouched; this file documents the desired values.
background-image=${config.home.homeDirectory}/Pictures/current_image
background-image=${config.home.homeDirectory}/Pictures/current_image_ghostty
background-image-opacity=0.9
background-image-position=center
background-image-fit=cover
background-image-repeat=false
'';
"${shaderFile}".source = pkgs.fetchurl {
# enabling custom-shader-animation = always, as cursors
# can get stuck on losing focus and look terrible. this
# will only animate for half a second, if you change to
# a whole-terminal crazily animated thing then probably
# disable that option
url = "https://github.com/sahaj-b/ghostty-cursor-shaders/raw/88c27a55b2e970eec19c21ef858a1a5bea489a1d/cursor_warp.glsl";
sha256 = "sha256-9ZlLcNu5cH0Ibc7qrS+lfrY4neesQm/5FdTCNa85G+s=";
};
};
programs.ghostty = {
@ -27,7 +40,8 @@
enableBashIntegration = true;
clearDefaultKeybinds = true;
settings = {
title = "ddubsOS-GhosTTY";
custom-shader = shaderFile;
custom-shader-animation = "always";
term = "xterm-256color";
confirm-close-surface = "false";
font-family = "Maple Mono NF";
@ -51,6 +65,9 @@
quick-terminal-position = "center";
shell-integration-features = "cursor,sudo";
bold-is-bright = "false";
focus-follows-mouse = "true";
# never show the size popups
resize-overlay = "never";
keybind = [
# Copy/Paste
"ctrl+shift+c=copy_to_clipboard"
@ -122,7 +139,7 @@
# Defaults
SOURCE_DIR="$HOME/Pictures/Wallpapers"
LINK_PATH="$HOME/Pictures/current_image"
LINK_PATH="$HOME/Pictures/current_image_ghostty"
LAUNCH=1
FOREGROUND=0
@ -143,11 +160,11 @@
cat <<'EOF'
Usage: ghostty-bg [options] [--] [ghostty_args...]
Defaults: Launches ghostty in the background with background-image linked at ~/Pictures/current_image
Defaults: Launches ghostty in the background with background-image linked at ~/Pictures/current_image_ghostty
Options:
-s, --source DIR Source directory of images (default: ~/Pictures/Wallpapers)
-l, --link PATH Symlink path (default: ~/Pictures/current_image)
-l, --link PATH Symlink path (default: ~/Pictures/current_image_ghostty)
--no-launch Only update symlink; do not launch ghostty
--foreground Run ghostty in the foreground (default is background)
-h, --help Show this help