Migrating 25.11 updates to Main branch b4 creating stable-2.5
77
CHANGELOG.md
|
|
@ -5,26 +5,85 @@
|
|||
|
||||
---
|
||||
|
||||
# 🚀 **Current Release - ZaneyOS v2.4**
|
||||
# 🚀 **Current Release - ZaneyOS v2.5**
|
||||
|
||||
#### 📅 **Updated: November 28th, 2025**
|
||||
|
||||
- Set ZaneyOS to NixOS v25.11 stable branch
|
||||
- Moved to `nixvim` for NeoVIM configuration
|
||||
- Works better
|
||||
- Fewer issues vs. `nvf.nix`
|
||||
- `nvf.nix` still included, but commented out
|
||||
- Added `alacritty.nix` from ddubsOS
|
||||
- Added `tmux.nix` from ddubosOS (courtesy of Tony,btw)
|
||||
- Added `vscode.nix` from ddubsOS.
|
||||
- Pre-configured with many useful plugins
|
||||
- Also works as template to add more
|
||||
- Added `antigravity` IDE from Google based on vscodium
|
||||
- Created `modules/core/overlays.nix`
|
||||
- Currently only has `antigravity` but more maybe be needed later
|
||||
- Fixed gestures errors from Hyprland Upgrade
|
||||
- Added Noctalia Shell as default
|
||||
- Added Additional waybars from dddubsOS
|
||||
- Added Addtional Animations from ddubsOS
|
||||
- Switched to `bindd` for friendlier keybinds descriptions
|
||||
- Updated keybind parser to use these descriptions
|
||||
- Keybinds are now conditional on waybar or noctalia shell
|
||||
- Updated `README.md` and `README.es.md`
|
||||
- New screenshots
|
||||
- Updated Keybindings
|
||||
- Moved screenshots into a markdown suummary to reduce clutter
|
||||
- Added script to fix `doom iedit` update error
|
||||
- Moved some modules/home/*.nix files to their own subdir
|
||||
- Terminals
|
||||
- Alacritty
|
||||
- ghostty
|
||||
- Kitty
|
||||
- tmux
|
||||
- Wezterm
|
||||
- Editors
|
||||
- antigravity
|
||||
- emacs
|
||||
- evil-helix
|
||||
- nixvim
|
||||
- nvf
|
||||
- vscode
|
||||
- CLI/Utils
|
||||
- bat
|
||||
- Btop
|
||||
- Bottom
|
||||
- cava
|
||||
- fzf
|
||||
- git
|
||||
- gh
|
||||
- lazygit
|
||||
|
||||
#### 📅 **Updated: September 18th, 2025**
|
||||
|
||||
- 🧪 EXPERIMENTAL: AMD+NVIDIA hybrid support (amd-hybrid)
|
||||
- New driver module: `modules/drivers/nvidia-amd-hybrid.nix` (options: `enable`, `amdgpuBusID`, `nvidiaBusID`)
|
||||
- Kernel pin: `boot.kernelPackages` forced to `linuxPackages_6_12` when enabled (required for RTX 50xx open kernel module)
|
||||
- New profile: `profiles/amd-hybrid/default.nix` (wires `amdgpuID`/`nvidiaID` from `hosts/<host>/variables.nix`)
|
||||
- zcli detection updated to recognize `amd-hybrid`; `install-zaneyos.sh` prompts include `amd-hybrid`
|
||||
- New driver module: `modules/drivers/nvidia-amd-hybrid.nix` (options:
|
||||
`enable`, `amdgpuBusID`, `nvidiaBusID`)
|
||||
- Kernel pin: `boot.kernelPackages` forced to `linuxPackages_6_12` when
|
||||
enabled (required for RTX 50xx open kernel module)
|
||||
- New profile: `profiles/amd-hybrid/default.nix` (wires `amdgpuID`/`nvidiaID`
|
||||
from `hosts/<host>/variables.nix`)
|
||||
- zcli detection updated to recognize `amd-hybrid`; `install-zaneyos.sh`
|
||||
prompts include `amd-hybrid`
|
||||
- Added `amdgpuID` to `hosts/*/variables.nix`
|
||||
- Docs updated (`README`, `WARP.md`, cheatsheets)
|
||||
- Caution: Can't fully test at this time. Please verify your Bus IDs via `lspci` and use `zcli rebuild-boot` for safer activation
|
||||
- Caution: Can't fully test at this time. Please verify your Bus IDs via
|
||||
`lspci` and use `zcli rebuild-boot` for safer activation
|
||||
|
||||
#### 📅 **Updated: September 9th, 2025**
|
||||
|
||||
- 🛡️ Installer: Added defensive hostname validation and sanitization
|
||||
- Prevents invalid hostnames (e.g., with dots) from causing Nix evaluation errors
|
||||
- Auto-sanitizes to a compliant hostname (letters/digits with '-' or '_', 1–63 chars) and prompts for confirmation
|
||||
- Prevents invalid hostnames (e.g., with dots) from causing Nix evaluation
|
||||
errors
|
||||
- Auto-sanitizes to a compliant hostname (letters/digits with '-' or '_', 1–63
|
||||
chars) and prompts for confirmation
|
||||
- Explicitly rejects 'default' to avoid template overwrites
|
||||
- 🧩 Nix: Added assertion in modules/core/network.nix for clearer errors if an invalid hostname is provided
|
||||
- 🧩 Nix: Added assertion in modules/core/network.nix for clearer errors if an
|
||||
invalid hostname is provided
|
||||
|
||||
#### 📅 **Updated: August 30th, 2025**
|
||||
|
||||
|
|
|
|||
50
FAQ.es.md
|
|
@ -2,14 +2,7 @@
|
|||
|
||||
# 💬 Preguntas frecuentes de ZaneyOS para v2.4
|
||||
|
||||
- **Revisión v1.26**
|
||||
- **Fecha:** 1 de septiembre de 2025
|
||||
|
||||
> IMPORTANTE: ¿Actualizando de v2.3 a v2.4?
|
||||
> - Altamente recomendado: Lee `ZaneyOS-Upgrade.md` completamente antes de intentar la actualización.
|
||||
> - Explica la actualización automatizada, respaldo completo, migración de host y proceso de reversión.
|
||||
> - NO uses los alias `fu` o `fr` para esta actualización.
|
||||
> - Si has hecho modificaciones extensas, no ejecutes el script—revisa los documentos y migra manualmente.
|
||||
- **Fecha:** 28 de noviembre de 2025
|
||||
|
||||
**⌨ ¿Dónde puedo ver los atajos de teclado de Hyprland?**
|
||||
|
||||
|
|
@ -25,6 +18,7 @@ La utilidad `zcli` es una herramienta de línea de comandos diseñada para simpl
|
|||
Para usarlo, abre una terminal y escribe `zcli` seguido de uno de los comandos listados a continuación:
|
||||
|
||||
## Comandos del Sistema Core:
|
||||
|
||||
- `cleanup`: Limpia generaciones antiguas del sistema. Puedes especificar el número de generaciones a mantener. Incluye limpieza automatizada de logs de compilaciones antiguas.
|
||||
- `diag`: Crea un reporte de diagnóstico completo del sistema usando `inxi --full`, guardado en `~/diag.txt`. Perfecto para solucionar problemas.
|
||||
- `list-gens`: Lista tanto generaciones de usuario como de sistema con información detallada.
|
||||
|
|
@ -40,7 +34,9 @@ Para usarlo, abre una terminal y escribe `zcli` seguido de uno de los comandos l
|
|||
**Perfiles de GPU:** `amd`, `intel`, `nvidia`, `nvidia-hybrid`, y `vm`
|
||||
|
||||
## Opciones Avanzadas de Compilación:
|
||||
|
||||
Los comandos `rebuild`, `rebuild-boot` y `update` soportan opciones mejoradas para control granular:
|
||||
|
||||
- `--dry, -n`: Modo preview - muestra qué se haría sin ejecutar (dry run)
|
||||
- `--ask, -a`: Prompts de confirmación interactiva para operaciones críticas de seguridad
|
||||
- `--cores N`: Limita operaciones de compilación a N núcleos de CPU (esencial para VMs y sistemas con recursos limitados)
|
||||
|
|
@ -50,7 +46,9 @@ Los comandos `rebuild`, `rebuild-boot` y `update` soportan opciones mejoradas pa
|
|||
**Múltiples opciones pueden combinarse** para control preciso sobre tu proceso de compilación.
|
||||
|
||||
## Gestión de Doom Emacs:
|
||||
|
||||
Gestión completa del ciclo de vida de Doom Emacs con características de seguridad:
|
||||
|
||||
- `doom install`: Instalación automatizada de Doom Emacs usando el script get-doom con todos los paquetes requeridos
|
||||
- `doom status`: Verifica el estado de instalación y muestra información de versión para verificación
|
||||
- `doom remove`: Remueve la instalación de Doom Emacs de forma segura con prompts de confirmación para prevenir eliminación accidental
|
||||
|
|
@ -94,6 +92,7 @@ Doom Emacs:
|
|||
```
|
||||
|
||||
**Ejemplos:**
|
||||
|
||||
```bash
|
||||
# Gestión del sistema
|
||||
zcli rebuild --dry # Muestra qué se recompilaría
|
||||
|
|
@ -120,7 +119,8 @@ A continuación se muestran los atajos de teclado para Hyprland, formateados par
|
|||
|
||||
- `$modifier + Return` → Lanzar `Terminal`
|
||||
- `$modifier + K` → Lista atajos
|
||||
- `$modifier + Shift + Return` → Lanzar `rofi-launcher`
|
||||
- `$modifier + D ` → Lanzar `launcher`
|
||||
- `$modifier + Shift + Return` → Lanzar `launcher`
|
||||
- `$modifier + Shift + W` → Abrir `web-search`
|
||||
- `$modifier + Alt + W` → Abrir `wallsetter`
|
||||
- `$modifier + Shift + N` → Ejecutar `swaync-client -rs`
|
||||
|
|
@ -128,7 +128,7 @@ A continuación se muestran los atajos de teclado para Hyprland, formateados par
|
|||
- `$modifier + Y` → Abrir `kitty` con `yazi`
|
||||
- `$modifier + E` → Abrir `emopicker9000`
|
||||
- `$modifier + S` → Tomar captura de pantalla
|
||||
- `$modifier + D` → Abrir `Discord`
|
||||
- `$modifier + Shift + D` → Abrir `Discord`
|
||||
- `$modifier + O` → Lanzar `OBS Studio`
|
||||
- `$modifier + C` → Ejecutar `hyprpicker -a`
|
||||
- `$modifier + G` → Abrir `GIMP`
|
||||
|
|
@ -344,9 +344,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 permitiéndote usar el mouse para coincidir cómo están arreglados físicamente. Ej. qué monitor está a la izquierda, derecha, arriba o abajo. Es muy similar a la herramienta X11 basada, `arandr` Creará entonces un archivo de configuración compatible con Hyprland en `~/.config/hypr/monitors.conf`
|
||||
|
||||
|
|
@ -456,7 +456,7 @@ Si el rebuild se completa exitosamente, se creará una nueva generación con tus
|
|||
|
||||
- Usa la utilidad `zcli`. `zcli rebuild`
|
||||
- El alias legacy `fr`, Flake Rebuild está depreciado pero aún disponible **
|
||||
NOTA: Si **creaste un nuevo archivo**
|
||||
NOTA: Si **creaste un nuevo archivo\*\*
|
||||
- necesitarás ejecutar un comando `git add .` en la carpeta `zaneyos`
|
||||
- Si es exitoso se generará una nueva generación con tus cambios
|
||||
- Un logout o reboot podría ser requerido dependiendo de qué cambiaste
|
||||
|
|
@ -764,19 +764,24 @@ Altamente recomendado: Lee `ZaneyOS-Upgrade.md` antes de proceder. Detalla el up
|
|||
Usa el upgrade automatizado v2.3 → v2.4. Ve `ZaneyOS-Upgrade.md` y `UPGRADE-2.3-to-2.4.md`. Para evitar sobrescribir tu config antes de crear un respaldo, fetch solo el script sin modificar tu working tree:
|
||||
|
||||
- Git (recomendado):
|
||||
|
||||
```bash
|
||||
git -C ~/zaneyos fetch origin
|
||||
git -C ~/zaneyos show origin/main:upgrade-2.3-to-2.4.sh > ~/upgrade-2.3-to-2.4.sh
|
||||
chmod +x ~/upgrade-2.3-to-2.4.sh
|
||||
```
|
||||
|
||||
- Curl:
|
||||
|
||||
```bash
|
||||
curl -fsSL https://gitlab.com/zaney/zaneyos/-/raw/main/upgrade-2.3-to-2.4.sh -o ~/upgrade-2.3-to-2.4.sh
|
||||
chmod +x ~/upgrade-2.3-to-2.4.sh
|
||||
```
|
||||
|
||||
Luego ejecuta el script: `~/upgrade-2.3-to-2.4.sh`. Creará un respaldo completo antes de cambiar branches y migrará tus hosts de forma segura desde el respaldo.
|
||||
|
||||
**IMPORTANTE:**
|
||||
|
||||
- NO uses los alias `fu` o `fr` para este upgrade; el script usa un boot build seguro.
|
||||
- Si has hecho modificaciones extensas, no ejecutes el script. Lee los docs arriba y migra manualmente en su lugar.
|
||||
|
||||
|
|
@ -830,13 +835,13 @@ Será anunciado en el servidor Discord de Zaney [Discord](https://discord.gg/W7e
|
|||
~/zaneyos/
|
||||
├── hosts/ # Carpeta donde se guardan configs de host
|
||||
│ ├── default # Template de host default
|
||||
│ └── nixstation # Host de Zaney
|
||||
│ └── nixstation # Host de Zaney
|
||||
├── img/ # Imágenes para README.md
|
||||
├── modules/ # Archivos de config Core, HomeMgr, drivers
|
||||
│ └── drivers/ # Configs AMD,NVIDA,Intel,VM
|
||||
│ └── core/ # Servicios, paquetes, fonts, etc
|
||||
│ └── home/ # Archivos de config Home Manager
|
||||
│ ├── fastfetch/ # Config Fastfetch
|
||||
│ ├── fastfetch/ # Config Fastfetch
|
||||
│ ├── hyprland/ # Configs Hyrprland
|
||||
│ ├── rofi/ # Configs de menú rofi
|
||||
│ ├── scripts/ # screenshots, wallpaper, etc.
|
||||
|
|
@ -850,9 +855,9 @@ Será anunciado en el servidor Discord de Zaney [Discord](https://discord.gg/W7e
|
|||
│ ├── nvidia/ # Configs video NVIDIA discrete
|
||||
│ ├── nvidia-laptop/ # Configs video NVIDIA Hybrid
|
||||
│ └── vm/ # Configs Virtual Machine
|
||||
├── wallpapers/ # Agrega tus wallpapers aquí
|
||||
├── wallpapers/ # Agrega tus wallpapers aquí
|
||||
├── CHANGELOG.md # Lista de cambios
|
||||
├── CONTRIBUTING.md # Cómo puedes ayudar
|
||||
├── CONTRIBUTING.md # Cómo puedes ayudar
|
||||
├── FAQ.md # Preguntas Frecuentes
|
||||
├── flake.lock # Guarda info de versión de todos los paquetes instalados
|
||||
├── flake.nix # flake que controla config ZaneyOS
|
||||
|
|
@ -985,7 +990,7 @@ El keymap está en el archivo `~/zaneyos/modules/home/yazi/keymap.toml` file
|
|||
roboto-mono
|
||||
symbola
|
||||
terminus_font
|
||||
# NERD fonts
|
||||
# NERD fonts
|
||||
nerd-fonts.0xproto
|
||||
nerd-fonts._3270
|
||||
nerd-fonts.agave
|
||||
|
|
@ -1177,7 +1182,7 @@ ALT es la tecla META definida para WezTerm
|
|||
ALT + t Abrir nuevo Tab
|
||||
ALT + w Cerrar Tab actual
|
||||
ALT + n Mover a siguiente Tab
|
||||
ALT + p Mover a Tab anterior
|
||||
ALT + p Mover a Tab anterior
|
||||
-- Gestión de pane
|
||||
ALT + v Crear Split Vertical
|
||||
ALT + h Crear Split Horizontal
|
||||
|
|
@ -1272,7 +1277,7 @@ theme = Dracula
|
|||
</details>
|
||||
|
||||
**
|
||||
--> 🪧 Temas relacionados con NixOS general
|
||||
--> 🪧 Temas relacionados con NixOS general
|
||||
**
|
||||
|
||||
<details>
|
||||
|
|
@ -1372,4 +1377,5 @@ Esta característica es un cornerstone de la filosofía de diseño declarativo y
|
|||
|
||||
</div>
|
||||
|
||||
</details>
|
||||
</details>
|
||||
|
||||
|
|
|
|||
79
FAQ.md
|
|
@ -1,15 +1,8 @@
|
|||
[English](FAQ.md) | [Español](FAQ.es.md)
|
||||
|
||||
# 💬 ZaneyOS FAQ for v2.4
|
||||
# 💬 ZaneyOS FAQ for v2.5
|
||||
|
||||
- **Revision v1.26**
|
||||
- **Date:** 01-September-2025
|
||||
|
||||
> IMPORTANT: Upgrading from v2.3 to v2.4?
|
||||
> - Strongly recommended: Read `ZaneyOS-Upgrade.md` fully before attempting the upgrade.
|
||||
> - It explains the automated upgrade, full backup, host migration, and revert process.
|
||||
> - Do NOT use the `fu` or `fr` aliases for this upgrade.
|
||||
> - If you've made extensive modifications, do not run the script—review the docs and migrate manually.
|
||||
- **Date:** 28-November-2025
|
||||
|
||||
**⌨ Where can I see the Hyprland keybindings?**
|
||||
|
||||
|
|
@ -29,6 +22,7 @@ To use it, open a terminal and type `zcli` followed by one of the commands
|
|||
listed below:
|
||||
|
||||
## Core System Commands:
|
||||
|
||||
- `cleanup`: Clean up old system generations. You can specify the number of generations to keep. Includes automated log cleanup for old build logs.
|
||||
- `diag`: Create a comprehensive system diagnostic report using `inxi --full`, saved to `~/diag.txt`. Perfect for troubleshooting.
|
||||
- `list-gens`: List both user and system generations with detailed information.
|
||||
|
|
@ -38,6 +32,7 @@ listed below:
|
|||
- `update`: Update the flake and rebuild the system with comprehensive error handling.
|
||||
|
||||
## Host Management:
|
||||
|
||||
- `update-host`: Automatically set the host and profile in `flake.nix`. Features intelligent GPU detection and hostname validation.
|
||||
- `add-host`: Create new host configurations with automated GPU detection, hardware.nix generation, and git integration.
|
||||
- `del-host`: Safely delete host configurations with confirmation prompts to prevent accidental removal.
|
||||
|
|
@ -46,7 +41,9 @@ listed below:
|
|||
**GPU Profiles:** `amd`, `intel`, `nvidia`, `nvidia-hybrid`, and `vm`
|
||||
|
||||
## Advanced Build Options:
|
||||
|
||||
The `rebuild`, `rebuild-boot`, and `update` commands support enhanced options for fine-grained control:
|
||||
|
||||
- `--dry, -n`: Preview mode - shows what would be done without executing (dry run)
|
||||
- `--ask, -a`: Interactive confirmation prompts for safety-critical operations
|
||||
- `--cores N`: Limit build operations to N CPU cores (essential for VMs and resource-constrained systems)
|
||||
|
|
@ -56,7 +53,9 @@ The `rebuild`, `rebuild-boot`, and `update` commands support enhanced options fo
|
|||
**Multiple options can be combined** for precise control over your build process.
|
||||
|
||||
## Doom Emacs Management:
|
||||
|
||||
Complete Doom Emacs lifecycle management with safety features:
|
||||
|
||||
- `doom install`: Automated Doom Emacs installation using the get-doom script with all required packages
|
||||
- `doom status`: Check installation status and display version information for verification
|
||||
- `doom remove`: Safely remove Doom Emacs installation with confirmation prompts to prevent accidental deletion
|
||||
|
|
@ -100,6 +99,7 @@ Doom Emacs:
|
|||
```
|
||||
|
||||
**Examples:**
|
||||
|
||||
```bash
|
||||
# System management
|
||||
zcli rebuild --dry # Show what would be rebuilt
|
||||
|
|
@ -126,7 +126,8 @@ Below are the keybindings for Hyprland, formatted for easy reference.
|
|||
|
||||
- `$modifier + Return` → Launch `Terminal`
|
||||
- `$modifier + K` → List keybinds
|
||||
- `$modifier + Shift + Return` → Launch `rofi-launcher`
|
||||
- `$modifier + D ` → Application Launcher
|
||||
- `$modifier + Shift + Return` → Application Launcher
|
||||
- `$modifier + Shift + W` → Open `web-search`
|
||||
- `$modifier + Alt + W` → Open `wallsetter`
|
||||
- `$modifier + Shift + N` → Run `swaync-client -rs`
|
||||
|
|
@ -134,7 +135,7 @@ Below are the keybindings for Hyprland, formatted for easy reference.
|
|||
- `$modifier + Y` → Open `kitty` with `yazi`
|
||||
- `$modifier + E` → Open `emopicker9000`
|
||||
- `$modifier + S` → Take a screenshot
|
||||
- `$modifier + D` → Open `Discord`
|
||||
- `$modifier + Shift + D` → Open `Discord`
|
||||
- `$modifier + O` → Launch `OBS Studio`
|
||||
- `$modifier + C` → Run `hyprpicker -a`
|
||||
- `$modifier + G` → Open `GIMP`
|
||||
|
|
@ -354,9 +355,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
|
||||
|
|
@ -407,7 +408,7 @@ packages.
|
|||
...
|
||||
virt-viewer
|
||||
wget
|
||||
### My Apps ###
|
||||
### My Apps ###
|
||||
bottom
|
||||
dua
|
||||
emacs-nox
|
||||
|
|
@ -479,7 +480,7 @@ will be created.
|
|||
|
||||
- Use the `zcli` utility. `zcli rebuild`
|
||||
- The legacy `fr`, Flake Rebuild alias, is depreciated but still available **
|
||||
NOTE: If you **created a new file**
|
||||
NOTE: If you **created a new file\*\*
|
||||
- you will need to run a `git add .` command in the `zaneyos` folder
|
||||
- If successful a new generation will be generated with your changes
|
||||
- A logout or reboot could be required depending on what you changed
|
||||
|
|
@ -816,19 +817,24 @@ Strongly recommended: Read `ZaneyOS-Upgrade.md` before proceeding. It details th
|
|||
Use the automated v2.3 → v2.4 upgrade. See `ZaneyOS-Upgrade.md` and `UPGRADE-2.3-to-2.4.md`. To avoid overwriting your config before a backup is created, fetch just the script without modifying your working tree:
|
||||
|
||||
- Git (recommended):
|
||||
|
||||
```bash
|
||||
git -C ~/zaneyos fetch origin
|
||||
git -C ~/zaneyos show origin/main:upgrade-2.3-to-2.4.sh > ~/upgrade-2.3-to-2.4.sh
|
||||
chmod +x ~/upgrade-2.3-to-2.4.sh
|
||||
```
|
||||
|
||||
- Curl:
|
||||
|
||||
```bash
|
||||
curl -fsSL https://gitlab.com/zaney/zaneyos/-/raw/main/upgrade-2.3-to-2.4.sh -o ~/upgrade-2.3-to-2.4.sh
|
||||
chmod +x ~/upgrade-2.3-to-2.4.sh
|
||||
```
|
||||
|
||||
Then run the script: `~/upgrade-2.3-to-2.4.sh`. It will create a full backup before switching branches and migrate your hosts safely from the backup.
|
||||
|
||||
**IMPORTANT:**
|
||||
|
||||
- Do NOT use the `fu` or `fr` aliases for this upgrade; the script uses a safe boot build.
|
||||
- If you have made extensive modifications, do not run the script. Read the docs above and migrate manually instead.
|
||||
|
||||
|
|
@ -887,13 +893,13 @@ It will be announced on the Zaney [Discord](https://discord.gg/W7efsSDS) server.
|
|||
~/zaneyos/
|
||||
├── hosts/ # Folder where host configs are saved
|
||||
│ ├── default # Default host template
|
||||
│ └── nixstation # Zaney's host
|
||||
│ └── nixstation # Zaney's host
|
||||
├── img/ # Images for README.md
|
||||
├── modules/ # Core, HomeMgr, drivers config files
|
||||
│ └── drivers/ # AMD,NVIDA,Intel,VM config files
|
||||
│ └── core/ # Services, packages, fonts, etc
|
||||
│ └── home/ # Home Manager config files
|
||||
│ ├── fastfetch/ # Fastfetch config
|
||||
│ ├── fastfetch/ # Fastfetch config
|
||||
│ ├── hyprland/ # Hyrprland configs
|
||||
│ ├── rofi/ # rofi menu configs
|
||||
│ ├── scripts/ # screenshots, wallpaper, etc.
|
||||
|
|
@ -907,9 +913,9 @@ It will be announced on the Zaney [Discord](https://discord.gg/W7efsSDS) server.
|
|||
│ ├── nvidia/ # NVIDIA discrete video config files
|
||||
│ ├── nvidia-laptop/ # NVIDIA Hybrid video config files
|
||||
│ └── vm/ # Virtual Machine config files
|
||||
├── wallpapers/ # Add your wallpapers here
|
||||
├── wallpapers/ # Add your wallpapers here
|
||||
├── CHANGELOG.md # List of changes
|
||||
├── CONTRIBUTING.md # How you can help
|
||||
├── CONTRIBUTING.md # How you can help
|
||||
├── FAQ.md # Frequently Asked Questions
|
||||
├── flake.lock # Saves version info on all installed packages
|
||||
├── flake.nix # flake that controls ZaneyOS config
|
||||
|
|
@ -1052,7 +1058,7 @@ The keymap is in the `~/zaneyos/modules/home/yazi/keymap.toml` file
|
|||
roboto-mono
|
||||
symbola
|
||||
terminus_font
|
||||
# NERD fonts
|
||||
# NERD fonts
|
||||
nerd-fonts.0xproto
|
||||
nerd-fonts._3270
|
||||
nerd-fonts.agave
|
||||
|
|
@ -1248,7 +1254,7 @@ ALT is the defined META key for WezTerm
|
|||
ALT + t Open new Tab
|
||||
ALT + w Close current Tab
|
||||
ALT + n Move to next Tab
|
||||
ALT + p Move to previous Tab
|
||||
ALT + p Move to previous Tab
|
||||
-- Pane management
|
||||
ALT + v Create Vertical Split
|
||||
ALT + h Create Horizontal Split
|
||||
|
|
@ -1344,7 +1350,7 @@ theme = Dracula
|
|||
</details>
|
||||
|
||||
**
|
||||
--> 🪧 General NixOS related topics
|
||||
--> 🪧 General NixOS related topics
|
||||
**
|
||||
|
||||
<details>
|
||||
|
|
@ -1540,9 +1546,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
|
||||
|
|
@ -1593,7 +1599,7 @@ packages.
|
|||
...
|
||||
virt-viewer
|
||||
wget
|
||||
### My Apps ###
|
||||
### My Apps ###
|
||||
bottom
|
||||
dua
|
||||
emacs-nox
|
||||
|
|
@ -1996,19 +2002,24 @@ settings = {
|
|||
Use the automated v2.3 → v2.4 upgrade. See ZaneyOS-Upgrade.md and UPGRADE-2.3-to-2.4.md. To avoid overwriting your config before a backup is created, fetch just the script without modifying your working tree:
|
||||
|
||||
- Git (recommended):
|
||||
|
||||
```bash
|
||||
git -C ~/zaneyos fetch origin
|
||||
git -C ~/zaneyos show origin/main:upgrade-2.3-to-2.4.sh > ~/upgrade-2.3-to-2.4.sh
|
||||
chmod +x ~/upgrade-2.3-to-2.4.sh
|
||||
```
|
||||
|
||||
- Curl:
|
||||
|
||||
```bash
|
||||
curl -fsSL https://gitlab.com/zaney/zaneyos/-/raw/main/upgrade-2.3-to-2.4.sh -o ~/upgrade-2.3-to-2.4.sh
|
||||
chmod +x ~/upgrade-2.3-to-2.4.sh
|
||||
```
|
||||
|
||||
Then run the script: `~/upgrade-2.3-to-2.4.sh`. It will create a full backup before switching branches and migrate your hosts safely from the backup.
|
||||
|
||||
**IMPORTANT:**
|
||||
|
||||
- Do NOT use the `fu` or `fr` aliases for this upgrade; the script uses a safe boot build.
|
||||
- If you have made extensive modifications, do not run the script. Read the docs above and migrate manually instead.
|
||||
|
||||
|
|
@ -2067,13 +2078,13 @@ It will be announced on the Zaney [Discord](https://discord.gg/W7efsSDS) server.
|
|||
~/zaneyos/
|
||||
├── hosts/ # Folder where host configs are saved
|
||||
│ ├── default # Default host template
|
||||
│ └── nixstation # Zaney's host
|
||||
│ └── nixstation # Zaney's host
|
||||
├── img/ # Images for README.md
|
||||
├── modules/ # Core, HomeMgr, drivers config files
|
||||
│ └── drivers/ # AMD,NVIDA,Intel,VM config files
|
||||
│ └── core/ # Services, packages, fonts, etc
|
||||
│ └── home/ # Home Manager config files
|
||||
│ ├── fastfetch/ # Fastfetch config
|
||||
│ ├── fastfetch/ # Fastfetch config
|
||||
│ ├── hyprland/ # Hyrprland configs
|
||||
│ ├── rofi/ # rofi menu configs
|
||||
│ ├── scripts/ # screenshots, wallpaper, etc.
|
||||
|
|
@ -2087,9 +2098,9 @@ It will be announced on the Zaney [Discord](https://discord.gg/W7efsSDS) server.
|
|||
│ ├── nvidia/ # NVIDIA discrete video config files
|
||||
│ ├── nvidia-laptop/ # NVIDIA Hybrid video config files
|
||||
│ └── vm/ # Virtual Machine config files
|
||||
├── wallpapers/ # Add your wallpapers here
|
||||
├── wallpapers/ # Add your wallpapers here
|
||||
├── CHANGELOG.md # List of changes
|
||||
├── CONTRIBUTING.md # How you can help
|
||||
├── CONTRIBUTING.md # How you can help
|
||||
├── FAQ.md # Frequently Asked Questions
|
||||
├── flake.lock # Saves version info on all installed packages
|
||||
├── flake.nix # flake that controls ZaneyOS config
|
||||
|
|
@ -2226,7 +2237,7 @@ The keymap is in the `~/zaneyos/modules/home/yazi/keymap.toml` file
|
|||
roboto-mono
|
||||
symbola
|
||||
terminus_font
|
||||
# NERD fonts
|
||||
# NERD fonts
|
||||
nerd-fonts.0xproto
|
||||
nerd-fonts._3270
|
||||
nerd-fonts.agave
|
||||
|
|
@ -2423,7 +2434,7 @@ ALT is the defined META key for WezTerm
|
|||
ALT + t Open new Tab
|
||||
ALT + w Close current Tab
|
||||
ALT + n Move to next Tab
|
||||
ALT + p Move to previous Tab
|
||||
ALT + p Move to previous Tab
|
||||
-- Pane management
|
||||
ALT + v Create Vertical Split
|
||||
ALT + h Create Horizontal Split
|
||||
|
|
@ -2519,7 +2530,7 @@ theme = Dracula
|
|||
</details>
|
||||
|
||||
**
|
||||
--> 🪧 General NixOS related topics
|
||||
--> 🪧 General NixOS related topics
|
||||
**
|
||||
|
||||
<details>
|
||||
|
|
|
|||
115
README.es.md
|
|
@ -9,19 +9,39 @@
|
|||
ZaneyOS es una forma sencilla de reproducir mi configuración en cualquier sistema NixOS.
|
||||
Incluye el fondo de pantalla, scripts, aplicaciones, archivos de configuración y más.
|
||||
|
||||
<img align="center" width="80%" src="https://gitlab.com/Zaney/zaneyos/-/raw/main/img/demo.png" />
|
||||
|
||||
**Inspiración para la configuración de Waybar
|
||||
[aquí](https://github.com/justinlime/dotfiles).**
|
||||
|
||||
<img align="center" width="80%" src="https://gitlab.com/Zaney/zaneyos/-/raw/main/img/demo-img2.png" />
|
||||
|
||||
**Tercera opción de waybar**
|
||||
|
||||
<img align="center" width="80%" src="https://gitlab.com/Zaney/zaneyos/-/raw/main/img/demo-img3.png" />
|
||||
<img align="center" width="80%" src="img/ZaneyOS-Floating.png" />
|
||||
|
||||
</div>
|
||||
|
||||
<details>
|
||||
<summary><strong>📸 Más capturas de pantalla</strong></summary>
|
||||
|
||||
### Temas de Waybar
|
||||
|
||||
<img align="center" width="80%" src="img/demo-img2.png" />
|
||||
|
||||
<img align="center" width="80%" src="img/demo-img3.png" />
|
||||
|
||||
### Integración de Noctalia Shell
|
||||
|
||||
<img align="center" width="80%" src="img/ZaneyOS-noctalia-panel.png" />
|
||||
|
||||
<img align="center" width="80%" src="img/ZaneyOS-noctalia-app.png" />
|
||||
|
||||
<img align="center" width="80%" src="img/ZaneyOS-noctalia-settings.png" />
|
||||
|
||||
<img align="center" width="80%" src="img/ZaneyOS-noctalia-weather.png" />
|
||||
|
||||
### Características adicionales
|
||||
|
||||
<img align="center" width="80%" src="img/ZaneyOS-keybind-search.png" />
|
||||
|
||||
<img align="center" width="80%" src="img/ZaneyOS-nivim-emacs.png" />
|
||||
|
||||
</details>
|
||||
|
||||
<div align="center">
|
||||
|
||||
### Chuletas y Guías
|
||||
|
||||
- Guía para Principiantes de Nix: [English](cheatsheets/nix-beginner-guide.md) | [Español](cheatsheets/nix-beginner-guide.es.md)
|
||||
|
|
@ -95,13 +115,18 @@ Hazte un favor y
|
|||
|
||||
# Atajos de Hyprland
|
||||
|
||||
A continuación los atajos de Hyprland, en formato de referencia rápida.
|
||||
A continuación los atajos de Hyprland, en formato de referencia rápida. La columna de la derecha muestra atajos específicos de **Noctalia Shell** (solo disponibles cuando `barChoice = "noctalia"`).
|
||||
|
||||
## Lanzamiento de aplicaciones
|
||||
<table>
|
||||
<tr>
|
||||
<td width="50%">
|
||||
|
||||
## Atajos estándar
|
||||
|
||||
### Lanzamiento de aplicaciones
|
||||
|
||||
- `$modifier + Return` → Lanzar `terminal`
|
||||
- `$modifier + K` → Listar atajos
|
||||
- `$modifier + Shift + Return` → Lanzar `rofi-launcher`
|
||||
- `$modifier + Shift + W` → Abrir `web-search`
|
||||
- `$modifier + Alt + W` → Abrir `wallsetter`
|
||||
- `$modifier + Shift + N` → Ejecutar `swaync-client -rs`
|
||||
|
|
@ -109,15 +134,14 @@ A continuación los atajos de Hyprland, en formato de referencia rápida.
|
|||
- `$modifier + Y` → Abrir `kitty` con `yazi`
|
||||
- `$modifier + E` → Abrir `emopicker9000`
|
||||
- `$modifier + S` → Tomar captura de pantalla
|
||||
- `$modifier + D` → Abrir `Discord`
|
||||
- `$modifier + Shift + D` → Abrir `Discord`
|
||||
- `$modifier + O` → Lanzar `OBS Studio`
|
||||
- `$modifier + C` → Ejecutar `hyprpicker -a`
|
||||
- `$modifier + Alt + C` → Selector de color
|
||||
- `$modifier + G` → Abrir `GIMP`
|
||||
- `$modifier + V` → Historial del portapapeles con `cliphist`
|
||||
- `$modifier + T` → Alternar terminal con `pypr`
|
||||
- `$modifier + M` → Abrir `pavucontrol`
|
||||
- `$modifier + Alt + M` → Abrir `pavucontrol`
|
||||
|
||||
## Gestión de ventanas
|
||||
### Gestión de ventanas
|
||||
|
||||
- `$modifier + Q` → Cerrar ventana activa
|
||||
- `$modifier + P` → Alternar pseudo tiling
|
||||
|
|
@ -127,30 +151,63 @@ A continuación los atajos de Hyprland, en formato de referencia rápida.
|
|||
- `$modifier + Alt + F` → Flotar todas las ventanas
|
||||
- `$modifier + Shift + C` → Salir de Hyprland
|
||||
|
||||
## Movimiento de ventanas
|
||||
### Movimiento de ventanas
|
||||
|
||||
- `$modifier + Shift + ← / → / ↑ / ↓` → Mover ventana izq./der./arriba/abajo
|
||||
- `$modifier + Shift + H / L / K / J` → Mover ventana izq./der./arriba/abajo
|
||||
- `$modifier + Alt + ← / → / ↑ / ↓` → Intercambiar ventana izq./der./arriba/abajo
|
||||
- `$modifier + Alt + 43 / 46 / 45 / 44` → Intercambiar ventana izq./der./arriba/abajo
|
||||
- `$modifier + Shift + ← / → / ↑ / ↓` → Mover izq./der./arriba/abajo
|
||||
- `$modifier + Shift + H / L / K / J` → Mover izq./der./arriba/abajo
|
||||
- `$modifier + Alt + ← / → / ↑ / ↓` → Intercambiar izq./der./arriba/abajo
|
||||
|
||||
## Movimiento de foco
|
||||
### Movimiento de foco
|
||||
|
||||
- `$modifier + ← / → / ↑ / ↓` → Mover foco izq./der./arriba/abajo
|
||||
- `$modifier + H / L / K / J` → Mover foco izq./der./arriba/abajo
|
||||
|
||||
## Espacios de trabajo
|
||||
### Espacios de trabajo
|
||||
|
||||
- `$modifier + 1-10` → Cambiar al espacio 1-10
|
||||
- `$modifier + Shift + Space` → Mover ventana a espacio especial
|
||||
- `$modifier + Space` → Alternar espacio especial
|
||||
- `$modifier + Shift + 1-10` → Mover ventana al espacio 1-10
|
||||
- `$modifier + Control + → / ←` → Cambiar espacio hacia adelante/atrás
|
||||
- `$modifier + Control + → / ←` → Cambiar espacio adelante/atrás
|
||||
|
||||
## Ciclo de ventanas
|
||||
### Ciclo de ventanas
|
||||
|
||||
- `Alt + Tab` → Ir a la siguiente ventana
|
||||
- `Alt + Tab` → Traer la ventana activa al frente
|
||||
- `Alt + Tab` → Ir a siguiente ventana / Traer activa al frente
|
||||
|
||||
</td>
|
||||
<td width="50%">
|
||||
|
||||
## 🎨 Atajos de Noctalia Shell
|
||||
|
||||
*Disponibles cuando `barChoice = "noctalia"` en `variables.nix`*
|
||||
|
||||
- `$modifier + D` → Alternar iniciador
|
||||
- `$modifier + Shift + Return` → Alternar iniciador
|
||||
- `$modifier + M` → Menú de notificaciones
|
||||
- `$modifier + V` → Gestor de portapapeles
|
||||
- `$modifier + Alt + P` → Panel de configuración
|
||||
- `$modifier + Shift + ,` → Panel de configuración
|
||||
- `$modifier + Alt + L` → Bloquear pantalla
|
||||
- `$modifier + Shift + Y` → Gestor de fondos
|
||||
- `$modifier + X` → Menú de energía
|
||||
- `$modifier + C` → Centro de control
|
||||
- `$modifier + Ctrl + R` → Grabadora de pantalla
|
||||
|
||||
### Iniciador Rofi (Modo Waybar)
|
||||
|
||||
*Disponible cuando `barChoice = "waybar"` en `variables.nix`*
|
||||
|
||||
- `$modifier + D` → Lanzar Rofi
|
||||
- `$modifier + Shift + Return` → Lanzar Rofi
|
||||
|
||||
### Otras características
|
||||
|
||||
- `$modifier + Shift + Return` (Waybar) → Iniciador de aplicaciones
|
||||
- `$modifier + V` (Waybar) → Historial del portapapeles con `cliphist`
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
## Instalación:
|
||||
|
||||
|
|
|
|||
121
README.md
|
|
@ -4,24 +4,44 @@
|
|||
|
||||
## ZaneyOS 🟰 Best ❄️ NixOS Configs
|
||||
|
||||
** Updated: June 3rd,2025
|
||||
\*\* Updated: November 28th,2025
|
||||
|
||||
ZaneyOS is a simple way of reproducing my configuration on any NixOS system.
|
||||
This includes the wallpaper, scripts, applications, config files, and more.
|
||||
|
||||
<img align="center" width="80%" src="https://gitlab.com/Zaney/zaneyos/-/raw/main/img/demo.png" />
|
||||
|
||||
**Inspiration for the Waybar config
|
||||
[here](https://github.com/justinlime/dotfiles).**
|
||||
|
||||
<img align="center" width="80%" src="https://gitlab.com/Zaney/zaneyos/-/raw/main/img/demo-img2.png" />
|
||||
|
||||
**Third waybar option**
|
||||
|
||||
<img align="center" width="80%" src="https://gitlab.com/Zaney/zaneyos/-/raw/main/img/demo-img3.png" />
|
||||
<img align="center" width="80%" src="img/ZaneyOS-Floating.png" />
|
||||
|
||||
</div>
|
||||
|
||||
<details>
|
||||
<summary><strong>📸 More Screenshots</strong></summary>
|
||||
|
||||
### Waybar Themes
|
||||
|
||||
<img align="center" width="80%" src="img/demo-img2.png" />
|
||||
|
||||
<img align="center" width="80%" src="img/demo-img3.png" />
|
||||
|
||||
### Noctalia Shell Integration
|
||||
|
||||
<img align="center" width="80%" src="img/ZaneyOS-noctalia-panel.png" />
|
||||
|
||||
<img align="center" width="80%" src="img/ZaneyOS-noctalia-app.png" />
|
||||
|
||||
<img align="center" width="80%" src="img/ZaneyOS-noctalia-settings.png" />
|
||||
|
||||
<img align="center" width="80%" src="img/ZaneyOS-noctalia-weather.png" />
|
||||
|
||||
### Additional Features
|
||||
|
||||
<img align="center" width="80%" src="img/ZaneyOS-keybind-search.png" />
|
||||
|
||||
<img align="center" width="80%" src="img/ZaneyOS-nivim-emacs.png" />
|
||||
|
||||
</details>
|
||||
|
||||
<div align="center">
|
||||
|
||||
### Cheatsheets and Guides
|
||||
|
||||
- Nix Beginner Guide: [English](cheatsheets/nix-beginner-guide.md) |
|
||||
|
|
@ -40,7 +60,7 @@ This includes the wallpaper, scripts, applications, config files, and more.
|
|||
|
||||
#### 🍖 Requirements
|
||||
|
||||
- You must be running on NixOS, version 23.11+.
|
||||
- You must be running on NixOS, version 24.05+.
|
||||
- The `zaneyos` folder (this repo) is expected to be in your home directory.
|
||||
- You must have installed NIXOS using **GPT** parition with booting with
|
||||
**UEFI**.
|
||||
|
|
@ -105,13 +125,18 @@ Please do yourself a favor and
|
|||
|
||||
# Hyprland Keybindings
|
||||
|
||||
Below are the keybindings for Hyprland, formatted for easy reference.
|
||||
Below are the keybindings for Hyprland, formatted for easy reference. The right column shows keybindings that are specific to **Noctalia Shell** (only available when `barChoice = "noctalia"`).
|
||||
|
||||
## Application Launching
|
||||
<table>
|
||||
<tr>
|
||||
<td width="50%">
|
||||
|
||||
## Standard Keybindings
|
||||
|
||||
### Application Launching
|
||||
|
||||
- `$modifier + Return` → Launch `terminal`
|
||||
- `$modifier + K` → List keybinds
|
||||
- `$modifier + Shift + Return` → Launch `rofi-launcher`
|
||||
- `$modifier + Shift + W` → Open `web-search`
|
||||
- `$modifier + Alt + W` → Open `wallsetter`
|
||||
- `$modifier + Shift + N` → Run `swaync-client -rs`
|
||||
|
|
@ -119,15 +144,14 @@ Below are the keybindings for Hyprland, formatted for easy reference.
|
|||
- `$modifier + Y` → Open `kitty` with `yazi`
|
||||
- `$modifier + E` → Open `emopicker9000`
|
||||
- `$modifier + S` → Take a screenshot
|
||||
- `$modifier + D` → Open `Discord`
|
||||
- `$modifier + Shift + D` → Open `Discord`
|
||||
- `$modifier + O` → Launch `OBS Studio`
|
||||
- `$modifier + C` → Run `hyprpicker -a`
|
||||
- `$modifier + Alt + C` → Color Picker
|
||||
- `$modifier + G` → Open `GIMP`
|
||||
- `$modifier + V` → Show clipboard history via `cliphist`
|
||||
- `$modifier + T` → Toggle terminal with `pypr`
|
||||
- `$modifier + M` → Open `pavucontrol`
|
||||
- `$modifier + Alt + M` → Open `pavucontrol`
|
||||
|
||||
## Window Management
|
||||
### Window Management
|
||||
|
||||
- `$modifier + Q` → Kill active window
|
||||
- `$modifier + P` → Toggle pseudo tiling
|
||||
|
|
@ -137,19 +161,18 @@ Below are the keybindings for Hyprland, formatted for easy reference.
|
|||
- `$modifier + Alt + F` → Float all windows
|
||||
- `$modifier + Shift + C` → Exit Hyprland
|
||||
|
||||
## Window Movement
|
||||
### Window Movement
|
||||
|
||||
- `$modifier + Shift + ← / → / ↑ / ↓` → Move window left/right/up/down
|
||||
- `$modifier + Shift + H / L / K / J` → Move window left/right/up/down
|
||||
- `$modifier + Alt + ← / → / ↑ / ↓` → Swap window left/right/up/down
|
||||
- `$modifier + Alt + 43 / 46 / 45 / 44` → Swap window left/right/up/down
|
||||
- `$modifier + Shift + ← / → / ↑ / ↓` → Move left/right/up/down
|
||||
- `$modifier + Shift + H / L / K / J` → Move left/right/up/down
|
||||
- `$modifier + Alt + ← / → / ↑ / ↓` → Swap left/right/up/down
|
||||
|
||||
## Focus Movement
|
||||
### Focus Movement
|
||||
|
||||
- `$modifier + ← / → / ↑ / ↓` → Move focus left/right/up/down
|
||||
- `$modifier + H / L / K / J` → Move focus left/right/up/down
|
||||
|
||||
## Workspaces
|
||||
### Workspaces
|
||||
|
||||
- `$modifier + 1-10` → Switch to workspace 1-10
|
||||
- `$modifier + Shift + Space` → Move window to special workspace
|
||||
|
|
@ -157,10 +180,44 @@ Below are the keybindings for Hyprland, formatted for easy reference.
|
|||
- `$modifier + Shift + 1-10` → Move window to workspace 1-10
|
||||
- `$modifier + Control + → / ←` → Switch workspace forward/backward
|
||||
|
||||
## Window Cycling
|
||||
### Window Cycling
|
||||
|
||||
- `Alt + Tab` → Cycle to next window
|
||||
- `Alt + Tab` → Bring active window to top
|
||||
- `Alt + Tab` → Cycle to next window / Bring active to top
|
||||
|
||||
</td>
|
||||
<td width="50%">
|
||||
|
||||
## 🎨 Noctalia Shell Keybindings
|
||||
|
||||
*Available when `barChoice = "noctalia"` in `variables.nix`*
|
||||
|
||||
- `$modifier + D` → Launcher Toggle
|
||||
- `$modifier + Shift + Return` → Launcher Toggle
|
||||
- `$modifier + M` → Notifications Menu
|
||||
- `$modifier + V` → Clipboard Manager
|
||||
- `$modifier + Alt + P` → Settings Panel
|
||||
- `$modifier + Shift + ,` → Settings Panel
|
||||
- `$modifier + Alt + L` → Lock Screen
|
||||
- `$modifier + Shift + Y` → Wallpaper Manager
|
||||
- `$modifier + X` → Power Menu
|
||||
- `$modifier + C` → Control Center
|
||||
- `$modifier + Ctrl + R` → Screen Recorder
|
||||
|
||||
### Rofi Launcher (Waybar Mode)
|
||||
|
||||
*Available when `barChoice = "waybar"` in `variables.nix`*
|
||||
|
||||
- `$modifier + D` → Launch Rofi Launcher
|
||||
- `$modifier + Shift + Return` → Launch Rofi Launcher
|
||||
|
||||
### Other Features
|
||||
|
||||
- `$modifier + Shift + Return` (Waybar) → Application Launcher
|
||||
- `$modifier + V` (Waybar) → Clipboard History via `cliphist`
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
## Installation:
|
||||
|
||||
|
|
@ -228,7 +285,7 @@ nix-shell -p git vim
|
|||
2. Clone this repo & enter it:
|
||||
|
||||
```
|
||||
cd && git clone https://gitlab.com/zaney/zaneyos.git -b stable-2.4 --depth=1 ~/zaneyos
|
||||
cd && git clone https://gitlab.com/zaney/zaneyos.git -b stable-2.4 --depth=1 ~/zaneyos
|
||||
cd zaneyos
|
||||
|
||||
You can still run the `install.sh` script if you want to.
|
||||
|
|
@ -257,7 +314,7 @@ nixos-generate-config --show-hardware-config > hosts/<your-desired-hostname>/har
|
|||
profile. I.e. `intel`, `nvidia`, `nvidia-laptop`, `amd-hybrid`, or `vm`
|
||||
|
||||
```
|
||||
NIX_CONFIG="experimental-features = nix-command flakes"
|
||||
NIX_CONFIG="experimental-features = nix-command flakes"
|
||||
sudo nixos-rebuild switch --flake .#profile
|
||||
```
|
||||
|
||||
|
|
|
|||
44
WARP.md
|
|
@ -5,44 +5,47 @@ This file provides guidance to WARP (warp.dev) when working with code in this re
|
|||
Project: ZaneyOS — NixOS flake for desktop systems with per-host overrides, GPU/VM profiles, and an integrated Home Manager layer.
|
||||
|
||||
Important repo expectations
|
||||
- This repo is expected at: ~/zaneyos (programs.nh.flake points here). If you keep it elsewhere, update modules/core/nh.nix accordingly.
|
||||
- Target OS: NixOS 23.11+; UEFI + GPT expected; systemd-boot is supported out of the box (see README for details).
|
||||
|- This repo is expected at: ~/zaneyos (programs.nh.flake points here). If you keep it elsewhere, update modules/core/nh.nix accordingly.
|
||||
|- Target OS: NixOS 23.11+; UEFI + GPT expected; systemd-boot is supported out of the box (see README for details).
|
||||
|
||||
Common commands
|
||||
- Rebuild and switch (preferred via nh/zcli)
|
||||
|- Rebuild and switch (preferred via nh/zcli)
|
||||
- fr # zsh alias → nh os switch --hostname <profile>
|
||||
- fu # zsh alias → nh os switch --hostname <profile> --update
|
||||
- zcli rebuild [--dry|--ask|--cores N|--verbose|--no-nom]
|
||||
- zcli update [--dry|--ask|--cores N|--verbose|--no-nom]
|
||||
- Rebuild for next boot (safer for bigger changes)
|
||||
|- Rebuild for next boot (safer for bigger changes)
|
||||
- zcli rebuild-boot [same options]
|
||||
- sudo nixos-rebuild boot --flake .#<profile>
|
||||
- Direct NixOS (without nh/zcli)
|
||||
|- Direct NixOS (without nh/zcli)
|
||||
- sudo nixos-rebuild switch --flake .#<profile>
|
||||
- Validate the flake
|
||||
|- Validate the flake
|
||||
- nix flake check
|
||||
- Format Nix files (nixfmt-rfc-style is included)
|
||||
|- Format Nix files (nixfmt-rfc-style is included)
|
||||
- find . -name "*.nix" -print0 | xargs -0 nixfmt
|
||||
- Host management (zcli)
|
||||
|- Configuration comparison (compare against upstream)
|
||||
- ./modules/src/compare-zaneyos-config.sh # compares against official repo
|
||||
- ./modules/src/compare-zaneyos-config.sh --branch stable-2.4 # specific branch
|
||||
|- Host management (zcli)
|
||||
- zcli update-host [hostname] [profile] # auto-detect if args omitted
|
||||
- zcli add-host <hostname> [profile] # copies hosts/default, can gen hardware.nix
|
||||
- zcli del-host <hostname>
|
||||
- Diagnostics and maintenance
|
||||
|- Diagnostics and maintenance
|
||||
- zcli diag # writes ~/diag.txt
|
||||
- zcli cleanup # prunes generations (interactive)
|
||||
- zcli trim # runs fstrim with confirmation
|
||||
- 2.3 → 2.4 upgrade (existing installs)
|
||||
|- 2.3 → 2.4 upgrade (existing installs)
|
||||
- ./upgrade-2.3-to-2.4.sh # automated analysis, backup, and upgrade
|
||||
- ./upgrade-2.3-to-2.4.sh --revert
|
||||
|
||||
Notes on profiles and hosts
|
||||
- Profiles represent hardware targets: amd, intel, nvidia, nvidia-laptop (intel+NVIDIA hybrid), amd-hybrid (AMD+NVIDIA hybrid), vm.
|
||||
- Use the profile in flake targets like .#vm or .#nvidia, or via nh’s --hostname.
|
||||
- Host-specific settings live under hosts/<hostname>/; variables.nix holds UX and feature toggles.
|
||||
|- Profiles represent hardware targets: amd, intel, nvidia, nvidia-laptop (intel+NVIDIA hybrid), amd-hybrid (AMD+NVIDIA hybrid), vm.
|
||||
|- Use the profile in flake targets like .#vm or .#nvidia, or via nh's --hostname.
|
||||
|- Host-specific settings live under hosts/<hostname>/; variables.nix holds UX and feature toggles: barChoice (noctalia or waybar), waybarChoice (when barChoice="waybar"), clock24h, etc.
|
||||
|
||||
High-level architecture (big picture)
|
||||
- flake.nix
|
||||
- Inputs: nixpkgs 25.05, home-manager 25.05, stylix, nvf, nix-flatpak.
|
||||
|- flake.nix
|
||||
- Inputs: nixpkgs 25.11, home-manager 25.11, stylix, nvf, nix-flatpak, noctalia; nixvim and quickshell are included but currently inactive (uncommitted to outputs).
|
||||
- Defines system, host, profile, username; constructs nixosConfigurations via mkNixosConfig.
|
||||
- Each configuration imports profiles/<profile>.
|
||||
- profiles/<profile>/default.nix
|
||||
|
|
@ -51,14 +54,17 @@ High-level architecture (big picture)
|
|||
- hosts/<hostname>/
|
||||
- default.nix imports hardware.nix and host-packages.nix.
|
||||
- variables.nix is the primary control surface (display manager, terminal/browser defaults, waybarChoice, stylix image, 24h clock, Thunar/printing/NFS flags, intel/nvidia Bus IDs, etc.).
|
||||
- modules/core
|
||||
- Composes NixOS modules: boot, flatpak, fonts, hardware, network, nfs, nh, packages, printing, display manager (greetd/sddm), security, services (PipeWire/SSH/Bluetooth/fstrim; smartd conditional), steam, stylix, syncthing, system (nix settings, locales, env), thunar, user (Home Manager), virtualization, xserver.
|
||||
|- modules/core
|
||||
- Composes NixOS modules: boot, flatpak, fonts, hardware, network, nfs, nh, quickshell, packages, printing, display manager (greetd/sddm), security, services (PipeWire/SSH/Bluetooth/fstrim; smartd conditional), steam, stylix, syncthing, system (nix settings, locales, env), thunar, user (Home Manager), virtualization, xserver.
|
||||
- quickshell.nix installs quickshell with Qt6 dependencies and required environment variables (needed for noctalia-shell).
|
||||
- nh.nix enables nh and pins programs.nh.flake to ~/zaneyos.
|
||||
- user.nix integrates Home Manager and creates users.${username}, passing { inputs, username, host, profile } to the home layer.
|
||||
- modules/drivers
|
||||
- AMD, Intel, NVIDIA, NVIDIA Prime, NVIDIA AMD-Hybrid, and VM guest services; nvidia-prime options (enable, intelBusID, nvidiaBusID) are consumed by the nvidia-laptop profile; nvidia-amd-hybrid options (enable, amdgpuBusID, nvidiaBusID) are consumed by the amd-hybrid profile.
|
||||
- modules/home
|
||||
- Composes the user environment: Hyprland, Waybar (via waybarChoice), Rofi, Yazi, terminals (Kitty/WezTerm/Ghostty/Alacritty toggles), Zsh/Bash config, Git, NVF/Neovim, OBS, swaync, scripts, Stylix, optional Doom Emacs/VSCodium/Helix.
|
||||
|- modules/home
|
||||
- Composes the user environment: Hyprland, bar/shell choice (noctalia-shell or Waybar via barChoice), Rofi, Yazi, terminals (Kitty/WezTerm/Ghostty/Alacritty toggles), Zsh/Bash config, Git, NVF/Neovim, OBS, swaync, scripts, Stylix, optional Doom Emacs/VSCodium/Helix.
|
||||
- default.nix conditionally imports barModule: either noctalia.nix (when barChoice="noctalia") or waybarChoice (when barChoice="waybar").
|
||||
- noctalia.nix installs noctalia-shell and seeds ~/.config/quickshell/noctalia-shell from the package distribution.
|
||||
- scripts/default.nix installs zcli; zcli wraps rebuild/update/boot, cleanup, diagnostics, host management, and Doom lifecycle.
|
||||
- Shell aliases (zsh)
|
||||
- fr and fu are defined in modules/home/zsh/default.nix, parameterized by the active profile.
|
||||
|
|
|
|||
370
flake.lock
generated
|
|
@ -1,15 +1,36 @@
|
|||
{
|
||||
"nodes": {
|
||||
"antigravity-nix": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763923069,
|
||||
"narHash": "sha256-rz0rpiWu333RNbzVV+3t3AGotCSM7g4J6xf4d/xeyP8=",
|
||||
"owner": "jacopone",
|
||||
"repo": "antigravity-nix",
|
||||
"rev": "31ba7531e8a84b9e5ee498f822e35bc6a419f3c0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "jacopone",
|
||||
"repo": "antigravity-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"base16": {
|
||||
"inputs": {
|
||||
"fromYaml": "fromYaml"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746562888,
|
||||
"narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
|
||||
"lastModified": 1755819240,
|
||||
"narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
|
||||
"owner": "SenchoPens",
|
||||
"repo": "base16.nix",
|
||||
"rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
|
||||
"rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -38,11 +59,11 @@
|
|||
"base16-helix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1748408240,
|
||||
"narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
|
||||
"lastModified": 1752979451,
|
||||
"narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-helix",
|
||||
"rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
|
||||
"rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -71,11 +92,11 @@
|
|||
"firefox-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1748383148,
|
||||
"narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
|
||||
"lastModified": 1758112371,
|
||||
"narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
|
||||
"rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -101,6 +122,27 @@
|
|||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763759067,
|
||||
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nvf",
|
||||
|
|
@ -121,7 +163,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"flake-parts_3": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"stylix",
|
||||
|
|
@ -129,11 +171,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749398372,
|
||||
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
|
||||
"lastModified": 1756770412,
|
||||
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
|
||||
"rev": "4524271976b625a4a605beefd893f270620fd751",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -142,6 +184,42 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fromYaml": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -161,18 +239,20 @@
|
|||
"gnome-shell": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1744584021,
|
||||
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
|
||||
"host": "gitlab.gnome.org",
|
||||
"lastModified": 1762869044,
|
||||
"narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=",
|
||||
"owner": "GNOME",
|
||||
"repo": "gnome-shell",
|
||||
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
|
||||
"type": "github"
|
||||
"rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"host": "gitlab.gnome.org",
|
||||
"owner": "GNOME",
|
||||
"ref": "48.1",
|
||||
"ref": "gnome-49",
|
||||
"repo": "gnome-shell",
|
||||
"type": "github"
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
|
|
@ -182,20 +262,48 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1758463745,
|
||||
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
|
||||
"lastModified": 1764398914,
|
||||
"narHash": "sha256-YPrpwlVQidzQlMh0OnquaJR+58rKe9YNnuRis293Ilo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
|
||||
"rev": "d0c5fdc48db6f19471b8adc954eca09194e68036",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.05",
|
||||
"ref": "release-25.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ixx": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754860581,
|
||||
"narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "ixx",
|
||||
"rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"ref": "v0.1.1",
|
||||
"repo": "ixx",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mnw": {
|
||||
"locked": {
|
||||
"lastModified": 1758834834,
|
||||
|
|
@ -229,16 +337,16 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1763622513,
|
||||
"narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
|
||||
"lastModified": 1764471479,
|
||||
"narHash": "sha256-xG9OllpGJAX0BdsQ06N7TODTVVjiHtwpd2yLdQpQBDQ=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b",
|
||||
"rev": "0b9b52b21c79d7be01f55c10df8664e877be9884",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-25.05",
|
||||
"ref": "release-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -261,20 +369,63 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1751211869,
|
||||
"narHash": "sha256-1Cu92i1KSPbhPCKxoiVG5qnoRiKTgR5CcGSRyLpOd7Y=",
|
||||
"lastModified": 1762977756,
|
||||
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b43c397f6c213918d6cfe6e3550abfe79b5d1c51",
|
||||
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.05",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixvim": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nuschtosSearch": "nuschtosSearch",
|
||||
"systems": "systems_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764443358,
|
||||
"narHash": "sha256-bd9I02P/Mp9yYGcSWgLLdI/Zt0JqF8igSTAfUzknVHk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "6094d2a4396c0ff4e94b22315cc43f55db626c32",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"noctalia": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764464432,
|
||||
"narHash": "sha256-q7SUhWUVrg04bpx8inftY6jFc84cy8RFLJpCAGpHSjY=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"rev": "1c9d659635eee3a0937ebbbe755713e92637225a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": [
|
||||
|
|
@ -284,15 +435,14 @@
|
|||
"nixpkgs": [
|
||||
"stylix",
|
||||
"nixpkgs"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1751320053,
|
||||
"narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=",
|
||||
"lastModified": 1758998580,
|
||||
"narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670",
|
||||
"rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -301,13 +451,36 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nuschtosSearch": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"ixx": "ixx",
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761730856,
|
||||
"narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nvf": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"mnw": "mnw",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"systems": "systems"
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762622004,
|
||||
|
|
@ -323,12 +496,36 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"quickshell": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764045583,
|
||||
"narHash": "sha256-W24ReyRrhOKTKIsuAMkY5hnVlCufGoONM79sjUoyQkk=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3",
|
||||
"revCount": 709,
|
||||
"type": "git",
|
||||
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"antigravity-nix": "antigravity-nix",
|
||||
"home-manager": "home-manager",
|
||||
"nix-flatpak": "nix-flatpak",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixvim": "nixvim",
|
||||
"noctalia": "noctalia",
|
||||
"nvf": "nvf",
|
||||
"quickshell": "quickshell",
|
||||
"stylix": "stylix"
|
||||
}
|
||||
},
|
||||
|
|
@ -339,11 +536,11 @@
|
|||
"base16-helix": "base16-helix",
|
||||
"base16-vim": "base16-vim",
|
||||
"firefox-gnome-theme": "firefox-gnome-theme",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"flake-parts": "flake-parts_3",
|
||||
"gnome-shell": "gnome-shell",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nur": "nur",
|
||||
"systems": "systems_2",
|
||||
"systems": "systems_5",
|
||||
"tinted-foot": "tinted-foot",
|
||||
"tinted-kitty": "tinted-kitty",
|
||||
"tinted-schemes": "tinted-schemes",
|
||||
|
|
@ -351,16 +548,16 @@
|
|||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763680580,
|
||||
"narHash": "sha256-kmaYIf+MsFviYtYTXrWVaAwidTV3nBIXlNS7fPjxfi4=",
|
||||
"lastModified": 1764464945,
|
||||
"narHash": "sha256-rofXPD/9TGpHveo1MTlUfpnF0MCG1/uHUB9f0rosdqc=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "6bb18c101ee812a47afcee2e3718429d09aa5ee1",
|
||||
"rev": "1fdde45cb0d30936839a630b98660e1579603951",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "danth",
|
||||
"ref": "release-25.05",
|
||||
"ref": "release-25.11",
|
||||
"repo": "stylix",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -395,6 +592,51 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_4": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_5": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tinted-foot": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -431,11 +673,11 @@
|
|||
"tinted-schemes": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1750770351,
|
||||
"narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
|
||||
"lastModified": 1757716333,
|
||||
"narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "schemes",
|
||||
"rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
|
||||
"rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -447,11 +689,11 @@
|
|||
"tinted-tmux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1751159871,
|
||||
"narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
|
||||
"lastModified": 1757811970,
|
||||
"narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-tmux",
|
||||
"rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
|
||||
"rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -463,11 +705,11 @@
|
|||
"tinted-zed": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1751158968,
|
||||
"narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
|
||||
"lastModified": 1757811247,
|
||||
"narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-zed",
|
||||
"rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
|
||||
"rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -475,28 +717,6 @@
|
|||
"repo": "base16-zed",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"nur",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733222881,
|
||||
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
|||
78
flake.nix
|
|
@ -3,39 +3,53 @@
|
|||
|
||||
inputs = {
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-25.05";
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/release-25.11";
|
||||
nvf.url = "github:notashelf/nvf";
|
||||
stylix.url = "github:danth/stylix/release-25.05";
|
||||
stylix.url = "github:danth/stylix/release-25.11";
|
||||
nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest";
|
||||
|
||||
# Hypersysinfo (Optional)
|
||||
#hyprsysteminfo.url = "github:hyprwm/hyprsysteminfo";
|
||||
noctalia = {
|
||||
url = "github:noctalia-dev/noctalia-shell";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# Checking nixvim to see if it's better
|
||||
nixvim = {
|
||||
url = "github:nix-community/nixvim";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# QuickShell (optional add quickshell to outputs to enable)
|
||||
#quickshell = {
|
||||
# url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
|
||||
# inputs.nixpkgs.follows = "nixpkgs";
|
||||
#};
|
||||
quickshell = {
|
||||
url = "git+https://git.outfoxxed.me/outfoxxed/quickshell";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
# Google Antigravity (IDE)
|
||||
antigravity-nix = {
|
||||
url = "github:jacopone/antigravity-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
{
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
nix-flatpak,
|
||||
...
|
||||
}@inputs:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
host = "zaneyos-oem";
|
||||
outputs = {
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
nixvim,
|
||||
nix-flatpak,
|
||||
...
|
||||
} @ inputs: let
|
||||
system = "x86_64-linux";
|
||||
host = "zaneyos-24-vm";
|
||||
profile = "vm";
|
||||
username = "dwilliams";
|
||||
username = "dwilliams";
|
||||
|
||||
# Deduplicate nixosConfigurations while preserving the top-level 'profile'
|
||||
mkNixosConfig = gpuProfile: nixpkgs.lib.nixosSystem {
|
||||
# Deduplicate nixosConfigurations while preserving the top-level 'profile'
|
||||
mkNixosConfig = gpuProfile:
|
||||
nixpkgs.lib.nixosSystem {
|
||||
inherit system;
|
||||
specialArgs = {
|
||||
inherit inputs;
|
||||
|
|
@ -44,19 +58,19 @@
|
|||
inherit profile; # keep using the let-bound profile for modules/scripts
|
||||
};
|
||||
modules = [
|
||||
./modules/core/overlays.nix
|
||||
./profiles/${gpuProfile}
|
||||
nix-flatpak.nixosModules.nix-flatpak
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
nixosConfigurations = {
|
||||
amd = mkNixosConfig "amd";
|
||||
nvidia = mkNixosConfig "nvidia";
|
||||
nvidia-laptop = mkNixosConfig "nvidia-laptop";
|
||||
amd-hybrid = mkNixosConfig "amd-hybrid";
|
||||
intel = mkNixosConfig "intel";
|
||||
vm = mkNixosConfig "vm";
|
||||
};
|
||||
in {
|
||||
nixosConfigurations = {
|
||||
amd = mkNixosConfig "amd";
|
||||
nvidia = mkNixosConfig "nvidia";
|
||||
nvidia-laptop = mkNixosConfig "nvidia-laptop";
|
||||
amd-hybrid = mkNixosConfig "amd-hybrid";
|
||||
intel = mkNixosConfig "intel";
|
||||
vm = mkNixosConfig "vm";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
weztermEnable = false;
|
||||
ghosttyEnable = false;
|
||||
vscodeEnable = false;
|
||||
antigravityEnable = false; # Google port of vscodium
|
||||
# Note: This is evil-helix with VIM keybindings by default
|
||||
helixEnable = false;
|
||||
#To install: Enable here, zcli rebuild, then run zcli doom install
|
||||
|
|
@ -30,7 +31,11 @@
|
|||
|
||||
";
|
||||
|
||||
# Waybar Settings
|
||||
# Bar/Shell Settings
|
||||
# Choose between noctalia or waybar
|
||||
barChoice = "noctalia";
|
||||
|
||||
# Waybar Settings (used when barChoice = "waybar")
|
||||
clock24h = false;
|
||||
|
||||
# Program Options
|
||||
|
|
@ -86,24 +91,38 @@
|
|||
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
|
||||
# Throwback to ZaneyOS v1.0
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
|
||||
# Very colorful and bright colors
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-nekodyke.nix;
|
||||
# DWM styled waybars from Matt at TheLinuxCast
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-nekodyke.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
|
||||
|
||||
# Set Animation style
|
||||
# Available options are:
|
||||
# animations-def.nix (default)
|
||||
# animations-end4.nix (end-4 project very fluid)
|
||||
# animations-dynamic.nix (ml4w project)
|
||||
# animations-moving.nix (ml4w project)
|
||||
animChoice = ../../modules/home/hyprland/animations-def.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end4.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
|
||||
|
||||
# Set network hostId if required (needed for zfs)
|
||||
# Otherwise leave as-is
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
weztermEnable = false;
|
||||
ghosttyEnable = false;
|
||||
vscodeEnable = false;
|
||||
antigravityEnable = false; # Google port of vscodium
|
||||
helixEnable = false;
|
||||
#To install rebuild, then run zcli doom install
|
||||
doomEmacsEnable = false;
|
||||
|
|
@ -25,7 +26,11 @@
|
|||
# Hyprland Settings
|
||||
extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1";
|
||||
|
||||
# Waybar Settings
|
||||
# Bar/Shell Settings
|
||||
# Choose between noctalia or waybar
|
||||
barChoice = "noctalia";
|
||||
|
||||
# Waybar Settings (used when barChoice = "waybar")
|
||||
clock24h = false;
|
||||
|
||||
# Program Options
|
||||
|
|
@ -62,24 +67,41 @@
|
|||
|
||||
# Set Waybar
|
||||
# Available options:
|
||||
#waybarChoice= ../../modules/home/waybar/waybar-simple.nix;
|
||||
waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
|
||||
|
||||
# Set Animation style
|
||||
# Available options are:
|
||||
# animations-def.nix (default)
|
||||
# animations-end4.nix (end-4 project)
|
||||
# animations-dynamic.nix (ml4w project)
|
||||
# animations-moving.nix (ml4w project)
|
||||
animChoice = ../../modules/home/hyprland/animations-end4.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-def.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
|
||||
|
||||
# Set network hostId if required (needed for zfs)
|
||||
# Otherwise leave as-is
|
||||
|
|
|
|||
|
|
@ -10,15 +10,16 @@
|
|||
displayManager = "sddm";
|
||||
|
||||
# Emable/disable bundled applications
|
||||
tmuxEnable = false;
|
||||
alacrittyEnable = false;
|
||||
weztermEnable = false;
|
||||
ghosttyEnable = false;
|
||||
vscodeEnable = false;
|
||||
tmuxEnable = true;
|
||||
alacrittyEnable = true;
|
||||
weztermEnable = true;
|
||||
ghosttyEnable = true;
|
||||
vscodeEnable = true;
|
||||
antigravityEnable = false; # Google port of vscodium
|
||||
# Note: This is evil-helix with VIM keybindings by default
|
||||
helixEnable = false;
|
||||
helixEnable = true;
|
||||
#To install: Enable here, zcli rebuild, then run zcli doom install
|
||||
doomEmacsEnable = false;
|
||||
doomEmacsEnable = true;
|
||||
|
||||
# Hyprland Settings
|
||||
# Examples:
|
||||
|
|
@ -30,7 +31,11 @@
|
|||
|
||||
";
|
||||
|
||||
# Waybar Settings
|
||||
# Bar/Shell Settings
|
||||
# Choose between noctalia or waybar
|
||||
barChoice = "noctalia";
|
||||
|
||||
# Waybar Settings (used when barChoice = "waybar")
|
||||
clock24h = false;
|
||||
|
||||
# Program Options
|
||||
|
|
@ -72,38 +77,52 @@
|
|||
# This will set your color palette
|
||||
# Default background
|
||||
# Add new images to ~/zaneyos/wallpapers
|
||||
stylixImage = ../../wallpapers/mountainscapedark.jpg;
|
||||
#stylixImage = ../../wallpapers/mountainscapedark.jpg;
|
||||
#stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
|
||||
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
|
||||
#stylixImage = ../../wallpapers/Rainnight.jpg;
|
||||
stylixImage = ../../wallpapers/Rainnight.jpg;
|
||||
#stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
|
||||
#stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg;
|
||||
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
|
||||
|
||||
# Set Waybar
|
||||
# Available Options:
|
||||
waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
|
||||
# Throwback to ZaneyOS v1.0
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
|
||||
# Very colorful and bright colors
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-nekodyke.nix;
|
||||
# DWM styled waybars from Matt at TheLinuxCast
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
|
||||
waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-nekodyke.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
|
||||
|
||||
# Set Animation style
|
||||
# Available options are:
|
||||
# animations-def.nix (default)
|
||||
# animations-end4.nix (end-4 project very fluid)
|
||||
# animations-dynamic.nix (ml4w project)
|
||||
# animations-moving.nix (ml4w project)
|
||||
#animChoice = ../../modules/home/hyprland/animations-def.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end4.nix;
|
||||
animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
|
||||
animChoice = ../../modules/home/hyprland/animations-end4.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
|
||||
|
||||
# Set network hostId if required (needed for zfs)
|
||||
# Otherwise leave as-is
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
weztermEnable = true;
|
||||
ghosttyEnable = true;
|
||||
vscodeEnable = true;
|
||||
antigravityEnable = false; # Google port of vscodium
|
||||
helixEnable = true;
|
||||
#To install rebuild, then run zcli doom install
|
||||
doomEmacsEnable = false;
|
||||
|
|
@ -25,7 +26,11 @@
|
|||
# Hyprland Settings
|
||||
extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1";
|
||||
|
||||
# Waybar Settings
|
||||
# Bar/Shell Settings
|
||||
# Choose between noctalia or waybar
|
||||
barChoice = "noctalia";
|
||||
|
||||
# Waybar Settings (used when barChoice = "waybar")
|
||||
clock24h = false;
|
||||
|
||||
# Program Options
|
||||
|
|
@ -62,24 +67,41 @@
|
|||
|
||||
# Set Waybar
|
||||
# Available options:
|
||||
#waybarChoice= ../../modules/home/waybar/waybar-simple.nix;
|
||||
waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-simple.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-curved.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jerry.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-dwm.nix;
|
||||
waybarChoice = ../../modules/home/waybar/waybar-dwm-2.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-TheBlackDon.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-tony.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-ddubsos-v1.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-mecha.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-ml4w-modern.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jak-oglo-simple.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix;
|
||||
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
|
||||
|
||||
# Set Animation style
|
||||
# Available options are:
|
||||
# animations-def.nix (default)
|
||||
# animations-end4.nix (end-4 project)
|
||||
# animations-dynamic.nix (ml4w project)
|
||||
# animations-moving.nix (ml4w project)
|
||||
animChoice = ../../modules/home/hyprland/animations-end4.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-def.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-moving.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;
|
||||
|
||||
# Set network hostId if required (needed for zfs)
|
||||
# Otherwise leave as-is
|
||||
|
|
|
|||
BIN
img/ZaneyOS-Floating.png
Normal file
|
After Width: | Height: | Size: 1.3 MiB |
BIN
img/ZaneyOS-keybind-search.png
Normal file
|
After Width: | Height: | Size: 192 KiB |
BIN
img/ZaneyOS-nivim-emacs.png
Normal file
|
After Width: | Height: | Size: 799 KiB |
BIN
img/ZaneyOS-noctalia-app.png
Normal file
|
After Width: | Height: | Size: 487 KiB |
BIN
img/ZaneyOS-noctalia-panel.png
Normal file
|
After Width: | Height: | Size: 482 KiB |
BIN
img/ZaneyOS-noctalia-settings.png
Normal file
|
After Width: | Height: | Size: 492 KiB |
BIN
img/ZaneyOS-noctalia-weather.png
Normal file
|
After Width: | Height: | Size: 1,014 KiB |
|
|
@ -1,9 +1,9 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
######################################
|
||||
# Install script for zaneyos
|
||||
# Author: Don Williams
|
||||
# Date: June 27, 2005
|
||||
# Install script for zaneyos
|
||||
# Author: Don Williams
|
||||
# Date: June 27, 2005
|
||||
#######################################
|
||||
|
||||
# Define colors
|
||||
|
|
@ -54,7 +54,7 @@ print_failure_banner() {
|
|||
print_header "Verifying System Requirements"
|
||||
|
||||
# Check for git
|
||||
if ! command -v git &> /dev/null; then
|
||||
if ! command -v git &>/dev/null; then
|
||||
print_error "Git is not installed."
|
||||
echo -e "Please install git and pciutils are installed, then re-run the install script."
|
||||
echo -e "Example: nix-shell -p git pciutils"
|
||||
|
|
@ -62,14 +62,14 @@ if ! command -v git &> /dev/null; then
|
|||
fi
|
||||
|
||||
# Check for lspci (pciutils)
|
||||
if ! command -v lspci &> /dev/null; then
|
||||
if ! command -v lspci &>/dev/null; then
|
||||
print_error "pciutils is not installed."
|
||||
echo -e "Please install git and pciutils, then re-run the install script."
|
||||
echo -e "Example: nix-shell -p git pciutils"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -n "$(grep -i nixos < /etc/os-release)" ]; then
|
||||
if [ -n "$(grep -i nixos </etc/os-release)" ]; then
|
||||
echo -e "${GREEN}Verified this is NixOS.${NC}"
|
||||
else
|
||||
print_error "This is not NixOS or the distribution information is not available."
|
||||
|
|
@ -186,20 +186,17 @@ if [ -d "zaneyos" ]; then
|
|||
echo -e "${RED}║ An existing ZaneyOS installation was detected at ~/zaneyos ║${NC}"
|
||||
echo -e "${RED}║ ║${NC}"
|
||||
echo -e "${RED}║ This installer will COMPLETELY REPLACE your existing configuration! ║${NC}"
|
||||
echo -e "${RED}║ All customizations, packages, and settings will be LOST! ║${NC}"
|
||||
echo -e "${RED}║ All customizations, packages, and settings will be LOST! ║${NC}"
|
||||
echo -e "${RED}║ ║${NC}"
|
||||
echo -e "${RED}║ If you want to UPGRADE from ZaneyOS 2.3 to 2.4: ║${NC}"
|
||||
echo -e "${RED}║ 1. Press Ctrl+C to cancel this installer ║${NC}"
|
||||
echo -e "${RED}║ 2. Run: cd ~/zaneyos && ./upgrade-2.3-to-2.4.sh ║${NC}"
|
||||
echo -e "${RED}║ ** A backup copy of your config will be created ** ║${NC}"
|
||||
echo -e "${RED}║ * You will have to merge your changes back ** ║${NC}"
|
||||
echo -e "${RED}║ ║${NC}"
|
||||
echo -e "${RED}║ The upgrade script preserves ALL your customizations! ║${NC}"
|
||||
echo -e "${RED}╚═══════════════════════════════════════════════════════════════════════╝${NC}"
|
||||
echo ""
|
||||
echo -e "${YELLOW}If you REALLY want to do a fresh installation (losing all customizations):${NC}"
|
||||
read -p "Type 'REPLACE' to continue with fresh install or Ctrl+C to cancel: " confirmation
|
||||
if [ "$confirmation" != "REPLACE" ]; then
|
||||
echo -e "${GREEN}Installation cancelled. Use the upgrade script instead!${NC}"
|
||||
echo -e "${GREEN}Run: cd ~/zaneyos && ./upgrade-2.3-to-2.4.sh${NC}"
|
||||
echo -e "${GREEN}Installation cancelled. ${NC}"
|
||||
exit 0
|
||||
fi
|
||||
echo -e "${GREEN}zaneyos exists, backing up to .config/zaneyos-backups folder.${NC}"
|
||||
|
|
@ -219,7 +216,7 @@ else
|
|||
fi
|
||||
|
||||
print_header "Cloning ZaneyOS Repository"
|
||||
git clone https://gitlab.com/zaney/zaneyos.git --depth=1 ~/zaneyos
|
||||
git clone https://gitlab.com/zaney/zaneyos.git -b stable-2.5 --depth=1 ~/zaneyos
|
||||
cd ~/zaneyos || exit 1
|
||||
|
||||
print_header "Git Configuration"
|
||||
|
|
@ -303,31 +300,31 @@ echo "Updating configuration files with working awk commands..."
|
|||
cp ./flake.nix ./flake.nix.bak
|
||||
# Use sed for hostname (more reliable)
|
||||
sed -i "/^[[:space:]]*host[[:space:]]*=[[:space:]]*\"/s/\"[^\"]*\"/\"$hostName\"/" ./flake.nix.bak
|
||||
awk -v newprof="$profile" '/^ profile = / { gsub(/"[^"]*"/, "\"" newprof "\""); } { print }' ./flake.nix.bak > ./flake.nix
|
||||
awk -v newprof="$profile" '/^ profile = / { gsub(/"[^"]*"/, "\"" newprof "\""); } { print }' ./flake.nix.bak >./flake.nix
|
||||
cp ./flake.nix ./flake.nix.bak
|
||||
awk -v newuser="$installusername" '/^ username = / { gsub(/"[^"]*"/, "\"" newuser "\""); } { print }' ./flake.nix.bak > ./flake.nix
|
||||
awk -v newuser="$installusername" '/^ username = / { gsub(/"[^"]*"/, "\"" newuser "\""); } { print }' ./flake.nix.bak >./flake.nix
|
||||
rm ./flake.nix.bak
|
||||
|
||||
# Update timezone in system.nix
|
||||
# Update timezone in system.nix
|
||||
cp ./modules/core/system.nix ./modules/core/system.nix.bak
|
||||
awk -v newtz="$timezone" '/^ time\.timeZone = / { gsub(/"[^"]*"/, "\"" newtz "\""); } { print }' ./modules/core/system.nix.bak > ./modules/core/system.nix
|
||||
awk -v newtz="$timezone" '/^ time\.timeZone = / { gsub(/"[^"]*"/, "\"" newtz "\""); } { print }' ./modules/core/system.nix.bak >./modules/core/system.nix
|
||||
rm ./modules/core/system.nix.bak
|
||||
|
||||
# Update variables in host file
|
||||
cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak
|
||||
awk -v newuser="$gitUsername" '/^ gitUsername = / { gsub(/"[^"]*"/, "\"" newuser "\""); } { print }' ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix
|
||||
awk -v newuser="$gitUsername" '/^ gitUsername = / { gsub(/"[^"]*"/, "\"" newuser "\""); } { print }' ./hosts/$hostName/variables.nix.bak >./hosts/$hostName/variables.nix
|
||||
cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak
|
||||
awk -v newemail="$gitEmail" '/^ gitEmail = / { gsub(/"[^"]*"/, "\"" newemail "\""); } { print }' ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix
|
||||
awk -v newemail="$gitEmail" '/^ gitEmail = / { gsub(/"[^"]*"/, "\"" newemail "\""); } { print }' ./hosts/$hostName/variables.nix.bak >./hosts/$hostName/variables.nix
|
||||
cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak
|
||||
awk -v newkb="$keyboardLayout" '/^ keyboardLayout = / { gsub(/"[^"]*"/, "\"" newkb "\""); } { print }' ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix
|
||||
awk -v newkb="$keyboardLayout" '/^ keyboardLayout = / { gsub(/"[^"]*"/, "\"" newkb "\""); } { print }' ./hosts/$hostName/variables.nix.bak >./hosts/$hostName/variables.nix
|
||||
cp ./hosts/$hostName/variables.nix ./hosts/$hostName/variables.nix.bak
|
||||
awk -v newckm="$consoleKeyMap" '/^ consoleKeyMap = / { gsub(/"[^"]*"/, "\"" newckm "\""); } { print }' ./hosts/$hostName/variables.nix.bak > ./hosts/$hostName/variables.nix
|
||||
awk -v newckm="$consoleKeyMap" '/^ consoleKeyMap = / { gsub(/"[^"]*"/, "\"" newckm "\""); } { print }' ./hosts/$hostName/variables.nix.bak >./hosts/$hostName/variables.nix
|
||||
rm ./hosts/$hostName/variables.nix.bak
|
||||
|
||||
echo "Configuration files updated successfully!"
|
||||
|
||||
print_header "Generating Hardware Configuration -- Ignore ERROR: cannot access /bin"
|
||||
sudo nixos-generate-config --show-hardware-config > ./hosts/$hostName/hardware.nix
|
||||
sudo nixos-generate-config --show-hardware-config >./hosts/$hostName/hardware.nix
|
||||
|
||||
print_header "Setting Nix Configuration"
|
||||
NIX_CONFIG="experimental-features = nix-command flakes"
|
||||
|
|
@ -336,8 +333,8 @@ print_header "Initiating NixOS Build"
|
|||
read -p "Ready to run initial build? (Y/N): " -n 1 -r
|
||||
echo
|
||||
if [[ ! $REPLY =~ ^[Yy]$ ]]; then
|
||||
echo -e "${RED}Build cancelled.${NC}"
|
||||
exit 1
|
||||
echo -e "${RED}Build cancelled.${NC}"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
sudo nixos-rebuild boot --flake ~/zaneyos/#${profile}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ in
|
|||
./network.nix
|
||||
./nfs.nix
|
||||
./nh.nix
|
||||
#./quickshell.nix #Disabled for now not using it yet
|
||||
./quickshell.nix
|
||||
./packages.nix
|
||||
./printing.nix
|
||||
# Conditionally import the display manager module
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
nerd-fonts.im-writing
|
||||
nerd-fonts.blex-mono
|
||||
noto-fonts
|
||||
noto-fonts-emoji
|
||||
noto-fonts-color-emoji
|
||||
noto-fonts-cjk-sans
|
||||
noto-fonts-cjk-serif
|
||||
noto-fonts-monochrome-emoji
|
||||
|
|
|
|||
|
|
@ -2,13 +2,12 @@
|
|||
, username
|
||||
, ...
|
||||
}: {
|
||||
services.greetd = {
|
||||
services.tuigreet = {
|
||||
enable = true;
|
||||
vt = 3;
|
||||
settings = {
|
||||
default_session = {
|
||||
user = username;
|
||||
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd Hyprland"; # start Hyprland with a TUI login manager
|
||||
command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd Hyprland"; # start Hyprland with a TUI login manager
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
6
modules/core/overlays.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{ inputs, ... }: {
|
||||
nixpkgs.overlays = [
|
||||
# Provide pkgs.google-antigravity via antigravity-nix overlay
|
||||
inputs.antigravity-nix.overlays.default
|
||||
];
|
||||
}
|
||||
|
|
@ -1,9 +1,20 @@
|
|||
{
|
||||
pkgs,
|
||||
inputs,
|
||||
host,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: let
|
||||
vars = import ../../hosts/${host}/variables.nix;
|
||||
inherit (vars) barChoice;
|
||||
# Noctalia-specific packages
|
||||
noctaliaPkgs =
|
||||
if barChoice == "noctalia"
|
||||
then
|
||||
with pkgs; [
|
||||
matugen # color palette generator needed for noctalia-shell
|
||||
app2unit # launcher for noctalia-shell
|
||||
]
|
||||
else [];
|
||||
in {
|
||||
programs = {
|
||||
neovim = {
|
||||
enable = true;
|
||||
|
|
@ -28,63 +39,59 @@
|
|||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
# Hyprland systeminfo QT (Optional)
|
||||
#inputs.hyprsysteminfo.packages.${pkgs.system}.default
|
||||
|
||||
#aider-chat # AI in terminal (Optional: Client only)
|
||||
amfora # Fancy Terminal Browser For Gemini Protocol
|
||||
appimage-run # Needed For AppImage Support
|
||||
brave # Brave Browser
|
||||
brightnessctl # For Screen Brightness Control
|
||||
#claude-code # Claude code terminal AI (Optional: Client only)
|
||||
cliphist # Clipboard manager using rofi menu
|
||||
cmatrix # Matrix Movie Effect In Terminal
|
||||
cowsay # Great Fun Terminal Program
|
||||
discord # Stable client
|
||||
discord-canary # beta client
|
||||
docker-compose # Allows Controlling Docker From A Single File
|
||||
duf # Utility For Viewing Disk Usage In Terminal
|
||||
dysk # Disk space util nice formattting
|
||||
eza # Beautiful ls Replacement
|
||||
ffmpeg # Terminal Video / Audio Editing
|
||||
file-roller # Archive Manager
|
||||
gedit # Simple Graphical Text Editor
|
||||
#gemini-cli # CLI AI client ONLY (optional)
|
||||
gimp # Great Photo Editor
|
||||
glxinfo # needed for inxi diag util
|
||||
greetd.tuigreet # The Login Manager (Sometimes Referred To As Display Manager)
|
||||
htop # Simple Terminal Based System Monitor
|
||||
hyprpicker # Color Picker
|
||||
hyprshot # Screen capture
|
||||
eog # For Image Viewing
|
||||
inxi # CLI System Information Tool
|
||||
killall # For Killing All Instances Of Programs
|
||||
libnotify # For Notifications
|
||||
lm_sensors # Used For Getting Hardware Temps
|
||||
lolcat # Add Colors To Your Terminal Command Output
|
||||
lshw # Detailed Hardware Information
|
||||
mpv # Incredible Video Player
|
||||
ncdu # Disk Usage Analyzer With Ncurses Interface
|
||||
nixfmt-rfc-style # Nix Formatter
|
||||
nwg-displays # configure monitor configs via GUI
|
||||
onefetch # provides zsaneyos build info on current system
|
||||
pavucontrol # For Editing Audio Levels & Devices
|
||||
pciutils # Collection Of Tools For Inspecting PCI Devices
|
||||
picard # For Changing Music Metadata & Getting Cover Art
|
||||
pkg-config # Wrapper Script For Allowing Packages To Get Info On Others
|
||||
playerctl # Allows Changing Media Volume Through Scripts
|
||||
rhythmbox # audio player
|
||||
ripgrep # Improved Grep
|
||||
socat # Needed For Screenshots
|
||||
unrar # Tool For Handling .rar Files
|
||||
unzip # Tool For Handling .zip Files
|
||||
usbutils # Good Tools For USB Devices
|
||||
uwsm # Universal Wayland Session Manager (optional must be enabled)
|
||||
v4l-utils # Used For Things Like OBS Virtual Camera
|
||||
warp-terminal # Terminal with AI support build in
|
||||
waypaper # Change wallpaper
|
||||
wget # Tool For Fetching Files With Links
|
||||
ytmdl # Tool For Downloading Audio From YouTube
|
||||
];
|
||||
environment.systemPackages = with pkgs;
|
||||
noctaliaPkgs
|
||||
++ [
|
||||
amfora # Fancy Terminal Browser For Gemini Protocol
|
||||
appimage-run # Needed For AppImage Support
|
||||
brave # Brave Browser
|
||||
brightnessctl # For Screen Brightness Control
|
||||
cliphist # Clipboard manager using rofi menu
|
||||
cmatrix # Matrix Movie Effect In Terminal
|
||||
cowsay # Great Fun Terminal Program
|
||||
discord # Stable client
|
||||
discord-canary # beta client
|
||||
docker-compose # Allows Controlling Docker From A Single File
|
||||
duf # Utility For Viewing Disk Usage In Terminal
|
||||
dysk # Disk space util nice formattting
|
||||
eza # Beautiful ls Replacement
|
||||
ffmpeg # Terminal Video / Audio Editing
|
||||
file-roller # Archive Manager
|
||||
gedit # Simple Graphical Text Editor
|
||||
gemini-cli # CLI AI client ONLY (optional)
|
||||
gimp # Great Photo Editor
|
||||
mesa-demos # needed for inxi diag util
|
||||
tuigreet # The Login Manager (Sometimes Referred To As Display Manager)
|
||||
htop # Simple Terminal Based System Monitor
|
||||
eog # For Image Viewing
|
||||
inxi # CLI System Information Tool
|
||||
killall # For Killing All Instances Of Programs
|
||||
libnotify # For Notifications
|
||||
lm_sensors # Used For Getting Hardware Temps
|
||||
lolcat # Add Colors To Your Terminal Command Output
|
||||
lshw # Detailed Hardware Information
|
||||
mdcat # CLI markdown parser
|
||||
mpv # Incredible Video Player
|
||||
ncdu # Disk Usage Analyzer With Ncurses Interface
|
||||
nixfmt-rfc-style # Nix Formatter
|
||||
nwg-displays # configure monitor configs via GUI
|
||||
onefetch # provides zsaneyos build info on current system
|
||||
pavucontrol # For Editing Audio Levels & Devices
|
||||
pciutils # Collection Of Tools For Inspecting PCI Devices
|
||||
picard # For Changing Music Metadata & Getting Cover Art
|
||||
pkg-config # Wrapper Script For Allowing Packages To Get Info On Others
|
||||
playerctl # Allows Changing Media Volume Through Scripts
|
||||
rhythmbox # audio player
|
||||
ripgrep # Improved Grep
|
||||
socat # Needed For Screenshots
|
||||
unrar # Tool For Handling .rar Files
|
||||
unzip # Tool For Handling .zip Files
|
||||
usbutils # Good Tools For USB Devices
|
||||
uwsm # Universal Wayland Session Manager (optional must be enabled)
|
||||
v4l-utils # Used For Things Like OBS Virtual Camera
|
||||
warp-terminal # Terminal with AI support build in
|
||||
waypaper # Change wallpaper
|
||||
wget # Tool For Fetching Files With Links
|
||||
ytmdl # Tool For Downloading Audio From YouTube
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ in
|
|||
};
|
||||
environment.variables = {
|
||||
NIXOS_OZONE_WL = "1";
|
||||
ZANEYOS_VERSION = "2.4.1";
|
||||
ZANEYOS_VERSION = "2.5.0";
|
||||
ZANEYOS = "true";
|
||||
};
|
||||
console.keyMap = "${consoleKeyMap}";
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ in
|
|||
useUserPackages = true;
|
||||
useGlobalPkgs = false;
|
||||
backupFileExtension = "backup";
|
||||
extraSpecialArgs = { inherit inputs username host profile; };
|
||||
extraSpecialArgs = { inherit inputs username host profile pkgs; };
|
||||
users.${username} = {
|
||||
imports = [ ./../home ];
|
||||
home = {
|
||||
|
|
|
|||
|
|
@ -16,8 +16,8 @@ in
|
|||
hardware.graphics = {
|
||||
extraPackages = with pkgs; [
|
||||
intel-media-driver
|
||||
vaapiIntel
|
||||
vaapiVdpau
|
||||
intel-vaapi-driver
|
||||
libva-vdpau-driver
|
||||
libvdpau-va-gl
|
||||
];
|
||||
};
|
||||
|
|
|
|||
139
modules/fix-emacs-iedit.sh
Executable file
|
|
@ -0,0 +1,139 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
# Repair iedit package corruption in Doom Emacs
|
||||
# Removes cached iedit repo and re-syncs Doom configuration
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
# Color codes and icons
|
||||
INFO="ℹ️"
|
||||
SUCCESS="✅"
|
||||
ERROR="❌"
|
||||
WARN="⚠️"
|
||||
LOADING="⏳"
|
||||
PROC="🔧"
|
||||
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[1;33m'
|
||||
NC='\033[0m' # No Color
|
||||
|
||||
# Helper functions
|
||||
info() {
|
||||
echo -e "${INFO} $1"
|
||||
}
|
||||
|
||||
success() {
|
||||
echo -e "${GREEN}${SUCCESS} $1${NC}"
|
||||
}
|
||||
|
||||
error() {
|
||||
echo -e "${RED}${ERROR} $1${NC}" >&2
|
||||
}
|
||||
|
||||
warn() {
|
||||
echo -e "${YELLOW}${WARN} $1${NC}"
|
||||
}
|
||||
|
||||
loading() {
|
||||
echo -e "${LOADING} $1"
|
||||
}
|
||||
|
||||
# Exit handler
|
||||
cleanup() {
|
||||
local exit_code=$?
|
||||
if [[ $exit_code -ne 0 ]]; then
|
||||
error "Script failed with exit code $exit_code"
|
||||
fi
|
||||
return $exit_code
|
||||
}
|
||||
|
||||
trap cleanup EXIT
|
||||
|
||||
# Main script
|
||||
echo ""
|
||||
info "Starting iedit package repair..."
|
||||
echo ""
|
||||
|
||||
# Verify emacs.d exists
|
||||
if [[ ! -d "$HOME/.emacs.d" ]]; then
|
||||
error "Emacs config directory not found: $HOME/.emacs.d"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Change to emacs directory
|
||||
info "Navigating to $HOME/.emacs.d"
|
||||
if ! cd "$HOME/.emacs.d" 2>/dev/null; then
|
||||
error "Failed to change to $HOME/.emacs.d"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Remove cached iedit repository
|
||||
loading "Removing cached iedit repository..."
|
||||
if [[ -d ".local/straight/repos/iedit" ]]; then
|
||||
if rm -rf ".local/straight/repos/iedit" 2>/dev/null; then
|
||||
success "Cleaned iedit cache"
|
||||
else
|
||||
error "Failed to remove iedit cache directory"
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
warn "iedit cache not found (already cleaned?)"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
|
||||
# Run doom upgrade
|
||||
loading "Running doom upgrade..."
|
||||
if command -v doom &>/dev/null; then
|
||||
if doom upgrade; then
|
||||
success "Doom upgrade completed"
|
||||
else
|
||||
error "Doom upgrade failed"
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
error "Doom command not found. Is Doom Emacs installed?"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo ""
|
||||
|
||||
# Run doom sync
|
||||
loading "Running doom sync..."
|
||||
if doom sync; then
|
||||
success "Doom sync completed"
|
||||
else
|
||||
error "Doom sync failed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo ""
|
||||
|
||||
# Restart Emacs service
|
||||
echo "${PROC} Restarting Emacs service..."
|
||||
loading "Killing existing Emacs processes..."
|
||||
pkill -9 emacs || true # Don't fail if no process found
|
||||
sleep 1
|
||||
|
||||
loading "Starting Emacs service..."
|
||||
if systemctl --user start emacs 2>/dev/null; then
|
||||
sleep 2
|
||||
|
||||
# Check status
|
||||
if systemctl --user is-active --quiet emacs; then
|
||||
success "Emacs service started successfully"
|
||||
systemctl --user status emacs
|
||||
else
|
||||
error "Emacs service failed to start"
|
||||
systemctl --user status emacs
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
error "Failed to start Emacs service"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo ""
|
||||
success "iedit repair complete!"
|
||||
exit 0
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
{ lib, ... }: {
|
||||
programs.alacritty =
|
||||
let
|
||||
font_family = lib.mkForce "Maple Mono NF";
|
||||
in
|
||||
{
|
||||
enable = true;
|
||||
settings = {
|
||||
font = {
|
||||
normal = {
|
||||
family = font_family;
|
||||
style = "Regular";
|
||||
};
|
||||
bold = {
|
||||
family = font_family;
|
||||
style = "Bold";
|
||||
};
|
||||
italic = {
|
||||
family = font_family;
|
||||
style = "Italic";
|
||||
};
|
||||
bold_italic = {
|
||||
family = font_family;
|
||||
style = "Bold Italic";
|
||||
};
|
||||
size = 15;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
37
modules/home/cli/git.nix
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
{ host, ... }:
|
||||
let
|
||||
inherit (import ../../../hosts/${host}/variables.nix) gitUsername gitEmail;
|
||||
in
|
||||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
user = {
|
||||
name = "${gitUsername}";
|
||||
email = "${gitEmail}";
|
||||
};
|
||||
|
||||
# FOSS-friendly settings
|
||||
push.default = "simple"; # Match modern push behavior
|
||||
credential.helper = "cache --timeout=7200";
|
||||
init.defaultBranch = "main"; # Set default new branches to 'main'
|
||||
log.decorate = "full"; # Show branch/tag info in git log
|
||||
log.date = "iso"; # ISO 8601 date format
|
||||
# Conflict resolution style for readable diffs
|
||||
merge.conflictStyle = "diff3";
|
||||
|
||||
# Optional: FOSS-friendly Git aliases
|
||||
alias = {
|
||||
br = "branch --sort=-committerdate";
|
||||
co = "checkout";
|
||||
df = "diff";
|
||||
com = "commit -a";
|
||||
gs = "stash";
|
||||
gp = "pull";
|
||||
lg = "log --graph --pretty=format:'%Cred%h%Creset - %C(yellow)%d%Creset %s %C(green)(%cr)%C(bold blue) <%an>%Creset' --abbrev-commit";
|
||||
st = "status";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,7 +1,10 @@
|
|||
{ host, ... }:
|
||||
let
|
||||
inherit (import ../../hosts/${host}/variables.nix)
|
||||
vars = import ../../hosts/${host}/variables.nix;
|
||||
inherit
|
||||
(vars)
|
||||
alacrittyEnable
|
||||
barChoice
|
||||
ghosttyEnable
|
||||
tmuxEnable
|
||||
waybarChoice
|
||||
|
|
@ -9,62 +12,95 @@ let
|
|||
vscodeEnable
|
||||
helixEnable
|
||||
doomEmacsEnable
|
||||
antigravityEnable
|
||||
;
|
||||
# Select bar module based on barChoice
|
||||
barModule =
|
||||
if barChoice == "noctalia"
|
||||
then ./noctalia.nix
|
||||
else waybarChoice;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
./amfora.nix
|
||||
./bash.nix
|
||||
./bashrc-personal.nix
|
||||
./bat.nix
|
||||
./btop.nix
|
||||
./bottom.nix
|
||||
./cava.nix
|
||||
./emoji.nix
|
||||
./eza.nix
|
||||
./fastfetch
|
||||
./fzf.nix
|
||||
./gh.nix
|
||||
./git.nix
|
||||
./gtk.nix
|
||||
./htop.nix
|
||||
./hyprland
|
||||
./kitty.nix
|
||||
./lazygit.nix
|
||||
./obs-studio.nix
|
||||
./nvf.nix
|
||||
./obs-studio.nix
|
||||
./rofi
|
||||
./qt.nix
|
||||
./scripts
|
||||
./scripts/gemini-cli.nix
|
||||
#./starship.nix
|
||||
#./starship-ddubs-1.nix
|
||||
./stylix.nix
|
||||
./swappy.nix
|
||||
./swaync.nix
|
||||
./tealdeer.nix
|
||||
./virtmanager.nix
|
||||
waybarChoice
|
||||
./wlogout
|
||||
./xdg.nix
|
||||
./yazi
|
||||
./zoxide.nix
|
||||
./zsh
|
||||
]
|
||||
++ (if helixEnable then [ ./evil-helix.nix ] else [ ])
|
||||
++ (if vscodeEnable then [ ./vscode.nix ] else [ ])
|
||||
++ (
|
||||
if doomEmacsEnable then
|
||||
[
|
||||
imports =
|
||||
[
|
||||
./amfora.nix
|
||||
./bash.nix
|
||||
./bashrc-personal.nix
|
||||
./cli/bat.nix
|
||||
./cli/btop.nix
|
||||
./cli/bottom.nix
|
||||
./cli/cava.nix
|
||||
./emoji.nix
|
||||
./eza.nix
|
||||
./fastfetch
|
||||
./cli/fzf.nix
|
||||
./cli/gh.nix
|
||||
./cli/git.nix
|
||||
./gtk.nix
|
||||
./cli/htop.nix
|
||||
./hyprland
|
||||
./terminals/kitty.nix
|
||||
./cli/lazygit.nix
|
||||
./obs-studio.nix
|
||||
#./editors/nvf.nix
|
||||
./editors/nixvim.nix
|
||||
./rofi
|
||||
./qt.nix
|
||||
./scripts
|
||||
./scripts/gemini-cli.nix
|
||||
./stylix.nix
|
||||
./swappy.nix
|
||||
./swaync.nix
|
||||
./tealdeer.nix
|
||||
./virtmanager.nix
|
||||
barModule
|
||||
./wlogout
|
||||
./xdg.nix
|
||||
./yazi
|
||||
./zoxide.nix
|
||||
./zsh
|
||||
]
|
||||
++ (
|
||||
if helixEnable
|
||||
then [ ./editors/evil-helix.nix ]
|
||||
else [ ]
|
||||
)
|
||||
++ (
|
||||
if vscodeEnable
|
||||
then [ ./editors/vscode.nix ]
|
||||
else [ ]
|
||||
)
|
||||
++ (
|
||||
if antigravityEnable
|
||||
then [ ./editors/antigravity.nix ]
|
||||
else [ ]
|
||||
)
|
||||
++ (
|
||||
if doomEmacsEnable
|
||||
then [
|
||||
./editors/doom-emacs-install.nix
|
||||
./editors/doom-emacs.nix
|
||||
]
|
||||
else
|
||||
[ ]
|
||||
)
|
||||
++ (if weztermEnable then [ ./wezterm.nix ] else [ ])
|
||||
++ (if ghosttyEnable then [ ./ghostty.nix ] else [ ])
|
||||
++ (if tmuxEnable then [ ./tmux.nix ] else [ ])
|
||||
++ (if alacrittyEnable then [ ./alacritty.nix ] else [ ]);
|
||||
else [ ]
|
||||
)
|
||||
++ (
|
||||
if weztermEnable
|
||||
then [ ./terminals/wezterm.nix ]
|
||||
else [ ]
|
||||
)
|
||||
++ (
|
||||
if ghosttyEnable
|
||||
then [ ./terminals/ghostty.nix ]
|
||||
else [ ]
|
||||
)
|
||||
++ (
|
||||
if tmuxEnable
|
||||
then [ ./terminals/tmux.nix ]
|
||||
else [ ]
|
||||
)
|
||||
++ (
|
||||
if alacrittyEnable
|
||||
then [ ./terminals/alacritty.nix ]
|
||||
else [ ]
|
||||
);
|
||||
}
|
||||
|
|
|
|||
6
modules/home/editors/antigravity.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{ pkgs, ... }: {
|
||||
# Google Antigravity IDE helper, exposed via antigravity-nix overlay as pkgs.google-antigravity
|
||||
home.packages = with pkgs; [
|
||||
google-antigravity
|
||||
];
|
||||
}
|
||||
465
modules/home/editors/nixvim.nix
Normal file
|
|
@ -0,0 +1,465 @@
|
|||
{
|
||||
inputs,
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
# Bring in Nixvim's Home Manager module so programs.nixvim options exist
|
||||
imports = [inputs.nixvim.homeModules.nixvim];
|
||||
|
||||
programs.nixvim = {
|
||||
enable = true;
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
|
||||
globals = {
|
||||
mapleader = " ";
|
||||
maplocalleader = " ";
|
||||
};
|
||||
|
||||
# Core editor options
|
||||
opts = {
|
||||
number = true;
|
||||
relativenumber = false;
|
||||
shiftwidth = 2;
|
||||
tabstop = 2;
|
||||
expandtab = true;
|
||||
smartindent = true;
|
||||
wrap = false;
|
||||
swapfile = false;
|
||||
termguicolors = true;
|
||||
signcolumn = "yes";
|
||||
updatetime = 200;
|
||||
cursorline = true;
|
||||
spell = true;
|
||||
spelllang = ["en"];
|
||||
# Send all yanks/deletes to the system clipboard (Wayland/X11)
|
||||
clipboard = "unnamedplus";
|
||||
};
|
||||
|
||||
# Theme: Catppuccin (mocha)
|
||||
colorschemes.catppuccin = {
|
||||
enable = true;
|
||||
settings = {
|
||||
flavour = "mocha";
|
||||
transparent_background = false;
|
||||
};
|
||||
};
|
||||
|
||||
plugins = {
|
||||
# UI and visuals
|
||||
web-devicons.enable = true;
|
||||
lualine = {
|
||||
enable = true;
|
||||
settings = {
|
||||
options = {theme = "catppuccin";};
|
||||
};
|
||||
};
|
||||
bufferline.enable = true;
|
||||
indent-blankline.enable = true;
|
||||
colorizer.enable = true;
|
||||
illuminate.enable = true;
|
||||
|
||||
# File tree (Neo-tree to match NVF)
|
||||
neo-tree = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
# Fuzzy finder
|
||||
telescope.enable = true;
|
||||
|
||||
# Treesitter for syntax/TS features
|
||||
treesitter.enable = true;
|
||||
treesitter-context.enable = false;
|
||||
|
||||
# Project management
|
||||
project-nvim.enable = true;
|
||||
|
||||
# Notifications and UI polish
|
||||
notify.enable = true;
|
||||
noice.enable = true;
|
||||
|
||||
# Startup dashboard
|
||||
alpha = {
|
||||
enable = true;
|
||||
theme = "dashboard"; # required by nixvim: either set a theme or a custom layout
|
||||
};
|
||||
|
||||
# Git integrations
|
||||
gitsigns.enable = true;
|
||||
diffview.enable = true;
|
||||
|
||||
# Motions and editing helpers
|
||||
hop.enable = true;
|
||||
leap.enable = true;
|
||||
vim-surround.enable = true;
|
||||
comment.enable = true;
|
||||
which-key.enable = true;
|
||||
|
||||
# Autopairs for (), {}, [], '', "", etc.
|
||||
nvim-autopairs = {
|
||||
enable = true;
|
||||
settings = {
|
||||
check_ts = true; # leverage Treesitter for smarter pairing
|
||||
enable_check_bracket_line = false;
|
||||
fast_wrap = {
|
||||
enable = true;
|
||||
map = "<M-e>"; # Alt+e to fast-wrap
|
||||
chars = ["{" "[" "(" "\"" "'" "`"];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Terminal
|
||||
toggleterm = {
|
||||
enable = true;
|
||||
settings = {direction = "float";};
|
||||
};
|
||||
|
||||
# Diagnostics UI
|
||||
trouble.enable = true;
|
||||
|
||||
# Markdown preview
|
||||
markdown-preview.enable = true;
|
||||
|
||||
# Completion and snippets
|
||||
cmp = {
|
||||
enable = true;
|
||||
};
|
||||
# Completion sources for LSP, buffer, path, and snippets
|
||||
cmp-nvim-lsp.enable = true;
|
||||
cmp-buffer.enable = true;
|
||||
cmp-path.enable = true;
|
||||
cmp_luasnip.enable = true;
|
||||
|
||||
luasnip.enable = true;
|
||||
friendly-snippets.enable = true;
|
||||
|
||||
# Signature help while typing function params
|
||||
lsp-signature.enable = true;
|
||||
|
||||
# LSP configuration
|
||||
lsp = {
|
||||
enable = true;
|
||||
servers = {
|
||||
nil_ls.enable = true;
|
||||
lua_ls.enable = true;
|
||||
pyright.enable = true;
|
||||
ts_ls.enable = true;
|
||||
html.enable = true;
|
||||
cssls.enable = true;
|
||||
clangd.enable = true;
|
||||
zls.enable = true;
|
||||
marksman.enable = true;
|
||||
hyprls.enable = true;
|
||||
# hyprls is optional; keep tools available via extraPackages
|
||||
};
|
||||
keymaps = {
|
||||
diagnostic = {
|
||||
"<leader>dl" = "open_float";
|
||||
"[d" = "goto_prev";
|
||||
"]d" = "goto_next";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Formatter: conform.nvim (Prettierd, Stylua, etc.)
|
||||
conform-nvim = {
|
||||
enable = true;
|
||||
settings = {
|
||||
formatters_by_ft = {
|
||||
nix = ["nixpkgs_fmt"];
|
||||
lua = ["stylua"];
|
||||
javascript = ["prettierd"];
|
||||
typescript = ["prettierd"];
|
||||
javascriptreact = ["prettierd"];
|
||||
typescriptreact = ["prettierd"];
|
||||
css = ["prettierd"];
|
||||
html = ["prettierd"];
|
||||
markdown = ["prettierd"];
|
||||
sh = ["shfmt"];
|
||||
};
|
||||
format_on_save = {
|
||||
lsp_fallback = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Keymaps aligned with your NVF setup
|
||||
keymaps = [
|
||||
# Insert-mode escape
|
||||
{
|
||||
key = "jk";
|
||||
mode = ["i"];
|
||||
action = "<ESC>";
|
||||
options.desc = "Exit insert mode";
|
||||
}
|
||||
|
||||
# Telescope
|
||||
{
|
||||
key = "<leader>ff";
|
||||
mode = ["n"];
|
||||
action = "<cmd>Telescope find_files<cr>";
|
||||
options.desc = "Search files by name";
|
||||
}
|
||||
{
|
||||
key = "<leader>lg";
|
||||
mode = ["n"];
|
||||
action = "<cmd>Telescope live_grep<cr>";
|
||||
options.desc = "Search files by contents";
|
||||
}
|
||||
|
||||
# File tree (Neo-tree)
|
||||
{
|
||||
key = "<leader>fe";
|
||||
mode = ["n"];
|
||||
action = "<cmd>Neotree toggle<cr>";
|
||||
options.desc = "File browser toggle";
|
||||
}
|
||||
|
||||
# Terminal
|
||||
{
|
||||
key = "<leader>t";
|
||||
mode = ["n"];
|
||||
action = "<cmd>ToggleTerm<CR>";
|
||||
options.desc = "Toggle terminal";
|
||||
}
|
||||
|
||||
# Comment line (Doom Emacs style)
|
||||
{
|
||||
key = "<leader>.";
|
||||
mode = ["n"];
|
||||
action = "<cmd>lua require('Comment.api').toggle.linewise.current()<CR>";
|
||||
options.desc = "Comment line";
|
||||
}
|
||||
{
|
||||
key = "<leader>.";
|
||||
mode = ["v"];
|
||||
action = "<esc><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<CR>";
|
||||
options.desc = "Comment selection";
|
||||
}
|
||||
|
||||
# Diagnostics
|
||||
{
|
||||
key = "<leader>dj";
|
||||
mode = ["n"];
|
||||
action = "<cmd>lua vim.diagnostic.goto_next()<CR>";
|
||||
options.desc = "Go to next diagnostic";
|
||||
}
|
||||
{
|
||||
key = "<leader>dk";
|
||||
mode = ["n"];
|
||||
action = "<cmd>lua vim.diagnostic.goto_prev()<CR>";
|
||||
options.desc = "Go to previous diagnostic";
|
||||
}
|
||||
{
|
||||
key = "<leader>dl";
|
||||
mode = ["n"];
|
||||
action = "<cmd>lua vim.diagnostic.open_float()<CR>";
|
||||
options.desc = "Show diagnostic details";
|
||||
}
|
||||
{
|
||||
key = "<leader>dt";
|
||||
mode = ["n"];
|
||||
action = "<cmd>Trouble diagnostics toggle<cr>";
|
||||
options.desc = "Toggle diagnostics list";
|
||||
}
|
||||
|
||||
# Disable accidental F1 across modes
|
||||
{
|
||||
key = "<F1>";
|
||||
mode = ["n" "i" "v" "x" "s" "o" "t" "c"];
|
||||
action = "<Nop>";
|
||||
options.desc = "Disable accidental F1 help";
|
||||
}
|
||||
# Help mappings
|
||||
{
|
||||
key = "<leader>h";
|
||||
mode = ["n"];
|
||||
action = ":help<Space>";
|
||||
options = {
|
||||
desc = "Open :help prompt";
|
||||
nowait = true;
|
||||
};
|
||||
}
|
||||
{
|
||||
key = "<leader>H";
|
||||
mode = ["n"];
|
||||
action = ":help <C-r><C-w><CR>";
|
||||
options.desc = "Help for word under cursor";
|
||||
}
|
||||
];
|
||||
|
||||
# Runtime tools and language servers
|
||||
extraPackages = with pkgs; [
|
||||
ripgrep
|
||||
fd
|
||||
bat
|
||||
# Wayland clipboard provider used by Neovim for system clipboard access
|
||||
wl-clipboard
|
||||
lazygit
|
||||
nil
|
||||
hyprls
|
||||
nodePackages.typescript-language-server
|
||||
nodePackages.typescript
|
||||
vscode-langservers-extracted
|
||||
pyright
|
||||
lua-language-server
|
||||
zls
|
||||
marksman
|
||||
clang-tools
|
||||
prettierd
|
||||
stylua
|
||||
shfmt
|
||||
nixpkgs-fmt
|
||||
figlet
|
||||
toilet
|
||||
];
|
||||
|
||||
# Diagnostic UI and notify background tweaks
|
||||
extraConfigLua = ''
|
||||
-- Inline diagnostics (virtual text) similar to NVF virtual_lines
|
||||
vim.diagnostic.config({
|
||||
virtual_text = { prefix = "●", spacing = 2 },
|
||||
update_in_insert = true,
|
||||
severity_sort = true,
|
||||
underline = true,
|
||||
signs = true,
|
||||
})
|
||||
|
||||
-- Basic LSP keymaps when LSP attaches
|
||||
local function lsp_on_attach(_, bufnr)
|
||||
local map = function(mode, lhs, rhs, desc)
|
||||
vim.keymap.set(mode, lhs, rhs, { buffer = bufnr, desc = desc })
|
||||
end
|
||||
map('n', 'K', vim.lsp.buf.hover, 'Hover docs')
|
||||
map('n', 'gd', vim.lsp.buf.definition, 'Goto definition')
|
||||
map('n', 'gD', vim.lsp.buf.declaration, 'Goto declaration')
|
||||
map('n', 'gi', vim.lsp.buf.implementation, 'Goto implementation')
|
||||
map('n', 'gr', vim.lsp.buf.references, 'References')
|
||||
map('n', '<leader>rn', vim.lsp.buf.rename, 'Rename symbol')
|
||||
map('n', '<leader>ca', vim.lsp.buf.code_action, 'Code action')
|
||||
end
|
||||
|
||||
-- If nixvim exposes a hook, register it; otherwise set a global autocmd
|
||||
if vim.g.__nixvim_lsp_attached ~= true then
|
||||
vim.g.__nixvim_lsp_attached = true
|
||||
vim.api.nvim_create_autocmd('LspAttach', {
|
||||
callback = function(args)
|
||||
local bufnr = args.buf
|
||||
lsp_on_attach(nil, bufnr)
|
||||
end,
|
||||
})
|
||||
end
|
||||
|
||||
-- Notify background using Stylix palette
|
||||
local ok, notify = pcall(require, 'notify')
|
||||
if ok then
|
||||
notify.setup({ background_colour = "#${config.lib.stylix.colors.base01}" })
|
||||
vim.notify = notify
|
||||
end
|
||||
|
||||
-- nvim-cmp setup: sources + mappings + snippet expansion
|
||||
do
|
||||
local ok_cmp, cmp = pcall(require, "cmp")
|
||||
if ok_cmp then
|
||||
local ok_snip, luasnip = pcall(require, "luasnip")
|
||||
if ok_snip then
|
||||
-- Load friendly-snippets lazily if available
|
||||
pcall(function()
|
||||
require("luasnip.loaders.from_vscode").lazy_load()
|
||||
end)
|
||||
end
|
||||
cmp.setup({
|
||||
snippet = {
|
||||
expand = function(args)
|
||||
if ok_snip then luasnip.lsp_expand(args.body) end
|
||||
end,
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<CR>"] = cmp.mapping.confirm({ select = true }),
|
||||
["<Tab>"] = cmp.mapping.select_next_item(),
|
||||
["<S-Tab>"] = cmp.mapping.select_prev_item(),
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip" },
|
||||
}, {
|
||||
{ name = "path" },
|
||||
{ name = "buffer" },
|
||||
}),
|
||||
})
|
||||
-- nvim-cmp integration with nvim-autopairs (optional)
|
||||
local ok_ap, cmp_autopairs = pcall(require, "nvim-autopairs.completion.cmp")
|
||||
if ok_ap then
|
||||
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Startup dashboard (alpha-nvim)
|
||||
do
|
||||
local ok_alpha, alpha = pcall(require, "alpha")
|
||||
if ok_alpha then
|
||||
local dashboard = require("alpha.themes.dashboard")
|
||||
|
||||
-- Prefer generating the header with toilet (ansi-shadow), then figlet; fall back if unavailable
|
||||
local header_lines = nil
|
||||
local function gen_banner(cmd)
|
||||
local h = io.popen(cmd)
|
||||
if not h then return nil end
|
||||
local out = h:read("*a") or ""
|
||||
h:close()
|
||||
if #out == 0 then return nil end
|
||||
local lines = {}
|
||||
for line in out:gmatch("([^\n]*)\n?") do
|
||||
if line ~= "" then table.insert(lines, line) end
|
||||
end
|
||||
return #lines > 0 and lines or nil
|
||||
end
|
||||
|
||||
header_lines = gen_banner('toilet -f ansi-shadow NIXOS 2>/dev/null')
|
||||
or gen_banner('figlet -f "ANSI Shadow" NIXOS 2>/dev/null')
|
||||
or gen_banner('figlet NIXOS 2>/dev/null')
|
||||
|
||||
if not header_lines then
|
||||
header_lines = {
|
||||
" _ _ ___ __ __ ___ ___ ____ ",
|
||||
"| \\ | |_ _| \\ \\/ / / _ \\ / _ \\\ | _ \\ ",
|
||||
"| \\| || | \\ / | | | | | | || | | |",
|
||||
"| |\\ || | / \\ | |_| | |_| || |_| |",
|
||||
"|_| \\_|___| /_/\\_\\ \\___/ \\___/ |____/ ",
|
||||
}
|
||||
end
|
||||
dashboard.section.header.val = header_lines
|
||||
|
||||
dashboard.section.buttons.val = {
|
||||
dashboard.button("f", " Find file", ":Telescope find_files<CR>"),
|
||||
dashboard.button("r", " Recent files", ":Telescope oldfiles<CR>"),
|
||||
dashboard.button("g", " Live grep", ":Telescope live_grep<CR>"),
|
||||
dashboard.button("n", " New file", ":enew<CR>"),
|
||||
dashboard.button("e", " File browser", ":Neotree toggle<CR>"),
|
||||
dashboard.button("q", " Quit", ":qa<CR>"),
|
||||
}
|
||||
|
||||
local v = vim.version()
|
||||
dashboard.section.footer.val = string.format("NixVim • Neovim %d.%d.%d", v.major, v.minor, v.patch)
|
||||
|
||||
dashboard.opts.opts.noautocmd = true
|
||||
alpha.setup(dashboard.config)
|
||||
|
||||
-- Disable folding in alpha buffer
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = "alpha",
|
||||
callback = function()
|
||||
vim.opt_local.foldenable = false
|
||||
end,
|
||||
})
|
||||
end
|
||||
end
|
||||
'';
|
||||
};
|
||||
}
|
||||
93
modules/home/editors/vscode.nix
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (pkgs.lib) attrByPath;
|
||||
|
||||
# Optional versions; set these to real versions to enable marketplace fetches.
|
||||
hyprlangVer = "0.0.3"; # fireblast.hyprlang-vscode
|
||||
hyprlsVer = "0.1.2"; # ewen-lbh.vscode-hyprls
|
||||
neroHyprlandVer = "0.0.2"; # amarcos1337.nero-hyprland
|
||||
codeRunnerVer = "0.12.4"; # formulahendry.code-runner
|
||||
|
||||
# Helper: prefer Open VSX (pkgs.vscode-extensions). If missing and a version is
|
||||
# provided, fetch from the VSCode Marketplace using extensionsFromVscodeMarketplace.
|
||||
extOrMarketplace = {
|
||||
publisher,
|
||||
name,
|
||||
version ? null,
|
||||
sha256 ? null,
|
||||
}: let
|
||||
fromOpenVSX = attrByPath [publisher name] null pkgs.vscode-extensions;
|
||||
in
|
||||
if fromOpenVSX != null
|
||||
then [fromOpenVSX]
|
||||
else if version == null
|
||||
then []
|
||||
else
|
||||
pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
||||
{
|
||||
inherit name publisher version;
|
||||
sha256 =
|
||||
if sha256 == null
|
||||
then pkgs.lib.fakeSha256
|
||||
else sha256;
|
||||
}
|
||||
];
|
||||
|
||||
hyprlangExts = extOrMarketplace {
|
||||
publisher = "fireblast";
|
||||
name = "hyprlang-vscode";
|
||||
version = hyprlangVer;
|
||||
sha256 = "sha256-iMCyomgMGGUXaVqq1l7bgyvFgZa/W/eWHaqkA5RmExE=";
|
||||
};
|
||||
hyprlsExts = extOrMarketplace {
|
||||
publisher = "ewen-lbh";
|
||||
name = "vscode-hyprls";
|
||||
version = hyprlsVer;
|
||||
sha256 = "sha256-pTg8ZyfhZj31Rv8gxhPbQ+CYzb5MXYdaI46JQHPU9ng=";
|
||||
};
|
||||
neroHyprlandExts = extOrMarketplace {
|
||||
publisher = "amarcos1337";
|
||||
name = "nero-hyprland";
|
||||
version = neroHyprlandVer;
|
||||
sha256 = "sha256-3RiSYmJK/xODCvUi9c2xtvEIWSBABVHk6QYCAFoqsa8=";
|
||||
};
|
||||
codeRunnerExts = extOrMarketplace {
|
||||
publisher = "formulahendry";
|
||||
name = "code-runner";
|
||||
version = codeRunnerVer;
|
||||
sha256 = pkgs.lib.fakeSha256;
|
||||
};
|
||||
in {
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
profiles = {
|
||||
default = {
|
||||
extensions =
|
||||
(with pkgs.vscode-extensions; [
|
||||
catppuccin.catppuccin-vsc
|
||||
bbenoist.nix
|
||||
kamadorueda.alejandra
|
||||
jeff-hykin.better-nix-syntax
|
||||
ms-vscode.cpptools-extension-pack
|
||||
vscodevim.vim
|
||||
mads-hartmann.bash-ide-vscode
|
||||
tamasfe.even-better-toml
|
||||
zainchen.json
|
||||
shd101wyy.markdown-preview-enhanced
|
||||
])
|
||||
++ hyprlangExts
|
||||
++ hyprlsExts
|
||||
++ neroHyprlandExts
|
||||
++ codeRunnerExts;
|
||||
userSettings = lib.mkForce {
|
||||
"workbench.colorTheme" = "Nero Hyprland";
|
||||
"workbench.iconTheme" = "catppuccin-mocha";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
}
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
{ host, ... }:
|
||||
let
|
||||
inherit (import ../../hosts/${host}/variables.nix) gitUsername gitEmail;
|
||||
in
|
||||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = "${gitUsername}";
|
||||
userEmail = "${gitEmail}";
|
||||
|
||||
extraConfig = {
|
||||
# FOSS-friendly settings
|
||||
push.default = "simple"; # Match modern push behavior
|
||||
credential.helper = "cache --timeout=7200";
|
||||
init.defaultBranch = "main"; # Set default new branches to 'main'
|
||||
log.decorate = "full"; # Show branch/tag info in git log
|
||||
log.date = "iso"; # ISO 8601 date format
|
||||
# Conflict resolution style for readable diffs
|
||||
merge.conflictStyle = "diff3";
|
||||
};
|
||||
# Optional: FOSS-friendly Git aliases
|
||||
aliases = {
|
||||
br = "branch --sort=-committerdate";
|
||||
co = "checkout";
|
||||
df = "diff";
|
||||
com = "commit -a";
|
||||
gs = "stash";
|
||||
gp = "pull";
|
||||
lg = "log --graph --pretty=format:'%Cred%h%Creset - %C(yellow)%d%Creset %s %C(green)(%cr)%C(bold blue) <%an>%Creset' --abbrev-commit";
|
||||
st = "status";
|
||||
};
|
||||
};
|
||||
}
|
||||
41
modules/home/hyprland/animations-end-slide.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{host, ...}: let
|
||||
inherit
|
||||
(import ../../../hosts/${host}/variables.nix)
|
||||
;
|
||||
in {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
# Name: END-4-slide Modified to better support Hyprtrails
|
||||
# Credit: END-4 project https://github.com/end-4/dots-hyprland
|
||||
animations = {
|
||||
enabled = true;
|
||||
bezier = [
|
||||
"linear, 0, 0, 1, 1"
|
||||
"md3_standard, 0.2, 0, 0, 1"
|
||||
"md3_decel, 0.05, 0.7, 0.1, 1"
|
||||
"md3_accel, 0.3, 0, 0.8, 0.15"
|
||||
"overshot, 0.05, 0.9, 0.1, 1.1"
|
||||
"crazyshot, 0.1, 1.5, 0.76, 0.92 "
|
||||
"hyprnostretch, 0.05, 0.9, 0.1, 1.0"
|
||||
"menu_decel, 0.1, 1, 0, 1"
|
||||
"menu_accel, 0.38, 0.04, 1, 0.07"
|
||||
"easeInOutCirc, 0.85, 0, 0.15, 1"
|
||||
"easeOutCirc, 0, 0.55, 0.45, 1"
|
||||
"easeOutExpo, 0.16, 1, 0.3, 1"
|
||||
"softAcDecel, 0.26, 0.26, 0.15, 1"
|
||||
"md2, 0.4, 0, 0.2, 1 # use with .2s duration"
|
||||
];
|
||||
animation = [
|
||||
"windows, 1, 3, md3_decel, slide"
|
||||
"windowsIn, 1, 3, md3_decel, slide"
|
||||
"windowsOut, 1, 3, md3_accel, slide"
|
||||
"border, 1, 10, default"
|
||||
"fade, 1, 3, md3_decel"
|
||||
"layersIn, 1, 3, menu_decel, slide"
|
||||
"layersOut, 1, 1.6, menu_accel"
|
||||
"fadeLayersIn, 1, 2, menu_decel"
|
||||
"fadeLayersOut, 1, 4.5, menu_accel"
|
||||
"workspaces, 1, 7, menu_decel, slide"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
41
modules/home/hyprland/animations-end4-slide.nix
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
{host, ...}: let
|
||||
inherit
|
||||
(import ../../../hosts/${host}/variables.nix)
|
||||
;
|
||||
in {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
# Name: END-4-slide Modified to better support Hyprtrails
|
||||
# Credit: END-4 project https://github.com/end-4/dots-hyprland
|
||||
animations = {
|
||||
enabled = true;
|
||||
bezier = [
|
||||
"linear, 0, 0, 1, 1"
|
||||
"md3_standard, 0.2, 0, 0, 1"
|
||||
"md3_decel, 0.05, 0.7, 0.1, 1"
|
||||
"md3_accel, 0.3, 0, 0.8, 0.15"
|
||||
"overshot, 0.05, 0.9, 0.1, 1.1"
|
||||
"crazyshot, 0.1, 1.5, 0.76, 0.92 "
|
||||
"hyprnostretch, 0.05, 0.9, 0.1, 1.0"
|
||||
"menu_decel, 0.1, 1, 0, 1"
|
||||
"menu_accel, 0.38, 0.04, 1, 0.07"
|
||||
"easeInOutCirc, 0.85, 0, 0.15, 1"
|
||||
"easeOutCirc, 0, 0.55, 0.45, 1"
|
||||
"easeOutExpo, 0.16, 1, 0.3, 1"
|
||||
"softAcDecel, 0.26, 0.26, 0.15, 1"
|
||||
"md2, 0.4, 0, 0.2, 1 # use with .2s duration"
|
||||
];
|
||||
animation = [
|
||||
"windows, 1, 3, md3_decel, slide"
|
||||
"windowsIn, 1, 3, md3_decel, slide"
|
||||
"windowsOut, 1, 3, md3_accel, slide"
|
||||
"border, 1, 10, default"
|
||||
"fade, 1, 3, md3_decel"
|
||||
"layersIn, 1, 3, menu_decel, slide"
|
||||
"layersOut, 1, 1.6, menu_accel"
|
||||
"fadeLayersIn, 1, 2, menu_decel"
|
||||
"fadeLayersOut, 1, 4.5, menu_accel"
|
||||
"workspaces, 1, 7, menu_decel, slide"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
45
modules/home/hyprland/animations-hyde-optimized.nix
Normal file
|
|
@ -0,0 +1,45 @@
|
|||
{host, ...}: let
|
||||
inherit
|
||||
(import ../../../hosts/${host}/variables.nix)
|
||||
;
|
||||
in {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
animations = {
|
||||
enabled = true;
|
||||
bezier = [
|
||||
"wind, 0.05, 0.85, 0.03, 0.97"
|
||||
"winIn, 0.07, 0.88, 0.04, 0.99"
|
||||
"winOut, 0.20, -0.15, 0, 1"
|
||||
"liner, 1, 1, 1, 1"
|
||||
"md3_standard, 0.12, 0, 0, 1"
|
||||
"md3_decel, 0.05, 0.80, 0.10, 0.97"
|
||||
"md3_accel, 0.20, 0, 0.80, 0.08"
|
||||
"overshot, 0.05, 0.85, 0.07, 1.04"
|
||||
"crazyshot, 0.1, 1.22, 0.68, 0.98"
|
||||
"hyprnostretch, 0.05, 0.82, 0.03, 0.94"
|
||||
"menu_decel, 0.05, 0.82, 0, 1"
|
||||
"menu_accel, 0.20, 0, 0.82, 0.10"
|
||||
"easeInOutCirc, 0.75, 0, 0.15, 1"
|
||||
"easeOutCirc, 0, 0.48, 0.38, 1"
|
||||
"easeOutExpo, 0.10, 0.94, 0.23, 0.98"
|
||||
"softAcDecel, 0.20, 0.20, 0.15, 1"
|
||||
"md2, 0.30, 0, 0.15, 1"
|
||||
"OutBack, 0.28, 1.40, 0.58, 1"
|
||||
];
|
||||
animation = [
|
||||
"border, 1, 1.6, liner"
|
||||
"borderangle, 1, 82, liner, once"
|
||||
"windowsIn, 1, 3.2, winIn, slide"
|
||||
"windowsOut, 1, 2.8, easeOutCirc"
|
||||
"windowsMove, 1, 3.0, wind, slide"
|
||||
"fade, 1, 1.8, md3_decel"
|
||||
"layersIn, 1, 1.8, menu_decel, slide"
|
||||
"layersOut, 1, 1.5, menu_accel"
|
||||
"fadeLayersIn, 1, 1.6, menu_decel"
|
||||
"fadeLayersOut, 1, 1.8, menu_accel"
|
||||
"workspaces, 1, 4.0, menu_decel, slide"
|
||||
"specialWorkspace, 1, 2.3, md3_decel, slidefadevert 15%"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
47
modules/home/hyprland/animations-mahaveer-me-1.nix
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
{host, ...}: let
|
||||
inherit
|
||||
(import ../../../hosts/${host}/variables.nix)
|
||||
;
|
||||
in {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
animations = {
|
||||
enabled = true;
|
||||
bezier = [
|
||||
"wind, 0.05, 0.9, 0.1, 1.05"
|
||||
"winIn, 0.1, 1.1, 0.1, 1.1"
|
||||
"winOut, 0.3, -0.3, 0, 1"
|
||||
"liner, 1, 1, 1, 1"
|
||||
"md3_standard, 0.2, 0, 0, 1"
|
||||
"md3_decel, 0.05, 0.7, 0.1, 1"
|
||||
"md3_accel, 0.3, 0, 0.8, 0.15"
|
||||
"overshot, 0.05, 0.9, 0.1, 1.1"
|
||||
"crazyshot, 0.1, 1.5, 0.76, 0.92"
|
||||
"hyprnostretch, 0.05, 0.9, 0.1, 1.0"
|
||||
"menu_decel, 0.1, 1, 0, 1"
|
||||
"menu_accel, 0.38, 0.04, 1, 0.07"
|
||||
"easeInOutCirc, 0.85, 0, 0.15, 1"
|
||||
"easeOutCirc, 0, 0.55, 0.45, 1"
|
||||
"easeOutExpo, 0.16, 1, 0.3, 1"
|
||||
"softAcDecel, 0.26, 0.26, 0.15, 1"
|
||||
"md2, 0.4, 0, 0.2, 1"
|
||||
];
|
||||
animation = [
|
||||
"border, 1, 1, liner"
|
||||
"borderangle, 1, 30, liner, once"
|
||||
"windows, 1, 6, wind, slide"
|
||||
"windowsIn, 1, 6, winIn, slide"
|
||||
"windowsOut, 1, 5, winOut, slide"
|
||||
"windowsMove, 1, 5, wind, slide"
|
||||
"fade, 1, 3, md3_decel"
|
||||
"layersIn, 1, 3, menu_decel, slide"
|
||||
"layersOut, 1, 1.6, menu_accel"
|
||||
"fadeLayersIn, 1, 2, menu_decel"
|
||||
"fadeLayersOut, 1, 4.5, menu_accel"
|
||||
"workspaces, 1, 7, menu_decel, slide"
|
||||
"workspaces, 1, 5, wind"
|
||||
"specialWorkspace, 1, 3, md3_decel, slidefadevert 15%"
|
||||
"specialWorkspace, 1, 3, md3_decel, slidevert"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
32
modules/home/hyprland/animations-mahaveer-me-2.nix
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
{host, ...}: let
|
||||
inherit
|
||||
(import ../../../hosts/${host}/variables.nix)
|
||||
;
|
||||
in {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
animations = {
|
||||
enabled = true;
|
||||
bezier = [
|
||||
"wind, 0.05, 0.9, 0.1, 1.05"
|
||||
"winIn, 0.1, 1.1, 0.1, 1.1"
|
||||
"winOut, 0.3, -0.3, 0, 1"
|
||||
"liner, 1, 1, 1, 1"
|
||||
"overshot, 0.05, 0.9, 0.1, 1.05"
|
||||
"smoothOut, 0.5, 0, 0.99, 0.99"
|
||||
"smoothIn, 0.5, -0.5, 0.68, 1.5"
|
||||
];
|
||||
animation = [
|
||||
"windows, 1, 6, wind, slide"
|
||||
"windowsIn, 1, 5, winIn, slide"
|
||||
"windowsOut, 1, 3, smoothOut, slide"
|
||||
"windowsMove, 1, 5, wind, slide"
|
||||
"border, 1, 1, liner"
|
||||
"borderangle, 1, 180, liner, loop"
|
||||
"fade, 1, 3, smoothOut"
|
||||
"workspaces, 1, 5, overshot"
|
||||
"workspacesIn, 1, 5, winIn, slide"
|
||||
"workspacesOut, 1, 5, winOut, slide"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
22
modules/home/hyprland/animations-ml4w-classic.nix
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
{host, ...}: let
|
||||
inherit
|
||||
(import ../../../hosts/${host}/variables.nix)
|
||||
;
|
||||
in {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
animations = {
|
||||
enabled = true;
|
||||
bezier = [
|
||||
"myBezier, 0.05, 0.9, 0.1, 1.05"
|
||||
];
|
||||
animation = [
|
||||
"windows, 1, 7, myBezier"
|
||||
"windowsOut, 1, 7, default, popin 80%"
|
||||
"border, 1, 10, default"
|
||||
"borderangle, 1, 8, default"
|
||||
"fade, 1, 7, default"
|
||||
"workspaces, 1, 6, default"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
31
modules/home/hyprland/animations-ml4w-fast.nix
Normal file
|
|
@ -0,0 +1,31 @@
|
|||
{host, ...}: let
|
||||
inherit
|
||||
(import ../../../hosts/${host}/variables.nix)
|
||||
;
|
||||
in {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
animations = {
|
||||
enabled = true;
|
||||
bezier = [
|
||||
"linear, 0, 0, 1, 1"
|
||||
"md3_standard, 0.2, 0, 0, 1"
|
||||
"md3_decel, 0.05, 0.7, 0.1, 1"
|
||||
"md3_accel, 0.3, 0, 0.8, 0.15"
|
||||
"overshot, 0.05, 0.9, 0.1, 1.1"
|
||||
"crazyshot, 0.1, 1.5, 0.76, 0.92"
|
||||
"hyprnostretch, 0.05, 0.9, 0.1, 1.0"
|
||||
"fluent_decel, 0.1, 1, 0, 1"
|
||||
"easeInOutCirc, 0.85, 0, 0.15, 1"
|
||||
"easeOutCirc, 0, 0.55, 0.45, 1"
|
||||
"easeOutExpo, 0.16, 1, 0.3, 1"
|
||||
];
|
||||
animation = [
|
||||
"windows, 1, 3, md3_decel, popin 60%"
|
||||
"border, 1, 10, default"
|
||||
"fade, 1, 2.5, md3_decel"
|
||||
"workspaces, 1, 3.5, easeOutExpo, slide"
|
||||
"specialWorkspace, 1, 3, md3_decel, slidevert"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
27
modules/home/hyprland/animations-ml4w-high.nix
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
{host, ...}: let
|
||||
inherit
|
||||
(import ../../../hosts/${host}/variables.nix)
|
||||
;
|
||||
in {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
animations = {
|
||||
enabled = true;
|
||||
bezier = [
|
||||
"wind, 0.05, 0.9, 0.1, 1.05"
|
||||
"winIn, 0.1, 1.1, 0.1, 1.1"
|
||||
"winOut, 0.3, -0.3, 0, 1"
|
||||
"liner, 1, 1, 1, 1"
|
||||
];
|
||||
animation = [
|
||||
"windows, 1, 6, wind, slide"
|
||||
"windowsIn, 1, 6, winIn, slide"
|
||||
"windowsOut, 1, 5, winOut, slide"
|
||||
"windowsMove, 1, 5, wind, slide"
|
||||
"border, 1, 1, liner"
|
||||
"borderangle, 1, 30, liner, once"
|
||||
"fade, 1, 10, default"
|
||||
"workspaces, 1, 5, wind"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,105 +1,146 @@
|
|||
{ host, ... }:
|
||||
let
|
||||
{host, ...}: let
|
||||
vars = import ../../../hosts/${host}/variables.nix;
|
||||
inherit
|
||||
(import ../../../hosts/${host}/variables.nix)
|
||||
(vars)
|
||||
barChoice
|
||||
browser
|
||||
terminal
|
||||
;
|
||||
in
|
||||
{
|
||||
# Noctalia-specific bindings (only included when barChoice == "noctalia")
|
||||
noctaliaBind =
|
||||
if barChoice == "noctalia"
|
||||
then [
|
||||
"$modifier,D, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle"
|
||||
"$modifier SHIFT,Return, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle"
|
||||
"$modifier,M, Noctalia Notifications, exec, qs -c noctalia-shell ipc call notifications toggle"
|
||||
"$modifier,V, Noctalia Clipboard, exec, qs -c noctalia-shell ipc call launcher clipboard"
|
||||
"$modifier ALT,P, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle"
|
||||
"$modifier SHIFT,comma, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle"
|
||||
"$modifier ALT,L, Noctalia Lock Screen, exec, qs -c noctalia-shell ipc call sessionMenu lockAndSuspend"
|
||||
"$modifier SHIFT,Y, Noctalia Wallpaper, exec, qs -c noctalia-shell ipc call wallpaper toggle"
|
||||
"$modifier,X, Noctalia Power Menu, exec, dms qs -c noctalia-shell ipc call sessionMenu toggle"
|
||||
"$modifier,C, Noctalia Control Center, exec, qs -c noctalia-shell ipc call controlCenter toggle"
|
||||
"$modifier CTRL,R, Noctalia Screen Recorder, exec, qs -c noctalia-shell ipc call screenRecorder toggle"
|
||||
]
|
||||
else [];
|
||||
# Rofi launcher bindings (only included when barChoice != "noctalia")
|
||||
rofiBind =
|
||||
if barChoice != "noctalia"
|
||||
then [
|
||||
"$modifier,D, Rofi Launcher, exec, rofi-launcher"
|
||||
"$modifier SHIFT,Return, Rofi Launcher, exec, rofi-launcher"
|
||||
]
|
||||
else [];
|
||||
in {
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
bind = [
|
||||
"$modifier,Return,exec,${terminal}"
|
||||
"$modifier,K,exec,list-keybinds"
|
||||
"$modifier ,R,exec,rofi-launcher"
|
||||
"$modifier SHIFT,Return,exec,rofi-launcher"
|
||||
"$modifier SHIFT,W,exec,web-search"
|
||||
"$modifier ALT,W,exec,wallsetter"
|
||||
"$modifier SHIFT,N,exec,swaync-client -rs"
|
||||
"$modifier,W,exec,${browser}"
|
||||
"$modifier,Y,exec,kitty -e yazi"
|
||||
"$modifier,E,exec,emopicker9000"
|
||||
"$modifier,S,exec,screenshootin"
|
||||
"$modifier CTRL,S,exec,hyprshot -m output -o $HOME/Pictures/ScreenShots"
|
||||
"$modifier SHIFT,S,exec,hyprshot -m window -o $HOME/Pictures/ScreenShots"
|
||||
"$modifier ALT,S,exec,hyprshot -m region -o $HOME/Pictures/ScreenShots"
|
||||
"$modifier,D,exec,discord"
|
||||
"$modifier,O,exec,obs"
|
||||
"$modifier,C,exec,hyprpicker -a"
|
||||
"$modifier,G,exec,gimp"
|
||||
"$modifier shift,T,exec,pypr toggle term"
|
||||
"$modifier,T,exec, thunar"
|
||||
"$modifier,M,exec,pavucontrol"
|
||||
"$modifier,Q,killactive,"
|
||||
"$modifier,P,pseudo,"
|
||||
"$modifier,V,exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy"
|
||||
"$modifier SHIFT,I,togglesplit,"
|
||||
"$modifier,F,fullscreen,"
|
||||
"$modifier SHIFT,F,togglefloating,"
|
||||
"$modifier ALT,F,workspaceopt, allfloat"
|
||||
"$modifier SHIFT,C,exit,"
|
||||
"$modifier SHIFT,left,movewindow,l"
|
||||
"$modifier SHIFT,right,movewindow,r"
|
||||
"$modifier SHIFT,up,movewindow,u"
|
||||
"$modifier SHIFT,down,movewindow,d"
|
||||
"$modifier SHIFT,h,movewindow,l"
|
||||
"$modifier SHIFT,l,movewindow,r"
|
||||
"$modifier SHIFT,k,movewindow,u"
|
||||
"$modifier SHIFT,j,movewindow,d"
|
||||
"$modifier ALT, left, swapwindow,l"
|
||||
"$modifier ALT, right, swapwindow,r"
|
||||
"$modifier ALT, up, swapwindow,u"
|
||||
"$modifier ALT, down, swapwindow,d"
|
||||
"$modifier ALT, 43, swapwindow,l"
|
||||
"$modifier ALT, 46, swapwindow,r"
|
||||
"$modifier ALT, 45, swapwindow,u"
|
||||
"$modifier ALT, 44, swapwindow,d"
|
||||
"$modifier,left,movefocus,l"
|
||||
"$modifier,right,movefocus,r"
|
||||
"$modifier,up,movefocus,u"
|
||||
"$modifier,down,movefocus,d"
|
||||
"$modifier,h,movefocus,l"
|
||||
"$modifier,l,movefocus,r"
|
||||
"$modifier,k,movefocus,u"
|
||||
"$modifier,j,movefocus,d"
|
||||
"$modifier,1,workspace,1"
|
||||
"$modifier,2,workspace,2"
|
||||
"$modifier,3,workspace,3"
|
||||
"$modifier,4,workspace,4"
|
||||
"$modifier,5,workspace,5"
|
||||
"$modifier,6,workspace,6"
|
||||
"$modifier,7,workspace,7"
|
||||
"$modifier,8,workspace,8"
|
||||
"$modifier,9,workspace,9"
|
||||
"$modifier,0,workspace,10"
|
||||
"$modifier SHIFT,SPACE,movetoworkspace,special"
|
||||
"$modifier,SPACE,togglespecialworkspace"
|
||||
"$modifier SHIFT,1,movetoworkspace,1"
|
||||
"$modifier SHIFT,2,movetoworkspace,2"
|
||||
"$modifier SHIFT,3,movetoworkspace,3"
|
||||
"$modifier SHIFT,4,movetoworkspace,4"
|
||||
"$modifier SHIFT,5,movetoworkspace,5"
|
||||
"$modifier SHIFT,6,movetoworkspace,6"
|
||||
"$modifier SHIFT,7,movetoworkspace,7"
|
||||
"$modifier SHIFT,8,movetoworkspace,8"
|
||||
"$modifier SHIFT,9,movetoworkspace,9"
|
||||
"$modifier SHIFT,0,movetoworkspace,10"
|
||||
"$modifier CONTROL,right,workspace,e+1"
|
||||
"$modifier CONTROL,left,workspace,e-1"
|
||||
"$modifier,mouse_down,workspace, e+1"
|
||||
"$modifier,mouse_up,workspace, e-1"
|
||||
"ALT,Tab,cyclenext"
|
||||
"ALT,Tab,bringactivetotop"
|
||||
",XF86AudioRaiseVolume,exec,wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
|
||||
",XF86AudioLowerVolume,exec,wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
||||
" ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||
",XF86AudioPlay, exec, playerctl play-pause"
|
||||
",XF86AudioPause, exec, playerctl play-pause"
|
||||
",XF86AudioNext, exec, playerctl next"
|
||||
",XF86AudioPrev, exec, playerctl previous"
|
||||
",XF86MonBrightnessDown,exec,brightnessctl set 5%-"
|
||||
",XF86MonBrightnessUp,exec,brightnessctl set +5%"
|
||||
];
|
||||
bindd =
|
||||
noctaliaBind
|
||||
++ rofiBind
|
||||
++ [
|
||||
# ============= TERMINALS =============
|
||||
"$modifier,Return, Terminal, exec, ${terminal}"
|
||||
# ============= APPLICATION LAUNCHERS =============
|
||||
"$modifier,K, Keybinds Help, 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 SHIFT,N, Notification Reset, exec, swaync-client -rs"
|
||||
"$modifier,W, Web Browser, exec, ${browser}"
|
||||
"$modifier,Y, File Manager, exec, kitty -e yazi"
|
||||
"$modifier,E, Emoji Picker, exec, emopicker9000"
|
||||
"$modifier,S, Screenshot, exec, screenshootin"
|
||||
# ============= SCREENSHOTS =============
|
||||
"$modifier CTRL,S, Screenshot Output, exec, hyprshot -m output -o $HOME/Pictures/ScreenShots"
|
||||
"$modifier SHIFT,S, Screenshot Window, exec, hyprshot -m window -o $HOME/Pictures/ScreenShots"
|
||||
"$modifier ALT,S, Screenshot Region, exec, hyprshot -m region -o $HOME/Pictures/ScreenShots"
|
||||
"$modifier,O, OBS Studio, exec, obs"
|
||||
"$modifier ALT,C, Color Picker, exec, hyprpicker -a"
|
||||
"$modifier,G, GIMP, exec, gimp"
|
||||
"$modifier shift,T, Dropdown Terminal, exec, pypr toggle term"
|
||||
"$modifier,T, Thunar, exec, thunar"
|
||||
"$modifier ALT,M, Audio Control, exec, pavucontrol"
|
||||
# ============= WINDOW MANAGEMENT =============
|
||||
"$modifier,Q, Kill Active Window, killactive,"
|
||||
"$modifier,P, Pseudo Tile, pseudo,"
|
||||
"$modifier,V, Clipboard History, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy"
|
||||
"$modifier SHIFT,I, Toggle Split, togglesplit,"
|
||||
"$modifier,F, Maximize, fullscreen,"
|
||||
"$modifier SHIFT,F, Toggle Floating, togglefloating,"
|
||||
"$modifier ALT,F, Float All Windows, workspaceopt, allfloat"
|
||||
"$modifier SHIFT,C, Exit/Logout of Hyprland, exit,"
|
||||
# ============= WINDOW MOVEMENT (ARROW KEYS) =============
|
||||
"$modifier SHIFT,left, Move Left, movewindow, l"
|
||||
"$modifier SHIFT,right, Move Right, movewindow, r"
|
||||
"$modifier SHIFT,up, Move Up, movewindow, u"
|
||||
"$modifier SHIFT,down, Move Down, movewindow, d"
|
||||
# ============= WINDOW MOVEMENT (VI STYLE) =============
|
||||
"$modifier SHIFT,h, Move Left (VI), movewindow, l"
|
||||
"$modifier SHIFT,l, Move Right (VI), movewindow, r"
|
||||
"$modifier SHIFT,k, Move Up (VI), movewindow, u"
|
||||
"$modifier SHIFT,j, Move Down (VI), movewindow, d"
|
||||
# ============= WINDOW SWAPPING (ARROW KEYS) =============
|
||||
"$modifier ALT, left, Swap Left, swapwindow, l"
|
||||
"$modifier ALT, right, Swap Right, swapwindow, r"
|
||||
"$modifier ALT, up, Swap Up, swapwindow, u"
|
||||
"$modifier ALT, down, Swap Down, swapwindow, d"
|
||||
# ============= WINDOW SWAPPING (VI KEYCODES) =============
|
||||
"$modifier ALT, 43, Swap Left (VI), swapwindow, l"
|
||||
"$modifier ALT, 46, Swap Right (VI), swapwindow, r"
|
||||
"$modifier ALT, 45, Swap Up (VI), swapwindow, u"
|
||||
"$modifier ALT, 44, Swap Down (VI), swapwindow, d"
|
||||
# ============= FOCUS MOVEMENT (ARROW KEYS) =============
|
||||
"$modifier,left, Focus Left, movefocus, l"
|
||||
"$modifier,right, Focus Right, movefocus, r"
|
||||
"$modifier,up, Focus Up, movefocus, u"
|
||||
"$modifier,down, Focus Down, movefocus, d"
|
||||
# ============= FOCUS MOVEMENT (VI STYLE) =============
|
||||
"$modifier,h, Focus Left (VI), movefocus, l"
|
||||
"$modifier,l, Focus Right (VI), movefocus, r"
|
||||
"$modifier,k, Focus Up (VI), movefocus, u"
|
||||
"$modifier,j, Focus Down (VI), movefocus, d"
|
||||
# ============= WORKSPACE SWITCHING (1-10) =============
|
||||
"$modifier,1, Workspace 1, workspace, 1"
|
||||
"$modifier,2, Workspace 2, workspace, 2"
|
||||
"$modifier,3, Workspace 3, workspace, 3"
|
||||
"$modifier,4, Workspace 4, workspace, 4"
|
||||
"$modifier,5, Workspace 5, workspace, 5"
|
||||
"$modifier,6, Workspace 6, workspace, 6"
|
||||
"$modifier,7, Workspace 7, workspace, 7"
|
||||
"$modifier,8, Workspace 8, workspace, 8"
|
||||
"$modifier,9, Workspace 9, workspace, 9"
|
||||
"$modifier,0, Workspace 10, workspace, 10"
|
||||
# ============= MOVE WINDOW TO WORKSPACE (1-10) =============
|
||||
"$modifier SHIFT,SPACE, Move to Special, movetoworkspace, special"
|
||||
"$modifier,SPACE, Toggle Special, togglespecialworkspace"
|
||||
"$modifier SHIFT,1, Move to Workspace 1, movetoworkspace, 1"
|
||||
"$modifier SHIFT,2, Move to Workspace 2, movetoworkspace, 2"
|
||||
"$modifier SHIFT,3, Move to Workspace 3, movetoworkspace, 3"
|
||||
"$modifier SHIFT,4, Move to Workspace 4, movetoworkspace, 4"
|
||||
"$modifier SHIFT,5, Move to Workspace 5, movetoworkspace, 5"
|
||||
"$modifier SHIFT,6, Move to Workspace 6, movetoworkspace, 6"
|
||||
"$modifier SHIFT,7, Move to Workspace 7, movetoworkspace, 7"
|
||||
"$modifier SHIFT,8, Move to Workspace 8, movetoworkspace, 8"
|
||||
"$modifier SHIFT,9, Move to Workspace 9, movetoworkspace, 9"
|
||||
"$modifier SHIFT,0, Move to Workspace 10, movetoworkspace, 10"
|
||||
# ============= WORKSPACE NAVIGATION =============
|
||||
"$modifier CONTROL,right, Next Workspace, workspace, e+1"
|
||||
"$modifier CONTROL,left, Previous Workspace, workspace, e-1"
|
||||
"$modifier,mouse_down, Next Workspace Mouse, workspace, e+1"
|
||||
"$modifier,mouse_up, Previous Workspace Mouse, workspace, e-1"
|
||||
# ============= WINDOW CYCLING =============
|
||||
"ALT,Tab, Cycle Next Window, cyclenext"
|
||||
"ALT,Tab, Bring Active To Top, bringactivetotop"
|
||||
# ============= MEDIA & HARDWARE CONTROLS =============
|
||||
",XF86AudioRaiseVolume, Volume Up, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
|
||||
",XF86AudioLowerVolume, Volume Down, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
||||
" ,XF86AudioMute, Mute Toggle, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||
",XF86AudioPlay, Play Pause, exec, playerctl play-pause"
|
||||
",XF86AudioPause, Play Pause, exec, playerctl play-pause"
|
||||
",XF86AudioNext, Next Track, exec, playerctl next"
|
||||
",XF86AudioPrev, Previous Track, exec, playerctl previous"
|
||||
",XF86MonBrightnessDown, Brightness Down, exec, brightnessctl set 5%-"
|
||||
",XF86MonBrightnessUp, Brightness Up, exec, brightnessctl set +5%"
|
||||
];
|
||||
|
||||
bindm = [
|
||||
"$modifier, mouse:272, movewindow"
|
||||
|
|
|
|||
|
|
@ -1,9 +1,26 @@
|
|||
{ host, ... }:
|
||||
let
|
||||
inherit
|
||||
(import ../../../hosts/${host}/variables.nix)
|
||||
vars = import ../../../hosts/${host}/variables.nix;
|
||||
inherit (vars)
|
||||
barChoice
|
||||
stylixImage
|
||||
;
|
||||
# Noctalia-specific startup commands
|
||||
noctaliaExec = if barChoice == "noctalia" then [
|
||||
"killall -q waybar"
|
||||
"pkill waybar"
|
||||
"killall -q swaync"
|
||||
"pkill swaync"
|
||||
"qs -c noctalia-shell"
|
||||
] else [];
|
||||
# Waybar-specific startup commands
|
||||
waybarExec = if barChoice != "noctalia" then [
|
||||
"killall -q swww;sleep .5 && swww-daemon"
|
||||
"killall -q waybar;sleep .5 && waybar"
|
||||
"killall -q swaync;sleep .5 && swaync"
|
||||
"nm-applet --indicator"
|
||||
"sleep 1.0 && swww img ${stylixImage}"
|
||||
] else [];
|
||||
in
|
||||
{
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
|
|
@ -14,14 +31,7 @@ in
|
|||
"
|
||||
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
|
||||
"systemctl --user start hyprpolkitagent"
|
||||
|
||||
"killall -q swww;sleep .5 && swww-daemon"
|
||||
"killall -q waybar;sleep .5 && waybar"
|
||||
"killall -q swaync;sleep .5 && swaync"
|
||||
"#wallsetter &"
|
||||
"pypr &"
|
||||
"nm-applet --indicator"
|
||||
"sleep 1.0 && swww img ${stylixImage}"
|
||||
];
|
||||
] ++ noctaliaExec ++ waybarExec;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{ host
|
||||
, config
|
||||
, pkgs
|
||||
, ...
|
||||
{
|
||||
host,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
inherit
|
||||
(import ../../../hosts/${host}/variables.nix)
|
||||
inherit (import ../../../hosts/${host}/variables.nix)
|
||||
extraMonitorSettings
|
||||
keyboardLayout
|
||||
stylixImage
|
||||
|
|
@ -21,7 +21,8 @@ in
|
|||
ydotool
|
||||
hyprpolkitagent
|
||||
hyprshot
|
||||
hyprland-qtutils # needed for banners and ANR messages
|
||||
hyprpicker
|
||||
#hyprland-qtutils # needed for banners and ANR messages
|
||||
];
|
||||
systemd.user.targets.hyprland-session.Unit.Wants = [
|
||||
"xdg-desktop-autostart.target"
|
||||
|
|
@ -66,14 +67,13 @@ in
|
|||
};
|
||||
|
||||
gestures = {
|
||||
workspace_swipe = 1;
|
||||
workspace_swipe_fingers = 3;
|
||||
gesture = [ "3, horizontal, workspace" ];
|
||||
workspace_swipe_distance = 500;
|
||||
workspace_swipe_invert = 1;
|
||||
workspace_swipe_invert = true;
|
||||
workspace_swipe_min_speed_to_force = 30;
|
||||
workspace_swipe_cancel_ratio = 0.5;
|
||||
workspace_swipe_create_new = 1;
|
||||
workspace_swipe_forever = 1;
|
||||
workspace_swipe_create_new = true;
|
||||
workspace_swipe_forever = true;
|
||||
};
|
||||
|
||||
general = {
|
||||
|
|
@ -83,7 +83,8 @@ in
|
|||
gaps_out = 8;
|
||||
border_size = 2;
|
||||
resize_on_border = true;
|
||||
"col.active_border" = "rgb(${config.lib.stylix.colors.base08}) rgb(${config.lib.stylix.colors.base0C}) 45deg";
|
||||
"col.active_border" =
|
||||
"rgb(${config.lib.stylix.colors.base08}) rgb(${config.lib.stylix.colors.base0C}) 45deg";
|
||||
"col.inactive_border" = "rgb(${config.lib.stylix.colors.base01})";
|
||||
};
|
||||
|
||||
|
|
@ -96,7 +97,7 @@ in
|
|||
disable_splash_rendering = true;
|
||||
enable_swallow = false;
|
||||
vfr = true; # Variable Frame Rate
|
||||
vrr = 2; #Variable Refresh Rate Might need to set to 0 for NVIDIA/AQ_DRM_DEVICES
|
||||
vrr = 2; # Variable Refresh Rate Might need to set to 0 for NVIDIA/AQ_DRM_DEVICES
|
||||
# Screen flashing to black momentarily or going black when app is fullscreen
|
||||
# Try setting vrr to 0
|
||||
|
||||
|
|
@ -163,7 +164,9 @@ in
|
|||
extraConfig = "
|
||||
monitor=,preferred,auto,auto
|
||||
monitor=Virtual-1,1920x1080@60,auto,1
|
||||
${extraMonitorSettings}
|
||||
${
|
||||
extraMonitorSettings
|
||||
}
|
||||
# To enable blur on waybar uncomment the line below
|
||||
# Thanks to SchotjeChrisman
|
||||
#layerrule = blur,waybar
|
||||
|
|
|
|||
26
modules/home/noctalia.nix
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{ config, pkgs, inputs, lib, ... }:
|
||||
let
|
||||
system = pkgs.stdenv.hostPlatform.system;
|
||||
noctaliaPath = inputs.noctalia.packages.${system}.default;
|
||||
configDir = "${noctaliaPath}/share/noctalia-shell";
|
||||
in
|
||||
{
|
||||
# Install the Noctalia package for this user (CLI, assets, etc.)
|
||||
home.packages = [
|
||||
noctaliaPath
|
||||
];
|
||||
|
||||
# Seed the Noctalia QuickShell shell code into ~/.config/quickshell/noctalia-shell
|
||||
# once, then leave it writable so the GUI and the user can tweak it.
|
||||
home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
|
||||
set -eu
|
||||
DEST="$HOME/.config/quickshell/noctalia-shell"
|
||||
SRC="${configDir}"
|
||||
|
||||
if [ ! -d "$DEST" ]; then
|
||||
mkdir -p "$HOME/.config/quickshell"
|
||||
cp -R "$SRC" "$DEST"
|
||||
chmod -R u+rwX "$DEST"
|
||||
fi
|
||||
'';
|
||||
}
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
programs = {
|
||||
rofi = {
|
||||
enable = true;
|
||||
package = pkgs.rofi-wayland;
|
||||
package = pkgs.rofi;
|
||||
extraConfig = {
|
||||
modi = "drun,filebrowser,run";
|
||||
show-icons = true;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ pkgs.writeShellScriptBin "emopicker9000" ''
|
|||
fi
|
||||
|
||||
# Get user selection via wofi from emoji file.
|
||||
chosen=$(cat $HOME/.config/.emoji | ${pkgs.rofi-wayland}/bin/rofi -i -dmenu -config ~/.config/rofi/config-long.rasi | awk '{print $1}')
|
||||
chosen=$(cat $HOME/.config/.emoji | ${pkgs.rofi}/bin/rofi -i -dmenu -config ~/.config/rofi/config-long.rasi | awk '{print $1}')
|
||||
|
||||
# Exit if none chosen.
|
||||
[ -z "$chosen" ] && exit
|
||||
|
|
|
|||
|
|
@ -6,10 +6,60 @@ pkgs.writeShellScriptBin "list-keybinds" ''
|
|||
fi
|
||||
|
||||
msg='☣️ NOTE ☣️: Clicking with Mouse or Pressing ENTER will have NO function'
|
||||
keybinds=$(cat ~/.config/hypr/hyprland.conf | grep -E '^bind')
|
||||
|
||||
# replace #modifier with SUPER in the displayed keybinds for rofi
|
||||
display_keybinds=$(echo "$keybinds" | sed 's/\$modifier/SUPER/g')
|
||||
# Parse keybind entries from the Nix config and format for rofi display
|
||||
BIND_NIX="$HOME/zaneyos/modules/home/hyprland/binds.nix"
|
||||
if [[ -f "$BIND_NIX" ]]; then
|
||||
display_keybinds=$(
|
||||
${pkgs.gawk}/bin/awk '
|
||||
# Track when we enter any keybind array
|
||||
/noctaliaBind/ { in_block = 1; next }
|
||||
/rofiBind/ { in_block = 1; next }
|
||||
/bindd[ ]*=/ && /\[/ { in_block = 1; next }
|
||||
|
||||
in_block {
|
||||
# Check for end of array
|
||||
if (/^[ ]*\]/) {
|
||||
in_block = 0
|
||||
next
|
||||
}
|
||||
|
||||
# Extract quoted string from line
|
||||
if (match($0, /"([^"]+)"/, arr)) {
|
||||
line = arr[1]
|
||||
|
||||
# Split by comma to get: mods, key, desc, action, params
|
||||
n = split(line, parts, ",")
|
||||
if (n >= 3) {
|
||||
# Extract and trim each part
|
||||
mods = parts[1]
|
||||
key = parts[2]
|
||||
desc = parts[3]
|
||||
|
||||
gsub(/^[ \t]+|[ \t]+$/, "", mods)
|
||||
gsub(/^[ \t]+|[ \t]+$/, "", key)
|
||||
gsub(/^[ \t]+|[ \t]+$/, "", desc)
|
||||
|
||||
# Build display keybind
|
||||
if (mods != "" && key != "") {
|
||||
display = mods " + " key
|
||||
gsub(/\$modifier/, "SUPER", display)
|
||||
gsub(/ +/, " ", display)
|
||||
|
||||
# Output: "KEYBIND: Description"
|
||||
if (desc != "") {
|
||||
printf "%s: %s\n", display, desc
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
' "$BIND_NIX"
|
||||
)
|
||||
else
|
||||
# Fallback: Show error message
|
||||
display_keybinds="Error: Keybinds file not found at $BIND_NIX"
|
||||
fi
|
||||
|
||||
# use rofi to display the keybinds with the modified content
|
||||
echo "$display_keybinds" | rofi -dmenu -i -config ~/.config/rofi/config-long.rasi -mesg "$msg"
|
||||
|
|
|
|||
|
|
@ -25,10 +25,10 @@ pkgs.writeShellScriptBin "web-search" ''
|
|||
|
||||
main() {
|
||||
# Pass the list to rofi
|
||||
platform=$( (gen_list) | ${pkgs.rofi-wayland}/bin/rofi -dmenu -config ~/.config/rofi/config-long.rasi )
|
||||
platform=$( (gen_list) | ${pkgs.rofi}/bin/rofi -dmenu -config ~/.config/rofi/config-long.rasi )
|
||||
|
||||
if [[ -n "$platform" ]]; then
|
||||
query=$( (echo ) | ${pkgs.rofi-wayland}/bin/rofi -dmenu -config ~/.config/rofi/config-long.rasi )
|
||||
query=$( (echo ) | ${pkgs.rofi}/bin/rofi -dmenu -config ~/.config/rofi/config-long.rasi )
|
||||
|
||||
if [[ -n "$query" ]]; then
|
||||
url=''${URLS[$platform]}$query
|
||||
|
|
|
|||
48
modules/home/terminals/alacritty.nix
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
programs.alacritty = let
|
||||
font_family = lib.mkDefault "Maple mono NF";
|
||||
in {
|
||||
enable = true;
|
||||
settings = lib.mkDefault {
|
||||
colors = {
|
||||
primary = {
|
||||
background = "#1a1b26";
|
||||
foreground = "#c0caf5";
|
||||
};
|
||||
normal = {
|
||||
black = "#15161e";
|
||||
red = "#f7768e";
|
||||
green = "#9ece6a";
|
||||
yellow = "#e0af68";
|
||||
blue = "#7aa2f7";
|
||||
magenta = "#bb9af7";
|
||||
cyan = "#7dcfff";
|
||||
white = "#a9b1d6";
|
||||
};
|
||||
};
|
||||
font = {
|
||||
normal = {
|
||||
family = font_family;
|
||||
style = "Regular";
|
||||
};
|
||||
bold = {
|
||||
family = font_family;
|
||||
style = "Bold";
|
||||
};
|
||||
italic = {
|
||||
family = font_family;
|
||||
style = "Italic";
|
||||
};
|
||||
bold_italic = {
|
||||
family = font_family;
|
||||
style = "Bold Italic";
|
||||
};
|
||||
size = 12;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
152
modules/home/terminals/tmux.nix
Normal file
|
|
@ -0,0 +1,152 @@
|
|||
# Tmux is a terminal multiplexer that allows you to run multiple terminal sessions in a single window.
|
||||
{pkgs, ...}: {
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
mouse = true;
|
||||
shell = "${pkgs.zsh}/bin/zsh";
|
||||
prefix = "C-a";
|
||||
terminal = "tmux-256color";
|
||||
keyMode = "vi";
|
||||
baseIndex = 1;
|
||||
clock24 = false;
|
||||
|
||||
extraConfig = ''
|
||||
set-option -g status-position top
|
||||
set -ga terminal-overrides ",*:RGB"
|
||||
set -g default-terminal "tmux-256color"
|
||||
set-option -g history-limit 5000
|
||||
set -g renumber-windows on
|
||||
set -g set-clipboard on
|
||||
|
||||
unbind C-b
|
||||
bind-key C-a send-prefix
|
||||
unbind %
|
||||
unbind '"'
|
||||
|
||||
# VIM Motion realated settings
|
||||
bind-key h select-pane -L
|
||||
bind-key j select-pane -D
|
||||
bind-key k select-pane -U
|
||||
bind-key l select-pane -R
|
||||
|
||||
bind -n M-h select-pane -L
|
||||
bind -n M-j select-pane -D
|
||||
bind -n M-k select-pane -U
|
||||
bind -n M-l select-pane -R
|
||||
|
||||
bind-key -T copy-mode-vi v send-keys -X begin-selection
|
||||
bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle
|
||||
bind-key -T copy-mode-vi y send-keys -X copy-selection-and-cancel
|
||||
unbind -T copy-mode-vi MouseDragEnd1Pane
|
||||
|
||||
set -gq allow-passthrough on
|
||||
bind-key x kill-pane # skip "kill-pane 1? (y/n)" prompt
|
||||
|
||||
bind-key -n C-Tab next-window
|
||||
bind-key -n C-S-Tab previous-window
|
||||
bind-key -n M-Tab new-window
|
||||
|
||||
bind -n M-1 select-window -t 1
|
||||
bind -n M-2 select-window -t 2
|
||||
bind -n M-3 select-window -t 3
|
||||
bind -n M-4 select-window -t 4
|
||||
bind -n M-5 select-window -t 5
|
||||
bind -n M-6 select-window -t 6
|
||||
bind -n M-7 select-window -t 7
|
||||
bind -n M-8 select-window -t 8
|
||||
bind -n M-9 select-window -t 9
|
||||
|
||||
# Start windows and panes index at 1, not 0.
|
||||
setw -g pane-base-index 1
|
||||
|
||||
# Creating panes
|
||||
bind-key "|" split-window -h -c "#{pane_current_path}"
|
||||
bind-key "\\" split-window -fh -c "#{pane_current_path}"
|
||||
|
||||
bind-key "-" split-window -v -c "#{pane_current_path}"
|
||||
bind-key "_" split-window -fv -c "#{pane_current_path}"
|
||||
|
||||
bind -r C-j resize-pane -D 15
|
||||
bind -r C-k resize-pane -U 15
|
||||
bind -r C-h resize-pane -L 15
|
||||
bind -r C-l resize-pane -R 15
|
||||
|
||||
# 'c' to new window
|
||||
bind-key c new-window
|
||||
# 'n' next window
|
||||
bind-key n next-window
|
||||
# 'p' next previous
|
||||
bind-key n previous-window
|
||||
|
||||
unbind r
|
||||
bind r source-file ~/.config/tmux/tmux.conf
|
||||
bind -r m resize-pane -Z
|
||||
|
||||
bind-key t clock-mode
|
||||
bind-key q display-panes
|
||||
bind-key u refresh-client
|
||||
bind-key o select-pane -t :.+
|
||||
|
||||
##### Display Popups #####
|
||||
|
||||
bind C-y display-popup \
|
||||
-d "#{pane_current_path}" \
|
||||
-w 80% \
|
||||
-h 80% \
|
||||
-E "lazygit"
|
||||
|
||||
bind C-n display-popup -E 'bash -i -c "read -p \"Session name: \" name; tmux new-session -d -s \$name && tmux switch-client -t \$name"'
|
||||
bind C-j display-popup -E "tmux list-sessions | sed -E 's/:.*$//' | grep -v \"^$(tmux display-message -p '#S')\$\" | fzf --reverse | xargs tmux switch-client -t"
|
||||
|
||||
bind C-r display-popup \
|
||||
-d "#{pane_current_path}" \
|
||||
-w 90% \
|
||||
-h 90% \
|
||||
-E "yazi"
|
||||
|
||||
bind C-t display-popup \
|
||||
-d "#{pane_current_path}" \
|
||||
-w 75% \
|
||||
-h 75% \
|
||||
-E "zsh"
|
||||
|
||||
# Tokyonight Moon theme (from tmux.tony.conf)
|
||||
set -g status "on"
|
||||
set -g status-bg "#222436"
|
||||
set -g status-justify "left"
|
||||
set -g status-left-length "100"
|
||||
set -g status-right-length "100"
|
||||
|
||||
# Messages
|
||||
set -g message-style "fg=#86e1fc,bg=#3a3f5a,align=centre"
|
||||
set -g message-command-style "fg=#86e1fc,bg=#3a3f5a,align=centre"
|
||||
|
||||
# Panes
|
||||
set -g pane-border-style "fg=#3a3f5a"
|
||||
set -g pane-active-border-style "fg=#82aaff"
|
||||
|
||||
# Windows
|
||||
set -g window-status-activity-style "fg=#c8d3f5,bg=#222436,none"
|
||||
set -g window-status-separator ""
|
||||
set -g window-status-style "fg=#c8d3f5,bg=#222436,none"
|
||||
|
||||
# Statusline - current window
|
||||
set -g window-status-current-format "#[fg=#82aaff,bg=#222436] #I: #[fg=#c099ff,bg=#222436](✓) #[fg=#86e1fc,bg=#222436]#(echo '#{pane_current_path}' | rev | cut -d'/' -f-2 | rev) #[fg=#c099ff,bg=#222436]"
|
||||
|
||||
# Statusline - other windows
|
||||
set -g window-status-format "#[fg=#82aaff,bg=#222436] #I: #[fg=#c8d3f5,bg=#222436]#W"
|
||||
|
||||
# Statusline - right side
|
||||
set -g status-right "#[fg=#82aaff,bg=#222436,nobold,nounderscore,noitalics]#[fg=#222436,bg=#82aaff,nobold,nounderscore,noitalics] #[fg=#c8d3f5,bg=#3a3f5a] #W #{?client_prefix,#[fg=#c099ff],#[fg=#86e1fc]}#[bg=#3a3f5a]#{?client_prefix,#[bg=#c099ff],#[bg=#86e1fc]}#[fg=#222436] #[fg=#c8d3f5,bg=#3a3f5a] #S "
|
||||
|
||||
# Statusline - left side (empty)
|
||||
set -g status-left ""
|
||||
|
||||
# Modes
|
||||
set -g clock-mode-colour "#82aaff"
|
||||
set -g mode-style "fg=#82aaff bg=#444a73 bold"
|
||||
|
||||
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
@ -1,118 +0,0 @@
|
|||
# Tmux is a terminal multiplexer that allows you to run multiple terminal sessions in a single window.
|
||||
{ pkgs, ... }: {
|
||||
programs.tmux = {
|
||||
enable = true;
|
||||
mouse = true;
|
||||
shell = "${pkgs.zsh}/bin/zsh";
|
||||
prefix = "C-a";
|
||||
terminal = "kitty";
|
||||
keyMode = "vi";
|
||||
|
||||
extraConfig = ''
|
||||
set-option -g status-position top
|
||||
|
||||
#set -g default-terminal "screen-256color"
|
||||
set-option -g history-limit 5000
|
||||
unbind %
|
||||
unbind '"'
|
||||
|
||||
bind-key h select-pane -L
|
||||
bind-key j select-pane -D
|
||||
bind-key k select-pane -U
|
||||
bind-key l select-pane -R
|
||||
|
||||
set -gq allow-passthrough on
|
||||
bind-key x kill-pane # skip "kill-pane 1? (y/n)" prompt
|
||||
|
||||
bind-key -n C-Tab next-window
|
||||
bind-key -n C-S-Tab previous-window
|
||||
bind-key -n M-Tab new-window
|
||||
|
||||
|
||||
# Start windows and panes index at 1, not 0.
|
||||
set -g base-index 1
|
||||
setw -g pane-base-index 1
|
||||
|
||||
|
||||
bind-key "|" split-window -h -c "#{pane_current_path}"
|
||||
bind-key "\\" split-window -fh -c "#{pane_current_path}"
|
||||
|
||||
bind-key "-" split-window -v -c "#{pane_current_path}"
|
||||
bind-key "_" split-window -fv -c "#{pane_current_path}"
|
||||
|
||||
bind -r C-j resize-pane -D 15
|
||||
bind -r C-k resize-pane -U 15
|
||||
bind -r C-h resize-pane -L 15
|
||||
bind -r C-l resize-pane -R 15
|
||||
|
||||
# 'c' to new window
|
||||
bind-key c new-window
|
||||
|
||||
# 'n' next window
|
||||
bind-key n next-window
|
||||
|
||||
# 'p' next previous
|
||||
bind-key n previous-window
|
||||
|
||||
unbind r
|
||||
bind r source-file ~/.config/tmux/tmux.conf
|
||||
|
||||
bind -r m resize-pane -Z
|
||||
|
||||
bind-key t clock-mode
|
||||
bind-key q display-panes
|
||||
bind-key u refresh-client
|
||||
bind-key o select-pane -t :.+
|
||||
|
||||
|
||||
##### Display Popups #####
|
||||
|
||||
bind C-y display-popup \
|
||||
-d "#{pane_current_path}" \
|
||||
-w 80% \
|
||||
-h 80% \
|
||||
-E "lazygit"
|
||||
bind C-n display-popup -E 'bash -i -c "read -p \"Session name: \" name; tmux new-session -d -s \$name && tmux switch-client -t \$name"'
|
||||
bind C-j display-popup -E "tmux list-sessions | sed -E 's/:.*$//' | grep -v \"^$(tmux display-message -p '#S')\$\" | fzf --reverse | xargs tmux switch-client -t"
|
||||
#bind C-p display-popup -E "ipython"
|
||||
#bind C-f display-popup \
|
||||
# -w 80% \
|
||||
# -h 80% \
|
||||
# -E 'rmpc'
|
||||
bind C-r display-popup \
|
||||
-d "#{pane_current_path}" \
|
||||
-w 90% \
|
||||
-h 90% \
|
||||
-E "yazi"
|
||||
bind C-z display-popup \
|
||||
-w 90% \
|
||||
-h 90% \
|
||||
-E 'nvim ~/ddubsos/flake.nix'
|
||||
#bind C-g display-popup -E "bash -i ~/.tmux/scripts/chat-popup.sh"
|
||||
bind C-t display-popup \
|
||||
-d "#{pane_current_path}" \
|
||||
-w 75% \
|
||||
-h 75% \
|
||||
-E "zsh"
|
||||
|
||||
##### Display Menu #####
|
||||
|
||||
bind d display-menu -T "#[align=centre]Dotfiles" -x C -y C \
|
||||
"ZaneyOS flake.nix" f "display-popup -E 'nvim ~/zaneyos/flake.nix'" \
|
||||
"ZaneyOS packages" p "display-popup -E 'nvim ~/zaneyos/modules/core/packages.nix'" \
|
||||
"ZaneyOS keybinds" k "display-popup -E 'nvim ~/zaneyos/modules/home/hyprland/binds.nix'" \
|
||||
"ZaneyOS env variables" e "display-popup -E 'nvim ~/zaneyos/modules/home/hyprland/env.nix'" \
|
||||
"ZaneyOS windowrules" w "display-popup -E 'nvim ~/zaneyos/modules/home/hyprland/windowrules.nix'" \
|
||||
"Exit" q ""
|
||||
|
||||
|
||||
|
||||
'';
|
||||
|
||||
plugins = with pkgs; [
|
||||
tmuxPlugins.vim-tmux-navigator
|
||||
tmuxPlugins.sensible
|
||||
tmuxPlugins.tokyo-night-tmux
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
{ pkgs, ... }: {
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
programs.vscode = {
|
||||
enable = true;
|
||||
profiles = {
|
||||
default = {
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
bbenoist.nix
|
||||
jeff-hykin.better-nix-syntax
|
||||
ms-vscode.cpptools-extension-pack
|
||||
vscodevim.vim # Vim emulation
|
||||
mads-hartmann.bash-ide-vscode
|
||||
tamasfe.even-better-toml
|
||||
zainchen.json
|
||||
shd101wyy.markdown-preview-enhanced
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
376
modules/home/waybar/Jerry-waybar.nix
Normal file
|
|
@ -0,0 +1,376 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
terminal = "kitty";
|
||||
base00 = "0F1419";
|
||||
base01 = "131721";
|
||||
base03 = "3E4B59";
|
||||
base05 = "E6E1CF";
|
||||
base06 = "E6E1CF";
|
||||
base07 = "F3F4F5";
|
||||
base08 = "F07178";
|
||||
base09 = "FF8F40";
|
||||
base0A = "FFB454";
|
||||
base0B = "B8CC52";
|
||||
base0C = "95E6CB";
|
||||
base0D = "59C2FF";
|
||||
base0E = "D2A6FF";
|
||||
base0F = "E6B673";
|
||||
scriptsDir = ./scripts;
|
||||
scripts = builtins.attrNames (builtins.readDir scriptsDir);
|
||||
in
|
||||
with lib; {
|
||||
home.file = builtins.listToAttrs (map
|
||||
(name: {
|
||||
name = ".config/waybar/scripts/" + name;
|
||||
value = {
|
||||
source = "${scriptsDir}/${name}";
|
||||
executable = true;
|
||||
};
|
||||
})
|
||||
scripts);
|
||||
# Configure & Theme Waybar
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar;
|
||||
settings = [
|
||||
{
|
||||
layer = "top";
|
||||
position = "top";
|
||||
|
||||
modules-center = ["network" "pulseaudio" "cpu" "hyprland/workspaces" "memory" "disk" "clock" "custom/weather"];
|
||||
modules-left = ["custom/startmenu" "hyprland/window"]; # Eternal: [ "hyprland/workspaces" "cpu" "memory" "network" ]
|
||||
modules-right = ["tray" "idle_inhibitor" "custom/notification" "battery" "custom/power"]; # Eternal: [ "idle_inhibitor" "pulseaudio" "clock" "custom/notification" "tray" ]
|
||||
|
||||
"hyprland/workspaces" = {
|
||||
format = "{name}";
|
||||
format-icons = {
|
||||
default = " ";
|
||||
active = " ";
|
||||
urgent = " ";
|
||||
};
|
||||
on-scroll-up = "hyprctl dispatch workspace e+1";
|
||||
on-scroll-down = "hyprctl dispatch workspace e-1";
|
||||
};
|
||||
"clock" = {
|
||||
format = '' {:%H:%M}'';
|
||||
/*
|
||||
''{: %I:%M %p}'';
|
||||
*/
|
||||
tooltip = true;
|
||||
tooltip-format = "<big>{:%A, %d.%B %Y }</big><tt><small>{calendar}</small></tt>";
|
||||
};
|
||||
"hyprland/window" = {
|
||||
max-length = 60;
|
||||
separate-outputs = false;
|
||||
};
|
||||
"memory" = {
|
||||
interval = 5;
|
||||
format = " {}%";
|
||||
tooltip = true;
|
||||
on-click = "${terminal} -e btop";
|
||||
};
|
||||
"cpu" = {
|
||||
interval = 5;
|
||||
format = " {usage:2}%";
|
||||
tooltip = true;
|
||||
on-click = "${terminal} -e btop";
|
||||
};
|
||||
"disk" = {
|
||||
format = " {free}";
|
||||
tooltip = true;
|
||||
on-click = "${terminal} -e sh -c df -h ; read";
|
||||
};
|
||||
"network" = {
|
||||
format-icons = ["" "" "" "" ""];
|
||||
format-ethernet = " {bandwidthDownBits}";
|
||||
format-wifi = " {bandwidthDownBits}";
|
||||
format-disconnected = "";
|
||||
tooltip = false;
|
||||
on-click = "${terminal} -e btop";
|
||||
};
|
||||
"tray" = {
|
||||
spacing = 12;
|
||||
};
|
||||
"pulseaudio" = {
|
||||
format = "{icon} {volume}% {format_source}";
|
||||
format-bluetooth = "{volume}% {icon} {format_source}";
|
||||
format-bluetooth-muted = " {icon} {format_source}";
|
||||
format-muted = " {format_source}";
|
||||
format-source = " {volume}%";
|
||||
format-source-muted = "";
|
||||
format-icons = {
|
||||
headphone = "";
|
||||
hands-free = "";
|
||||
headset = "";
|
||||
phone = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = ["" "" ""];
|
||||
};
|
||||
on-click = "pavucontrol";
|
||||
};
|
||||
"custom/power" = {
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Left Click: Power Menu (qs-wlogout)\nRight Click: Rofi Power Menu";
|
||||
format = " ";
|
||||
on-click = "qs-wlogout";
|
||||
"on-click-right" = "~/.config/waybar/scripts/power-menu.sh";
|
||||
};
|
||||
"custom/startmenu" = {
|
||||
tooltip = true;
|
||||
"tooltip-format" = "App menu";
|
||||
format = "";
|
||||
# on-click = "rofi -show drun";
|
||||
on-click = "launch-nwg-menu";
|
||||
"on-click-right" = "nwg-drawer -mr 225 -ml 225 -mt 200 -mb 200 -is 48 --spacing 15";
|
||||
};
|
||||
"idle_inhibitor" = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
activated = " ";
|
||||
deactivated = " ";
|
||||
};
|
||||
tooltip = "true";
|
||||
};
|
||||
"custom/notification" = {
|
||||
tooltip = false;
|
||||
format = "{icon} {}";
|
||||
format-icons = {
|
||||
notification = "<span foreground='red'><sup></sup></span>";
|
||||
none = "";
|
||||
dnd-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-none = "";
|
||||
inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
inhibited-none = "";
|
||||
dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-inhibited-none = "";
|
||||
};
|
||||
return-type = "json";
|
||||
exec-if = "which swaync-client";
|
||||
exec = "swaync-client -swb";
|
||||
on-click = "pavucontrol";
|
||||
escape = true;
|
||||
};
|
||||
"custom/weather" = {
|
||||
return-type = "json";
|
||||
exec = "sh -lc 'WEATHER_ICON_STYLE=emoji WEATHER_TOOLTIP_MARKUP=1 ~/.config/waybar/scripts/Weather.py'";
|
||||
interval = 600;
|
||||
tooltip = true;
|
||||
};
|
||||
"battery" = {
|
||||
states = {
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{icon} {capacity}%";
|
||||
format-charging = " {capacity}%";
|
||||
format-plugged = " {capacity}%";
|
||||
format-icons = ["" "" "" "" "" "" "" "" "" ""];
|
||||
on-click = "";
|
||||
tooltip = false;
|
||||
};
|
||||
}
|
||||
];
|
||||
style = concatStrings [
|
||||
''
|
||||
* {
|
||||
font-size: 16px;
|
||||
font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif;
|
||||
font-weight: bold;
|
||||
}
|
||||
window#waybar {
|
||||
/*
|
||||
|
||||
background-color: rgba(26,27,38,0);
|
||||
border-bottom: 1px solid rgba(26,27,38,0);
|
||||
border-radius: 0px;
|
||||
color: #${base0F};
|
||||
*/
|
||||
|
||||
background-color: rgba(26,27,38,0);
|
||||
border-bottom: 1px solid rgba(26,27,38,0);
|
||||
border-radius: 0px;
|
||||
color: #${base0F};
|
||||
}
|
||||
#workspaces {
|
||||
/*
|
||||
Eternal
|
||||
background: linear-gradient(180deg, #${base00}, #${base01});
|
||||
margin: 5px 5px 5px 0px;
|
||||
padding: 0px 10px;
|
||||
border-radius: 0px 15px 50px 0px;
|
||||
border: 0px;
|
||||
font-style: normal;
|
||||
color: #${base00};
|
||||
*/
|
||||
background: linear-gradient(45deg, #${base01}, #${base01});
|
||||
margin: 5px;
|
||||
padding: 0px 1px;
|
||||
border-radius: 15px;
|
||||
border: 0px;
|
||||
font-style: normal;
|
||||
color: #${base00};
|
||||
}
|
||||
#workspaces button {
|
||||
padding: 0px 5px;
|
||||
margin: 4px 3px;
|
||||
border-radius: 15px;
|
||||
border: 0px;
|
||||
color: #${base00};
|
||||
background: linear-gradient(45deg, #${base0D}, #${base0E});
|
||||
opacity: 0.5;
|
||||
transition: all 0.3s ease-in-out;
|
||||
}
|
||||
#workspaces button.active {
|
||||
padding: 0px 5px;
|
||||
margin: 4px 3px;
|
||||
border-radius: 15px;
|
||||
border: 0px;
|
||||
color: #${base00};
|
||||
background: linear-gradient(45deg, #${base0D}, #${base0E});
|
||||
opacity: 1.0;
|
||||
min-width: 40px;
|
||||
transition: all 0.3s ease-in-out;
|
||||
}
|
||||
#workspaces button:hover {
|
||||
border-radius: 15px;
|
||||
color: #${base00};
|
||||
background: linear-gradient(45deg, #${base0D}, #${base0E});
|
||||
opacity: 0.8;
|
||||
}
|
||||
tooltip {
|
||||
background: #${base00};
|
||||
border: 1px solid #${base0E};
|
||||
border-radius: 10px;
|
||||
}
|
||||
tooltip label {
|
||||
color: #${base07};
|
||||
}
|
||||
#window {
|
||||
/*
|
||||
Eternal
|
||||
color: #${base05};
|
||||
background: #${base00};
|
||||
border-radius: 15px;
|
||||
margin: 5px;
|
||||
padding: 2px 20px;
|
||||
*/
|
||||
margin: 5px;
|
||||
padding: 2px 20px;
|
||||
color: #${base05};
|
||||
background: #${base01};
|
||||
border-radius: 50px 15px 50px 15px;
|
||||
}
|
||||
#memory {
|
||||
color: #${base0F};
|
||||
/*
|
||||
Eternal
|
||||
background: #${base00};
|
||||
border-radius: 50px 15px 50px 15px;
|
||||
margin: 5px;
|
||||
padding: 2px 20px;
|
||||
*/
|
||||
background: #${base01};
|
||||
margin: 5px;
|
||||
padding: 2px 20px;
|
||||
border-radius: 15px 50px 15px 50px;
|
||||
}
|
||||
#clock {
|
||||
color: #${base0B};
|
||||
background: #${base00};
|
||||
border-radius: 15px 50px 15px 50px;
|
||||
margin: 5px;
|
||||
padding: 2px 20px;
|
||||
}
|
||||
#idle_inhibitor {
|
||||
color: #${base0A};
|
||||
background: #${base00};
|
||||
border-radius: 50px 15px 50px 15px;
|
||||
margin: 5px;
|
||||
padding: 2px 20px;
|
||||
}
|
||||
#cpu {
|
||||
color: #${base07};
|
||||
background: #${base00};
|
||||
border-radius: 50px 15px 50px 15px;
|
||||
margin: 5px;
|
||||
padding: 2px 20px;
|
||||
}
|
||||
#disk {
|
||||
color: #${base03};
|
||||
background: #${base00};
|
||||
border-radius: 15px 50px 15px 50px;
|
||||
margin: 5px;
|
||||
padding: 2px 20px;
|
||||
}
|
||||
#battery {
|
||||
color: #${base08};
|
||||
background: #${base00};
|
||||
border-radius: 15px 50px 15px 50px;
|
||||
margin: 5px;
|
||||
padding: 2px 20px;
|
||||
}
|
||||
#network {
|
||||
color: #${base09};
|
||||
background: #${base00};
|
||||
border-radius: 50px 15px 50px 15px;
|
||||
margin: 5px;
|
||||
padding: 2px 20px;
|
||||
}
|
||||
#tray {
|
||||
color: #${base05};
|
||||
background: #${base00};
|
||||
border-radius: 15px 50px 15px 50px;
|
||||
margin: 5px;
|
||||
padding: 2px 20px;
|
||||
}
|
||||
#pulseaudio {
|
||||
color: #${base0D};
|
||||
/*
|
||||
Eternal
|
||||
background: #${base00};
|
||||
border-radius: 15px 50px 15px 50px;
|
||||
margin: 5px;
|
||||
padding: 2px 20px;
|
||||
*/
|
||||
background: #${base01};
|
||||
margin: 4px;
|
||||
padding: 2px 20px;
|
||||
border-radius: 50px 15px 50px 15px;
|
||||
}
|
||||
#custom-notification {
|
||||
color: #${base0C};
|
||||
background: #${base00};
|
||||
border-radius: 15px 50px 15px 50px;
|
||||
margin: 5px;
|
||||
padding: 2px 20px;
|
||||
}
|
||||
#custom-startmenu {
|
||||
color: #${base03};
|
||||
background: #${base00};
|
||||
border-radius: 0px 15px 50px 0px;
|
||||
margin: 5px 5px 5px 0px;
|
||||
padding: 2px 20px;
|
||||
}
|
||||
#idle_inhibitor {
|
||||
color: #${base09};
|
||||
background: #${base00};
|
||||
border-radius: 15px 50px 15px 50px;
|
||||
margin: 5px;
|
||||
padding: 2px 20px;
|
||||
}
|
||||
#custom-power {
|
||||
color: #${base08}; /* Red color for power menu */
|
||||
background: #${base00};
|
||||
border-radius: 15px 0px 0px 50px;
|
||||
margin: 5px 0px 5px 5px;
|
||||
padding: 2px 20px;
|
||||
}
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
563
modules/home/waybar/waybar-TheBlackDon.nix
Normal file
|
|
@ -0,0 +1,563 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
host,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
inherit (import ../../../hosts/${host}/variables.nix) clock24h;
|
||||
scriptsDir = ./scripts;
|
||||
scripts = builtins.attrNames (builtins.readDir scriptsDir);
|
||||
in
|
||||
with lib; {
|
||||
# Install any helper scripts shipped in modules/home/waybar/scripts into ~/.config/waybar/scripts
|
||||
home.file = builtins.listToAttrs (map
|
||||
(name: {
|
||||
name = ".config/waybar/scripts/" + name;
|
||||
value = {
|
||||
source = "${scriptsDir}/${name}";
|
||||
executable = true;
|
||||
};
|
||||
})
|
||||
scripts);
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar;
|
||||
|
||||
settings = [
|
||||
{
|
||||
layer = "top";
|
||||
position = "top";
|
||||
exclusive = true;
|
||||
passthrough = false;
|
||||
"fixed-center" = true;
|
||||
ipc = true;
|
||||
|
||||
height = 34;
|
||||
spacing = 0;
|
||||
margin = 2;
|
||||
"margin-top" = 0;
|
||||
"margin-bottom" = 0;
|
||||
"margin-left" = 0;
|
||||
"margin-right" = 0;
|
||||
|
||||
modules-left = [
|
||||
"custom/startmenu"
|
||||
"custom/qs_wallpapers_apply"
|
||||
"custom/qs_vid_wallpapers_apply"
|
||||
"hyprland/workspaces"
|
||||
"idle_inhibitor"
|
||||
"tray"
|
||||
"mpd#2"
|
||||
"mpd#3"
|
||||
"mpd#4"
|
||||
"mpd"
|
||||
];
|
||||
modules-center = ["cpu" "cpu#2" "memory" "memory#2" "disk" "disk#2"];
|
||||
modules-right = [
|
||||
"custom/themes"
|
||||
"pulseaudio"
|
||||
"pulseaudio#2"
|
||||
"backlight"
|
||||
"backlight#2"
|
||||
"battery"
|
||||
"battery#2"
|
||||
"bluetooth"
|
||||
"bluetooth#2"
|
||||
"network"
|
||||
"network#2"
|
||||
"clock"
|
||||
"clock#2"
|
||||
"custom/power"
|
||||
];
|
||||
|
||||
# --- Modules (ported from provided BlackDog config) ---
|
||||
backlight = {
|
||||
interval = 2;
|
||||
format = "{icon}";
|
||||
"format-icons" = ["" "" "" "" "" "" ""];
|
||||
"on-scroll-up" = "light -A 5%";
|
||||
"on-scroll-down" = "light -U 5%";
|
||||
"smooth-scrolling-threshold" = 1;
|
||||
};
|
||||
"backlight#2" = {
|
||||
interval = 2;
|
||||
format = "{percent}%";
|
||||
"on-scroll-up" = "light -A 5%";
|
||||
"on-scroll-down" = "light -U 5%";
|
||||
"smooth-scrolling-threshold" = 1;
|
||||
};
|
||||
|
||||
battery = {
|
||||
interval = 60;
|
||||
"full-at" = 100;
|
||||
"design-capacity" = false;
|
||||
states = {
|
||||
good = 95;
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{icon}";
|
||||
"format-charging" = "";
|
||||
"format-plugged" = "ﮣ";
|
||||
"format-full" = "";
|
||||
"format-icons" = ["" "" "" "" "" "" "" "" ""];
|
||||
"format-time" = "{H}h {M}min";
|
||||
tooltip = true;
|
||||
};
|
||||
"battery#2" = {
|
||||
interval = 60;
|
||||
"full-at" = 100;
|
||||
"design-capacity" = false;
|
||||
states = {
|
||||
good = 95;
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{capacity}%";
|
||||
"format-charging" = "{capacity}%";
|
||||
"format-plugged" = "{capacity}%";
|
||||
"format-full" = "Full";
|
||||
"format-alt" = "{time}";
|
||||
"format-time" = "{H}h {M}min";
|
||||
tooltip = true;
|
||||
};
|
||||
|
||||
bluetooth = {
|
||||
format = "";
|
||||
"format-on" = "";
|
||||
"format-off" = "";
|
||||
"format-disabled" = "";
|
||||
"format-connected" = "";
|
||||
"format-connected-battery" = "";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "{controller_alias}\t{controller_address}";
|
||||
"tooltip-format-connected" = "{controller_alias}\t{controller_address}\n\n{device_enumerate}";
|
||||
"tooltip-format-enumerate-connected" = "{device_alias}\t{device_address}";
|
||||
"on-click" = "$HOME/.config/hypr/scripts/rofi_bluetooth";
|
||||
"on-click-right" = "blueman-manager";
|
||||
};
|
||||
"bluetooth#2" = {
|
||||
format = "{status}";
|
||||
"format-on" = "{status}";
|
||||
"format-off" = "{status}";
|
||||
"format-disabled" = "{status}";
|
||||
"format-connected" = "{device_alias}";
|
||||
"format-connected-battery" = "{device_alias}, {device_battery_percentage}%";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "{controller_alias}\t{controller_address}";
|
||||
"tooltip-format-connected" = "{controller_alias}\t{controller_address}\n\n{device_enumerate}";
|
||||
"tooltip-format-enumerate-connected" = "{device_alias}\t{device_address}";
|
||||
"on-click" = "$HOME/.config/hypr/scripts/rofi_bluetooth";
|
||||
"on-click-right" = "blueman-manager";
|
||||
};
|
||||
|
||||
clock = {
|
||||
"tooltip-format" = "<big>{:%B %Y}</big>\n<tt><small>{calendar}</small></tt>";
|
||||
format = "";
|
||||
};
|
||||
"clock#2" = {
|
||||
interval = 60;
|
||||
"tooltip-format" = "<big>{:%B %Y}</big>\n<tt><small>{calendar}</small></tt>";
|
||||
format =
|
||||
if clock24h
|
||||
then "{:%H:%M}"
|
||||
else "{:%I:%M %p}";
|
||||
"format-alt" = "{:%a %b %d, %G}";
|
||||
};
|
||||
|
||||
cpu = {
|
||||
interval = 5;
|
||||
format = "";
|
||||
};
|
||||
"cpu#2" = {
|
||||
interval = 5;
|
||||
format = "{usage}%";
|
||||
};
|
||||
|
||||
"custom/themes" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
"on-click" = "$HOME/.config/hypr/theme/theme.sh --pywal";
|
||||
"on-click-right" = "$HOME/.config/hypr/theme/theme.sh --default";
|
||||
};
|
||||
|
||||
# Start menu aligned to project standard
|
||||
"custom/startmenu" = {
|
||||
tooltip = true;
|
||||
"tooltip-format" = "App menu";
|
||||
format = "";
|
||||
on-click = "launch-nwg-menu";
|
||||
"on-click-right" = "nwg-drawer -mr 225 -ml 225 -mt 200 -mb 200 -is 48 --spacing 15";
|
||||
};
|
||||
|
||||
# Power menu aligned to project standard (qs-wlogout + rofi fallback)
|
||||
"custom/power" = {
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Left Click: Power Menu (qs-wlogout)\nRight Click: Rofi Power Menu";
|
||||
format = " ⏻ ";
|
||||
on-click = "qs-wlogout";
|
||||
"on-click-right" = "~/.config/waybar/scripts/power-menu.sh";
|
||||
};
|
||||
|
||||
disk = {
|
||||
interval = 30;
|
||||
format = "";
|
||||
};
|
||||
"disk#2" = {
|
||||
interval = 30;
|
||||
format = "{free}";
|
||||
};
|
||||
|
||||
memory = {
|
||||
interval = 10;
|
||||
format = "";
|
||||
};
|
||||
"memory#2" = {
|
||||
interval = 10;
|
||||
format = "{used:0.1f}G";
|
||||
};
|
||||
|
||||
# Optional Spotify module (kept from source; may require script)
|
||||
"custom/spotify" = {
|
||||
exec = "$HOME/.config/hypr/waybar/spotify";
|
||||
interval = 1;
|
||||
format = "{}";
|
||||
tooltip = true;
|
||||
"max-length" = 40;
|
||||
"on-click" = "playerctl play-pause";
|
||||
"on-click-middle" = "playerctl previous";
|
||||
"on-click-right" = "playerctl next";
|
||||
"on-scroll-up" = "playerctl position 05+";
|
||||
"on-scroll-down" = "playerctl position 05-";
|
||||
"smooth-scrolling-threshold" = 1;
|
||||
};
|
||||
|
||||
# MPD transport cluster
|
||||
mpd = {
|
||||
interval = 2;
|
||||
"unknown-tag" = "N/A";
|
||||
format = "{artist} - {title} | 祥 {elapsedTime:%M:%S}";
|
||||
"format-disconnected" = "Disconnected";
|
||||
"format-paused" = "{artist} - {title}";
|
||||
"format-stopped" = "Stopped";
|
||||
"tooltip-format" = "MPD (connected)";
|
||||
"tooltip-format-disconnected" = "MPD (disconnected)";
|
||||
"on-click" = "mpc toggle";
|
||||
"on-scroll-up" = "mpc seek +00:00:01";
|
||||
"on-scroll-down" = "mpc seek -00:00:01";
|
||||
"smooth-scrolling-threshold" = 1;
|
||||
};
|
||||
"mpd#2" = {
|
||||
format = "玲";
|
||||
"format-disconnected" = "玲";
|
||||
"format-paused" = "玲";
|
||||
"format-stopped" = "玲";
|
||||
"on-click" = "mpc prev";
|
||||
};
|
||||
"mpd#3" = {
|
||||
interval = 1;
|
||||
format = "{stateIcon}";
|
||||
"format-disconnected" = "";
|
||||
"format-paused" = "{stateIcon}";
|
||||
"format-stopped" = "";
|
||||
"state-icons" = {
|
||||
paused = "";
|
||||
playing = "";
|
||||
};
|
||||
"on-click" = "mpc toggle";
|
||||
};
|
||||
"mpd#4" = {
|
||||
format = "怜";
|
||||
"format-disconnected" = "怜";
|
||||
"format-paused" = "怜";
|
||||
"format-stopped" = "怜";
|
||||
"on-click" = "mpc next";
|
||||
};
|
||||
|
||||
network = {
|
||||
interval = 5;
|
||||
"format-wifi" = "直";
|
||||
"format-ethernet" = "";
|
||||
"format-linked" = "";
|
||||
"format-disconnected" = "睊";
|
||||
"format-disabled" = "睊";
|
||||
"tooltip-format" = " {ifname} via {gwaddr}";
|
||||
"on-click" = "$HOME/.config/hypr/scripts/rofi_network";
|
||||
};
|
||||
"network#2" = {
|
||||
interval = 5;
|
||||
"format-wifi" = "{essid}";
|
||||
"format-ethernet" = "{ipaddr}/{cidr}";
|
||||
"format-linked" = "{ifname} (No IP)";
|
||||
"format-disconnected" = "Disconnected";
|
||||
"format-disabled" = "Disabled";
|
||||
"format-alt" = " {bandwidthUpBits} | {bandwidthDownBits}";
|
||||
"tooltip-format" = " {ifname} via {gwaddr}";
|
||||
};
|
||||
|
||||
pulseaudio = {
|
||||
format = "{icon}";
|
||||
"format-muted" = "";
|
||||
"format-bluetooth" = "";
|
||||
"format-bluetooth-muted" = "";
|
||||
"format-source" = "";
|
||||
"format-source-muted" = "";
|
||||
"format-icons" = {
|
||||
headphone = "";
|
||||
"hands-free" = "ﳌ";
|
||||
headset = "";
|
||||
phone = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = ["" "" ""];
|
||||
};
|
||||
"scroll-step" = 5.0;
|
||||
"on-click" = "pulsemixer --toggle-mute";
|
||||
"on-click-right" = "pulsemixer --toggle-mute";
|
||||
"smooth-scrolling-threshold" = 1;
|
||||
};
|
||||
"pulseaudio#2" = {
|
||||
format = "{volume}%";
|
||||
"format-muted" = "Mute";
|
||||
"format-bluetooth" = "{volume}%";
|
||||
"format-bluetooth-muted" = "Mute";
|
||||
"format-source" = "{volume}%";
|
||||
"scroll-step" = 5.0;
|
||||
"on-click" = "pulsemixer --toggle-mute";
|
||||
"on-click-right" = "pulsemixer --toggle-mute";
|
||||
"smooth-scrolling-threshold" = 1;
|
||||
};
|
||||
|
||||
idle_inhibitor = {
|
||||
format = "{icon}";
|
||||
"format-icons" = {
|
||||
activated = "";
|
||||
deactivated = "";
|
||||
};
|
||||
timeout = 30;
|
||||
};
|
||||
|
||||
"hyprland/workspaces" = {
|
||||
format = "{icon}";
|
||||
"sort-by-number" = true;
|
||||
"active-only" = false;
|
||||
"format-icons" = {
|
||||
"1" = "1";
|
||||
"2" = "2";
|
||||
"3" = "3";
|
||||
"4" = "4";
|
||||
"5" = "5";
|
||||
"6" = "6";
|
||||
"7" = "7";
|
||||
"8" = "8";
|
||||
"9" = "9";
|
||||
"10" = "10";
|
||||
urgent = "";
|
||||
focused = "";
|
||||
default = "";
|
||||
};
|
||||
on-click = "activate";
|
||||
};
|
||||
|
||||
tray = {
|
||||
"icon-size" = 16;
|
||||
spacing = 10;
|
||||
};
|
||||
|
||||
# ddubs wallpaper quick actions
|
||||
"custom/qs_wallpapers_apply" = {
|
||||
format = "";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Set image wallpaper";
|
||||
on-click = "qs-wallpapers-apply";
|
||||
};
|
||||
"custom/qs_vid_wallpapers_apply" = {
|
||||
format = "";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Set video wallpaper";
|
||||
on-click = "qs-vid-wallpapers-apply";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
# --- CSS (colors + styles from provided BlackDog theme, with startmenu selector updated) ---
|
||||
style = concatStrings [
|
||||
''
|
||||
/** Colors (from colors.css) **/
|
||||
@define-color background #0a0a0a;
|
||||
@define-color background-alt1 #181818;
|
||||
@define-color background-alt2 #232323;
|
||||
@define-color foreground #ddd8d0;
|
||||
@define-color selected #E29E5D;
|
||||
@define-color black #0a0a0a;
|
||||
@define-color red #C53A31;
|
||||
@define-color green #867971;
|
||||
@define-color yellow #8F847B;
|
||||
@define-color blue #E29E5D;
|
||||
@define-color magenta #7C7987;
|
||||
@define-color cyan #A19993;
|
||||
@define-color white #ddd8d0;
|
||||
|
||||
/** Fonts **/
|
||||
* {
|
||||
font-family: "JetBrains Mono", "Symbols Nerd Font", Iosevka, archcraft, sans-serif;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
/** Waybar Window **/
|
||||
window#waybar {
|
||||
background-color: @background;
|
||||
color: @foreground;
|
||||
border-bottom: 2px solid @background-alt1;
|
||||
transition-property: background-color;
|
||||
transition-duration: .5s;
|
||||
}
|
||||
window#waybar.hidden { opacity: 0.5; }
|
||||
|
||||
/** Custom **/
|
||||
#custom-startmenu {
|
||||
background-color: @background-alt1;
|
||||
color: @magenta;
|
||||
font-size: 18px;
|
||||
border-radius: 0px 14px 0px 0px;
|
||||
margin: 0px 0px 0px 0px;
|
||||
padding: 2px 8px 2px 8px;
|
||||
}
|
||||
#custom-themes { background-color: @selected; }
|
||||
#custom-power {
|
||||
background-color: @red;
|
||||
font-size: 16px;
|
||||
}
|
||||
#custom-power, #custom-themes {
|
||||
color: @background;
|
||||
border-radius: 10px;
|
||||
margin: 6px 6px 6px 0px;
|
||||
padding: 2px 8px 2px 8px;
|
||||
}
|
||||
|
||||
/** Idle Inhibitor **/
|
||||
#idle_inhibitor {
|
||||
background-color: @green;
|
||||
color: @background;
|
||||
border-radius: 10px;
|
||||
margin: 6px 0px 6px 6px;
|
||||
padding: 4px 6px;
|
||||
}
|
||||
#idle_inhibitor.deactivated { background-color: @red; }
|
||||
|
||||
/** Tray **/
|
||||
#tray {
|
||||
background-color: @background-alt1;
|
||||
border-radius: 10px;
|
||||
margin: 6px 0px 6px 6px;
|
||||
padding: 4px 6px;
|
||||
}
|
||||
#tray > .passive { -gtk-icon-effect: dim; }
|
||||
#tray > .needs-attention { -gtk-icon-effect: highlight; }
|
||||
|
||||
/** MPD **/
|
||||
@keyframes gradient {
|
||||
0% { background-position: 0% 50%; }
|
||||
50% { background-position: 100% 50%; }
|
||||
100% { background-position: 0% 50%; }
|
||||
}
|
||||
#mpd { color: @foreground; font-size: 12px; font-weight: bold; }
|
||||
#mpd.disconnected, #mpd.stopped { color: @red; }
|
||||
#mpd.playing { color: @cyan; }
|
||||
#mpd.2 { border-radius: 10px 0px 0px 10px; margin: 6px 0px 6px 6px; padding: 4px 6px 4px 10px; }
|
||||
#mpd.3 { margin: 6px 0px 6px 0px; padding: 4px; }
|
||||
#mpd.4 { border-radius: 0px 10px 10px 0px; margin: 6px 6px 6px 0px; padding: 4px 10px 4px 6px; }
|
||||
#mpd.2,#mpd.3,#mpd.4 { background-color: @background-alt1; font-size: 14px; }
|
||||
|
||||
/** Spotify **/
|
||||
#custom-spotify {
|
||||
background-color: @background-alt1;
|
||||
color: @foreground;
|
||||
border-radius: 10px;
|
||||
margin: 6px 0px 6px 6px;
|
||||
padding: 4px 8px;
|
||||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
}
|
||||
#custom-spotify.paused { color: @foreground; }
|
||||
#custom-spotify.playing {
|
||||
background: linear-gradient(90deg, @magenta 25%, @red 50%, @yellow 75%, @cyan 100%);
|
||||
background-size: 300% 300%;
|
||||
animation: gradient 10s ease infinite;
|
||||
color: @background;
|
||||
}
|
||||
#custom-spotify.offline { color: @red; }
|
||||
|
||||
/** CPU/Memory/Disk **/
|
||||
#cpu { color: @red; }
|
||||
#memory { color: @green; }
|
||||
#disk { color: @yellow; }
|
||||
|
||||
/** Pulseaudio **/
|
||||
#pulseaudio { color: @blue; }
|
||||
#pulseaudio.bluetooth { color: @cyan; }
|
||||
#pulseaudio.muted { color: @red; }
|
||||
|
||||
/** Backlight **/
|
||||
#backlight { color: @magenta; }
|
||||
|
||||
/** Battery **/
|
||||
#battery { color: @cyan; }
|
||||
@keyframes blink { to { color: @foreground; } }
|
||||
#battery.critical:not(.charging) { background-color: @background-alt2; }
|
||||
#battery.2.critical:not(.charging) {
|
||||
background-color: @background-alt1;
|
||||
color: @red;
|
||||
animation-name: blink;
|
||||
animation-duration: 0.5s;
|
||||
animation-timing-function: linear;
|
||||
animation-iteration-count: infinite;
|
||||
animation-direction: alternate;
|
||||
}
|
||||
|
||||
/** Network **/
|
||||
#network { color: @yellow; }
|
||||
#network.disconnected, #network.disabled { color: @red; }
|
||||
|
||||
/** Bluetooth **/
|
||||
#bluetooth { color: @green; }
|
||||
#bluetooth.disabled, #bluetooth.off { color: @red; }
|
||||
|
||||
/** Clock **/
|
||||
#clock { color: @blue; }
|
||||
|
||||
/** Workspaces **/
|
||||
#workspaces {
|
||||
background-color: @background;
|
||||
border-radius: 10px;
|
||||
margin-left: 6px;
|
||||
margin-bottom: 2px;
|
||||
padding: 0px;
|
||||
}
|
||||
#workspaces button { color: @foreground; }
|
||||
#workspaces button.active { color: @red; }
|
||||
#workspaces button.urgent { color: @green; }
|
||||
#workspaces button.hidden { color: @yellow; }
|
||||
|
||||
/** Common style **/
|
||||
#backlight, #battery, #clock, #cpu, #disk, #memory, #pulseaudio, #network, #bluetooth {
|
||||
background-color: @background-alt2;
|
||||
border-radius: 10px 0px 0px 10px;
|
||||
margin: 6px 0px 6px 0px;
|
||||
padding: 4px 6px;
|
||||
}
|
||||
#backlight.2, #battery.2, #clock.2, #cpu.2, #disk.2, #memory.2, #pulseaudio.2, #network.2, #bluetooth.2 {
|
||||
background-color: @background-alt1;
|
||||
color: @foreground;
|
||||
font-size: 12px;
|
||||
font-weight: bold;
|
||||
border-radius: 0px 10px 10px 0px;
|
||||
margin: 6px 6px 6px 0px;
|
||||
padding: 5px 6px 4px 6px;
|
||||
}
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
295
modules/home/waybar/waybar-ddubsos-v1.nix
Normal file
|
|
@ -0,0 +1,295 @@
|
|||
{
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
host,
|
||||
...
|
||||
}: let
|
||||
betterTransition = "all 0.3s cubic-bezier(.55,-0.68,.48,1.682)";
|
||||
inherit (import ../../../hosts/${host}/variables.nix) clock24h;
|
||||
scriptsDir = ./scripts;
|
||||
scripts = builtins.attrNames (builtins.readDir scriptsDir);
|
||||
in
|
||||
with lib; {
|
||||
home.file = builtins.listToAttrs (map
|
||||
(name: {
|
||||
name = ".config/waybar/scripts/" + name;
|
||||
value = {
|
||||
source = "${scriptsDir}/${name}";
|
||||
executable = true;
|
||||
};
|
||||
})
|
||||
scripts);
|
||||
# Configure & Theme Waybar
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar;
|
||||
settings = [
|
||||
{
|
||||
layer = "top";
|
||||
position = "top";
|
||||
|
||||
modules-center = ["hyprland/workspaces" "custom/weather"];
|
||||
modules-left = ["custom/startmenu" "clock" "hyprland/window" "custom/sep_left" "custom/cava_mviz" "custom/sep_right"];
|
||||
modules-right = [
|
||||
"pulseaudio"
|
||||
"cpu"
|
||||
"memory"
|
||||
"custom/notification"
|
||||
"idle_inhibitor"
|
||||
"custom/themeselector"
|
||||
"battery"
|
||||
"tray"
|
||||
"custom/power"
|
||||
];
|
||||
|
||||
"hyprland/workspaces" = {
|
||||
format = "{name}";
|
||||
format-icons = {
|
||||
default = " ";
|
||||
active = " ";
|
||||
urgent = " ";
|
||||
};
|
||||
on-scroll-up = "hyprctl dispatch workspace e+1";
|
||||
on-scroll-down = "hyprctl dispatch workspace e-1";
|
||||
};
|
||||
"clock" = {
|
||||
format =
|
||||
if clock24h == true
|
||||
then " {:L%H:%M}"
|
||||
else " {:L%I:%M %p}";
|
||||
tooltip = true;
|
||||
tooltip-format = "<big>{:%A, %d.%B %Y }</big><tt><small>{calendar}</small></tt>";
|
||||
};
|
||||
"hyprland/window" = {
|
||||
max-length = 25;
|
||||
separate-outputs = false;
|
||||
rewrite = {
|
||||
"" = " 🙈 No Windows? ";
|
||||
};
|
||||
};
|
||||
"memory" = {
|
||||
interval = 5;
|
||||
format = " {}%";
|
||||
tooltip = true;
|
||||
};
|
||||
"cpu" = {
|
||||
interval = 5;
|
||||
format = " {usage:2}%";
|
||||
tooltip = true;
|
||||
};
|
||||
"disk" = {
|
||||
format = " {free}";
|
||||
tooltip = true;
|
||||
};
|
||||
"network" = {
|
||||
format-icons = ["" "" "" "" ""];
|
||||
format-ethernet = " {bandwidthDownOctets}";
|
||||
format-wifi = "{icon} {signalStrength}%";
|
||||
format-disconnected = "";
|
||||
tooltip = false;
|
||||
};
|
||||
"tray" = {spacing = 12;};
|
||||
"pulseaudio" = {
|
||||
format = "{icon} {volume}% {format_source}";
|
||||
format-bluetooth = "{volume}% {icon} {format_source}";
|
||||
format-bluetooth-muted = " {icon} {format_source}";
|
||||
format-muted = " {format_source}";
|
||||
format-source = " {volume}%";
|
||||
format-source-muted = "";
|
||||
format-icons = {
|
||||
headphone = "";
|
||||
hands-free = "";
|
||||
headset = "";
|
||||
phone = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = ["" "" ""];
|
||||
};
|
||||
on-click = "sleep 0.1 && pavucontrol";
|
||||
};
|
||||
"custom/cava_mviz" = {
|
||||
"exec" = "WaybarCava";
|
||||
"format" = "{}";
|
||||
};
|
||||
"custom/sep_left" = {
|
||||
format = " [";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/sep_right" = {
|
||||
format = "] ";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/themeselector" = {
|
||||
tooltip = false;
|
||||
format = "";
|
||||
on-click = "sleep 0.1 && theme-selector";
|
||||
};
|
||||
"custom/power" = {
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Power menu: Left-click for QS logout, Right-click for rofi power menu";
|
||||
format = " ⏻ ";
|
||||
"on-click" = "qs-wlogout";
|
||||
"on-click-right" = "~/.config/waybar/scripts/power-menu.sh";
|
||||
};
|
||||
"custom/startmenu" = {
|
||||
tooltip = true;
|
||||
"tooltip-format" = "App menu";
|
||||
format = "";
|
||||
# on-click = "rofi -show drun";
|
||||
on-click = "launch-nwg-menu";
|
||||
"on-click-right" = "nwg-drawer -mr 225 -ml 225 -mt 200 -mb 200 -is 48 --spacing 15";
|
||||
};
|
||||
"custom/hyprbindings" = {
|
||||
tooltip = false;
|
||||
format = " Bindings";
|
||||
on-click = "sleep 0.1 && list-keybinds";
|
||||
};
|
||||
"idle_inhibitor" = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
activated = " ";
|
||||
deactivated = " ";
|
||||
};
|
||||
tooltip = "true";
|
||||
};
|
||||
"custom/notification" = {
|
||||
tooltip = false;
|
||||
format = "{icon} {}";
|
||||
format-icons = {
|
||||
notification = "<span foreground='red'><sup></sup></span>";
|
||||
none = "";
|
||||
dnd-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-none = "";
|
||||
inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
inhibited-none = "";
|
||||
dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-inhibited-none = "";
|
||||
};
|
||||
return-type = "json";
|
||||
exec-if = "which swaync-client";
|
||||
exec = "swaync-client -swb";
|
||||
on-click = "sleep 0.1 && task-waybar";
|
||||
escape = true;
|
||||
};
|
||||
"custom/weather" = {
|
||||
return-type = "json";
|
||||
exec = "sh -lc 'WEATHER_ICON_STYLE=emoji WEATHER_TOOLTIP_MARKUP=1 ~/.config/waybar/scripts/Weather.py'";
|
||||
interval = 600;
|
||||
tooltip = true;
|
||||
};
|
||||
"battery" = {
|
||||
states = {
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{icon} {capacity}%";
|
||||
format-charging = " {capacity}%";
|
||||
format-plugged = " {capacity}%";
|
||||
format-icons = ["" "" "" "" "" "" "" "" "" ""];
|
||||
on-click = "";
|
||||
tooltip = false;
|
||||
};
|
||||
}
|
||||
];
|
||||
style = concatStrings [
|
||||
''
|
||||
* {
|
||||
font-family: JetBrainsMono Nerd Font Mono;
|
||||
font-size: 18px;
|
||||
border-radius: 0px;
|
||||
border: none;
|
||||
min-height: 0px;
|
||||
}
|
||||
window#waybar {
|
||||
background: rgba(0,0,0,0);
|
||||
}
|
||||
#workspaces {
|
||||
color: #${config.lib.stylix.colors.base00};
|
||||
background: #${config.lib.stylix.colors.base01};
|
||||
margin: 4px 4px;
|
||||
padding: 5px 5px;
|
||||
border-radius: 16px;
|
||||
}
|
||||
#workspaces button {
|
||||
font-weight: bold;
|
||||
padding: 0px 5px;
|
||||
margin: 0px 3px;
|
||||
border-radius: 16px;
|
||||
color: #${config.lib.stylix.colors.base00};
|
||||
background: linear-gradient(45deg, #${config.lib.stylix.colors.base08}, #${config.lib.stylix.colors.base0D});
|
||||
opacity: 0.5;
|
||||
transition: ${betterTransition};
|
||||
}
|
||||
#workspaces button.active {
|
||||
font-weight: bold;
|
||||
padding: 0px 5px;
|
||||
margin: 0px 3px;
|
||||
border-radius: 16px;
|
||||
color: #${config.lib.stylix.colors.base00};
|
||||
background: linear-gradient(45deg, #${config.lib.stylix.colors.base08}, #${config.lib.stylix.colors.base0D});
|
||||
transition: ${betterTransition};
|
||||
opacity: 1.0;
|
||||
min-width: 40px;
|
||||
}
|
||||
#workspaces button:hover {
|
||||
font-weight: bold;
|
||||
border-radius: 16px;
|
||||
color: #${config.lib.stylix.colors.base00};
|
||||
background: linear-gradient(45deg, #${config.lib.stylix.colors.base08}, #${config.lib.stylix.colors.base0D});
|
||||
opacity: 0.8;
|
||||
transition: ${betterTransition};
|
||||
}
|
||||
tooltip {
|
||||
background: #${config.lib.stylix.colors.base00};
|
||||
border: 1px solid #${config.lib.stylix.colors.base08};
|
||||
border-radius: 12px;
|
||||
}
|
||||
tooltip label {
|
||||
color: #${config.lib.stylix.colors.base08};
|
||||
}
|
||||
#window, #pulseaudio, #cpu, #memory, #idle_inhibitor {
|
||||
font-weight: bold;
|
||||
margin: 4px 0px;
|
||||
margin-left: 7px;
|
||||
padding: 0px 18px;
|
||||
background: #${config.lib.stylix.colors.base00};
|
||||
color: #${config.lib.stylix.colors.base08};
|
||||
border-radius: 8px 8px 8px 8px;
|
||||
}
|
||||
#idle_inhibitor {
|
||||
font-size: 28px;
|
||||
}
|
||||
#custom-startmenu {
|
||||
color: #${config.lib.stylix.colors.base0B};
|
||||
background: #${config.lib.stylix.colors.base02};
|
||||
font-size: 22px;
|
||||
margin: 0px;
|
||||
padding: 0px 5px 0px 5px;
|
||||
border-radius: 16px 16px 16px 16px;
|
||||
}
|
||||
#custom-hyprbindings, #network, #battery,
|
||||
#custom-notification, #tray, #custom-power {
|
||||
/* font-weight: bold; */
|
||||
font-size: 20px;
|
||||
background: #${config.lib.stylix.colors.base00};
|
||||
color: #${config.lib.stylix.colors.base08};
|
||||
margin: 4px 0px;
|
||||
margin-right: 7px;
|
||||
border-radius: 8px 8px 8px 8px;
|
||||
padding: 0px 18px;
|
||||
}
|
||||
#clock {
|
||||
font-weight: bold;
|
||||
font-size: 16px;
|
||||
color: #0D0E15;
|
||||
background: linear-gradient(90deg, #${config.lib.stylix.colors.base0B}, #${config.lib.stylix.colors.base02});
|
||||
margin: 0px;
|
||||
padding: 0px 5px 0px 5px;
|
||||
border-radius: 16px 16px 16px 16px;
|
||||
}
|
||||
|
||||
} ''
|
||||
];
|
||||
};
|
||||
}
|
||||
532
modules/home/waybar/waybar-dwm2.nix
Normal file
|
|
@ -0,0 +1,532 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
scriptsDir = ./scripts;
|
||||
scripts = builtins.attrNames (builtins.readDir scriptsDir);
|
||||
in {
|
||||
home.packages = with pkgs; [waybar];
|
||||
|
||||
home.file = builtins.listToAttrs (
|
||||
map (name: {
|
||||
name = ".config/waybar/scripts/" + name;
|
||||
value = {
|
||||
source = "${scriptsDir}/${name}";
|
||||
executable = true;
|
||||
};
|
||||
})
|
||||
scripts
|
||||
);
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
"modules-left" = [
|
||||
"custom/startmenu"
|
||||
"hyprland/workspaces"
|
||||
"temperature"
|
||||
"hyprland/window"
|
||||
];
|
||||
"modules-center" = ["custom/spacer" "custom/weather"];
|
||||
"modules-right" = [
|
||||
"tray"
|
||||
"cpu"
|
||||
"memory"
|
||||
"idle_inhibitor"
|
||||
"clock"
|
||||
"pulseaudio"
|
||||
"bluetooth"
|
||||
"custom/power"
|
||||
];
|
||||
"hyprland/window" = {
|
||||
format = "{title}";
|
||||
"max-length" = 333;
|
||||
"seperate-outputs" = true;
|
||||
};
|
||||
clock = {
|
||||
format = "<span foreground='#282828'> </span><span>{:%I:%M %a %d}</span>";
|
||||
"tooltip-format" = "{calendar}";
|
||||
calendar = {
|
||||
mode = "month";
|
||||
"mode-mon-col" = 3;
|
||||
"on-scroll" = 1;
|
||||
"on-click-right" = "mode";
|
||||
format = {
|
||||
months = "<span color='#ffead3'><b>{}</b></span>";
|
||||
days = "<span color='#ecc6d9'><b>{}</b></span>";
|
||||
weeks = "<span color='#99ffdd'><b>{%W}</b></span>";
|
||||
weekdays = "<span color='#ffcc66'><b>{}</b></span>";
|
||||
today = "<span color='#ff6699'><b>{}</b></span>";
|
||||
};
|
||||
};
|
||||
actions = {
|
||||
"on-click-middle" = "mode";
|
||||
"on-click-right" = "shift_up";
|
||||
"on-click" = "shift_down";
|
||||
};
|
||||
};
|
||||
cpu = {
|
||||
format = "<span foreground='#b8bb26'></span> {usage}%";
|
||||
};
|
||||
memory = {
|
||||
format = "<span foreground='#d65d9e'></span> {}%";
|
||||
interval = 1;
|
||||
};
|
||||
"custom/gpu-util" = {
|
||||
exec = "./scripts/gpu-util";
|
||||
format = "<span foreground='#67b0e8'></span> {}";
|
||||
interval = 1;
|
||||
};
|
||||
"custom/gpu-temp" = {
|
||||
exec = "./scripts/gpu-temp";
|
||||
format = "<span foreground='#e57474'></span> {}";
|
||||
interval = 1;
|
||||
};
|
||||
temperature = {
|
||||
"hwmon-path" = "/sys/class/hwmon/hwmon1/temp1_input";
|
||||
"critical-threshold" = 80;
|
||||
format = "<span foreground='#83a598'></span> {temperatureC}°C";
|
||||
interval = 1;
|
||||
};
|
||||
"custom/startmenu" = {
|
||||
format = "";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "App menu";
|
||||
# "on-click" = "rofi -show drun";
|
||||
"on-click" = "launch-nwg-menu";
|
||||
"on-click-right" = "nwg-drawer -mr 225 -ml 225 -mt 200 -mb 200 -is 48 --spacing 15";
|
||||
};
|
||||
"hyprland/workspaces" = {
|
||||
format = "{icon}";
|
||||
"active-only" = false;
|
||||
"sort-by-number" = false;
|
||||
"on-click" = "activate";
|
||||
"all-outputs" = false;
|
||||
"format-icons" = {
|
||||
"1" = "1";
|
||||
"2" = "2";
|
||||
"3" = "3";
|
||||
"4" = "4";
|
||||
"5" = "5";
|
||||
"6" = "6";
|
||||
"7" = "7";
|
||||
"8" = "8";
|
||||
"9" = "9";
|
||||
"10" = "10";
|
||||
};
|
||||
};
|
||||
network = {
|
||||
format = " Off";
|
||||
"format-wifi" = "{essid} ({signalStrength}%)";
|
||||
"format-ethernet" = "<span foreground='#b48ead'></span>";
|
||||
"format-disconnected" = " Disconnected";
|
||||
"tooltip-format" = "{ifname} via {gwaddr} ";
|
||||
"tooltip-format-wifi" = "{essid}({signalStrength}%) ";
|
||||
"tooltip-format-ethernet" = " {ifname}";
|
||||
"tooltip-format-disconnected" = "Disconnected";
|
||||
};
|
||||
pulseaudio = {
|
||||
format = "<span foreground='#cc241d'>{icon}</span> {volume}% {format_source}";
|
||||
"format-bluetooth" = "<span foreground='#b16286'>{icon}</span> {volume}% {format_source}";
|
||||
"format-bluetooth-muted" = "<span foreground='#D699B6'></span> {format_source}";
|
||||
"format-muted" = "<span foreground='#7A8478'></span> {format_source}";
|
||||
"format-source" = "<span foreground='#E67E80'></span> {volume}%";
|
||||
"format-source-muted" = "<span foreground='#F38BA8'></span>";
|
||||
"format-icons" = {
|
||||
headphone = "";
|
||||
phone = "";
|
||||
portable = "";
|
||||
default = [
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
"on-click-left" = "pavucontrol";
|
||||
input = true;
|
||||
};
|
||||
"custom/playerctl" = {
|
||||
format = "{icon} <span>{}</span>";
|
||||
"return-type" = "json";
|
||||
"max-length" = 333;
|
||||
exec = "playerctl -a metadata --format '{\"text\": \"{{artist}} ~ {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F";
|
||||
"on-click-middle" = "playerctl play-pause";
|
||||
"on-click" = "playerctl previous";
|
||||
"on-click-right" = "playerctl next";
|
||||
"format-icons" = {
|
||||
Playing = "<span foreground='#98BB6C'></span>";
|
||||
Paused = "<span foreground='#E46876'></span>";
|
||||
};
|
||||
};
|
||||
"custom/weather" = {
|
||||
"return-type" = "json";
|
||||
exec = "sh -lc 'WEATHER_ICON_STYLE=emoji WEATHER_TOOLTIP_MARKUP=1 ~/.config/waybar/scripts/Weather.py'";
|
||||
interval = 600;
|
||||
tooltip = true;
|
||||
};
|
||||
tray = {
|
||||
format = "<span foreground='#D3C6AA'>{icon}</span>";
|
||||
"icon-size" = 14;
|
||||
spacing = 5;
|
||||
};
|
||||
idle_inhibitor = {
|
||||
format = "{icon}";
|
||||
"format-icons" = {
|
||||
activated = " ";
|
||||
deactivated = " ";
|
||||
};
|
||||
};
|
||||
"custom/subs" = {
|
||||
format = "<span foreground='#fbf1c7'> </span> {}";
|
||||
exec = "/usr/local/bin/subsfile.sh";
|
||||
"on-click" = "vivaldi-stable https://youtube.com/thelinuxcast";
|
||||
"restart-interval" = 1;
|
||||
};
|
||||
"custom/spacer" = {
|
||||
format = " ";
|
||||
};
|
||||
"wlr/taskbar" = {
|
||||
format = "{name}";
|
||||
"icon-size" = 14;
|
||||
"icon-theme" = "Numix-Circle";
|
||||
"tooltip-format" = "{title}";
|
||||
"on-click" = "activate";
|
||||
"on-click-middle" = "close";
|
||||
"ignore-list" = ["Alacritty"];
|
||||
"app_ids-mapping" = {
|
||||
firefoxdeveloperedition = "firefox-developer-edition";
|
||||
};
|
||||
rewrite = {
|
||||
"Firefox Web Browser" = "Firefox";
|
||||
"Foot Server" = "Terminal";
|
||||
};
|
||||
};
|
||||
bluetooth = {
|
||||
"on-click" = "./scripts/bluetooth-control";
|
||||
"on-click-right" = "./scripts/rofi-bluetooth";
|
||||
"on-click-middle" = "./scripts/rofi-bluetooth";
|
||||
format = "{icon}";
|
||||
interval = 15;
|
||||
"format-icons" = {
|
||||
on = "<span foreground='#43242B'></span>";
|
||||
off = "<span foreground='#76946A'></span>";
|
||||
disabled = "";
|
||||
connected = "";
|
||||
};
|
||||
"tooltip-format" = "{device_alias} {status}";
|
||||
};
|
||||
"custom/power" = {
|
||||
format = " ⏻ ";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Power menu: Left-click for QS logout, Right-click for rofi power menu";
|
||||
"on-click" = "qs-wlogout";
|
||||
"on-click-right" = "~/.config/waybar/scripts/power-menu.sh";
|
||||
};
|
||||
};
|
||||
};
|
||||
style = ''
|
||||
@define-color background #${config.stylix.base16Scheme.base00};
|
||||
@define-color foreground #${config.stylix.base16Scheme.base05};
|
||||
@define-color border #${config.stylix.base16Scheme.base02};
|
||||
@define-color color1 #${config.stylix.base16Scheme.base01};
|
||||
@define-color color2 #${config.stylix.base16Scheme.base02};
|
||||
@define-color color3 #${config.stylix.base16Scheme.base03};
|
||||
@define-color color4 #${config.stylix.base16Scheme.base04};
|
||||
@define-color color5 #${config.stylix.base16Scheme.base05};
|
||||
@define-color color6 #${config.stylix.base16Scheme.base06};
|
||||
@define-color color7 #${config.stylix.base16Scheme.base07};
|
||||
@define-color color8 #${config.stylix.base16Scheme.base08};
|
||||
@define-color color9 #${config.stylix.base16Scheme.base09};
|
||||
@define-color color10 #${config.stylix.base16Scheme.base0A};
|
||||
@define-color color11 #${config.stylix.base16Scheme.base0B};
|
||||
@define-color color12 #${config.stylix.base16Scheme.base0C};
|
||||
@define-color color13 #${config.stylix.base16Scheme.base0D};
|
||||
@define-color color14 #${config.stylix.base16Scheme.base0E};
|
||||
@define-color color15 #${config.stylix.base16Scheme.base0F};
|
||||
|
||||
* {
|
||||
min-height: 0;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
font-family: "JetBrains Mono Nerd Font";
|
||||
font-size: 14pt;
|
||||
font-weight: 700;
|
||||
padding-bottom: 0px;
|
||||
}
|
||||
|
||||
tooltip {
|
||||
background: @background;
|
||||
border: 2px solid @border;
|
||||
}
|
||||
|
||||
#window {
|
||||
margin: 0px 5px 0px 5px;
|
||||
padding-left: 10px;
|
||||
padding-right: 7px;
|
||||
background-color: @color14;
|
||||
color: #282828;
|
||||
}
|
||||
|
||||
window#waybar.empty #window {
|
||||
background-color: transparent;
|
||||
border-bottom: none;
|
||||
border-right: none;
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
background-color:@color14;
|
||||
color: @color2;
|
||||
}
|
||||
|
||||
/* Workspaces */
|
||||
|
||||
#workspaces {
|
||||
margin: 0px 0px 0px 0px;
|
||||
padding: 0px;
|
||||
background-color: @background;
|
||||
color: @color7;
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
margin: 0px 0px 0px 0px;
|
||||
padding-left: 3px;
|
||||
padding-right: 9px;
|
||||
background-color: @background;
|
||||
color: @color7;
|
||||
}
|
||||
|
||||
#workspaces button.active {
|
||||
padding: 0 2px 0 1px;
|
||||
color: @color3;
|
||||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
color: @color9;
|
||||
}
|
||||
|
||||
#custom-gpu-util {
|
||||
margin: 0px 5px 0px 5px;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
background-color: @background;
|
||||
color: @foreground;
|
||||
}
|
||||
|
||||
#tray {
|
||||
margin: 0px 0px 0px 0px;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
background-color: @background;
|
||||
color: @foreground;
|
||||
}
|
||||
|
||||
#idle_inhibitor {
|
||||
margin: 0px 0px 0px 0px;
|
||||
padding-left: 10px;
|
||||
padding-right: 12px;
|
||||
background-color: @background;
|
||||
color: @foreground;
|
||||
}
|
||||
|
||||
#idle_inhibitor.activated {
|
||||
color: @color9;
|
||||
}
|
||||
|
||||
#network {
|
||||
margin: 0px 0px 0px 0px;
|
||||
padding-left: 10px;
|
||||
padding-right: 12px;
|
||||
background-color: @background;
|
||||
color: @color11;
|
||||
}
|
||||
|
||||
#network.linked {
|
||||
color: @color6;
|
||||
}
|
||||
#network.disconnected,
|
||||
#network.disabled {
|
||||
color: @color4;
|
||||
}
|
||||
|
||||
#custom-subs {
|
||||
color: @foreground;
|
||||
margin: 0px 5px 0px 5px;
|
||||
padding-left: 10px;
|
||||
padding-right: 12px;
|
||||
border-bottom: 2px solid @background;
|
||||
border-right: 2px solid @background;
|
||||
border-color: @color8;
|
||||
background-color: @color13;
|
||||
}
|
||||
|
||||
#custom-cliphist {
|
||||
color: @color14;
|
||||
margin: 0px 5px 0px 5px;
|
||||
padding-left: 10px;
|
||||
padding-right: 12px;
|
||||
background-color: @background;
|
||||
}
|
||||
|
||||
#custom-gpu-temp,
|
||||
#custom-clipboard {
|
||||
margin: 0px 5px 0px 5px;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
color: @foreground;
|
||||
background-color: @background;
|
||||
}
|
||||
|
||||
#cpu {
|
||||
margin: 0px 0px 0px 0px;
|
||||
padding-left: 6px;
|
||||
padding-right: 6px;
|
||||
color: @foreground;
|
||||
background-color: @background;
|
||||
}
|
||||
|
||||
#custom-cpuicon {
|
||||
margin: 0px 0px 0px 0px;
|
||||
padding: 0px 10px 0px 10px;
|
||||
color: @color14;
|
||||
background-color: @background;
|
||||
}
|
||||
|
||||
#custom-diskicon {
|
||||
margin: 0px 0px 0px 0;
|
||||
padding: 0 10px 0 10px;
|
||||
color: @color2;
|
||||
background-color: @background;
|
||||
}
|
||||
|
||||
#disk {
|
||||
margin: 0px 0px 0px 0;
|
||||
padding-left: 0px;
|
||||
padding-right: 0px;
|
||||
color: @foreground;
|
||||
background-color: @background;
|
||||
}
|
||||
|
||||
#custom-notification {
|
||||
background-color: @background;
|
||||
color: @color15;
|
||||
padding: 0 12px;
|
||||
margin-right: 0px;
|
||||
font-size: 14px;
|
||||
font-family: "JetBrainsMono Nerd Font";
|
||||
}
|
||||
|
||||
#custom-memoryicon {
|
||||
margin: 0px 0px 0px 0px;
|
||||
color: @color4;
|
||||
padding: 0 11px 0 7px;
|
||||
background-color: @background;
|
||||
}
|
||||
|
||||
#memory {
|
||||
margin: 0px 0px 0px 0px;
|
||||
padding-left: 5px;
|
||||
padding-right: 10px;
|
||||
color: @color4;
|
||||
background-color: @background;
|
||||
}
|
||||
|
||||
#custom-tempicon {
|
||||
margin: 0px 0px 0px 0px;
|
||||
color: @color10;
|
||||
padding: 0 11px 0 8px;
|
||||
background-color: @background;
|
||||
}
|
||||
|
||||
#temperature {
|
||||
margin: 0px 0px 0px 0px;
|
||||
padding-left: 5px;
|
||||
padding-right: 10px;
|
||||
color: @color10;
|
||||
background-color: @background;
|
||||
}
|
||||
|
||||
#custom-playerctl {
|
||||
margin: 0px 5px 0px 5px;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
color: @foreground;
|
||||
background-color: @background;
|
||||
}
|
||||
|
||||
#battery,
|
||||
#backlight,
|
||||
#bluetooth,
|
||||
#pulseaudio {
|
||||
margin-top: 0px;
|
||||
margin-bottom: 0px;
|
||||
color: @foreground;
|
||||
background-color: @background;
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
margin-top: 0px;
|
||||
margin-bottom: 0px;
|
||||
color: @color15;
|
||||
background-color: @background;
|
||||
}
|
||||
|
||||
#battery,
|
||||
#bluetooth {
|
||||
margin-left: 0px;
|
||||
margin-right: 0px;
|
||||
padding-left: 0px;
|
||||
padding-right: 2px;
|
||||
}
|
||||
|
||||
#backlight,
|
||||
#pulseaudio {
|
||||
margin-right: 0px;
|
||||
margin-left: 0px;
|
||||
padding-left: 10px;
|
||||
padding-right: 7.5px;
|
||||
}
|
||||
|
||||
#clock {
|
||||
margin: 0px 0px 0px 0px;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
color: @color6;
|
||||
background-color: @background;
|
||||
}
|
||||
|
||||
#custom-clockicon {
|
||||
margin: 0px 0 0px 0px;
|
||||
color: @color6;
|
||||
padding: 0 5px 0 10px;
|
||||
background-color: @background;
|
||||
}
|
||||
|
||||
#taskbar {
|
||||
padding: 0 3px;
|
||||
margin: 0 0px;
|
||||
color: #ffffff;
|
||||
background-color: rgba(120,118,117,0.3);
|
||||
}
|
||||
#taskbar button {
|
||||
padding: 0 0 0 3px;
|
||||
margin: 0px 0px;
|
||||
color: #ffffff;
|
||||
background-color: rgba(120,118,117,0.1);
|
||||
}
|
||||
#taskbar button.active {
|
||||
background-color: rgba(120,118,117,0.8);
|
||||
}
|
||||
|
||||
#mode {
|
||||
margin: 0px 5px 0px 5px;
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
background-color: @background;
|
||||
color: @color9;
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
1024
modules/home/waybar/waybar-jak-catppuccin.nix
Normal file
1204
modules/home/waybar/waybar-jak-ml4w-modern.nix
Normal file
846
modules/home/waybar/waybar-jak-oglo-simple.nix
Normal file
|
|
@ -0,0 +1,846 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
# Install Waybar helper scripts under ~/.config/waybar/scripts (needed for power-menu.sh)
|
||||
scriptsDir = ./scripts;
|
||||
scripts = builtins.attrNames (builtins.readDir scriptsDir);
|
||||
|
||||
# Import upstream wallust color variables and base style from the source theme
|
||||
wallustColors = ''
|
||||
/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
|
||||
/* wallust template - colors-waybar */
|
||||
|
||||
@define-color foreground #DADDF8;
|
||||
@define-color background #1A1921;
|
||||
@define-color background-alt rgba(26,25,33,0.25);
|
||||
@define-color cursor #7B7EA0;
|
||||
|
||||
@define-color color0 #413F48;
|
||||
@define-color color1 #0F102E;
|
||||
@define-color color2 #151636;
|
||||
@define-color color3 #3F3683;
|
||||
@define-color color4 #404470;
|
||||
@define-color color5 #646AA1;
|
||||
@define-color color6 #7177B1;
|
||||
@define-color color7 #C2C7ED;
|
||||
@define-color color8 #888BA6;
|
||||
@define-color color9 #13153E;
|
||||
@define-color color10 #1C1E49;
|
||||
@define-color color11 #5448AF;
|
||||
@define-color color12 #555A95;
|
||||
@define-color color13 #868ED6;
|
||||
@define-color color14 #969FEC;
|
||||
@define-color color15 #C2C7ED;
|
||||
'';
|
||||
|
||||
baseStyle = ''
|
||||
/* ---- 💫 https://github.com/JaKooLit 💫 ---- */
|
||||
/* Oglo Chicklets */
|
||||
|
||||
* {
|
||||
font-family: "JetBrainsMono Nerd Font", FontAwesome, Roboto, Helvetica, Arial, sans-serif;
|
||||
font-size: 97%;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
background-color: #232a2e;
|
||||
border-bottom: 8px solid #1d2327;
|
||||
color: #d3c6aa;
|
||||
transition-property: background-color;
|
||||
transition-duration: .5s;
|
||||
}
|
||||
|
||||
window#waybar.hidden {
|
||||
opacity: 0.2;
|
||||
}
|
||||
|
||||
/*
|
||||
window#waybar.empty {
|
||||
background-color: transparent;
|
||||
}
|
||||
window#waybar.solo {
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
*/
|
||||
|
||||
button {
|
||||
all: unset;
|
||||
background-color: #778f52;
|
||||
color: #2d353b;
|
||||
border: none;
|
||||
border-bottom: 8px solid #5d743e;
|
||||
border-radius: 5px;
|
||||
padding-left: 15px;
|
||||
padding-right: 15px;
|
||||
transition: transform 0.1s ease-in-out;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
background: inherit;
|
||||
background-color: #92ab6c;
|
||||
border-bottom: 8px solid #788f57;
|
||||
}
|
||||
|
||||
button.active {
|
||||
background: inherit;
|
||||
background-color: #a5be7e;
|
||||
border-bottom: 8px solid #8aa168;
|
||||
}
|
||||
|
||||
#mode {
|
||||
background-color: #64727D;
|
||||
border-bottom: 3px solid #ffffff;
|
||||
}
|
||||
|
||||
#backlight,
|
||||
#backlight-slider,
|
||||
#battery,
|
||||
#bluetooth,
|
||||
#clock,
|
||||
#cpu,
|
||||
#disk,
|
||||
#idle_inhibitor,
|
||||
#keyboard-state,
|
||||
#memory,
|
||||
#mode,
|
||||
#mpris,
|
||||
#network,
|
||||
#power-profiles-daemon,
|
||||
#pulseaudio,
|
||||
#pulseaudio-slider,
|
||||
#taskbar,
|
||||
#temperature,
|
||||
#tray,
|
||||
#window,
|
||||
#wireplumber,
|
||||
#workspaces,
|
||||
#custom-backlight,
|
||||
#custom-browser,
|
||||
#custom-cava_mviz,
|
||||
#custom-cycle_wall,
|
||||
#custom-dot_update,
|
||||
#custom-file_manager,
|
||||
#custom-keybinds,
|
||||
#custom-keyboard,
|
||||
#custom-light_dark,
|
||||
#custom-lock,
|
||||
#custom-hint,
|
||||
#custom-hypridle,
|
||||
#custom-menu,
|
||||
#custom-playerctl,
|
||||
#custom-power_vertical,
|
||||
#custom-power,
|
||||
#custom-quit,
|
||||
#custom-reboot,
|
||||
#custom-settings,
|
||||
#custom-spotify,
|
||||
#custom-swaync,
|
||||
#custom-tty,
|
||||
#custom-updater,
|
||||
#custom-hyprpicker,
|
||||
#custom-weather,
|
||||
#custom-weather.clearNight,
|
||||
#custom-weather.cloudyFoggyDay,
|
||||
#custom-weather.cloudyFoggyNight,
|
||||
#custom-weather.default,
|
||||
#custom-weather.rainyDay,
|
||||
#custom-weather.rainyNight,
|
||||
#custom-weather.severe,
|
||||
#custom-weather.showyIcyDay,
|
||||
#custom-weather.snowyIcyNight,
|
||||
#custom-weather.sunnyDay{
|
||||
color: #ffffff;
|
||||
padding-top: 2px;
|
||||
padding-bottom: 2px;
|
||||
border-radius: 5px;
|
||||
padding-left: 5px;
|
||||
padding-right: 5px;
|
||||
}
|
||||
|
||||
#window,
|
||||
#workspaces {
|
||||
margin: 0 4px;
|
||||
}
|
||||
|
||||
/* If workspaces is the leftmost module, omit left margin */
|
||||
.modules-left > widget:first-child > #workspaces {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
/* If workspaces is the rightmost module, omit right margin */
|
||||
.modules-right > widget:last-child > #workspaces {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
#window {
|
||||
background-color: #343f44;
|
||||
color: #d3c6aa;
|
||||
border-bottom: 8px solid #2b3539;
|
||||
}
|
||||
|
||||
#custom-swaync {
|
||||
background-color: #778f52;
|
||||
color: #2d353b;
|
||||
border-bottom: 8px solid #5d743e;
|
||||
}
|
||||
|
||||
#custom-menu {
|
||||
background-color: #778f52;
|
||||
color: #2d353b;
|
||||
border-bottom: 8px solid #5d743e;
|
||||
}
|
||||
|
||||
#custom-power {
|
||||
background-color: #ee606a;
|
||||
color: #2d353b;
|
||||
border-bottom: 8px solid #ca4853;
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
#custom-power_vertical{
|
||||
background-color: #ee606a;
|
||||
color: #2d353b;
|
||||
border-bottom: 8px solid #ca4853;
|
||||
}
|
||||
|
||||
#clock {
|
||||
background-color: #96a84c;
|
||||
color: #2d353b;
|
||||
border-bottom: 8px solid #7a8c37;
|
||||
}
|
||||
|
||||
#battery {
|
||||
background-color: #3a998f;
|
||||
color: #2d353b;
|
||||
border-bottom: 8px solid #227d74;
|
||||
}
|
||||
|
||||
@keyframes blink {
|
||||
to {
|
||||
background-color: #ffffff;
|
||||
color: #000000;
|
||||
}
|
||||
}
|
||||
|
||||
#battery.critical:not(.charging) {
|
||||
background-color: #ee606a;
|
||||
color: #2d353b;
|
||||
border-bottom: 8px solid #ca4853;
|
||||
animation-name: blink;
|
||||
animation-duration: 3.0s;
|
||||
animation-timing-function: steps(12);
|
||||
animation-iteration-count: infinite;
|
||||
animation-direction: alternate;
|
||||
}
|
||||
|
||||
label:focus {
|
||||
background-color: #000000;
|
||||
}
|
||||
|
||||
#cpu {
|
||||
background-color: #778f52;
|
||||
color: #2d353b;
|
||||
border-bottom: 8px solid #5d743e;
|
||||
}
|
||||
|
||||
#memory {
|
||||
background-color: #d980ad;
|
||||
color: #2d353b;
|
||||
border-bottom: 8px solid #b86790;
|
||||
}
|
||||
|
||||
#disk {
|
||||
background-color: #964B00;
|
||||
border-bottom: 8px solid #793300;
|
||||
}
|
||||
|
||||
#custom-lock,
|
||||
#custom-light_dark,
|
||||
#backlight {
|
||||
background-color: #64b6ac;
|
||||
color: #2d353b;
|
||||
border-bottom: 8px solid #4f9990;
|
||||
padding-left: 10px;
|
||||
}
|
||||
|
||||
#network {
|
||||
background-color: #2980b9;
|
||||
}
|
||||
|
||||
#network.disconnected {
|
||||
background-color: #f53c3c;
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
background-color: #d8ac47;
|
||||
color: #2d353b;
|
||||
border-bottom: 8px solid #b78f30;
|
||||
}
|
||||
|
||||
#pulseaudio.muted {
|
||||
background-color: #90b1b1;
|
||||
color: #2a5c45;
|
||||
}
|
||||
|
||||
#wireplumber {
|
||||
background-color: #fff0f5;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
#wireplumber.muted {
|
||||
background-color: #f53c3c;
|
||||
}
|
||||
|
||||
#custom-media {
|
||||
background-color: #66cc99;
|
||||
color: #2a5c45;
|
||||
min-width: 100px;
|
||||
}
|
||||
|
||||
#custom-media.custom-spotify {
|
||||
background-color: #66cc99;
|
||||
}
|
||||
|
||||
#custom-media.custom-vlc {
|
||||
background-color: #ffa000;
|
||||
}
|
||||
|
||||
#temperature {
|
||||
background-color: #f0932b;
|
||||
border-bottom: 8px solid #b78f30;
|
||||
}
|
||||
|
||||
#temperature.critical {
|
||||
background-color: #eb4d4b;
|
||||
}
|
||||
|
||||
#tray {
|
||||
background-color: #e67f51;
|
||||
color: #2d353b;;
|
||||
border-bottom: 8px solid #c3653b;
|
||||
}
|
||||
|
||||
#tray > .passive {
|
||||
-gtk-icon-effect: dim;
|
||||
}
|
||||
|
||||
#tray > .needs-attention {
|
||||
-gtk-icon-effect: highlight;
|
||||
background-color: #eb4d4b;
|
||||
}
|
||||
|
||||
#idle_inhibitor {
|
||||
background-color: #2d3436;
|
||||
}
|
||||
|
||||
#idle_inhibitor.activated {
|
||||
background-color: #ecf0f1;
|
||||
color: #2d3436;
|
||||
}
|
||||
|
||||
#mpd {
|
||||
background-color: #66cc99;
|
||||
color: #2a5c45;
|
||||
}
|
||||
|
||||
#mpd.disconnected {
|
||||
background-color: #f53c3c;
|
||||
}
|
||||
|
||||
#mpd.stopped {
|
||||
background-color: #90b1b1;
|
||||
}
|
||||
|
||||
#mpd.paused {
|
||||
background-color: #51a37a;
|
||||
}
|
||||
|
||||
#language {
|
||||
background: #00b093;
|
||||
color: #740864;
|
||||
min-width: 16px;
|
||||
}
|
||||
|
||||
#keyboard-state {
|
||||
background: #97e1ad;
|
||||
color: #000000;
|
||||
min-width: 16px;
|
||||
border-bottom: 8px solid #78b48a;
|
||||
}
|
||||
|
||||
#keyboard-state > label {
|
||||
padding: 0 5px;
|
||||
}
|
||||
|
||||
#keyboard-state > label.locked {
|
||||
background: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
#scratchpad {
|
||||
background: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
#scratchpad.empty {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
tooltip {
|
||||
background-color: #232a2e;
|
||||
border: none;
|
||||
border-bottom: 8px solid #1d2327;
|
||||
}
|
||||
|
||||
tooltip decoration {
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
tooltip decoration:backdrop {
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
tooltip label {
|
||||
color: #d3c6aa;
|
||||
padding-left: 5px;
|
||||
padding-right: 5px;
|
||||
padding-top: 0px;
|
||||
padding-bottom: 5px;
|
||||
}
|
||||
|
||||
|
||||
#pulseaudio-slider slider {
|
||||
min-width: 0px;
|
||||
min-height: 0px;
|
||||
opacity: 0;
|
||||
background-image: none;
|
||||
border: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
#pulseaudio-slider trough {
|
||||
background-color: #7f849c;
|
||||
min-width: 80px;
|
||||
min-height: 5px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
#pulseaudio-slider highlight {
|
||||
min-height: 10px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
#backlight-slider slider {
|
||||
min-width: 0px;
|
||||
min-height: 0px;
|
||||
opacity: 0;
|
||||
background-image: none;
|
||||
border: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
#backlight-slider trough {
|
||||
background-color: #7f849c;
|
||||
min-width: 80px;
|
||||
min-height: 10px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
#backlight-slider highlight {
|
||||
min-width: 10px;
|
||||
border-radius: 5px;
|
||||
}
|
||||
'';
|
||||
|
||||
# Explicit overrides for notification coffee mug colors (red when inactive/no notifications, green when active/has notifications)
|
||||
overrides = ''
|
||||
/* Coffee mug notification colors */
|
||||
#custom-swaync { color: #ee606a; } /* default red */
|
||||
#custom-swaync.none,
|
||||
#custom-swaync.dnd-none,
|
||||
#custom-swaync.inhibited-none { color: #ee606a; }
|
||||
#custom-swaync.notification,
|
||||
#custom-swaync.dnd-notification,
|
||||
#custom-swaync.inhibited-notification { color: #00f769; }
|
||||
'';
|
||||
in {
|
||||
# Install scripts (power-menu.sh, etc.)
|
||||
home.file = builtins.listToAttrs (
|
||||
map (name: {
|
||||
name = ".config/waybar/scripts/" + name;
|
||||
value = {
|
||||
source = "${scriptsDir}/${name}";
|
||||
executable = true;
|
||||
};
|
||||
})
|
||||
scripts
|
||||
);
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar;
|
||||
|
||||
settings = [
|
||||
{
|
||||
layer = "top";
|
||||
position = "top";
|
||||
# mode = "dock";
|
||||
exclusive = true;
|
||||
passthrough = false;
|
||||
"gtk-layer-shell" = true;
|
||||
"margin-left" = 6;
|
||||
"margin-right" = 6;
|
||||
"margin-top" = 2;
|
||||
|
||||
# Layout
|
||||
"modules-left" = [
|
||||
"idle_inhibitor"
|
||||
"group/mobo_drawer"
|
||||
"hyprland/workspaces#rw"
|
||||
"tray"
|
||||
"mpris"
|
||||
];
|
||||
"modules-center" = [
|
||||
"clock#2"
|
||||
"group/notify"
|
||||
"custom/weather"
|
||||
];
|
||||
"modules-right" = [
|
||||
"hyprland/window"
|
||||
"battery"
|
||||
"group/audio"
|
||||
"custom/power"
|
||||
];
|
||||
|
||||
# Module definitions (subset needed by this layout)
|
||||
battery = {
|
||||
align = 0;
|
||||
rotate = 0;
|
||||
"full-at" = 100;
|
||||
"design-capacity" = false;
|
||||
states = {
|
||||
good = 95;
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{icon} {capacity}%";
|
||||
"format-charging" = " {capacity}%";
|
||||
"format-plugged" = " {capacity}%";
|
||||
"format-alt-click" = "click";
|
||||
"format-full" = "{icon} Full";
|
||||
"format-alt" = "{icon} {time}";
|
||||
"format-icons" = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
"format-time" = "{H}h {M}min";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "{timeTo} {power}w";
|
||||
"on-click-middle" = "$HOME/.config/hypr/scripts/ChangeBlur.sh";
|
||||
"on-click-right" = "$HOME/.config/hypr/scripts/Wlogout.sh";
|
||||
};
|
||||
|
||||
"clock#2" = {
|
||||
format = " {:%I:%M %p}";
|
||||
"format-alt" = "{:%A | %H:%M | %e %B}";
|
||||
"tooltip-format" = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
|
||||
};
|
||||
|
||||
cpu = {
|
||||
format = "{usage}% ";
|
||||
interval = 1;
|
||||
"min-length" = 5;
|
||||
"format-alt-click" = "click";
|
||||
"format-alt" = "{icon0}{icon1}{icon2}{icon3} {usage:>2}% ";
|
||||
"format-icons" = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
|
||||
"on-click-right" = "gnome-system-monitor";
|
||||
};
|
||||
|
||||
disk = {
|
||||
interval = 30;
|
||||
path = "/";
|
||||
format = "{percentage_used}% ";
|
||||
"tooltip-format" = "{used} used out of {total} on {path} ({percentage_used}%)";
|
||||
};
|
||||
|
||||
"hyprland/workspaces#rw" = {
|
||||
"disable-scroll" = true;
|
||||
"all-outputs" = true;
|
||||
"warp-on-scroll" = false;
|
||||
"sort-by-number" = true;
|
||||
"show-special" = false;
|
||||
"on-click" = "activate";
|
||||
"on-scroll-up" = "hyprctl dispatch workspace e+1";
|
||||
"on-scroll-down" = "hyprctl dispatch workspace e-1";
|
||||
"persistent-workspaces" = {"*" = 5;};
|
||||
format = "{icon} {windows}";
|
||||
"format-window-separator" = " ";
|
||||
"window-rewrite-default" = " ";
|
||||
"window-rewrite" = {
|
||||
"(.*) — Mozilla Firefox" = " $1";
|
||||
"(.*) - fish" = "> [$1]";
|
||||
"(.*) - zsh" = "> [$1]";
|
||||
"class<Warp|warp|dev.warp.Warp|warp-terminal>" = " ";
|
||||
"class<com.mitchellh.ghostty>" = " ";
|
||||
"class<remote-viewer|virt-viewer>" = " ";
|
||||
"class<helium>" = " ";
|
||||
"class<[Ss]ignal|signal-desktop|org.signal.Signal>" = " ";
|
||||
"title<.*Signal.*>" = " ";
|
||||
"class<remmina|org.remmina.Remmina>" = "🖥️ ";
|
||||
"class<[Kk]denlive|org.kde.kdenlive>" = "🎬 ";
|
||||
"title<.*Kdenlive.*>" = "🎬 ";
|
||||
|
||||
# qs-* apps
|
||||
"title<Hyprland Keybinds>" = " ";
|
||||
"title<Niri Keybinds>" = " ";
|
||||
"title<BSPWM Keybinds>" = " ";
|
||||
"title<DWM Keybinds>" = " ";
|
||||
"title<Emacs Leader Keybinds>" = " ";
|
||||
"title<Kitty Configuration>" = " ";
|
||||
"title<WezTerm Configuration>" = " ";
|
||||
"title<Yazi Configuration>" = " ";
|
||||
"title<Cheatsheets Viewer>" = " ";
|
||||
"title<Documentation Viewer>" = " ";
|
||||
"title<^Wallpapers$>" = " ";
|
||||
"title<^Video Wallpapers$>" = " ";
|
||||
"title<^qs-wlogout$>" = " ";
|
||||
|
||||
# BoxBuddy
|
||||
"class<[Bb]ox[Bb]uddy|io.github.dvlv.boxbuddy|io.github.dvlv.BoxBuddy>" = " ";
|
||||
"title<.*BoxBuddy.*>" = " ";
|
||||
|
||||
# Bazaar software store
|
||||
"class<io.github.kolunmi.Bazaar>" = " ";
|
||||
"title<^Bazaar$>" = " ";
|
||||
|
||||
# satty screenshot tool
|
||||
"class<com.gabm.satty>" = " ";
|
||||
"title<^satty$>" = " ";
|
||||
};
|
||||
};
|
||||
|
||||
"hyprland/window" = {
|
||||
format = "{}";
|
||||
"max-length" = 25;
|
||||
"separate-outputs" = true;
|
||||
"offscreen-css" = true;
|
||||
"offscreen-css-text" = "(inactive)";
|
||||
};
|
||||
|
||||
idle_inhibitor = {
|
||||
tooltip = true;
|
||||
"tooltip-format-activated" = "Idle_inhibitor active";
|
||||
"tooltip-format-deactivated" = "Idle_inhibitor not active";
|
||||
format = "{icon}";
|
||||
"format-icons" = {
|
||||
activated = " ";
|
||||
deactivated = " ";
|
||||
};
|
||||
};
|
||||
|
||||
memory = {
|
||||
interval = 10;
|
||||
format = "{used:0.1f}G ";
|
||||
"format-alt" = "{percentage}% ";
|
||||
"format-alt-click" = "click";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "{used:0.1f}GB/{total:0.1f}G";
|
||||
"on-click-right" = "$HOME/.config/hypr/scripts/WaybarScripts.sh --btop";
|
||||
};
|
||||
|
||||
"custom/weather" = {
|
||||
"return-type" = "json";
|
||||
exec = "sh -lc 'WEATHER_ICON_STYLE=emoji WEATHER_TOOLTIP_MARKUP=1 ~/.config/waybar/scripts/Weather.py'";
|
||||
interval = 600;
|
||||
tooltip = true;
|
||||
};
|
||||
|
||||
mpris = {
|
||||
interval = 10;
|
||||
format = "{player_icon} ";
|
||||
"format-paused" = "{status_icon} <i>{dynamic}</i>";
|
||||
"on-click-middle" = "playerctl play-pause";
|
||||
"on-click" = "playerctl previous";
|
||||
"on-click-right" = "playerctl next";
|
||||
"scroll-step" = 5.0;
|
||||
"on-scroll-up" = "$HOME/.config/hypr/scripts/Volume.sh --inc";
|
||||
"on-scroll-down" = "$HOME/.config/hypr/scripts/Volume.sh --dec";
|
||||
"smooth-scrolling-threshold" = 1;
|
||||
tooltip = true;
|
||||
"tooltip-format" = "{status_icon} {dynamic}\nLeft Click: previous\nMid Click: Pause\nRight Click: Next";
|
||||
"player-icons" = {
|
||||
chromium = "";
|
||||
default = "";
|
||||
firefox = "";
|
||||
kdeconnect = "";
|
||||
mopidy = "";
|
||||
mpv = "";
|
||||
spotify = "";
|
||||
vlc = "";
|
||||
};
|
||||
"status-icons" = {
|
||||
paused = "";
|
||||
playing = "";
|
||||
stopped = "";
|
||||
};
|
||||
"max-length" = 30;
|
||||
};
|
||||
|
||||
pulseaudio = {
|
||||
format = "{icon} {volume}%";
|
||||
"format-bluetooth" = "{icon} {volume}%";
|
||||
"format-muted" = "";
|
||||
"format-icons" = {
|
||||
headphone = "";
|
||||
"hands-free" = "";
|
||||
headset = "";
|
||||
phone = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = ["" "" "" ""];
|
||||
"ignored-sinks" = ["Easy Effects Sink"];
|
||||
};
|
||||
"scroll-step" = 5.0;
|
||||
"on-click" = "$HOME/.config/hypr/scripts/Volume.sh --toggle";
|
||||
"on-click-right" = "pavucontrol -t 3";
|
||||
"on-scroll-up" = "$HOME/.config/hypr/scripts/Volume.sh --inc";
|
||||
"on-scroll-down" = "$HOME/.config/hypr/scripts/Volume.sh --dec";
|
||||
"tooltip-format" = "{icon} {desc} | {volume}%";
|
||||
"smooth-scrolling-threshold" = 1;
|
||||
};
|
||||
|
||||
"pulseaudio#microphone" = {
|
||||
format = "{format_source}";
|
||||
"format-source" = " {volume}%";
|
||||
"format-source-muted" = "";
|
||||
"on-click" = "$HOME/.config/hypr/scripts/Volume.sh --toggle-mic";
|
||||
"on-click-right" = "pavucontrol -t 4";
|
||||
"on-scroll-up" = "$HOME/.config/hypr/scripts/Volume.sh --mic-inc";
|
||||
"on-scroll-down" = "$HOME/.config/hypr/scripts/Volume.sh --mic-dec";
|
||||
"tooltip-format" = "{source_desc} | {source_volume}%";
|
||||
"scroll-step" = 5;
|
||||
};
|
||||
|
||||
tray = {
|
||||
"icon-size" = 20;
|
||||
spacing = 4;
|
||||
};
|
||||
|
||||
# Groups
|
||||
"group/mobo_drawer" = {
|
||||
orientation = "inherit";
|
||||
drawer = {
|
||||
"transition-duration" = 500;
|
||||
"children-class" = "cpu";
|
||||
"transition-left-to-right" = true;
|
||||
};
|
||||
modules = ["temperature" "cpu" "power-profiles-daemon" "memory" "disk"];
|
||||
};
|
||||
|
||||
"group/audio" = {
|
||||
orientation = "inherit";
|
||||
drawer = {
|
||||
"transition-duration" = 500;
|
||||
"children-class" = "pulseaudio";
|
||||
"transition-left-to-right" = true;
|
||||
};
|
||||
modules = ["pulseaudio" "pulseaudio#microphone"];
|
||||
};
|
||||
|
||||
"group/notify" = {
|
||||
orientation = "inherit";
|
||||
drawer = {
|
||||
"transition-duration" = 500;
|
||||
"children-class" = "custom/swaync";
|
||||
"transition-left-to-right" = false;
|
||||
};
|
||||
modules = ["custom/swaync" "custom/dot_update"];
|
||||
};
|
||||
|
||||
# Custom modules
|
||||
"custom/power" = {
|
||||
format = " ⏻ ";
|
||||
"on-click" = "qs-wlogout";
|
||||
"on-click-right" = "~/.config/waybar/scripts/power-menu.sh";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Power menu: Left-click for QS logout, Right-click for rofi power menu";
|
||||
};
|
||||
|
||||
"custom/quit" = {
|
||||
format = "";
|
||||
"on-click" = "hyprctl dispatch exit";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Left Click: Exit Hyprland";
|
||||
};
|
||||
|
||||
"custom/swaync" = {
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Left Click: Launch Notification Center\nRight Click: Do not Disturb";
|
||||
format = "{} {icon} ";
|
||||
# Coffee mug icon for all states
|
||||
"format-icons" = {
|
||||
notification = "";
|
||||
none = "";
|
||||
"dnd-notification" = "";
|
||||
"dnd-none" = "";
|
||||
"inhibited-notification" = "";
|
||||
"inhibited-none" = "";
|
||||
"dnd-inhibited-notification" = "";
|
||||
"dnd-inhibited-none" = "";
|
||||
};
|
||||
"return-type" = "json";
|
||||
"exec-if" = "which swaync-client";
|
||||
exec = "swaync-client -swb";
|
||||
"on-click" = "sleep 0.1 && swaync-client -t -sw";
|
||||
"on-click-right" = "swaync-client -d -sw";
|
||||
escape = true;
|
||||
};
|
||||
|
||||
# Support modules referenced by groups
|
||||
temperature = {
|
||||
interval = 10;
|
||||
tooltip = true;
|
||||
"hwmon-path" = ["/sys/class/hwmon/hwmon1/temp1_input" "/sys/class/thermal/thermal_zone0/temp"];
|
||||
"critical-threshold" = 82;
|
||||
"format-critical" = "{temperatureC}°C {icon}";
|
||||
format = "{temperatureC}°C {icon}";
|
||||
"format-icons" = [""];
|
||||
"on-click-right" = "$HOME/.config/hypr/scripts/WaybarScripts.sh --nvtop";
|
||||
};
|
||||
|
||||
"power-profiles-daemon" = {
|
||||
format = "{icon} ";
|
||||
"tooltip-format" = "Power profile: {profile}\nDriver: {driver}";
|
||||
tooltip = true;
|
||||
"format-icons" = {
|
||||
default = "";
|
||||
performance = "";
|
||||
balanced = "";
|
||||
"power-saver" = "";
|
||||
};
|
||||
};
|
||||
|
||||
"custom/dot_update" = {
|
||||
format = " ";
|
||||
"on-click" = "$HOME/.config/hypr/scripts/KooLsDotsUpdate.sh";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Check KooL Dots update\nIf available";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
# Compose style: wallust colors first, then base style, then our overrides
|
||||
style = wallustColors + baseStyle + overrides;
|
||||
};
|
||||
}
|
||||
786
modules/home/waybar/waybar-jwt-catppuccin.nix
Normal file
|
|
@ -0,0 +1,786 @@
|
|||
{pkgs, ...}: let
|
||||
# Install any helper scripts shipped in modules/home/waybar/scripts into ~/.config/waybar/scripts
|
||||
scriptsDir = ./scripts;
|
||||
scripts = builtins.attrNames (builtins.readDir scriptsDir);
|
||||
|
||||
# Inline, improved Cava script packaged via Nix so we don't rely on an external bash file
|
||||
waybarCava = pkgs.writeShellScriptBin "WaybarCava" ''
|
||||
set -euo pipefail
|
||||
|
||||
# Ensure cava exists
|
||||
if ! command -v cava >/dev/null 2>&1; then
|
||||
echo "cava not found in PATH" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Characters for vertical bars (0..7)
|
||||
bar="▁▂▃▄▅▆▇█"
|
||||
|
||||
# Build sed script that:
|
||||
# - strips semicolons (cava RAW ASCII delimiter)
|
||||
# - maps digits 0..7 to the corresponding glyph in $bar
|
||||
dict="s/;//g"
|
||||
bar_length=''${#bar}
|
||||
for ((i = 0; i < bar_length; i++)); do
|
||||
dict+=";s/$i/''${bar:$i:1}/g"
|
||||
done
|
||||
|
||||
# Single-instance guard (kill prior instance cleanly)
|
||||
RUNTIME_DIR="''${XDG_RUNTIME_DIR:-/tmp}"
|
||||
pidfile="$RUNTIME_DIR/waybar-cava.pid"
|
||||
if [ -f "$pidfile" ]; then
|
||||
oldpid=$(cat "$pidfile" || true)
|
||||
if [ -n "''${oldpid:-}" ] && kill -0 "$oldpid" 2>/dev/null; then
|
||||
kill "$oldpid" 2>/dev/null || true
|
||||
# Give the old pipeline a moment to exit
|
||||
sleep 0.1 || true
|
||||
fi
|
||||
fi
|
||||
echo $$ > "$pidfile"
|
||||
|
||||
# Use a unique temporary config and clean it up on exit
|
||||
config_file=$(mktemp "''${RUNTIME_DIR}/waybar-cava.XXXXXX.conf")
|
||||
cleanup() {
|
||||
rm -f "$config_file" "$pidfile"
|
||||
}
|
||||
trap cleanup EXIT INT TERM
|
||||
|
||||
cat >"$config_file" <<EOF
|
||||
[general]
|
||||
framerate = 30
|
||||
bars = 10
|
||||
|
||||
[input]
|
||||
method = pulse
|
||||
source = auto
|
||||
|
||||
[output]
|
||||
method = raw
|
||||
raw_target = /dev/stdout
|
||||
data_format = ascii
|
||||
ascii_max_range = 7
|
||||
EOF
|
||||
|
||||
# Stream cava output and transform
|
||||
exec cava -p "$config_file" | sed -u "$dict"
|
||||
'';
|
||||
|
||||
# Catppuccin Mocha palette
|
||||
catppuccinColors = {
|
||||
rosewater = "#f5e0dc";
|
||||
flamingo = "#f2cdcd";
|
||||
pink = "#f5c2e7";
|
||||
mauve = "#cba6f7";
|
||||
red = "#f38ba8";
|
||||
maroon = "#eba0ac";
|
||||
peach = "#fab387";
|
||||
yellow = "#f9e2af";
|
||||
green = "#a6e3a1";
|
||||
teal = "#94e2d5";
|
||||
sky = "#89dceb";
|
||||
sapphire = "#74c7ec";
|
||||
blue = "#89b4fa";
|
||||
lavender = "#b4befe";
|
||||
text = "#cdd6f4";
|
||||
subtext1 = "#bac2de";
|
||||
subtext0 = "#a6adc8";
|
||||
overlay2 = "#9399b2";
|
||||
overlay1 = "#7f849c";
|
||||
overlay0 = "#6c7086";
|
||||
surface2 = "#585b70";
|
||||
surface1 = "#45475a";
|
||||
surface0 = "#313244";
|
||||
base = "#1e1e2e";
|
||||
mantle = "#181825";
|
||||
crust = "#11111b";
|
||||
};
|
||||
in {
|
||||
# Ensure bundled Waybar scripts are installed under ~/.config/waybar/scripts
|
||||
home.file = builtins.listToAttrs (
|
||||
map (name: {
|
||||
name = ".config/waybar/scripts/" + name;
|
||||
value = {
|
||||
source = "${scriptsDir}/${name}";
|
||||
executable = true;
|
||||
};
|
||||
})
|
||||
scripts
|
||||
);
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar;
|
||||
|
||||
settings = [
|
||||
{
|
||||
layer = "top";
|
||||
exclusive = true;
|
||||
passthrough = false;
|
||||
position = "top";
|
||||
height = 30;
|
||||
spacing = 4;
|
||||
"fixed-center" = true;
|
||||
ipc = true;
|
||||
"margin-top" = 3;
|
||||
"margin-left" = 8;
|
||||
"margin-right" = 8;
|
||||
|
||||
modules-left = [
|
||||
"custom/menu"
|
||||
"hyprland/workspaces"
|
||||
"custom/cava_mviz"
|
||||
"battery"
|
||||
];
|
||||
|
||||
modules-center = [
|
||||
"clock"
|
||||
"custom/weather"
|
||||
];
|
||||
|
||||
modules-right = [
|
||||
"idle_inhibitor"
|
||||
"custom/swaync"
|
||||
"pulseaudio"
|
||||
"temperature"
|
||||
"backlight"
|
||||
"custom/qs-wallpaper"
|
||||
"custom/qs-vid-wallpaper"
|
||||
"custom/power"
|
||||
];
|
||||
|
||||
# ---------- Modules configuration ----------
|
||||
"hyprland/workspaces" = {
|
||||
format = "{name}";
|
||||
persistent-workspaces = {
|
||||
"*" = 10;
|
||||
};
|
||||
};
|
||||
|
||||
"custom/menu" = {
|
||||
format = " ";
|
||||
# on-click = "pkill rofi || rofi -show drun -modi run,drun,filebrowser,window";
|
||||
on-click = "launch-nwg-menu";
|
||||
on-click-middle = "$HOME/.config/hypr/UserScripts/WallpaperSelect.sh";
|
||||
on-click-right = "$HOME/.config/hypr/scripts/WaybarLayout.sh";
|
||||
tooltip = true;
|
||||
tooltip-format = "Left Click: Rofi Menu\nMiddle Click: Wallpaper Menu\nRight Click: Waybar Layout Menu";
|
||||
};
|
||||
|
||||
# Integrated CAVA visualizer using the inline script above
|
||||
"custom/cava_mviz" = {
|
||||
exec = "${waybarCava}/bin/WaybarCava";
|
||||
format = "<span color='#a6e3a1'>[</span> {} <span color='#a6e3a1'>]</span>";
|
||||
};
|
||||
|
||||
idle_inhibitor = {
|
||||
format = "{icon}";
|
||||
tooltip = true;
|
||||
tooltip-format-activated = "Idle inhibitor is active";
|
||||
tooltip-format-deactivated = "Idle inhibitor is inactive";
|
||||
format-icons = {
|
||||
activated = "☕";
|
||||
deactivated = "☕";
|
||||
};
|
||||
};
|
||||
|
||||
"custom/qs-wallpaper" = {
|
||||
format = " ";
|
||||
on-click = "qs-wallpapers-apply";
|
||||
tooltip = true;
|
||||
tooltip-format = "Set wallpaper";
|
||||
};
|
||||
|
||||
"custom/qs-vid-wallpaper" = {
|
||||
format = " ";
|
||||
on-click = "qs-vid-wallpapers-apply";
|
||||
tooltip = true;
|
||||
tooltip-format = "Set video wallpaper";
|
||||
};
|
||||
|
||||
"custom/weather" = {
|
||||
return-type = "json";
|
||||
exec = "sh -lc 'WEATHER_ICON_STYLE=emoji WEATHER_TOOLTIP_MARKUP=1 ~/.config/waybar/scripts/Weather.py'";
|
||||
interval = 600;
|
||||
tooltip = true;
|
||||
};
|
||||
|
||||
clock = {
|
||||
tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
|
||||
format-alt = "{:%Y-%m-%d}";
|
||||
};
|
||||
|
||||
memory = {
|
||||
format = "{}% ";
|
||||
};
|
||||
|
||||
temperature = {
|
||||
critical-threshold = 80;
|
||||
hwmon-path = "/sys/class/hwmon/hwmon3/temp1_input";
|
||||
format = "{}°C {icon}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
|
||||
backlight = {
|
||||
format = "{percent}% {icon}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
|
||||
battery = {
|
||||
states = {
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{capacity}% {icon}";
|
||||
format-full = "{capacity}% {icon}";
|
||||
format-charging = "{capacity}% ";
|
||||
format-plugged = "{capacity}% ";
|
||||
format-alt = "{time} {icon}";
|
||||
interval = 3;
|
||||
format-icons = [
|
||||
" "
|
||||
" "
|
||||
" "
|
||||
" "
|
||||
" "
|
||||
];
|
||||
};
|
||||
|
||||
"power-profiles-daemon" = {
|
||||
format = "{icon}";
|
||||
tooltip-format = "Power profile: {profile}\nDriver: {driver}";
|
||||
tooltip = true;
|
||||
format-icons = {
|
||||
default = "";
|
||||
performance = "";
|
||||
balanced = "";
|
||||
power-saver = "";
|
||||
};
|
||||
};
|
||||
|
||||
network = {
|
||||
format-wifi = "Connected • ";
|
||||
on-click = "kitty --class floatwlmenu -e bash ~/.config/scripts/wireless-menu.sh";
|
||||
format-ethernet = "Connected • ";
|
||||
tooltip-format = "{ifname} via {gwaddr} ";
|
||||
format-linked = "{ifname} (No IP) ";
|
||||
format-disconnected = "No Internet ";
|
||||
};
|
||||
|
||||
pulseaudio = {
|
||||
format = "{volume}% {icon}";
|
||||
format-bluetooth = "{volume}% {icon} ";
|
||||
format-bluetooth-muted = " {icon} ";
|
||||
format-muted = " ";
|
||||
format-source = " {volume}% ";
|
||||
format-source-muted = "";
|
||||
format-icons = {
|
||||
headphone = "";
|
||||
hands-free = "";
|
||||
headset = "";
|
||||
phone = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = [
|
||||
""
|
||||
""
|
||||
" "
|
||||
];
|
||||
};
|
||||
on-click = "pavucontrol";
|
||||
};
|
||||
|
||||
"custom/swaync" = {
|
||||
tooltip = true;
|
||||
tooltip-format = "Left Click: Launch Notification Center\nRight Click: Do not Disturb";
|
||||
format = "{} {icon} ";
|
||||
format-icons = {
|
||||
notification = "<span foreground='red'><sup></sup></span>";
|
||||
none = "";
|
||||
dnd-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-none = "";
|
||||
inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
inhibited-none = "";
|
||||
dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-inhibited-none = "";
|
||||
};
|
||||
return-type = "json";
|
||||
exec-if = "which swaync-client";
|
||||
exec = "swaync-client -swb";
|
||||
on-click = "systemctl --user start swaync.service; swaync-client -t";
|
||||
on-click-right = "systemctl --user start swaync.service; swaync-client -d";
|
||||
escape = true;
|
||||
};
|
||||
|
||||
"custom/power" = {
|
||||
format = " ⏻ ";
|
||||
tooltip = false;
|
||||
on-click = "qs-wlogout";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
# Consolidated style (Catppuccin Mocha) with solid background
|
||||
style = let
|
||||
c = catppuccinColors;
|
||||
in ''
|
||||
@define-color rosewater ${c.rosewater};
|
||||
@define-color flamingo ${c.flamingo};
|
||||
@define-color pink ${c.pink};
|
||||
@define-color mauve ${c.mauve};
|
||||
@define-color red ${c.red};
|
||||
@define-color maroon ${c.maroon};
|
||||
@define-color peach ${c.peach};
|
||||
@define-color yellow ${c.yellow};
|
||||
@define-color green ${c.green};
|
||||
@define-color teal ${c.teal};
|
||||
@define-color sky ${c.sky};
|
||||
@define-color sapphire ${c.sapphire};
|
||||
@define-color blue ${c.blue};
|
||||
@define-color lavender ${c.lavender};
|
||||
@define-color text ${c.text};
|
||||
@define-color subtext1 ${c.subtext1};
|
||||
@define-color subtext0 ${c.subtext0};
|
||||
@define-color overlay2 ${c.overlay2};
|
||||
@define-color overlay1 ${c.overlay1};
|
||||
@define-color overlay0 ${c.overlay0};
|
||||
@define-color surface2 ${c.surface2};
|
||||
@define-color surface1 ${c.surface1};
|
||||
@define-color surface0 ${c.surface0};
|
||||
@define-color base ${c.base};
|
||||
@define-color mantle ${c.mantle};
|
||||
@define-color crust ${c.crust};
|
||||
|
||||
* {
|
||||
font-family: "Hack Nerd Font", "Font Awesome 6 Free", "Font Awesome 6 Brands", monospace;
|
||||
font-weight: 400;
|
||||
font-size: 18px;
|
||||
border-radius: 7px;
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
background-color: @base;
|
||||
color: #ffffff;
|
||||
border-radius: 0px;
|
||||
transition-property: background-color;
|
||||
transition-duration: 0.5s;
|
||||
}
|
||||
|
||||
/* Override white color for idle_inhibitor specifically */
|
||||
window#waybar > box > #idle_inhibitor {
|
||||
color: #f38ba8; /* red by default */
|
||||
}
|
||||
|
||||
window#waybar > box > #idle_inhibitor.activated {
|
||||
color: #a6e3a1; /* green when activated */
|
||||
}
|
||||
|
||||
window#waybar > box > #idle_inhibitor.deactivated {
|
||||
color: #f38ba8; /* red when deactivated */
|
||||
}
|
||||
|
||||
tooltip {
|
||||
background: @base;
|
||||
border-radius: 7px;
|
||||
}
|
||||
|
||||
button {
|
||||
box-shadow: inset 0 3px transparent;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
background: inherit;
|
||||
}
|
||||
|
||||
#pulseaudio:hover {
|
||||
background-color: @mantle;
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
padding: 0 5px;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
#workspaces button:hover {
|
||||
background: rgba(0, 0, 0, 0.3);
|
||||
border-radius: 7px;
|
||||
}
|
||||
|
||||
/* Hyprland workspaces - based on working waybar-jak-catppuccin */
|
||||
#workspaces button {
|
||||
color: @sapphire; /* default/inactive workspaces - pale blue */
|
||||
background-color: transparent;
|
||||
padding-top: 4px;
|
||||
padding-bottom: 4px;
|
||||
padding-right: 6px;
|
||||
padding-left: 4px;
|
||||
}
|
||||
|
||||
#workspaces button.active {
|
||||
color: @green; /* active workspace - green */
|
||||
background: transparent;
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
#workspaces button.focused {
|
||||
color: @rosewater; /* focused workspace - rosewater */
|
||||
background: transparent;
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
color: @crust;
|
||||
background: transparent;
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
#workspaces button:hover {
|
||||
background: transparent;
|
||||
color: @flamingo;
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
#workspaces button.empty {
|
||||
color: @red; /* empty workspace - red */
|
||||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
background-color: #eb4d4b;
|
||||
}
|
||||
|
||||
#mode {
|
||||
background-color: #64727d;
|
||||
box-shadow: inset 0 0px #ffffff;
|
||||
background: rgba(5, 5, 5, 0.3);
|
||||
color: #000000;
|
||||
padding: 1px 10px 1px 10px;
|
||||
border-radius: 0px 0px 0px 0px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#clock,
|
||||
#battery,
|
||||
#cpu,
|
||||
#memory,
|
||||
#disk,
|
||||
#temperature,
|
||||
#backlight,
|
||||
#network,
|
||||
#custom-spotify,
|
||||
#pulseaudio,
|
||||
#wireplumber,
|
||||
#custom-media,
|
||||
#custom-waypaper,
|
||||
#tray,
|
||||
#mode,
|
||||
#custom-weather,
|
||||
#idle_inhibitor,
|
||||
#scratchpad,
|
||||
#power-profiles-daemon,
|
||||
#custom-cava,
|
||||
#custom-cava_mviz,
|
||||
#custom-gpt,
|
||||
#custom-mspowers,
|
||||
#custom-qs-wallpaper,
|
||||
#custom-qs-vid-wallpaper,
|
||||
#custom-swaync,
|
||||
#mpd {
|
||||
background: @base;
|
||||
padding: 1px 10px 1px 10px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#window,
|
||||
#workspaces {
|
||||
background: @base;
|
||||
color: @rosewater;
|
||||
padding: 1px 1px 1px 1px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.modules-left > widget:first-child > #workspaces {
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
.modules-right > widget:last-child > #workspaces {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
#clock {
|
||||
color: @pink;
|
||||
margin-top: 5px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
#custom-mspowers {
|
||||
color: @yellow;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#clock:hover {
|
||||
background-color: @mantle;
|
||||
}
|
||||
|
||||
#custom-weather {
|
||||
color: @sky;
|
||||
padding: 1px 6px 1px 8px;
|
||||
}
|
||||
|
||||
#custom-spotify {
|
||||
color: @maroon;
|
||||
padding: 1px 6px 1px 8px;
|
||||
}
|
||||
|
||||
#custom-waypaper:hover {
|
||||
background-color: @mantle;
|
||||
}
|
||||
|
||||
#custom-cava,
|
||||
#custom-cava_mviz {
|
||||
background: @base;
|
||||
color: @mauve;
|
||||
padding: 1px 10px;
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
#custom-cava:hover,
|
||||
#custom-cava_mviz:hover {
|
||||
background-color: @mantle;
|
||||
}
|
||||
|
||||
#custom-gpt {
|
||||
font-size: 20px;
|
||||
background-position: center;
|
||||
background-repeat: no-repeat;
|
||||
background-size: 15px 15px;
|
||||
color: @mauve;
|
||||
border-radius: 7px;
|
||||
}
|
||||
|
||||
#custom-gpt:hover {
|
||||
background-color: @mantle;
|
||||
}
|
||||
|
||||
#custom-weather:hover {
|
||||
background-color: @mantle;
|
||||
}
|
||||
|
||||
#cava-player .status {
|
||||
font-size: 18px;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#custom-power {
|
||||
color: @mauve;
|
||||
background-color: @base;
|
||||
margin-right: 5px;
|
||||
margin-top: 5px;
|
||||
padding: 1px 5px 1px 2px;
|
||||
}
|
||||
|
||||
#custom-power:hover {
|
||||
background-color: @mantle;
|
||||
}
|
||||
|
||||
#custom-menu {
|
||||
color: @blue;
|
||||
background-color: @base;
|
||||
margin-left: 5px;
|
||||
margin-top: 5px;
|
||||
padding: 1px 10px 1px 10px;
|
||||
font-size: 18px;
|
||||
min-width: 30px;
|
||||
}
|
||||
|
||||
#custom-menu:hover {
|
||||
background-color: @mantle;
|
||||
}
|
||||
|
||||
#custom-qs-wallpaper,
|
||||
#custom-qs-vid-wallpaper {
|
||||
color: @sapphire;
|
||||
background-color: @base;
|
||||
font-size: 18px;
|
||||
min-width: 20px;
|
||||
}
|
||||
|
||||
#custom-qs-wallpaper:hover,
|
||||
#custom-qs-vid-wallpaper:hover {
|
||||
background-color: @mantle;
|
||||
}
|
||||
|
||||
#custom-swaync {
|
||||
color: @green;
|
||||
background-color: @base;
|
||||
}
|
||||
|
||||
#custom-swaync.notification,
|
||||
#custom-swaync.dnd-notification,
|
||||
#custom-swaync.inhibited-notification,
|
||||
#custom-swaync.dnd-inhibited-notification {
|
||||
color: @red;
|
||||
}
|
||||
|
||||
#custom-swaync:hover {
|
||||
background-color: @mantle;
|
||||
}
|
||||
|
||||
#battery {
|
||||
color: @mauve;
|
||||
}
|
||||
|
||||
#battery.charging,
|
||||
#battery.plugged {
|
||||
color: @green;
|
||||
}
|
||||
|
||||
@keyframes blink {
|
||||
to {
|
||||
background: @base;
|
||||
color: #000000;
|
||||
padding: 1px 10px 1px 10px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
#battery.critical:not(.charging) {
|
||||
color: #ffffff;
|
||||
animation-name: blink;
|
||||
animation-duration: 0.5s;
|
||||
animation-timing-function: steps(12);
|
||||
animation-iteration-count: infinite;
|
||||
animation-direction: alternate;
|
||||
}
|
||||
|
||||
#battery:hover {
|
||||
background-color: @mantle;
|
||||
}
|
||||
|
||||
#power-profiles-daemon {
|
||||
padding-right: 15px;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
#power-profiles-daemon.performance {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#power-profiles-daemon.balanced {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#power-profiles-daemon.power-saver {
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
label:focus {
|
||||
background: @base;
|
||||
}
|
||||
|
||||
#memory {
|
||||
color: @yellow;
|
||||
}
|
||||
|
||||
#memory:hover {
|
||||
background-color: @mantle;
|
||||
}
|
||||
|
||||
#disk {
|
||||
background: @base;
|
||||
}
|
||||
|
||||
#backlight {
|
||||
color: @green;
|
||||
}
|
||||
|
||||
#backlight:hover {
|
||||
background-color: @mantle;
|
||||
}
|
||||
|
||||
#network {
|
||||
color: @peach;
|
||||
}
|
||||
|
||||
#network.disconnected {
|
||||
color: @red;
|
||||
}
|
||||
|
||||
#network:hover {
|
||||
background-color: @mantle;
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
color: @peach;
|
||||
}
|
||||
|
||||
#pulseaudio.muted {
|
||||
color: @peach;
|
||||
}
|
||||
|
||||
#temperature {
|
||||
background: @base;
|
||||
color: @yellow;
|
||||
padding: 1px 10px 1px 10px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#temperature.critical {
|
||||
background-color: #eb4d4b;
|
||||
}
|
||||
|
||||
/* Idle inhibitor - comprehensive targeting without !important */
|
||||
#idle_inhibitor,
|
||||
.idle_inhibitor,
|
||||
button#idle_inhibitor,
|
||||
.module#idle_inhibitor,
|
||||
window#waybar #idle_inhibitor,
|
||||
window#waybar .idle_inhibitor,
|
||||
window#waybar button#idle_inhibitor {
|
||||
color: #f38ba8; /* red when deactivated */
|
||||
background-color: #1e1e2e;
|
||||
}
|
||||
|
||||
#idle_inhibitor.activated,
|
||||
.idle_inhibitor.activated,
|
||||
button#idle_inhibitor.activated,
|
||||
.module#idle_inhibitor.activated,
|
||||
window#waybar #idle_inhibitor.activated,
|
||||
window#waybar .idle_inhibitor.activated,
|
||||
window#waybar button#idle_inhibitor.activated {
|
||||
color: #a6e3a1; /* green when activated */
|
||||
background-color: #1e1e2e;
|
||||
}
|
||||
|
||||
#idle_inhibitor.deactivated,
|
||||
.idle_inhibitor.deactivated,
|
||||
button#idle_inhibitor.deactivated,
|
||||
.module#idle_inhibitor.deactivated,
|
||||
window#waybar #idle_inhibitor.deactivated,
|
||||
window#waybar .idle_inhibitor.deactivated,
|
||||
window#waybar button#idle_inhibitor.deactivated {
|
||||
color: #f38ba8; /* red when deactivated */
|
||||
background-color: #1e1e2e;
|
||||
}
|
||||
|
||||
#idle_inhibitor:hover {
|
||||
background-color: @mantle;
|
||||
}
|
||||
|
||||
'';
|
||||
};
|
||||
}
|
||||
711
modules/home/waybar/waybar-jwt-transparent.nix
Normal file
|
|
@ -0,0 +1,711 @@
|
|||
{pkgs, ...}: let
|
||||
# Install any helper scripts shipped in modules/home/waybar/scripts into ~/.config/waybar/scripts
|
||||
scriptsDir = ./scripts;
|
||||
scripts = builtins.attrNames (builtins.readDir scriptsDir);
|
||||
|
||||
# Inline, improved Cava script packaged via Nix so we don't rely on an external bash file
|
||||
waybarCava = pkgs.writeShellScriptBin "WaybarCava" ''
|
||||
set -euo pipefail
|
||||
|
||||
# Ensure cava exists
|
||||
if ! command -v cava >/dev/null 2>&1; then
|
||||
echo "cava not found in PATH" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Characters for vertical bars (0..7)
|
||||
bar="▁▂▃▄▅▆▇█"
|
||||
|
||||
# Build sed script that:
|
||||
# - strips semicolons (cava RAW ASCII delimiter)
|
||||
# - maps digits 0..7 to the corresponding glyph in $bar
|
||||
dict="s/;//g"
|
||||
bar_length=''${#bar}
|
||||
for ((i = 0; i < bar_length; i++)); do
|
||||
dict+=";s/$i/''${bar:$i:1}/g"
|
||||
done
|
||||
|
||||
# Single-instance guard (kill prior instance cleanly)
|
||||
RUNTIME_DIR="''${XDG_RUNTIME_DIR:-/tmp}"
|
||||
pidfile="$RUNTIME_DIR/waybar-cava.pid"
|
||||
if [ -f "$pidfile" ]; then
|
||||
oldpid=$(cat "$pidfile" || true)
|
||||
if [ -n "''${oldpid:-}" ] && kill -0 "$oldpid" 2>/dev/null; then
|
||||
kill "$oldpid" 2>/dev/null || true
|
||||
# Give the old pipeline a moment to exit
|
||||
sleep 0.1 || true
|
||||
fi
|
||||
fi
|
||||
echo $$ > "$pidfile"
|
||||
|
||||
# Use a unique temporary config and clean it up on exit
|
||||
config_file=$(mktemp "''${RUNTIME_DIR}/waybar-cava.XXXXXX.conf")
|
||||
cleanup() {
|
||||
rm -f "$config_file" "$pidfile"
|
||||
}
|
||||
trap cleanup EXIT INT TERM
|
||||
|
||||
cat >"$config_file" <<EOF
|
||||
[general]
|
||||
framerate = 30
|
||||
bars = 10
|
||||
|
||||
[input]
|
||||
method = pulse
|
||||
source = auto
|
||||
|
||||
[output]
|
||||
method = raw
|
||||
raw_target = /dev/stdout
|
||||
data_format = ascii
|
||||
ascii_max_range = 7
|
||||
EOF
|
||||
|
||||
# Stream cava output and transform
|
||||
exec cava -p "$config_file" | sed -u "$dict"
|
||||
'';
|
||||
in {
|
||||
# Ensure bundled Waybar scripts are installed under ~/.config/waybar/scripts
|
||||
home.file = builtins.listToAttrs (
|
||||
map (name: {
|
||||
name = ".config/waybar/scripts/" + name;
|
||||
value = {
|
||||
source = "${scriptsDir}/${name}";
|
||||
executable = true;
|
||||
};
|
||||
})
|
||||
scripts
|
||||
);
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar;
|
||||
|
||||
settings = [
|
||||
{
|
||||
layer = "top";
|
||||
exclusive = true;
|
||||
passthrough = false;
|
||||
position = "top";
|
||||
height = 30;
|
||||
spacing = 4;
|
||||
"fixed-center" = true;
|
||||
ipc = true;
|
||||
"margin-top" = 3;
|
||||
"margin-left" = 8;
|
||||
"margin-right" = 8;
|
||||
|
||||
modules-left = [
|
||||
"custom/menu"
|
||||
"hyprland/workspaces"
|
||||
"custom/cava_mviz"
|
||||
"battery"
|
||||
];
|
||||
|
||||
modules-center = [
|
||||
"clock"
|
||||
"custom/weather"
|
||||
];
|
||||
|
||||
modules-right = [
|
||||
"custom/swaync"
|
||||
"idle_inhibitor"
|
||||
"pulseaudio"
|
||||
"temperature"
|
||||
"backlight"
|
||||
"custom/qs-wallpaper"
|
||||
"custom/qs-vid-wallpaper"
|
||||
"custom/power"
|
||||
];
|
||||
|
||||
# ---------- Modules configuration ----------
|
||||
"hyprland/workspaces" = {
|
||||
format = "{name}";
|
||||
persistent-workspaces = {
|
||||
"*" = 10;
|
||||
};
|
||||
};
|
||||
|
||||
"custom/menu" = {
|
||||
format = " ";
|
||||
# on-click = "pkill rofi || rofi -show drun -modi run,drun,filebrowser,window";
|
||||
on-click = "launch-nwg-menu";
|
||||
on-click-middle = "$HOME/.config/hypr/UserScripts/WallpaperSelect.sh";
|
||||
on-click-right = "$HOME/.config/hypr/scripts/WaybarLayout.sh";
|
||||
tooltip = true;
|
||||
tooltip-format = "Left Click: Rofi Menu\nMiddle Click: Wallpaper Menu\nRight Click: Waybar Layout Menu";
|
||||
};
|
||||
|
||||
# Integrated CAVA visualizer using the inline script above
|
||||
"custom/cava_mviz" = {
|
||||
exec = "${waybarCava}/bin/WaybarCava";
|
||||
format = "<span color='#a6e3a1'>[</span> {} <span color='#a6e3a1'>]</span>";
|
||||
};
|
||||
|
||||
idle_inhibitor = {
|
||||
format = "{icon}";
|
||||
tooltip = true;
|
||||
tooltip-format-activated = "Idle inhibitor is active";
|
||||
tooltip-format-deactivated = "Idle inhibitor is inactive";
|
||||
format-icons = {
|
||||
activated = "☕";
|
||||
deactivated = "☕";
|
||||
};
|
||||
};
|
||||
|
||||
"custom/qs-wallpaper" = {
|
||||
format = " ";
|
||||
on-click = "qs-wallpapers-apply";
|
||||
tooltip = true;
|
||||
tooltip-format = "Set wallpaper";
|
||||
};
|
||||
|
||||
"custom/qs-vid-wallpaper" = {
|
||||
format = " ";
|
||||
on-click = "qs-vid-wallpapers-apply";
|
||||
tooltip = true;
|
||||
tooltip-format = "Set video wallpaper";
|
||||
};
|
||||
|
||||
"custom/weather" = {
|
||||
return-type = "json";
|
||||
exec = "sh -lc 'WEATHER_ICON_STYLE=emoji WEATHER_TOOLTIP_MARKUP=1 ~/.config/waybar/scripts/Weather.py'";
|
||||
interval = 600;
|
||||
tooltip = true;
|
||||
};
|
||||
|
||||
clock = {
|
||||
tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
|
||||
format-alt = "{:%Y-%m-%d}";
|
||||
};
|
||||
|
||||
memory = {
|
||||
format = "{}% ";
|
||||
};
|
||||
|
||||
temperature = {
|
||||
critical-threshold = 80;
|
||||
hwmon-path = "/sys/class/hwmon/hwmon3/temp1_input";
|
||||
format = "{}°C {icon}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
|
||||
backlight = {
|
||||
format = "{percent}% {icon}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
|
||||
battery = {
|
||||
states = {
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{capacity}% {icon}";
|
||||
format-full = "{capacity}% {icon}";
|
||||
format-charging = "{capacity}% ";
|
||||
format-plugged = "{capacity}% ";
|
||||
format-alt = "{time} {icon}";
|
||||
interval = 3;
|
||||
format-icons = [
|
||||
" "
|
||||
" "
|
||||
" "
|
||||
" "
|
||||
" "
|
||||
];
|
||||
};
|
||||
|
||||
"power-profiles-daemon" = {
|
||||
format = "{icon}";
|
||||
tooltip-format = "Power profile: {profile}\nDriver: {driver}";
|
||||
tooltip = true;
|
||||
format-icons = {
|
||||
default = "";
|
||||
performance = "";
|
||||
balanced = "";
|
||||
power-saver = "";
|
||||
};
|
||||
};
|
||||
|
||||
network = {
|
||||
format-wifi = "Connected • ";
|
||||
on-click = "kitty --class floatwlmenu -e bash ~/.config/scripts/wireless-menu.sh";
|
||||
format-ethernet = "Connected • ";
|
||||
tooltip-format = "{ifname} via {gwaddr} ";
|
||||
format-linked = "{ifname} (No IP) ";
|
||||
format-disconnected = "No Internet ";
|
||||
};
|
||||
|
||||
pulseaudio = {
|
||||
format = "{volume}% {icon}";
|
||||
format-bluetooth = "{volume}% {icon} ";
|
||||
format-bluetooth-muted = " {icon} ";
|
||||
format-muted = " ";
|
||||
format-source = " {volume}% ";
|
||||
format-source-muted = "";
|
||||
format-icons = {
|
||||
headphone = "";
|
||||
hands-free = "";
|
||||
headset = "";
|
||||
phone = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = [
|
||||
""
|
||||
""
|
||||
" "
|
||||
];
|
||||
};
|
||||
on-click = "pavucontrol";
|
||||
};
|
||||
|
||||
"custom/swaync" = {
|
||||
tooltip = true;
|
||||
tooltip-format = "Left Click: Launch Notification Center\nRight Click: Do not Disturb";
|
||||
format = "{} {icon} ";
|
||||
format-icons = {
|
||||
notification = "<span foreground='red'><sup></sup></span>";
|
||||
none = "";
|
||||
dnd-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-none = "";
|
||||
inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
inhibited-none = "";
|
||||
dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-inhibited-none = "";
|
||||
};
|
||||
return-type = "json";
|
||||
exec-if = "which swaync-client";
|
||||
exec = "swaync-client -swb";
|
||||
on-click = "systemctl --user start swaync.service; swaync-client -t";
|
||||
on-click-right = "systemctl --user start swaync.service; swaync-client -d";
|
||||
escape = true;
|
||||
};
|
||||
|
||||
"custom/power" = {
|
||||
format = " ⏻ ";
|
||||
tooltip = false;
|
||||
on-click = "qs-wlogout";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
# Transparent style based on transparent.css
|
||||
style = ''
|
||||
* {
|
||||
font-family: "Hack Nerd Font";
|
||||
font-weight: 400;
|
||||
font-size: 18px;
|
||||
border-radius: 7px;
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
background-color: transparent;
|
||||
color: #ffffff;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
#waybar > box {
|
||||
margin: 4px 8px 0 8px;
|
||||
padding: 2px;
|
||||
background-color: rgba(0, 0, 0, 0.1);
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
tooltip {
|
||||
background: rgb(30, 30, 46);
|
||||
border-radius: 7px;
|
||||
}
|
||||
|
||||
button {
|
||||
box-shadow: inset 0 3px transparent;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
background: inherit;
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
padding: 0 5px;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
#workspaces button:hover {
|
||||
background: rgba(255, 255, 255, 0.1);
|
||||
border-radius: 7px;
|
||||
}
|
||||
|
||||
/* Hyprland workspaces - based on working waybar-jak-catppuccin */
|
||||
#workspaces button {
|
||||
color: #74c7ec; /* default/inactive workspaces - sapphire */
|
||||
background-color: transparent;
|
||||
padding-top: 4px;
|
||||
padding-bottom: 4px;
|
||||
padding-right: 6px;
|
||||
padding-left: 4px;
|
||||
}
|
||||
|
||||
#workspaces button.active {
|
||||
color: #a6e3a1; /* active workspace - green */
|
||||
background: transparent;
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
#workspaces button.focused {
|
||||
color: #f5e0dc; /* focused workspace - rosewater */
|
||||
background: transparent;
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
color: #11111b; /* crust */
|
||||
background: transparent;
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
#workspaces button:hover {
|
||||
background: transparent;
|
||||
color: #f2cdcd; /* flamingo */
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
#workspaces button.empty {
|
||||
color: #f38ba8; /* empty workspace - red */
|
||||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
background-color: #eb4d4b;
|
||||
}
|
||||
|
||||
#mode {
|
||||
background-color: #64727d;
|
||||
box-shadow: inset 0 0px #ffffff;
|
||||
background: rgba(5, 5, 5, 0.3);
|
||||
color: #000000;
|
||||
padding: 1px 10px 1px 10px;
|
||||
border-radius: 0px 0px 0px 0px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#clock,
|
||||
#battery,
|
||||
#cpu,
|
||||
#memory,
|
||||
#disk,
|
||||
#temperature,
|
||||
#backlight,
|
||||
#network,
|
||||
#custom-spotify,
|
||||
#pulseaudio,
|
||||
#wireplumber,
|
||||
#custom-media,
|
||||
#custom-waypaper,
|
||||
#tray,
|
||||
#mode,
|
||||
#custom-weather,
|
||||
#idle_inhibitor,
|
||||
#scratchpad,
|
||||
#custom-power #power-profiles-daemon,
|
||||
#custom-cava,
|
||||
#custom-cava_mviz,
|
||||
#custom-gpt,
|
||||
#custom-menu,
|
||||
#custom-qs-wallpaper,
|
||||
#custom-qs-vid-wallpaper,
|
||||
#custom-swaync,
|
||||
#mpd {
|
||||
background: rgba(30, 30, 46, 0);
|
||||
padding: 1px 10px 1px 10px;
|
||||
}
|
||||
|
||||
#window,
|
||||
#workspaces {
|
||||
color: #f5e0dc;
|
||||
padding: 1px 1px 1px 1px;
|
||||
}
|
||||
|
||||
.modules-right > widget:last-child > #workspaces {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
#clock {
|
||||
color: #ffffff;
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
#clock:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#custom-weather {
|
||||
color: #ffffff;
|
||||
padding: 1px 6px 1px 8px;
|
||||
}
|
||||
|
||||
#custom-weather:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#custom-spotify {
|
||||
color: #ffffff;
|
||||
padding: 1px 6px 1px 8px;
|
||||
}
|
||||
|
||||
#custom-spotify:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#custom-cava,
|
||||
#custom-cava_mviz {
|
||||
background: rgb(30, 30, 46);
|
||||
color: #ffffff;
|
||||
padding: 1px 10px;
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
#custom-cava:hover,
|
||||
#custom-cava_mviz:hover {
|
||||
background-color: #181825;
|
||||
}
|
||||
|
||||
#custom-gpt {
|
||||
font-size: 20px;
|
||||
background-position: center;
|
||||
background-repeat: no-repeat;
|
||||
background-size: 15px 15px;
|
||||
color: #ffffff;
|
||||
border-radius: 7px;
|
||||
}
|
||||
|
||||
#custom-gpt:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#cava-player .status {
|
||||
font-size: 18px;
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#custom-power {
|
||||
color: #ffffff;
|
||||
padding: 1px 5px 1px 3px;
|
||||
margin-right: 1px;
|
||||
}
|
||||
|
||||
#custom-power:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#custom-menu {
|
||||
color: #89b4fa;
|
||||
padding: 1px 10px 1px 10px;
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
#custom-menu:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#custom-qs-wallpaper,
|
||||
#custom-qs-vid-wallpaper {
|
||||
color: #74c7ec;
|
||||
}
|
||||
|
||||
#custom-qs-wallpaper:hover,
|
||||
#custom-qs-vid-wallpaper:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#custom-swaync {
|
||||
color: #a6e3a1;
|
||||
}
|
||||
|
||||
#custom-swaync.notification,
|
||||
#custom-swaync.dnd-notification,
|
||||
#custom-swaync.inhibited-notification,
|
||||
#custom-swaync.dnd-inhibited-notification {
|
||||
color: #f38ba8;
|
||||
}
|
||||
|
||||
#custom-swaync:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#battery {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#battery.charging,
|
||||
#battery.plugged {
|
||||
color: #85eb81;
|
||||
}
|
||||
|
||||
#battery:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
@keyframes blink {
|
||||
to {
|
||||
background: rgb(30, 30, 46);
|
||||
color: #000000;
|
||||
padding: 1px 10px 1px 10px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
#battery.critical:not(.charging) {
|
||||
color: #ffffff;
|
||||
animation-name: blink;
|
||||
animation-duration: 0.5s;
|
||||
animation-timing-function: steps(12);
|
||||
animation-iteration-count: infinite;
|
||||
animation-direction: alternate;
|
||||
}
|
||||
|
||||
#power-profiles-daemon {
|
||||
padding-right: 15px;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
#power-profiles-daemon.performance {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#power-profiles-daemon.balanced {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#power-profiles-daemon.power-saver {
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
label:focus {
|
||||
background: rgb(30, 30, 46);
|
||||
}
|
||||
|
||||
#memory {
|
||||
color: #ffffff;
|
||||
padding: 1px 9px 1px 5px;
|
||||
}
|
||||
|
||||
#memory:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#disk {
|
||||
background: rgb(30, 30, 46);
|
||||
}
|
||||
|
||||
#backlight {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#network {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#network.disconnected {
|
||||
color: #f2564b;
|
||||
}
|
||||
|
||||
#network:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#pulseaudio.muted {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#wireplumber {
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
#pulseaudio:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#wireplumber.muted {
|
||||
background: rgb(30, 30, 46);
|
||||
padding: 1px 10px 1px 10px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#custom-media {
|
||||
color: #2a5c45;
|
||||
min-width: 100px;
|
||||
}
|
||||
|
||||
#custom-media.custom-spotify {
|
||||
background: rgb(30, 30, 46);
|
||||
padding: 1px 10px 1px 10px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#custom-media.custom-vlc {
|
||||
background: rgb(30, 30, 46);
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#temperature {
|
||||
color: #ffffff;
|
||||
}
|
||||
|
||||
#temperature.critical {
|
||||
background-color: #eb4d4b;
|
||||
}
|
||||
|
||||
#temperature:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#tray {
|
||||
background-color: #2980b9;
|
||||
}
|
||||
|
||||
#tray > .passive {
|
||||
-gtk-icon-effect: dim;
|
||||
}
|
||||
|
||||
#tray > .needs-attention {
|
||||
-gtk-icon-effect: highlight;
|
||||
background-color: #eb4d4b;
|
||||
}
|
||||
|
||||
/* Idle inhibitor - coffee mug color changes */
|
||||
#idle_inhibitor {
|
||||
color: #f38ba8; /* default red (deactivated) */
|
||||
}
|
||||
|
||||
#idle_inhibitor.activated {
|
||||
color: #a6e3a1; /* green when activated */
|
||||
}
|
||||
|
||||
#idle_inhibitor.deactivated {
|
||||
color: #f38ba8; /* red when deactivated */
|
||||
}
|
||||
|
||||
#idle_inhibitor:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
711
modules/home/waybar/waybar-jwt-ultradark.nix
Normal file
|
|
@ -0,0 +1,711 @@
|
|||
{pkgs, ...}: let
|
||||
# Install any helper scripts shipped in modules/home/waybar/scripts into ~/.config/waybar/scripts
|
||||
scriptsDir = ./scripts;
|
||||
scripts = builtins.attrNames (builtins.readDir scriptsDir);
|
||||
|
||||
# Inline, improved Cava script packaged via Nix so we don't rely on an external bash file
|
||||
waybarCava = pkgs.writeShellScriptBin "WaybarCava" ''
|
||||
set -euo pipefail
|
||||
|
||||
# Ensure cava exists
|
||||
if ! command -v cava >/dev/null 2>&1; then
|
||||
echo "cava not found in PATH" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Characters for vertical bars (0..7)
|
||||
bar="▁▂▃▄▅▆▇█"
|
||||
|
||||
# Build sed script that:
|
||||
# - strips semicolons (cava RAW ASCII delimiter)
|
||||
# - maps digits 0..7 to the corresponding glyph in $bar
|
||||
dict="s/;//g"
|
||||
bar_length=''${#bar}
|
||||
for ((i = 0; i < bar_length; i++)); do
|
||||
dict+=";s/$i/''${bar:$i:1}/g"
|
||||
done
|
||||
|
||||
# Single-instance guard (kill prior instance cleanly)
|
||||
RUNTIME_DIR="''${XDG_RUNTIME_DIR:-/tmp}"
|
||||
pidfile="$RUNTIME_DIR/waybar-cava.pid"
|
||||
if [ -f "$pidfile" ]; then
|
||||
oldpid=$(cat "$pidfile" || true)
|
||||
if [ -n "''${oldpid:-}" ] && kill -0 "$oldpid" 2>/dev/null; then
|
||||
kill "$oldpid" 2>/dev/null || true
|
||||
# Give the old pipeline a moment to exit
|
||||
sleep 0.1 || true
|
||||
fi
|
||||
fi
|
||||
echo $$ > "$pidfile"
|
||||
|
||||
# Use a unique temporary config and clean it up on exit
|
||||
config_file=$(mktemp "''${RUNTIME_DIR}/waybar-cava.XXXXXX.conf")
|
||||
cleanup() {
|
||||
rm -f "$config_file" "$pidfile"
|
||||
}
|
||||
trap cleanup EXIT INT TERM
|
||||
|
||||
cat >"$config_file" <<EOF
|
||||
[general]
|
||||
framerate = 30
|
||||
bars = 10
|
||||
|
||||
[input]
|
||||
method = pulse
|
||||
source = auto
|
||||
|
||||
[output]
|
||||
method = raw
|
||||
raw_target = /dev/stdout
|
||||
data_format = ascii
|
||||
ascii_max_range = 7
|
||||
EOF
|
||||
|
||||
# Stream cava output and transform
|
||||
exec cava -p "$config_file" | sed -u "$dict"
|
||||
'';
|
||||
in {
|
||||
# Ensure bundled Waybar scripts are installed under ~/.config/waybar/scripts
|
||||
home.file = builtins.listToAttrs (
|
||||
map (name: {
|
||||
name = ".config/waybar/scripts/" + name;
|
||||
value = {
|
||||
source = "${scriptsDir}/${name}";
|
||||
executable = true;
|
||||
};
|
||||
})
|
||||
scripts
|
||||
);
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar;
|
||||
|
||||
settings = [
|
||||
{
|
||||
layer = "top";
|
||||
exclusive = true;
|
||||
passthrough = false;
|
||||
position = "top";
|
||||
height = 30;
|
||||
spacing = 4;
|
||||
"fixed-center" = true;
|
||||
ipc = true;
|
||||
"margin-top" = 3;
|
||||
"margin-left" = 8;
|
||||
"margin-right" = 8;
|
||||
|
||||
modules-left = [
|
||||
"custom/menu"
|
||||
"hyprland/workspaces"
|
||||
"custom/cava_mviz"
|
||||
"battery"
|
||||
];
|
||||
|
||||
modules-center = [
|
||||
"clock"
|
||||
"custom/weather"
|
||||
];
|
||||
|
||||
modules-right = [
|
||||
"idle_inhibitor"
|
||||
"custom/swaync"
|
||||
"pulseaudio"
|
||||
"temperature"
|
||||
"backlight"
|
||||
"custom/qs-wallpaper"
|
||||
"custom/qs-vid-wallpaper"
|
||||
"custom/power"
|
||||
];
|
||||
|
||||
# ---------- Modules configuration ----------
|
||||
"hyprland/workspaces" = {
|
||||
format = "{name}";
|
||||
persistent-workspaces = {
|
||||
"*" = 10;
|
||||
};
|
||||
};
|
||||
|
||||
"custom/menu" = {
|
||||
format = " ";
|
||||
# on-click = "pkill rofi || rofi -show drun -modi run,drun,filebrowser,window";
|
||||
on-click = "launch-nwg-menu";
|
||||
on-click-middle = "$HOME/.config/hypr/UserScripts/WallpaperSelect.sh";
|
||||
on-click-right = "$HOME/.config/hypr/scripts/WaybarLayout.sh";
|
||||
tooltip = true;
|
||||
tooltip-format = "Left Click: Rofi Menu\nMiddle Click: Wallpaper Menu\nRight Click: Waybar Layout Menu";
|
||||
};
|
||||
|
||||
# Integrated CAVA visualizer using the inline script above
|
||||
"custom/cava_mviz" = {
|
||||
exec = "${waybarCava}/bin/WaybarCava";
|
||||
format = "<span color='#a6e3a1'>[</span> {} <span color='#a6e3a1'>]</span>";
|
||||
};
|
||||
|
||||
idle_inhibitor = {
|
||||
format = "{icon}";
|
||||
tooltip = true;
|
||||
tooltip-format-activated = "Idle inhibitor is active";
|
||||
tooltip-format-deactivated = "Idle inhibitor is inactive";
|
||||
format-icons = {
|
||||
activated = "☕";
|
||||
deactivated = "☕";
|
||||
};
|
||||
};
|
||||
|
||||
"custom/qs-wallpaper" = {
|
||||
format = " ";
|
||||
on-click = "qs-wallpapers-apply";
|
||||
tooltip = true;
|
||||
tooltip-format = "Set wallpaper";
|
||||
};
|
||||
|
||||
"custom/qs-vid-wallpaper" = {
|
||||
format = " ";
|
||||
on-click = "qs-vid-wallpapers-apply";
|
||||
tooltip = true;
|
||||
tooltip-format = "Set video wallpaper";
|
||||
};
|
||||
|
||||
"custom/weather" = {
|
||||
return-type = "json";
|
||||
exec = "sh -lc 'WEATHER_ICON_STYLE=emoji WEATHER_TOOLTIP_MARKUP=1 ~/.config/waybar/scripts/Weather.py'";
|
||||
interval = 600;
|
||||
tooltip = true;
|
||||
};
|
||||
|
||||
clock = {
|
||||
tooltip-format = "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>";
|
||||
format-alt = "{:%Y-%m-%d}";
|
||||
};
|
||||
|
||||
memory = {
|
||||
format = "{}% ";
|
||||
};
|
||||
|
||||
temperature = {
|
||||
critical-threshold = 80;
|
||||
hwmon-path = "/sys/class/hwmon/hwmon3/temp1_input";
|
||||
format = "{}°C {icon}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
|
||||
backlight = {
|
||||
format = "{percent}% {icon}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
|
||||
battery = {
|
||||
states = {
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{capacity}% {icon}";
|
||||
format-full = "{capacity}% {icon}";
|
||||
format-charging = "{capacity}% ";
|
||||
format-plugged = "{capacity}% ";
|
||||
format-alt = "{time} {icon}";
|
||||
interval = 3;
|
||||
format-icons = [
|
||||
" "
|
||||
" "
|
||||
" "
|
||||
" "
|
||||
" "
|
||||
];
|
||||
};
|
||||
|
||||
"power-profiles-daemon" = {
|
||||
format = "{icon}";
|
||||
tooltip-format = "Power profile: {profile}\nDriver: {driver}";
|
||||
tooltip = true;
|
||||
format-icons = {
|
||||
default = "";
|
||||
performance = "";
|
||||
balanced = "";
|
||||
power-saver = "";
|
||||
};
|
||||
};
|
||||
|
||||
network = {
|
||||
format-wifi = "Connected • ";
|
||||
on-click = "kitty --class floatwlmenu -e bash ~/.config/scripts/wireless-menu.sh";
|
||||
format-ethernet = "Connected • ";
|
||||
tooltip-format = "{ifname} via {gwaddr} ";
|
||||
format-linked = "{ifname} (No IP) ";
|
||||
format-disconnected = "No Internet ";
|
||||
};
|
||||
|
||||
pulseaudio = {
|
||||
format = "{volume}% {icon}";
|
||||
format-bluetooth = "{volume}% {icon} ";
|
||||
format-bluetooth-muted = " {icon} ";
|
||||
format-muted = " ";
|
||||
format-source = " {volume}% ";
|
||||
format-source-muted = "";
|
||||
format-icons = {
|
||||
headphone = "";
|
||||
hands-free = "";
|
||||
headset = "";
|
||||
phone = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = [
|
||||
""
|
||||
""
|
||||
" "
|
||||
];
|
||||
};
|
||||
on-click = "pavucontrol";
|
||||
};
|
||||
|
||||
"custom/swaync" = {
|
||||
tooltip = true;
|
||||
tooltip-format = "Left Click: Launch Notification Center\nRight Click: Do not Disturb";
|
||||
format = "{} {icon} ";
|
||||
format-icons = {
|
||||
notification = "<span foreground='red'><sup></sup></span>";
|
||||
none = "";
|
||||
dnd-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-none = "";
|
||||
inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
inhibited-none = "";
|
||||
dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-inhibited-none = "";
|
||||
};
|
||||
return-type = "json";
|
||||
exec-if = "which swaync-client";
|
||||
exec = "swaync-client -swb";
|
||||
on-click = "systemctl --user start swaync.service; swaync-client -t";
|
||||
on-click-right = "systemctl --user start swaync.service; swaync-client -d";
|
||||
escape = true;
|
||||
};
|
||||
|
||||
"custom/power" = {
|
||||
format = " ⏻ ";
|
||||
tooltip = false;
|
||||
on-click = "qs-wlogout";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
# Ultradark style based on ultradark.css
|
||||
style = ''
|
||||
* {
|
||||
font-family: "Hack Nerd Font";
|
||||
font-weight: 400;
|
||||
font-size: 18px;
|
||||
border-radius: 7px;
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
background-color: transparent;
|
||||
color: #e5e5e5;
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
#waybar > box {
|
||||
margin: 4px 8px 0 8px;
|
||||
padding: 2px;
|
||||
background-color: rgba(0, 0, 0, 1);
|
||||
border-radius: 8px;
|
||||
}
|
||||
|
||||
tooltip {
|
||||
background: rgb(30, 30, 46);
|
||||
border-radius: 7px;
|
||||
}
|
||||
|
||||
button {
|
||||
box-shadow: inset 0 3px transparent;
|
||||
border: none;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
background: inherit;
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
padding: 0 5px;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
#workspaces button:hover {
|
||||
background: rgba(255, 255, 255, 0.1);
|
||||
border-radius: 7px;
|
||||
}
|
||||
|
||||
/* Hyprland workspaces - based on working waybar-jak-catppuccin */
|
||||
#workspaces button {
|
||||
color: #74c7ec; /* default/inactive workspaces - sapphire */
|
||||
background-color: transparent;
|
||||
padding-top: 4px;
|
||||
padding-bottom: 4px;
|
||||
padding-right: 6px;
|
||||
padding-left: 4px;
|
||||
}
|
||||
|
||||
#workspaces button.active {
|
||||
color: #a6e3a1; /* active workspace - green */
|
||||
background: transparent;
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
#workspaces button.focused {
|
||||
color: #f5e0dc; /* focused workspace - rosewater */
|
||||
background: transparent;
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
color: #11111b; /* crust */
|
||||
background: transparent;
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
#workspaces button:hover {
|
||||
background: transparent;
|
||||
color: #f2cdcd; /* flamingo */
|
||||
border-radius: 15px;
|
||||
}
|
||||
|
||||
#workspaces button.empty {
|
||||
color: #f38ba8; /* empty workspace - red */
|
||||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
background-color: #eb4d4b;
|
||||
}
|
||||
|
||||
#mode {
|
||||
background-color: #64727d;
|
||||
box-shadow: inset 0 0px #ffffff;
|
||||
background: rgba(5, 5, 5, 0.3);
|
||||
color: #000000;
|
||||
padding: 1px 10px 1px 10px;
|
||||
border-radius: 0px 0px 0px 0px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#clock,
|
||||
#battery,
|
||||
#cpu,
|
||||
#memory,
|
||||
#disk,
|
||||
#temperature,
|
||||
#backlight,
|
||||
#network,
|
||||
#custom-spotify,
|
||||
#pulseaudio,
|
||||
#wireplumber,
|
||||
#custom-media,
|
||||
#custom-waypaper,
|
||||
#tray,
|
||||
#mode,
|
||||
#custom-weather,
|
||||
#idle_inhibitor,
|
||||
#scratchpad,
|
||||
#custom-power #power-profiles-daemon,
|
||||
#custom-cava,
|
||||
#custom-cava_mviz,
|
||||
#custom-gpt,
|
||||
#custom-menu,
|
||||
#custom-qs-wallpaper,
|
||||
#custom-qs-vid-wallpaper,
|
||||
#custom-swaync,
|
||||
#mpd {
|
||||
background: rgba(30, 30, 46, 0);
|
||||
padding: 1px 10px 1px 10px;
|
||||
}
|
||||
|
||||
#window,
|
||||
#workspaces {
|
||||
color: #f5e0dc;
|
||||
padding: 1px 1px 1px 1px;
|
||||
}
|
||||
|
||||
.modules-right > widget:last-child > #workspaces {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
#clock {
|
||||
color: #e5e5e5;
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
#clock:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#custom-weather {
|
||||
color: #e5e5e5;
|
||||
padding: 1px 6px 1px 8px;
|
||||
}
|
||||
|
||||
#custom-weather:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#custom-spotify {
|
||||
color: #e5e5e5;
|
||||
padding: 1px 6px 1px 8px;
|
||||
}
|
||||
|
||||
#custom-spotify:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#custom-cava,
|
||||
#custom-cava_mviz {
|
||||
background: rgb(30, 30, 46);
|
||||
color: #e5e5e5;
|
||||
padding: 1px 10px;
|
||||
margin-left: 8px;
|
||||
}
|
||||
|
||||
#custom-cava:hover,
|
||||
#custom-cava_mviz:hover {
|
||||
background-color: #181825;
|
||||
}
|
||||
|
||||
#custom-gpt {
|
||||
font-size: 20px;
|
||||
background-position: center;
|
||||
background-repeat: no-repeat;
|
||||
background-size: 15px 15px;
|
||||
color: #e5e5e5;
|
||||
border-radius: 7px;
|
||||
}
|
||||
|
||||
#custom-gpt:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#cava-player .status {
|
||||
font-size: 18px;
|
||||
color: #e5e5e5;
|
||||
}
|
||||
|
||||
#custom-power {
|
||||
color: #e5e5e5;
|
||||
padding: 1px 5px 1px 3px;
|
||||
margin-right: 1px;
|
||||
}
|
||||
|
||||
#custom-power:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#custom-menu {
|
||||
color: #89b4fa;
|
||||
padding: 1px 10px 1px 10px;
|
||||
margin-left: 5px;
|
||||
}
|
||||
|
||||
#custom-menu:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#custom-qs-wallpaper,
|
||||
#custom-qs-vid-wallpaper {
|
||||
color: #74c7ec;
|
||||
}
|
||||
|
||||
#custom-qs-wallpaper:hover,
|
||||
#custom-qs-vid-wallpaper:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#custom-swaync {
|
||||
color: #a6e3a1;
|
||||
}
|
||||
|
||||
#custom-swaync.notification,
|
||||
#custom-swaync.dnd-notification,
|
||||
#custom-swaync.inhibited-notification,
|
||||
#custom-swaync.dnd-inhibited-notification {
|
||||
color: #f38ba8;
|
||||
}
|
||||
|
||||
#custom-swaync:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#battery {
|
||||
color: #e5e5e5;
|
||||
}
|
||||
|
||||
#battery.charging,
|
||||
#battery.plugged {
|
||||
color: #85eb81;
|
||||
}
|
||||
|
||||
#battery:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
@keyframes blink {
|
||||
to {
|
||||
background: rgb(30, 30, 46);
|
||||
color: #000000;
|
||||
padding: 1px 10px 1px 10px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
#battery.critical:not(.charging) {
|
||||
color: #e5e5e5;
|
||||
animation-name: blink;
|
||||
animation-duration: 0.5s;
|
||||
animation-timing-function: steps(12);
|
||||
animation-iteration-count: infinite;
|
||||
animation-direction: alternate;
|
||||
}
|
||||
|
||||
#power-profiles-daemon {
|
||||
padding-right: 15px;
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
#power-profiles-daemon.performance {
|
||||
color: #e5e5e5;
|
||||
}
|
||||
|
||||
#power-profiles-daemon.balanced {
|
||||
color: #e5e5e5;
|
||||
}
|
||||
|
||||
#power-profiles-daemon.power-saver {
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
label:focus {
|
||||
background: rgb(30, 30, 46);
|
||||
}
|
||||
|
||||
#memory {
|
||||
color: #e5e5e5;
|
||||
padding: 1px 9px 1px 5px;
|
||||
}
|
||||
|
||||
#memory:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#disk {
|
||||
background: rgb(30, 30, 46);
|
||||
}
|
||||
|
||||
#backlight {
|
||||
color: #e5e5e5;
|
||||
}
|
||||
|
||||
#network {
|
||||
color: #e5e5e5;
|
||||
}
|
||||
|
||||
#network.disconnected {
|
||||
color: #f2564b;
|
||||
}
|
||||
|
||||
#network:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
color: #e5e5e5;
|
||||
}
|
||||
|
||||
#pulseaudio.muted {
|
||||
color: #e5e5e5;
|
||||
}
|
||||
|
||||
#wireplumber {
|
||||
color: #000000;
|
||||
}
|
||||
|
||||
#pulseaudio:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#wireplumber.muted {
|
||||
background: rgb(30, 30, 46);
|
||||
padding: 1px 10px 1px 10px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#custom-media {
|
||||
color: #2a5c45;
|
||||
min-width: 100px;
|
||||
}
|
||||
|
||||
#custom-media.custom-spotify {
|
||||
background: rgb(30, 30, 46);
|
||||
padding: 1px 10px 1px 10px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#custom-media.custom-vlc {
|
||||
background: rgb(30, 30, 46);
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
#temperature {
|
||||
color: #e5e5e5;
|
||||
}
|
||||
|
||||
#temperature.critical {
|
||||
background-color: #eb4d4b;
|
||||
}
|
||||
|
||||
#temperature:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
|
||||
#tray {
|
||||
background-color: #2980b9;
|
||||
}
|
||||
|
||||
#tray > .passive {
|
||||
-gtk-icon-effect: dim;
|
||||
}
|
||||
|
||||
#tray > .needs-attention {
|
||||
-gtk-icon-effect: highlight;
|
||||
background-color: #eb4d4b;
|
||||
}
|
||||
|
||||
/* Idle inhibitor - coffee mug color changes */
|
||||
#idle_inhibitor {
|
||||
color: #f38ba8; /* default red (deactivated) */
|
||||
}
|
||||
|
||||
#idle_inhibitor.activated {
|
||||
color: #a6e3a1; /* green when activated */
|
||||
}
|
||||
|
||||
#idle_inhibitor.deactivated {
|
||||
color: #f38ba8; /* red when deactivated */
|
||||
}
|
||||
|
||||
#idle_inhibitor:hover {
|
||||
background-color: rgba(255, 255, 255, 0.1);
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
568
modules/home/waybar/waybar-mangowc-jak-catppuccin.nix
Normal file
|
|
@ -0,0 +1,568 @@
|
|||
{pkgs, ...}: let
|
||||
scriptsDir = ../waybar/scripts;
|
||||
scripts = builtins.attrNames (builtins.readDir scriptsDir);
|
||||
|
||||
waybarCava = pkgs.writeShellScriptBin "WaybarCava" ''
|
||||
set -euo pipefail
|
||||
if ! command -v cava >/dev/null 2>&1; then
|
||||
echo "cava not found in PATH" >&2
|
||||
exit 1
|
||||
fi
|
||||
bar="▁▂▃▄▅▆▇█"
|
||||
dict="s/;//g"
|
||||
bar_length=''${#bar}
|
||||
for ((i = 0; i < bar_length; i++)); do
|
||||
dict+=";s/$i/''${bar:$i:1}/g"
|
||||
done
|
||||
RUNTIME_DIR="''${XDG_RUNTIME_DIR:-/tmp}"
|
||||
pidfile="$RUNTIME_DIR/waybar-cava.pid"
|
||||
if [ -f "$pidfile" ]; then
|
||||
oldpid=$(cat "$pidfile" || true)
|
||||
if [ -n "''${oldpid:-}" ] && kill -0 "$oldpid" 2>/dev/null; then
|
||||
kill "$oldpid" 2>/dev/null || true
|
||||
sleep 0.1 || true
|
||||
fi
|
||||
fi
|
||||
echo $$ > "$pidfile"
|
||||
config_file=$(mktemp "''${RUNTIME_DIR}/waybar-cava.XXXXXX.conf")
|
||||
cleanup() { rm -f "$config_file" "$pidfile"; }
|
||||
trap cleanup EXIT INT TERM
|
||||
cat >"$config_file" <<EOF
|
||||
[general]
|
||||
framerate = 30
|
||||
bars = 10
|
||||
|
||||
[input]
|
||||
method = pulse
|
||||
source = auto
|
||||
|
||||
[output]
|
||||
method = raw
|
||||
raw_target = /dev/stdout
|
||||
data_format = ascii
|
||||
ascii_max_range = 7
|
||||
EOF
|
||||
exec cava -p "$config_file" | sed -u "$dict"
|
||||
'';
|
||||
|
||||
catppuccinColors = {
|
||||
rosewater = "#f5e0dc";
|
||||
flamingo = "#f2cdcd";
|
||||
pink = "#f5c2e7";
|
||||
mauve = "#cba6f7";
|
||||
red = "#f38ba8";
|
||||
maroon = "#eba0ac";
|
||||
peach = "#fab387";
|
||||
yellow = "#f9e2af";
|
||||
green = "#a6e3a1";
|
||||
teal = "#94e2d5";
|
||||
sky = "#89dceb";
|
||||
sapphire = "#74c7ec";
|
||||
blue = "#89b4fa";
|
||||
lavender = "#b4befe";
|
||||
text = "#cdd6f4";
|
||||
subtext1 = "#bac2de";
|
||||
subtext0 = "#a6adc8";
|
||||
overlay2 = "#9399b2";
|
||||
overlay1 = "#7f849c";
|
||||
overlay0 = "#6c7086";
|
||||
surface2 = "#585b70";
|
||||
surface1 = "#45475a";
|
||||
surface0 = "#313244";
|
||||
base = "#1e1e2e";
|
||||
mantle = "#181825";
|
||||
crust = "#11111b";
|
||||
};
|
||||
|
||||
cfg = {
|
||||
layer = "top";
|
||||
exclusive = true;
|
||||
passthrough = false;
|
||||
position = "top";
|
||||
spacing = 3;
|
||||
"fixed-center" = true;
|
||||
ipc = true;
|
||||
"margin-top" = 3;
|
||||
"margin-left" = 8;
|
||||
"margin-right" = 8;
|
||||
|
||||
modules-left = [
|
||||
"custom/separator#line"
|
||||
"custom/startmenu"
|
||||
"custom/qs_wallpapers_apply"
|
||||
"custom/separator#blank"
|
||||
"custom/qs_vid_wallpapers_apply"
|
||||
"custom/separator#line"
|
||||
"custom/separator#blank"
|
||||
"custom/cava_mviz"
|
||||
"custom/separator#blank"
|
||||
"custom/separator#line"
|
||||
"tray"
|
||||
"custom/separator#line"
|
||||
];
|
||||
|
||||
# Remove Hyprland-specific modules for MangoWC
|
||||
modules-center = [
|
||||
"custom/separator#line"
|
||||
"custom/playerctl"
|
||||
"custom/separator#line"
|
||||
];
|
||||
|
||||
modules-right = [
|
||||
"custom/separator#line"
|
||||
"custom/swaync"
|
||||
"custom/separator#line"
|
||||
"idle_inhibitor"
|
||||
"custom/separator#line"
|
||||
"clock"
|
||||
"custom/separator#line"
|
||||
"custom/weather"
|
||||
"custom/separator#line"
|
||||
"group/audio"
|
||||
"custom/separator#line"
|
||||
"custom/power"
|
||||
];
|
||||
|
||||
temperature = {
|
||||
interval = 10;
|
||||
tooltip = true;
|
||||
"hwmon-path" = [
|
||||
"/sys/class/hwmon/hwmon1/temp1_input"
|
||||
"/sys/class/thermal/thermal_zone0/temp"
|
||||
];
|
||||
"critical-threshold" = 82;
|
||||
"format-critical" = "{temperatureC}°C {icon}";
|
||||
format = "{temperatureC}°C {icon}";
|
||||
"format-icons" = [""];
|
||||
"on-click-right" = "$HOME/.config/hypr/scripts/WaybarScripts.sh --nvtop";
|
||||
};
|
||||
|
||||
battery = {
|
||||
align = 0;
|
||||
rotate = 0;
|
||||
"full-at" = 100;
|
||||
"design-capacity" = false;
|
||||
states = {
|
||||
good = 95;
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{icon} {capacity}%";
|
||||
"format-charging" = " {capacity}%";
|
||||
"format-plugged" = " {capacity}%";
|
||||
"format-alt-click" = "click";
|
||||
"format-full" = "{icon} Full";
|
||||
"format-alt" = "{icon} {time}";
|
||||
"format-icons" = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
"format-time" = "{H}h {M}min";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "{timeTo} {power}w";
|
||||
"on-click-middle" = "$HOME/.config/hypr/scripts/ChangeBlur.sh";
|
||||
"on-click-right" = "$HOME/.config/hypr/scripts/Wlogout.sh";
|
||||
};
|
||||
|
||||
bluetooth = {
|
||||
format = " ";
|
||||
"format-disabled" = "";
|
||||
"format-connected" = " {num_connections}";
|
||||
"tooltip-format" = " {device_alias}";
|
||||
"tooltip-format-connected" = "{device_enumerate}";
|
||||
"tooltip-format-enumerate-connected" = " {device_alias} {device_battery_percentage}%";
|
||||
tooltip = true;
|
||||
"on-click" = "blueman-manager";
|
||||
};
|
||||
|
||||
clock = {
|
||||
interval = 1;
|
||||
format = " {:%I:%M %p}";
|
||||
"format-alt" = " {:%H:%M %Y, %d %B, %A}";
|
||||
"tooltip-format" = "<tt><small>{calendar}</small></tt>";
|
||||
calendar = {
|
||||
mode = "year";
|
||||
"mode-mon-col" = 3;
|
||||
"weeks-pos" = "right";
|
||||
"on-scroll" = 1;
|
||||
format = {
|
||||
months = "<span color='#ffead3'><b>{}</b></span>";
|
||||
days = "<span color='#ecc6d9'><b>{}</b></span>";
|
||||
weeks = "<span color='#99ffdd'><b>W{:%V}</b></span>";
|
||||
weekdays = "<span color='#ffcc66'><b>{}</b></span>";
|
||||
today = "<span color='#ff6699'><b><u>{}</u></b></span>";
|
||||
};
|
||||
};
|
||||
actions = {
|
||||
"on-click-right" = "mode";
|
||||
"on-click-forward" = "tz_up";
|
||||
"on-click-backward" = "tz_down";
|
||||
"on-scroll-up" = "shift_up";
|
||||
"on-scroll-down" = "shift_down";
|
||||
};
|
||||
};
|
||||
|
||||
cpu = {
|
||||
format = "{usage}% ";
|
||||
interval = 1;
|
||||
"min-length" = 5;
|
||||
"format-alt-click" = "click";
|
||||
"format-alt" = "{icon0}{icon1}{icon2}{icon3} {usage:>2}% ";
|
||||
"format-icons" = ["▁" "▂" "▃" "▄" "▅" "▆" "▇" "█"];
|
||||
"on-click-right" = "gnome-system-monitor";
|
||||
};
|
||||
|
||||
disk = {
|
||||
interval = 30;
|
||||
path = "/";
|
||||
format = "{percentage_used}% ";
|
||||
"tooltip-format" = "{used} used out of {total} on {path} ({percentage_used}%)";
|
||||
};
|
||||
|
||||
idle_inhibitor = {
|
||||
tooltip = true;
|
||||
"tooltip-format-activated" = "Idle_inhibitor active";
|
||||
"tooltip-format-deactivated" = "Idle_inhibitor not active";
|
||||
format = "{icon}";
|
||||
"format-icons" = {
|
||||
activated = " ";
|
||||
deactivated = " ";
|
||||
};
|
||||
};
|
||||
|
||||
"keyboard-state" = {
|
||||
capslock = true;
|
||||
format = {
|
||||
numlock = "N {icon}";
|
||||
capslock = " {icon}";
|
||||
};
|
||||
"format-icons" = {
|
||||
locked = "";
|
||||
unlocked = "";
|
||||
};
|
||||
};
|
||||
|
||||
memory = {
|
||||
interval = 10;
|
||||
format = "{used:0.1f}G ";
|
||||
"format-alt" = "{percentage}% ";
|
||||
"format-alt-click" = "click";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "{used:0.1f}GB/{total:0.1f}G";
|
||||
"on-click-right" = "$HOME/.config/hypr/scripts/WaybarScripts.sh --btop";
|
||||
};
|
||||
|
||||
network = {
|
||||
format = "{ifname}";
|
||||
"format-wifi" = "{icon}";
|
||||
"format-ethernet" = "";
|
||||
"format-disconnected" = "";
|
||||
"tooltip-format" = "{ipaddr} {bandwidthUpBits} {bandwidthDownBits}";
|
||||
"format-linked" = " {ifname} (No IP)";
|
||||
"tooltip-format-wifi" = "{essid} {icon} {signalStrength}%";
|
||||
"tooltip-format-ethernet" = "{ifname} ";
|
||||
"tooltip-format-disconnected" = " Disconnected";
|
||||
"max-length" = 30;
|
||||
"format-icons" = ["" "" "" "" ""];
|
||||
"on-click-right" = "$HOME/.config/hypr/scripts/WaybarScripts.sh --nmtui";
|
||||
};
|
||||
|
||||
"network#speed" = {
|
||||
interval = 1;
|
||||
format = "{ifname}";
|
||||
"format-wifi" = "{icon} {bandwidthUpBytes} {bandwidthDownBytes}";
|
||||
"format-ethernet" = " {bandwidthUpBytes} {bandwidthDownBytes}";
|
||||
"format-disconnected" = "";
|
||||
"tooltip-format" = "{ipaddr}";
|
||||
"format-linked" = " {ifname} (No IP)";
|
||||
"tooltip-format-wifi" = "{essid} {icon} {signalStrength}%";
|
||||
"tooltip-format-ethernet" = "{ifname} ";
|
||||
"tooltip-format-disconnected" = " Disconnected";
|
||||
"min-length" = 24;
|
||||
"max-length" = 24;
|
||||
"format-icons" = ["" "" "" "" ""];
|
||||
};
|
||||
|
||||
"power-profiles-daemon" = {
|
||||
format = "{icon} ";
|
||||
"tooltip-format" = "Power profile: {profile}\nDriver: {driver}";
|
||||
tooltip = true;
|
||||
"format-icons" = {
|
||||
default = "";
|
||||
performance = "";
|
||||
balanced = "";
|
||||
"power-saver" = "";
|
||||
};
|
||||
};
|
||||
|
||||
pulseaudio = {
|
||||
format = "{icon} {volume}%";
|
||||
"format-bluetooth" = "{icon} {volume}%";
|
||||
"format-muted" = "";
|
||||
"format-icons" = {
|
||||
headphone = "";
|
||||
"hands-free" = "";
|
||||
headset = "";
|
||||
phone = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = ["" "" "" ""];
|
||||
"ignored-sinks" = ["Easy Effects Sink"];
|
||||
};
|
||||
"scroll-step" = 5.0;
|
||||
"on-click" = "$HOME/.config/hypr/scripts/Volume.sh --toggle";
|
||||
"on-click-right" = "pavucontrol -t 3";
|
||||
"on-scroll-up" = "$HOME/.config/hypr/scripts/Volume.sh --inc";
|
||||
"on-scroll-down" = "$HOME/.config/hypr/scripts/Volume.sh --dec";
|
||||
"tooltip-format" = "{icon} {desc} | {volume}%";
|
||||
"smooth-scrolling-threshold" = 1;
|
||||
};
|
||||
|
||||
"pulseaudio#microphone" = {
|
||||
format = "{format_source}";
|
||||
"format-source" = " {volume}%";
|
||||
"format-source-muted" = "";
|
||||
"on-click" = "$HOME/.config/hypr/scripts/Volume.sh --toggle-mic";
|
||||
"on-click-right" = "pavucontrol -t 4";
|
||||
"on-scroll-up" = "$HOME/.config/hypr/scripts/Volume.sh --mic-inc";
|
||||
"on-scroll-down" = "$HOME/.config/hypr/scripts/Volume.sh --mic-dec";
|
||||
"tooltip-format" = "{source_desc} | {source_volume}%";
|
||||
"scroll-step" = 5;
|
||||
};
|
||||
|
||||
tray = {
|
||||
"icon-size" = 20;
|
||||
spacing = 4;
|
||||
};
|
||||
|
||||
"group/audio" = {
|
||||
orientation = "inherit";
|
||||
drawer = {
|
||||
"transition-duration" = 500;
|
||||
"children-class" = "pulseaudio";
|
||||
"transition-left-to-right" = true;
|
||||
};
|
||||
modules = ["pulseaudio" "pulseaudio#microphone"];
|
||||
};
|
||||
|
||||
"custom/weather" = {
|
||||
return-type = "json";
|
||||
exec = "sh -lc 'WEATHER_ICON_STYLE=emoji WEATHER_TOOLTIP_MARKUP=1 ~/.config/mangowc/waybar/scripts/Weather.py'";
|
||||
interval = 600;
|
||||
tooltip = true;
|
||||
};
|
||||
|
||||
"custom/file_manager" = {
|
||||
format = " ";
|
||||
"on-click" = "$HOME/.config/hypr/scripts/WaybarScripts.sh --files";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "File Manager";
|
||||
};
|
||||
"custom/tty" = {
|
||||
format = " ";
|
||||
"on-click" = "$HOME/.config/hypr/scripts/WaybarScripts.sh --term";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Launch Terminal";
|
||||
};
|
||||
"custom/browser" = {
|
||||
format = " ";
|
||||
"on-click" = "xdg-open https://";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Launch Browser";
|
||||
};
|
||||
"custom/settings" = {
|
||||
format = " ";
|
||||
"on-click" = "$HOME/.config/hypr/scripts/Kool_Quick_Settings.sh";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Launch KooL Settings Menu";
|
||||
};
|
||||
|
||||
"custom/qs_wallpapers_apply" = {
|
||||
format = " ";
|
||||
"on-click" = "qs-wallpapers-apply";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Set wallpaper";
|
||||
};
|
||||
"custom/qs_vid_wallpapers_apply" = {
|
||||
format = " ";
|
||||
"on-click" = "qs-vid-wallpapers-apply";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Set video wallpaper";
|
||||
};
|
||||
|
||||
"custom/light_dark" = {
|
||||
format = " ";
|
||||
"on-click" = "$HOME/.config/hypr/scripts/DarkLight.sh";
|
||||
"on-click-right" = "$HOME/.config/hypr/scripts/WaybarStyles.sh";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Left Click: Switch Dark-Light Themes\nRight Click: Waybar Styles Menu";
|
||||
};
|
||||
"custom/lock" = {
|
||||
format = "";
|
||||
"on-click" = "$HOME/.config/hypr/scripts/LockScreen.sh";
|
||||
tooltip = true;
|
||||
"tooltip-format" = " Screen Lock";
|
||||
};
|
||||
"custom/menu" = {
|
||||
format = " ";
|
||||
"on-click" = "launch-nwg-menu";
|
||||
"on-click-right" = "$HOME/.config/hypr/scripts/WaybarLayout.sh";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Left Click: App Menu\nRight Click: Waybar Layout Menu";
|
||||
};
|
||||
"custom/startmenu" = {
|
||||
tooltip = true;
|
||||
"tooltip-format" = "App menu";
|
||||
format = "";
|
||||
on-click = "launch-nwg-menu";
|
||||
};
|
||||
|
||||
"custom/cava_mviz" = {
|
||||
exec = "${waybarCava}/bin/WaybarCava";
|
||||
format = "<span color='#a6e3a1'>[</span> {} <span color='#a6e3a1'>]</span>";
|
||||
};
|
||||
|
||||
"custom/playerctl" = {
|
||||
format = "<span>{}</span>";
|
||||
"return-type" = "json";
|
||||
"max-length" = 25;
|
||||
exec = "playerctl -a metadata --format '{\"text\": \"{{artist}} {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F";
|
||||
"on-click-middle" = "playerctl play-pause";
|
||||
"on-click" = "playerctl previous";
|
||||
"on-click-right" = "playerctl next";
|
||||
"scroll-step" = 5.0;
|
||||
"on-scroll-up" = "$HOME/.config/hypr/scripts/Volume.sh --inc";
|
||||
"on-scroll-down" = "$HOME/.config/hypr/scripts/Volume.sh --dec";
|
||||
"smooth-scrolling-threshold" = 1;
|
||||
};
|
||||
|
||||
"custom/power" = {
|
||||
format = " ⏻ ";
|
||||
"on-click" = "qs-wlogout";
|
||||
"on-click-right" = "~/.config/mangowc/waybar/scripts/power-menu.sh";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Power menu: Left-click for QS logout, Right-click for rofi power menu";
|
||||
};
|
||||
|
||||
"custom/quit" = {
|
||||
format = "";
|
||||
"on-click" = "loginctl kill-session $XDG_SESSION_ID";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Left Click: Logout";
|
||||
};
|
||||
|
||||
"custom/swaync" = {
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Left Click: Launch Notification Center\nRight Click: Do not Disturb";
|
||||
format = "{} {icon} ";
|
||||
"format-icons" = {
|
||||
notification = "<span foreground='red'><sup></sup></span>";
|
||||
none = "";
|
||||
"dnd-notification" = "<span foreground='red'><sup></sup></span>";
|
||||
"dnd-none" = "";
|
||||
"inhibited-notification" = "<span foreground='red'><sup></sup></span>";
|
||||
"inhibited-none" = "";
|
||||
"dnd-inhibited-notification" = "<span foreground='red'><sup></sup></span>";
|
||||
"dnd-inhibited-none" = "";
|
||||
};
|
||||
"return-type" = "json";
|
||||
"exec-if" = "which swaync-client";
|
||||
exec = "swaync-client -swb";
|
||||
"on-click" = "systemctl --user start swaync.service; swaync-client -t";
|
||||
"on-click-right" = "systemctl --user start swaync.service; swaync-client -d";
|
||||
escape = true;
|
||||
};
|
||||
|
||||
"custom/separator#line" = {
|
||||
format = "|";
|
||||
interval = "once";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/separator#blank" = {
|
||||
format = "";
|
||||
interval = "once";
|
||||
tooltip = false;
|
||||
};
|
||||
};
|
||||
|
||||
style = let
|
||||
c = catppuccinColors;
|
||||
in ''
|
||||
@define-color rosewater ${c.rosewater};
|
||||
@define-color flamingo ${c.flamingo};
|
||||
@define-color pink ${c.pink};
|
||||
@define-color mauve ${c.mauve};
|
||||
@define-color red ${c.red};
|
||||
@define-color maroon ${c.maroon};
|
||||
@define-color peach ${c.peach};
|
||||
@define-color yellow ${c.yellow};
|
||||
@define-color green ${c.green};
|
||||
@define-color teal ${c.teal};
|
||||
@define-color sky ${c.sky};
|
||||
@define-color sapphire ${c.sapphire};
|
||||
@define-color blue ${c.blue};
|
||||
@define-color lavender ${c.lavender};
|
||||
@define-color text ${c.text};
|
||||
@define-color subtext1 ${c.subtext1};
|
||||
@define-color subtext0 ${c.subtext0};
|
||||
@define-color overlay2 ${c.overlay2};
|
||||
@define-color overlay1 ${c.overlay1};
|
||||
@define-color overlay0 ${c.overlay0};
|
||||
@define-color surface2 ${c.surface2};
|
||||
@define-color surface1 ${c.surface1};
|
||||
@define-color surface0 ${c.surface0};
|
||||
@define-color base ${c.base};
|
||||
@define-color mantle ${c.mantle};
|
||||
@define-color crust ${c.crust};
|
||||
|
||||
* { font-family: "JetBrainsMono Nerd Font"; font-weight: bold; min-height: 0; font-size: 101%; }
|
||||
window#waybar { background-color: @base; border-radius: 5px; }
|
||||
tooltip { background: @base; opacity: 1; border-radius: 10px; border-width: 2px; border-style: solid; border-color: @sapphire; }
|
||||
tooltip label { color: @blue; }
|
||||
#custom-startmenu { color: @green; margin-left: 4px; margin-right: 8px; }
|
||||
#custom-cava_mviz { margin-left: 4px; }
|
||||
#workspaces button { color: @sapphire; }
|
||||
#workspaces button.active { color: @green; }
|
||||
#workspaces button.empty { color: @red; }
|
||||
#idle_inhibitor.activated { color: @green; }
|
||||
#idle_inhibitor.deactivated { color: @red; }
|
||||
#custom-power { color: @red; }
|
||||
#network { color: @mauve; }
|
||||
#custom-weather { color: @green; }
|
||||
#pulseaudio { color: @blue; }
|
||||
#clock { color: @green; }
|
||||
#custom-playerctl { color: @lavender; }
|
||||
'';
|
||||
|
||||
mangowcWaybar = pkgs.writeShellScriptBin "mangowc-waybar" ''
|
||||
exec waybar -c "$HOME/.config/mangowc/waybar/config.jsonc" -s "$HOME/.config/mangowc/waybar/style.css"
|
||||
'';
|
||||
in {
|
||||
# Install scripts under ~/.config/mangowc/waybar/scripts
|
||||
home.file =
|
||||
builtins.listToAttrs (
|
||||
map (name: {
|
||||
name = ".config/mangowc/waybar/scripts/" + name;
|
||||
value = {
|
||||
source = "${scriptsDir}/${name}";
|
||||
executable = true;
|
||||
};
|
||||
})
|
||||
scripts
|
||||
)
|
||||
// {
|
||||
".config/mangowc/waybar/config.jsonc".text = builtins.toJSON [cfg];
|
||||
".config/mangowc/waybar/style.css".text = style;
|
||||
};
|
||||
|
||||
home.packages = [mangowcWaybar waybarCava];
|
||||
}
|
||||
514
modules/home/waybar/waybar-mecha.nix
Normal file
|
|
@ -0,0 +1,514 @@
|
|||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
scriptsDir = ./scripts;
|
||||
scripts = builtins.attrNames (builtins.readDir scriptsDir);
|
||||
in {
|
||||
home.file = builtins.listToAttrs (map
|
||||
(name: {
|
||||
name = ".config/waybar/scripts/" + name;
|
||||
value = {
|
||||
source = "${scriptsDir}/${name}";
|
||||
executable = true;
|
||||
};
|
||||
})
|
||||
scripts);
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
position = "top";
|
||||
mode = "dock";
|
||||
reload_style_on_change = true;
|
||||
"gtk-layer-shell" = true;
|
||||
modules-left = [
|
||||
"custom/startmenu"
|
||||
"custom/left1"
|
||||
"hyprland/workspaces"
|
||||
"custom/right1"
|
||||
"custom/paddw"
|
||||
"hyprland/window"
|
||||
];
|
||||
modules-center = [
|
||||
"custom/paddc"
|
||||
"custom/left2"
|
||||
"custom/temperature"
|
||||
"custom/left3"
|
||||
"memory"
|
||||
"custom/left4"
|
||||
"cpu"
|
||||
"custom/leftin1"
|
||||
"custom/left5"
|
||||
"custom/distro"
|
||||
"custom/right2"
|
||||
"custom/rightin1"
|
||||
"idle_inhibitor"
|
||||
"custom/weather"
|
||||
"clock#time"
|
||||
"custom/right3"
|
||||
"clock#date"
|
||||
"custom/right4"
|
||||
"custom/right5"
|
||||
];
|
||||
modules-right = [
|
||||
"mpris"
|
||||
"custom/left6"
|
||||
"pulseaudio"
|
||||
"custom/left7"
|
||||
"backlight"
|
||||
"custom/left8"
|
||||
"battery"
|
||||
"custom/leftin2"
|
||||
"custom/power"
|
||||
];
|
||||
|
||||
"hyprland/workspaces" = {
|
||||
on-scroll-up = "hyprctl dispatch workspace -1";
|
||||
on-scroll-down = "hyprctl dispatch workspace +1";
|
||||
persistent-workspaces = {
|
||||
"1" = [];
|
||||
"2" = [];
|
||||
"3" = [];
|
||||
"4" = [];
|
||||
"5" = [];
|
||||
};
|
||||
};
|
||||
|
||||
"hyprland/window" = {
|
||||
swap-icon-label = false;
|
||||
format = "{}";
|
||||
tooltip = false;
|
||||
min-length = 5;
|
||||
rewrite = {
|
||||
"" = "<span foreground='#89b4fa'> </span> Hyprland";
|
||||
"~" = " Terminal";
|
||||
"zsh" = " Terminal";
|
||||
"kitty" = " Terminal";
|
||||
"tmux(.*)" = "<span foreground='#a6e3a1'> </span> Tmux";
|
||||
"(.*)Mozilla Firefox" = "<span foreground='#f38ba8'> </span> Firefox";
|
||||
"(.*) <EFBFBD><EFBFBD> Mozilla Firefox" = "<span foreground='#f38ba8'> </span> $1";
|
||||
"(.*)Zen Browser" = "<span foreground='#fab387'> </span> Zen Browser";
|
||||
"(.*) — Zen Browser" = "<span foreground='#fab387'> </span> $1";
|
||||
"(.*) - Visual Studio Code" = "<span foreground='#89b4fa'> </span> $1";
|
||||
"(.*)Visual Studio Code" = "<span foreground='#89b4fa'> </span> Visual Studio Code";
|
||||
"nvim" = "<span foreground='#a6e3a1'> </span> Neovim";
|
||||
"nvim (.*)" = "<span foreground='#a6e3a1'> </span> $1";
|
||||
"vim" = "<span foreground='#a6e3a1'> </span> Vim";
|
||||
"vim (.*)" = "<span foreground='#a6e3a1'> </span> $1";
|
||||
"(.*)Spotify" = "<span foreground='#a6e3a1'> </span> Spotify";
|
||||
"(.*)Spotify Premium" = "<span foreground='#a6e3a1'> </span> Spotify Premium";
|
||||
"OBS(.*)" = "<span foreground='#a6adc8'> </span> OBS Studio";
|
||||
"VLC media player" = "<span foreground='#fab387'> </span> VLC Media Player";
|
||||
"(.*) - VLC media player" = "<span foreground='#fab387'> </span> $1";
|
||||
"(.*) - mpv" = "<span foreground='#cba6f7'> </span> $1";
|
||||
"qView" = " qView";
|
||||
"(.*).jpg" = " $1.jpg";
|
||||
"(.*).png" = " $1.png";
|
||||
"(.*).svg" = " $1.svg";
|
||||
"• Discord(.*)" = "Discord$1";
|
||||
"(.*)Discord(.*)" = "<span foreground='#89b4fa'> </span> $1Discord$2";
|
||||
"vesktop" = "<span foreground='#89b4fa'> </span> Discord";
|
||||
"ONLYOFFICE Desktop Editors" = "<span foreground='#f38ba8'> </span> OnlyOffice Desktop";
|
||||
"(.*).docx" = "<span foreground='#89b4fa'> </span> $1.docx";
|
||||
"(.*).xlsx" = "<span foreground='#a6e3a1'> </span> $1.xlsx";
|
||||
"(.*).pptx" = "<span foreground='#fab387'> </span> $1.pptx";
|
||||
"(.*).pdf" = "<span foreground='#f38ba8'> </span> $1.pdf";
|
||||
"Authenticate" = " Authenticate";
|
||||
};
|
||||
};
|
||||
|
||||
"custom/startmenu" = {
|
||||
format = "";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "App menu";
|
||||
# on-click = "rofi -show drun";
|
||||
on-click = "launch-nwg-menu";
|
||||
"on-click-right" = "nwg-drawer -mr 225 -ml 225 -mt 200 -mb 200 -is 48 --spacing 15";
|
||||
};
|
||||
|
||||
"custom/temperature" = {
|
||||
exec = "~/.config/waybar/scripts/cpu-temp.sh";
|
||||
return-type = "json";
|
||||
format = "{}";
|
||||
interval = 5;
|
||||
min-length = 8;
|
||||
max-length = 8;
|
||||
};
|
||||
|
||||
memory = {
|
||||
states = {
|
||||
warning = 75;
|
||||
critical = 90;
|
||||
};
|
||||
format = " {percentage}%";
|
||||
"format-critical" = " {percentage}%";
|
||||
tooltip = false;
|
||||
interval = 5;
|
||||
min-length = 7;
|
||||
max-length = 7;
|
||||
};
|
||||
|
||||
cpu = {
|
||||
format = " {usage}%";
|
||||
tooltip = false;
|
||||
interval = 5;
|
||||
min-length = 6;
|
||||
max-length = 6;
|
||||
};
|
||||
|
||||
"custom/distro" = {
|
||||
format = " ";
|
||||
tooltip = false;
|
||||
};
|
||||
|
||||
idle_inhibitor = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
activated = " ";
|
||||
deactivated = " ";
|
||||
};
|
||||
"tooltip-format-activated" = "Presentation Mode";
|
||||
"tooltip-format-deactivated" = "Idle Mode";
|
||||
"start-activated" = false;
|
||||
};
|
||||
|
||||
"custom/weather" = {
|
||||
"return-type" = "json";
|
||||
exec = "sh -lc 'WEATHER_ICON_STYLE=emoji WEATHER_TOOLTIP_MARKUP=1 ~/.config/waybar/scripts/Weather.py'";
|
||||
interval = 600;
|
||||
tooltip = true;
|
||||
};
|
||||
|
||||
"clock#time" = {
|
||||
format = "{:%H:%M}";
|
||||
tooltip = false;
|
||||
min-length = 6;
|
||||
max-length = 6;
|
||||
};
|
||||
|
||||
"clock#date" = {
|
||||
format = " {:%m-%d}";
|
||||
"tooltip-format" = "<tt>{calendar}</tt>";
|
||||
calendar = {
|
||||
mode = "month";
|
||||
"mode-mon-col" = 6;
|
||||
"on-click-right" = "mode";
|
||||
format = {
|
||||
months = "<span color='#b4befe'><b>{}</b></span>";
|
||||
weekdays = "<span color='#a6adc8' font='7'>{}</span>";
|
||||
today = "<span color='#f38ba8'><b>{}</b></span>";
|
||||
};
|
||||
};
|
||||
actions = {
|
||||
"on-click" = "mode";
|
||||
"on-click-right" = "mode";
|
||||
};
|
||||
min-length = 8;
|
||||
max-length = 8;
|
||||
};
|
||||
|
||||
"custom/wifi" = {
|
||||
exec = "~/.config/waybar/scripts/wifi-status.sh";
|
||||
return-type = "json";
|
||||
format = "{}";
|
||||
on-click = "~/.config/waybar/scripts/wifi-menu.sh";
|
||||
"on-click-right" = "kitty --title ' Network Manager TUI' bash -c nmtui";
|
||||
interval = 1;
|
||||
min-length = 1;
|
||||
max-length = 1;
|
||||
};
|
||||
|
||||
bluetooth = {
|
||||
format = "";
|
||||
"format-disabled" = "";
|
||||
"format-connected" = "";
|
||||
"format-connected-battery" = "";
|
||||
"tooltip-format" = "{num_connections} connected";
|
||||
"tooltip-format-disabled" = "Bluetooth Disabled";
|
||||
"tooltip-format-connected" = "{device_enumerate}";
|
||||
"tooltip-format-enumerate-connected" = "{device_alias}";
|
||||
"tooltip-format-enumerate-connected-battery" = ":: {device_alias}: {device_battery_percentage}%";
|
||||
on-click = "~/.config/waybar/scripts/bluetooth-menu.sh";
|
||||
"on-click-right" = "kitty --title ' Bluetooth TUI' bash -c bluetui";
|
||||
interval = 1;
|
||||
min-length = 1;
|
||||
max-length = 1;
|
||||
};
|
||||
|
||||
mpris = {
|
||||
format = "{player_icon} {title} - {artist}";
|
||||
"format-paused" = "{status_icon} {title} - {artist}";
|
||||
"player-icons" = {
|
||||
default = " ";
|
||||
spotify = "<span foreground='#a6e3a1'> </span>";
|
||||
firefox = "<span foreground='#f38ba8'> </span>";
|
||||
};
|
||||
"status-icons" = {
|
||||
paused = "<span color='#b4befe'>\u200A\u200A\u2009\u2009</span>";
|
||||
};
|
||||
"tooltip-format" = "Playing: {title} - {artist}";
|
||||
"tooltip-format-paused" = "Paused: {title} - {artist}";
|
||||
min-length = 5;
|
||||
max-length = 35;
|
||||
};
|
||||
|
||||
pulseaudio = {
|
||||
format = "{icon} {volume}%";
|
||||
"format-muted" = " {volume}%";
|
||||
"format-icons" = {
|
||||
default = ["" "" ""];
|
||||
headphone = "";
|
||||
headset = "";
|
||||
};
|
||||
"tooltip-format" = "Device: {desc}";
|
||||
on-click = "~/.config/waybar/scripts/volume-control.sh -o m";
|
||||
"on-scroll-up" = "~/.config/waybar/scripts/volume-control.sh -o i";
|
||||
"on-scroll-down" = "~/.config/waybar/scripts/volume-control.sh -o d";
|
||||
min-length = 6;
|
||||
max-length = 6;
|
||||
};
|
||||
|
||||
backlight = {
|
||||
format = "{icon} {percent}%";
|
||||
"format-icons" = ["" "" "" "" "" "" "" "" ""];
|
||||
tooltip = false;
|
||||
"on-scroll-up" = "~/.config/waybar/scripts/brightness-control.sh -o i";
|
||||
"on-scroll-down" = "~/.config/waybar/scripts/brightness-control.sh -o d";
|
||||
min-length = 6;
|
||||
max-length = 6;
|
||||
};
|
||||
|
||||
battery = {
|
||||
states = {
|
||||
warning = 20;
|
||||
critical = 10;
|
||||
};
|
||||
format = "{icon} {capacity}%";
|
||||
"format-icons" = ["" "" "" "" "" "" "" "" "" ""];
|
||||
"format-charging" = " {capacity}%";
|
||||
"tooltip-format" = "Discharging: {time}";
|
||||
"tooltip-format-charging" = "Charging: {time}";
|
||||
interval = 1;
|
||||
min-length = 6;
|
||||
max-length = 6;
|
||||
};
|
||||
|
||||
"custom/power" = {
|
||||
format = " ⏻ ";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Power menu: Left-click for QS logout, Right-click for rofi power menu";
|
||||
"on-click" = "qs-wlogout";
|
||||
"on-click-right" = "~/.config/waybar/scripts/power-menu.sh";
|
||||
};
|
||||
|
||||
"custom/paddw" = {
|
||||
format = " ";
|
||||
tooltip = false;
|
||||
};
|
||||
|
||||
"custom/paddc" = {
|
||||
format = " ";
|
||||
tooltip = false;
|
||||
};
|
||||
|
||||
"custom/left1" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/left2" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/left3" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/left4" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/left5" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/left6" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/left7" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/left8" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
|
||||
"custom/right1" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/right2" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/right3" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/right4" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/right5" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
|
||||
"custom/leftin1" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/leftin2" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
|
||||
"custom/rightin1" = {
|
||||
format = "";
|
||||
tooltip = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
style = ''
|
||||
* {
|
||||
font-family: "JetBrainsMono Nerd Font";
|
||||
font-weight: bold;
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
background-color: #${config.lib.stylix.colors.base00};
|
||||
transition-property: background-color;
|
||||
transition-duration: .5s;
|
||||
}
|
||||
|
||||
#workspaces {
|
||||
background: #${config.lib.stylix.colors.base01};
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
padding: 0 5px;
|
||||
background-color: transparent;
|
||||
color: #${config.lib.stylix.colors.base05};
|
||||
}
|
||||
|
||||
#workspaces button:hover {
|
||||
background: rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
#workspaces button.focused {
|
||||
background-color: #${config.lib.stylix.colors.base03};
|
||||
box-shadow: inherit;
|
||||
text-shadow: 0 0 2px rgba(0, 0, 0, 0.6);
|
||||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
background-color: #${config.lib.stylix.colors.base08};
|
||||
}
|
||||
|
||||
#mode {
|
||||
background-color: #${config.lib.stylix.colors.base01};
|
||||
border-bottom: 3px solid #${config.lib.stylix.colors.base05};
|
||||
}
|
||||
|
||||
#clock,
|
||||
#battery,
|
||||
#cpu,
|
||||
#memory,
|
||||
#disk,
|
||||
#temperature,
|
||||
#backlight,
|
||||
#network,
|
||||
#pulseaudio,
|
||||
#wireplumber,
|
||||
#custom-media,
|
||||
#tray,
|
||||
#mode,
|
||||
#idle_inhibitor,
|
||||
#scratchpad,
|
||||
#mpris {
|
||||
padding: 0 10px;
|
||||
color: #${config.lib.stylix.colors.base05};
|
||||
background-color: #${config.lib.stylix.colors.base01};
|
||||
}
|
||||
|
||||
#window,
|
||||
#workspaces {
|
||||
margin: 0 4px;
|
||||
}
|
||||
|
||||
.modules-left > widget:first-child > #workspaces {
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
.modules-right > widget:last-child > #workspaces {
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
#battery.charging, #battery.plugged {
|
||||
color: #${config.lib.stylix.colors.base0B};
|
||||
background-color: #${config.lib.stylix.colors.base01};
|
||||
}
|
||||
|
||||
@keyframes blink {
|
||||
to {
|
||||
background-color: #${config.lib.stylix.colors.base01};
|
||||
color: #${config.lib.stylix.colors.base08};
|
||||
}
|
||||
}
|
||||
|
||||
#battery.critical:not(.charging) {
|
||||
background-color: #${config.lib.stylix.colors.base08};
|
||||
color: #${config.lib.stylix.colors.base01};
|
||||
animation-name: blink;
|
||||
animation-duration: 0.5s;
|
||||
animation-timing-function: linear;
|
||||
animation-iteration-count: infinite;
|
||||
animation-direction: alternate;
|
||||
}
|
||||
|
||||
label:focus {
|
||||
background-color: #${config.lib.stylix.colors.base00};
|
||||
}
|
||||
|
||||
#pulseaudio.muted {
|
||||
background-color: #${config.lib.stylix.colors.base01};
|
||||
color: #${config.lib.stylix.colors.base04};
|
||||
}
|
||||
|
||||
#tray {
|
||||
background-color: #${config.lib.stylix.colors.base01};
|
||||
}
|
||||
|
||||
#tray > .passive {
|
||||
-gtk-icon-effect: dim;
|
||||
}
|
||||
|
||||
#tray > .needs-attention {
|
||||
-gtk-icon-effect: highlight;
|
||||
background-color: #${config.lib.stylix.colors.base09};
|
||||
}
|
||||
|
||||
#idle_inhibitor.activated {
|
||||
background-color: #${config.lib.stylix.colors.base01};
|
||||
color: #${config.lib.stylix.colors.base0B};
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
499
modules/home/waybar/waybar-old-ddubsos.nix
Normal file
|
|
@ -0,0 +1,499 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
# Install helper scripts shipped in modules/home/waybar/scripts into ~/.config/waybar/scripts
|
||||
scriptsDir = ./scripts;
|
||||
scripts = builtins.attrNames (builtins.readDir scriptsDir);
|
||||
|
||||
# Updated CAVA visualizer script packaged via Nix (from waybar-jak-catppuccin.nix)
|
||||
waybarCava = pkgs.writeShellScriptBin "WaybarCava" ''
|
||||
set -euo pipefail
|
||||
|
||||
# Ensure cava exists
|
||||
if ! command -v cava >/dev/null 2>&1; then
|
||||
echo "cava not found in PATH" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Characters for vertical bars (0..7)
|
||||
bar="▁▂▃▄▅▆▇█"
|
||||
|
||||
# Build sed script that maps 0..7 to glyphs and strips ';'
|
||||
dict="s/;//g"
|
||||
bar_length=''${#bar}
|
||||
for ((i = 0; i < bar_length; i++)); do
|
||||
dict+=";s/$i/''${bar:$i:1}/g"
|
||||
done
|
||||
|
||||
RUNTIME_DIR="''${XDG_RUNTIME_DIR:-/tmp}"
|
||||
pidfile="$RUNTIME_DIR/waybar-cava.pid"
|
||||
if [ -f "$pidfile" ]; then
|
||||
oldpid=$(cat "$pidfile" || true)
|
||||
if [ -n "''${oldpid:-}" ] && kill -0 "$oldpid" 2>/dev/null; then
|
||||
kill "$oldpid" 2>/dev/null || true
|
||||
sleep 0.1 || true
|
||||
fi
|
||||
fi
|
||||
echo $$ > "$pidfile"
|
||||
|
||||
config_file=$(mktemp "''${RUNTIME_DIR}/waybar-cava.XXXXXX.conf")
|
||||
cleanup() {
|
||||
rm -f "$config_file" "$pidfile"
|
||||
}
|
||||
trap cleanup EXIT INT TERM
|
||||
|
||||
cat >"$config_file" <<EOF
|
||||
[general]
|
||||
framerate = 30
|
||||
bars = 10
|
||||
|
||||
[input]
|
||||
method = pulse
|
||||
source = auto
|
||||
|
||||
[output]
|
||||
method = raw
|
||||
raw_target = /dev/stdout
|
||||
data_format = ascii
|
||||
ascii_max_range = 7
|
||||
EOF
|
||||
|
||||
exec cava -p "$config_file" | sed -u "$dict"
|
||||
'';
|
||||
in
|
||||
with lib; {
|
||||
home.file = builtins.listToAttrs (
|
||||
map (name: {
|
||||
name = ".config/waybar/scripts/" + name;
|
||||
value = {
|
||||
source = "${scriptsDir}/${name}";
|
||||
executable = true;
|
||||
};
|
||||
})
|
||||
scripts
|
||||
);
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar;
|
||||
settings = [
|
||||
{
|
||||
layer = "top";
|
||||
position = "top";
|
||||
spacing = 6;
|
||||
|
||||
# Old ddubsOS layout converted, with updated CAVA and tweaks
|
||||
modules-center = ["hyprland/workspaces"];
|
||||
modules-left = [
|
||||
"custom/startmenu"
|
||||
"group/qs_wallpapers"
|
||||
"clock"
|
||||
"hyprland/window"
|
||||
"custom/sep_left"
|
||||
"custom/cava_mviz"
|
||||
"custom/sep_right"
|
||||
"tray"
|
||||
];
|
||||
modules-right = [
|
||||
"custom/weather"
|
||||
"idle_inhibitor"
|
||||
"custom/notification"
|
||||
"pulseaudio"
|
||||
"cpu"
|
||||
"memory"
|
||||
"battery"
|
||||
"custom/power"
|
||||
];
|
||||
|
||||
"hyprland/workspaces" = {
|
||||
format = "{name}";
|
||||
format-icons = {
|
||||
default = " ";
|
||||
active = " ";
|
||||
urgent = " ";
|
||||
};
|
||||
on-scroll-up = "hyprctl dispatch workspace e+1";
|
||||
on-scroll-down = "hyprctl dispatch workspace e-1";
|
||||
};
|
||||
clock = {
|
||||
format = " {:%H:%M}";
|
||||
tooltip = true;
|
||||
tooltip-format = "<big>{:%A, %d.%B %Y }</big><tt><small>{calendar}</small></tt>";
|
||||
};
|
||||
"hyprland/window" = {
|
||||
max-length = 25;
|
||||
separate-outputs = false;
|
||||
};
|
||||
memory = {
|
||||
interval = 5;
|
||||
format = " {}%";
|
||||
tooltip = true;
|
||||
};
|
||||
cpu = {
|
||||
interval = 5;
|
||||
format = " {usage:2}%";
|
||||
tooltip = true;
|
||||
};
|
||||
disk = {
|
||||
format = " {free}";
|
||||
tooltip = true;
|
||||
};
|
||||
network = {
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
format-ethernet = " {bandwidthDownOctets}";
|
||||
format-wifi = "{icon} {signalStrength}%";
|
||||
format-disconnected = "";
|
||||
tooltip = false;
|
||||
};
|
||||
tray = {
|
||||
spacing = 12;
|
||||
};
|
||||
pulseaudio = {
|
||||
format = "{icon} {volume}% {format_source}";
|
||||
format-bluetooth = "{volume}% {icon} {format_source}";
|
||||
format-bluetooth-muted = " {icon} {format_source}";
|
||||
format-muted = " {format_source}";
|
||||
format-source = " {volume}%";
|
||||
format-source-muted = "";
|
||||
format-icons = {
|
||||
headphone = "";
|
||||
hands-free = "";
|
||||
headset = "";
|
||||
phone = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = [
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
on-click = "sleep 0.1 && pavucontrol";
|
||||
};
|
||||
|
||||
# Updated CAVA visualizer
|
||||
"custom/cava_mviz" = {
|
||||
exec = "${waybarCava}/bin/WaybarCava";
|
||||
format = "{}";
|
||||
};
|
||||
|
||||
# Separators
|
||||
"custom/sep_left" = {
|
||||
format = " [";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/sep_right" = {
|
||||
format = "] ";
|
||||
tooltip = false;
|
||||
};
|
||||
|
||||
"custom/startmenu" = {
|
||||
tooltip = true;
|
||||
tooltip-format = "App menu";
|
||||
format = "";
|
||||
on-click = "rofi-legacy.menu";
|
||||
"on-click-right" = "nwg-drawer -mr 225 -ml 225 -mt 200 -mb 200 -is 48 --spacing 15";
|
||||
#on-click = "rofi -show drun";
|
||||
};
|
||||
|
||||
# Wallpaper quick-switchers (same color/background as startmenu)
|
||||
"custom/qs_wallpapers_apply" = {
|
||||
format = "";
|
||||
tooltip = true;
|
||||
tooltip-format = "Set image wallpaper";
|
||||
on-click = "qs-wallpapers-apply";
|
||||
};
|
||||
"custom/qs_vid_wallpapers_apply" = {
|
||||
format = "";
|
||||
tooltip = true;
|
||||
tooltip-format = "Set video wallpaper";
|
||||
on-click = "qs-vid-wallpapers-apply";
|
||||
};
|
||||
|
||||
# Group the QS buttons to avoid bar spacing between them
|
||||
"group/qs_wallpapers" = {
|
||||
orientation = "inherit";
|
||||
modules = [
|
||||
"custom/qs_wallpapers_apply"
|
||||
"custom/qs_vid_wallpapers_apply"
|
||||
];
|
||||
};
|
||||
|
||||
# Notifications (compatible with swaync if present)
|
||||
"custom/notification" = {
|
||||
tooltip = false;
|
||||
format = "{icon} {}";
|
||||
format-icons = {
|
||||
notification = "<span foreground='red'><sup></sup></span>";
|
||||
none = "";
|
||||
dnd-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-none = "";
|
||||
inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
inhibited-none = "";
|
||||
dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-inhibited-none = "";
|
||||
};
|
||||
return-type = "json";
|
||||
exec-if = "which swaync-client";
|
||||
exec = "swaync-client -swb";
|
||||
on-click = "sleep 0.1 && task-waybar";
|
||||
escape = true;
|
||||
};
|
||||
|
||||
# Idle inhibitor with colored coffee mug icons (green active, red inactive)
|
||||
idle_inhibitor = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
activated = "<span foreground='#00f769'></span>";
|
||||
deactivated = "<span foreground='#ea51b2'></span>";
|
||||
};
|
||||
tooltip = true;
|
||||
};
|
||||
|
||||
"custom/weather" = {
|
||||
return-type = "json";
|
||||
exec = "sh -lc 'WEATHER_ICON_STYLE=emoji WEATHER_TOOLTIP_MARKUP=1 ~/.config/waybar/scripts/Weather.py'";
|
||||
interval = 600;
|
||||
tooltip = true;
|
||||
};
|
||||
|
||||
battery = {
|
||||
states = {
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{icon} {capacity}%";
|
||||
format-charging = " {capacity}%";
|
||||
format-plugged = " {capacity}%";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
on-click = "";
|
||||
tooltip = false;
|
||||
};
|
||||
|
||||
# Power menu with qs-wlogout primary and rofi fallback (icon: ⏻)
|
||||
"custom/power" = {
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Power menu: Left-click for QS logout, Right-click for rofi power menu";
|
||||
format = " ⏻ ";
|
||||
"on-click" = "qs-wlogout";
|
||||
"on-click-right" = "~/.config/waybar/scripts/power-menu.sh";
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
style = concatStrings [
|
||||
''
|
||||
* {
|
||||
font-size: 16px;
|
||||
font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif;
|
||||
font-weight: bold;
|
||||
}
|
||||
window#waybar {
|
||||
background-color: #282936;
|
||||
border-bottom: 1px solid #282936;
|
||||
border-radius: 0px;
|
||||
color: #00f769;
|
||||
}
|
||||
#workspaces {
|
||||
background: #3a3c4e;
|
||||
margin: 4px;
|
||||
padding: 0px 1px;
|
||||
border-radius: 10px;
|
||||
border: 0px;
|
||||
font-style: normal;
|
||||
color: #282936;
|
||||
}
|
||||
#workspaces button {
|
||||
padding: 0px 5px;
|
||||
margin: 4px 3px;
|
||||
border-radius: 10px;
|
||||
border: 0px;
|
||||
color: #282936;
|
||||
background: linear-gradient(45deg, #b45bcf, #00f769, #62d6e8, #b45bcf);
|
||||
background-size: 300% 300%;
|
||||
animation: gradient_horizontal 15s ease infinite;
|
||||
opacity: 0.5;
|
||||
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
|
||||
}
|
||||
#workspaces button.active {
|
||||
padding: 0px 5px;
|
||||
margin: 4px 3px;
|
||||
border-radius: 10px;
|
||||
border: 0px;
|
||||
color: #282936;
|
||||
background: linear-gradient(45deg, #b45bcf, #00f769, #62d6e8, #b45bcf);
|
||||
background-size: 300% 300%;
|
||||
animation: gradient_horizontal 15s ease infinite;
|
||||
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
|
||||
opacity: 1.0;
|
||||
min-width: 40px;
|
||||
}
|
||||
#workspaces button:hover {
|
||||
border-radius: 10px;
|
||||
color: #282936;
|
||||
background: linear-gradient(45deg, #b45bcf, #00f769, #62d6e8, #b45bcf);
|
||||
background-size: 300% 300%;
|
||||
animation: gradient_horizontal 15s ease infinite;
|
||||
opacity: 0.8;
|
||||
transition: all 0.3s cubic-bezier(.55,-0.68,.48,1.682);
|
||||
}
|
||||
@keyframes gradient_horizontal {
|
||||
0% { background-position: 0% 50%; }
|
||||
50% { background-position: 100% 50%; }
|
||||
100% { background-position: 0% 50%; }
|
||||
}
|
||||
@keyframes swiping {
|
||||
0% { background-position: 0% 200%; }
|
||||
100% { background-position: 200% 200%; }
|
||||
}
|
||||
tooltip {
|
||||
background: #282936;
|
||||
border: 1px solid #b45bcf;
|
||||
border-radius: 10px;
|
||||
}
|
||||
tooltip label { color: #f7f7fb; }
|
||||
#window {
|
||||
margin: 4px;
|
||||
padding: 2px 10px;
|
||||
color: #62d6e8; /* match pulseaudio blue */
|
||||
background: #3a3c4e;
|
||||
border-radius: 10px;
|
||||
}
|
||||
#memory {
|
||||
color: #00f769;
|
||||
background: #3a3c4e;
|
||||
margin: 4px;
|
||||
padding: 2px 10px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
#clock {
|
||||
color: #ebff87;
|
||||
background: #3a3c4e;
|
||||
margin: 4px;
|
||||
padding: 2px 10px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
#cpu {
|
||||
color: #f7f7fb;
|
||||
background: #3a3c4e;
|
||||
margin: 4px;
|
||||
padding: 2px 10px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
#disk {
|
||||
color: #626483;
|
||||
background: #3a3c4e;
|
||||
margin: 4px;
|
||||
padding: 2px 10px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
#battery {
|
||||
color: #ea51b2;
|
||||
background: #3a3c4e;
|
||||
margin: 4px;
|
||||
padding: 2px 10px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
#network {
|
||||
color: #b45bcf;
|
||||
background: #3a3c4e;
|
||||
margin: 4px;
|
||||
padding: 2px 10px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
#custom-hyprbindings {
|
||||
color: #b45bcf;
|
||||
background: #3a3c4e;
|
||||
margin: 4px;
|
||||
padding: 2px 10px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
#tray {
|
||||
color: #e9e9f4;
|
||||
background: #3a3c4e;
|
||||
margin: 4px;
|
||||
padding: 2px 10px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
#pulseaudio {
|
||||
color: #62d6e8;
|
||||
background: #3a3c4e;
|
||||
margin: 4px;
|
||||
padding: 2px 10px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
#custom-notification {
|
||||
color: #00f769; /* default green like jak-catppuccin */
|
||||
background: #3a3c4e;
|
||||
margin: 4px;
|
||||
padding: 2px 8px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
/* Turn red on new alerts (match class names used by format-icons) */
|
||||
#custom-notification.notification,
|
||||
#custom-notification.dnd-notification,
|
||||
#custom-notification.inhibited-notification {
|
||||
color: #f38ba8; /* catppuccin red tone */
|
||||
}
|
||||
#custom-startmenu {
|
||||
color: #00f769;
|
||||
background: transparent;
|
||||
margin: 2px;
|
||||
padding: 3px 5px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
/* Match qs icons to startmenu color/background */
|
||||
#custom-qs_wallpapers_apply,
|
||||
#custom-qs_vid_wallpapers_apply {
|
||||
color: #00f769;
|
||||
background: transparent;
|
||||
margin: 7px;
|
||||
padding: 3px 8px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
/* Inside the QS group, make the two buttons sit closer */
|
||||
#group-qs_wallpapers { margin: 0; padding: 0; }
|
||||
#group-qs_wallpapers > * { margin: 0; }
|
||||
/* Tighten QS buttons margins/padding to bring them closer */
|
||||
#custom-qs_wallpapers_apply,
|
||||
#custom-qs_vid_wallpapers_apply {
|
||||
margin: 2px 2px;
|
||||
padding: 2px 4px;
|
||||
}
|
||||
#idle_inhibitor {
|
||||
color: #b45bcf;
|
||||
background: #3a3c4e;
|
||||
margin: 4px 0px;
|
||||
padding: 2px 14px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
#custom-power {
|
||||
color: #ea51b2; /* Red color for power menu */
|
||||
background: #3a3c4e;
|
||||
margin: 4px 4px;
|
||||
padding: 10px 10px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
340
modules/home/waybar/waybar-pctrade-catppuccin.nix
Normal file
|
|
@ -0,0 +1,340 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
host,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
# Keep consistency with other modules; scriptsDir can supply Weather.py, etc.
|
||||
scriptsDir = ./scripts;
|
||||
scripts = builtins.attrNames (builtins.readDir scriptsDir);
|
||||
in
|
||||
with lib; {
|
||||
# Install any helper scripts from ./scripts into ~/.config/waybar/scripts
|
||||
home.file = builtins.listToAttrs (
|
||||
map
|
||||
(name: {
|
||||
name = ".config/waybar/scripts/" + name;
|
||||
value = {
|
||||
source = "${scriptsDir}/${name}";
|
||||
executable = true;
|
||||
};
|
||||
})
|
||||
scripts
|
||||
);
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar;
|
||||
|
||||
# Waybar configuration
|
||||
settings = [
|
||||
{
|
||||
layer = "top";
|
||||
position = "top";
|
||||
height = 30;
|
||||
spacing = 4;
|
||||
|
||||
# Layout to mirror waybarpc/config (with requested removals)
|
||||
# - Left: start menu, clock, separator, weather
|
||||
# - Center: workspaces
|
||||
# - Right: tray, pulseaudio, battery, swaync, idle_inhibitor, power
|
||||
modules-left = [
|
||||
"custom/startmenu"
|
||||
"clock"
|
||||
"custom/weather"
|
||||
];
|
||||
modules-center = [
|
||||
"hyprland/workspaces"
|
||||
];
|
||||
modules-right = [
|
||||
"battery"
|
||||
"tray"
|
||||
"custom/notification"
|
||||
"idle_inhibitor"
|
||||
"pulseaudio"
|
||||
"custom/power"
|
||||
];
|
||||
|
||||
# Workspaces (Hyprland)
|
||||
"hyprland/workspaces" = {
|
||||
format = "{name}";
|
||||
format-icons = {
|
||||
default = " ";
|
||||
active = " ";
|
||||
urgent = " ";
|
||||
};
|
||||
on-scroll-up = "hyprctl dispatch workspace e+1";
|
||||
on-scroll-down = "hyprctl dispatch workspace e-1";
|
||||
};
|
||||
|
||||
# 12-hour time format
|
||||
clock = {
|
||||
format = '' {:%I:%M %p}'';
|
||||
tooltip = true;
|
||||
tooltip-format = "<big>{:%A, %d.%B %Y }</big>\n<tt><small>{calendar}</small></tt>";
|
||||
};
|
||||
|
||||
# Idle inhibitor with coffee mug icon
|
||||
idle_inhibitor = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
activated = "";
|
||||
deactivated = "";
|
||||
};
|
||||
tooltip = true;
|
||||
};
|
||||
|
||||
# Notifications (SwayNotificationCenter via swaync-client)
|
||||
"custom/notification" = {
|
||||
tooltip = false;
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
notification = "<span foreground='red'><sup></sup></span>";
|
||||
none = "";
|
||||
dnd-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-none = "";
|
||||
inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
inhibited-none = "";
|
||||
dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-inhibited-none = "";
|
||||
};
|
||||
return-type = "json";
|
||||
exec-if = "which swaync-client";
|
||||
exec = "swaync-client -swb";
|
||||
on-click = "swaync-client -t";
|
||||
escape = true;
|
||||
};
|
||||
|
||||
# Audio
|
||||
pulseaudio = {
|
||||
format = "{icon} {volume}% {format_source}";
|
||||
format-bluetooth = "{volume}% {icon} {format_source}";
|
||||
format-bluetooth-muted = " {icon} {format_source}";
|
||||
format-muted = " {format_source}";
|
||||
format-source = " {volume}%";
|
||||
format-source-muted = "";
|
||||
format-icons = {
|
||||
headphone = "";
|
||||
hands-free = "";
|
||||
headset = "";
|
||||
phone = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = ["" "" ""];
|
||||
};
|
||||
on-click = "sleep 0.1 && pavucontrol";
|
||||
};
|
||||
|
||||
# Battery
|
||||
battery = {
|
||||
states = {
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "{icon} {capacity}%";
|
||||
format-charging = " {capacity}%";
|
||||
format-plugged = " {capacity}%";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
tooltip = false;
|
||||
};
|
||||
|
||||
# Tray
|
||||
tray = {
|
||||
spacing = 10;
|
||||
};
|
||||
|
||||
# Start menu and power menu
|
||||
"custom/startmenu" = {
|
||||
format = "";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "App menu";
|
||||
# on-click = "rofi -show drun";
|
||||
on-click = "launch-nwg-menu";
|
||||
"on-click-right" = "nwg-drawer -mr 225 -ml 225 -mt 200 -mb 200 -is 48 --spacing 15";
|
||||
};
|
||||
|
||||
"custom/power" = {
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Power menu: Left-click for QS logout";
|
||||
format = " ⏻ ";
|
||||
on-click = "qs-wlogout";
|
||||
};
|
||||
|
||||
# Weather widget (uses existing ddubsos Weather.py script if present)
|
||||
"custom/weather" = {
|
||||
return-type = "json";
|
||||
exec = "sh -lc 'WEATHER_ICON_STYLE=emoji WEATHER_TOOLTIP_MARKUP=1 ~/.config/waybar/scripts/Weather.py'";
|
||||
interval = 600;
|
||||
tooltip = true;
|
||||
};
|
||||
}
|
||||
];
|
||||
|
||||
# Styling to mirror ~/Projects/waybarpc/style.css (with Catppuccin-like colors)
|
||||
style = lib.concatStrings [
|
||||
''
|
||||
/* Color variables based on waybarpc/colors.css */
|
||||
@define-color bg #1a1b26;
|
||||
@define-color bg-alt #16161e;
|
||||
@define-color bg-alt2 #24283b;
|
||||
@define-color bg-alt3 #414868;
|
||||
@define-color border #565f89;
|
||||
@define-color border2 #6183bb;
|
||||
@define-color text #c0caf5;
|
||||
@define-color text-dark #1a1b26; /* alias for typo tex-dark in original */
|
||||
@define-color tex-dark #1a1b26;
|
||||
@define-color accent #7e9cd8;
|
||||
@define-color accent2 #957fb8;
|
||||
@define-color red #f7768e;
|
||||
@define-color green #a6e3a1;
|
||||
@define-color blue #89b4fa;
|
||||
|
||||
* {
|
||||
font-family: JetBrainsMono Nerd Font, monospace;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
window#waybar { background-color: @bg; }
|
||||
window#waybar.hidden { opacity: 0.5; margin: 15px; }
|
||||
|
||||
/* Workspaces container */
|
||||
#workspaces {
|
||||
background-color: @bg-alt;
|
||||
padding: 2px;
|
||||
margin: 2px;
|
||||
border-radius: 10px;
|
||||
}
|
||||
/* 3D shaded workspace buttons */
|
||||
#workspaces button {
|
||||
all: initial;
|
||||
min-width: 0;
|
||||
background: linear-gradient(to bottom, @bg-alt3, @bg);
|
||||
padding: 6px 12px;
|
||||
transition: all 0.1s linear;
|
||||
border-top: 1px solid @border;
|
||||
box-shadow: 0px 17px 5px 1px rgba(0, 0, 0, 0.2);
|
||||
color: @accent2;
|
||||
font-weight: 800;
|
||||
text-shadow: -1px -1px 1px rgba(205, 214, 244, 0.1), 0px 2px 3px rgba(0, 0, 0, 0.3);
|
||||
}
|
||||
#workspaces button:first-child {
|
||||
border-top-left-radius: 6px;
|
||||
border-bottom-left-radius: 6px;
|
||||
}
|
||||
#workspaces button:last-child {
|
||||
border-top-right-radius: 6px;
|
||||
border-bottom-right-radius: 6px;
|
||||
}
|
||||
#workspaces button.empty {
|
||||
color: #737373;
|
||||
background: transparent;
|
||||
text-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
#workspaces button.active {
|
||||
box-shadow: 0px 20px 8px 2px rgba(0, 0, 0, 0.35);
|
||||
background: linear-gradient(to bottom, @bg-alt3, @bg-alt);
|
||||
color: @text;
|
||||
font-size: 25px;
|
||||
border-top: 1px solid @border2;
|
||||
border-bottom: 3px solid @border2;
|
||||
text-shadow: 0px 0px 14px @text;
|
||||
}
|
||||
#workspaces button.focused {
|
||||
background: linear-gradient(to bottom, @accent2, @bg-alt3);
|
||||
color: @bg;
|
||||
text-shadow: 0px 0px 12px @accent2;
|
||||
font-size: 22px;
|
||||
border-top: 1px solid @accent2;
|
||||
}
|
||||
#workspaces button.visible {
|
||||
background: linear-gradient(to bottom, @bg-alt3, @bg-alt2);
|
||||
color: @accent;
|
||||
text-shadow: none;
|
||||
font-size: 18px;
|
||||
border-top: 1px solid @border;
|
||||
}
|
||||
#workspaces button.urgent {
|
||||
background-color: @red;
|
||||
color: @bg;
|
||||
text-shadow: 0px 0px 8px @red;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
/* Clock with gradient block */
|
||||
#clock {
|
||||
background: linear-gradient(to bottom, @bg-alt3, @bg);
|
||||
font-size: 14px;
|
||||
margin: 2px;
|
||||
padding: 6px 10px;
|
||||
border-radius: 6px;
|
||||
font-weight: bold;
|
||||
border-top: 1px solid @border;
|
||||
border-bottom: 2px solid @bg-alt;
|
||||
color: @text;
|
||||
}
|
||||
|
||||
/* Notifications state color cues */
|
||||
#custom-notification.none { color: @green; }
|
||||
#custom-notification.notification, #custom-notification.dnd-notification, #custom-notification.inhibited-notification, #custom-notification.dnd-inhibited-notification { color: @red; }
|
||||
|
||||
/* Idle inhibitor colors */
|
||||
#idle_inhibitor.activated { color: @green; }
|
||||
#idle_inhibitor.deactivated { color: @red; }
|
||||
|
||||
/* Right-side blocks */
|
||||
#pulseaudio, #battery, #tray {
|
||||
background: linear-gradient(to bottom, @bg-alt3, @bg);
|
||||
padding: 4px 8px;
|
||||
margin: 2px;
|
||||
border-radius: 6px;
|
||||
border-top: 1px solid @border;
|
||||
border-bottom: 2px solid @bg-alt;
|
||||
font-weight: bold;
|
||||
color: @text;
|
||||
}
|
||||
#pulseaudio { margin-left: 0; margin-right: 0; }
|
||||
|
||||
/* Shaded block style (match workspace button look) */
|
||||
#custom-startmenu, #custom-weather, #idle_inhibitor, #custom-power, #custom-notification {
|
||||
background: linear-gradient(to bottom, @bg-alt3, @bg);
|
||||
padding: 6px 10px;
|
||||
margin: 2px;
|
||||
border-radius: 6px;
|
||||
border-top: 1px solid @border;
|
||||
border-bottom: 2px solid @bg-alt;
|
||||
box-shadow: 0px 12px 4px 1px rgba(0, 0, 0, 0.2);
|
||||
text-shadow: -1px -1px 1px rgba(205, 214, 244, 0.1), 0px 2px 3px rgba(0, 0, 0, 0.3);
|
||||
color: @text;
|
||||
font-size: 14px;
|
||||
}
|
||||
/* Make icons slightly larger for clarity */
|
||||
#custom-startmenu, #idle_inhibitor, #custom-power, #custom-notification { font-size: 16px; }
|
||||
#battery.warning, #battery.critical, #battery.urgent { color: @red; }
|
||||
|
||||
/* Separator styling */
|
||||
#custom-sep { color: @accent; }
|
||||
|
||||
/* Center the startmenu glyph like the power button */
|
||||
#custom-startmenu {
|
||||
min-width: 28px;
|
||||
min-height: 24px;
|
||||
padding-left: 8px;
|
||||
padding-right: 12px;
|
||||
}
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||
449
modules/home/waybar/waybar-tony.nix
Normal file
|
|
@ -0,0 +1,449 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
host,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
inherit (import ../../../hosts/${host}/variables.nix) clock24h;
|
||||
scriptsDir = ./scripts;
|
||||
scripts = builtins.attrNames (builtins.readDir scriptsDir);
|
||||
in
|
||||
with lib; {
|
||||
# Configure & Theme Waybar (Tony)
|
||||
home.file = builtins.listToAttrs (
|
||||
map (name: {
|
||||
name = ".config/waybar/scripts/" + name;
|
||||
value = {
|
||||
source = "${scriptsDir}/${name}";
|
||||
executable = true;
|
||||
};
|
||||
})
|
||||
scripts
|
||||
);
|
||||
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar;
|
||||
settings = [
|
||||
{
|
||||
layer = "top";
|
||||
position = "top";
|
||||
height = 30;
|
||||
spacing = 4;
|
||||
|
||||
modules-left = [
|
||||
"custom/startmenu"
|
||||
"custom/sep_gap_left"
|
||||
"group/qs_wallpapers"
|
||||
"custom/sep"
|
||||
"hyprland/workspaces"
|
||||
"custom/sep"
|
||||
#"custom/sep"
|
||||
"hyprland/window"
|
||||
"custom/sep"
|
||||
];
|
||||
modules-center = [
|
||||
#"custom/sep"
|
||||
"idle_inhibitor"
|
||||
"custom/weather"
|
||||
"custom/notification"
|
||||
#"custom/sep"
|
||||
];
|
||||
modules-right = [
|
||||
"custom/sep"
|
||||
"tray"
|
||||
"custom/sep"
|
||||
"pulseaudio"
|
||||
#"network"
|
||||
"cpu"
|
||||
#"memory"
|
||||
"clock"
|
||||
"custom/sep"
|
||||
"custom/power"
|
||||
];
|
||||
|
||||
"hyprland/workspaces" = {
|
||||
disable-scroll = true;
|
||||
all-outputs = true;
|
||||
warp-on-scroll = false;
|
||||
format = "{name}";
|
||||
persistent-workspaces = {
|
||||
"*" = 9;
|
||||
};
|
||||
};
|
||||
"hyprland/window" = {
|
||||
max-length = 40;
|
||||
seperate-outputs = false;
|
||||
};
|
||||
tray = {
|
||||
spacing = 10;
|
||||
};
|
||||
clock = {
|
||||
format-alt = "{:%Y-%m-%d}";
|
||||
};
|
||||
cpu = {
|
||||
format = "CPU: {usage}%";
|
||||
tooltip = false;
|
||||
};
|
||||
memory = {
|
||||
format = "Mem: {used}GiB";
|
||||
};
|
||||
disk = {
|
||||
interval = 60;
|
||||
path = "/";
|
||||
format = "Disk: {free}";
|
||||
};
|
||||
battery = {
|
||||
states = {
|
||||
good = 95;
|
||||
warning = 30;
|
||||
critical = 15;
|
||||
};
|
||||
format = "Bat: {capacity}% {icon} {time}";
|
||||
format-plugged = "{capacity}% ";
|
||||
format-alt = "Bat {capacity}%";
|
||||
format-time = "{H}:{M}";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
network = {
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
format-ethernet = "{ifname} {ipaddr}";
|
||||
format-wifi = "{essid} {signalStrength}% {ipaddr}";
|
||||
format-disconnected = "";
|
||||
tooltip = true;
|
||||
tooltip-format = "{ifname}\nIPv4: {ipaddr}/{cidr}\nGateway: {gwaddr}\nSSID: {essid}\nSignal: {signalStrength}%";
|
||||
on-click = "nmtui";
|
||||
};
|
||||
"custom/sep" = {
|
||||
format = "|";
|
||||
interval = 0;
|
||||
};
|
||||
"idle_inhibitor" = {
|
||||
format = "{icon}";
|
||||
format-icons = {
|
||||
activated = "";
|
||||
deactivated = "";
|
||||
};
|
||||
tooltip = true;
|
||||
};
|
||||
"custom/startmenu" = {
|
||||
format = "";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "App menu";
|
||||
on-click = "rofi -show drun";
|
||||
"on-click-right" = "nwg-drawer -mr 225 -ml 225 -mt 200 -mb 200 -is 48 --spacing 15";
|
||||
};
|
||||
|
||||
# Wallpaper quick-switchers close to startmenu
|
||||
"custom/qs_wallpapers_apply" = {
|
||||
format = "";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Set image wallpaper";
|
||||
on-click = "qs-wallpapers-apply";
|
||||
};
|
||||
"custom/qs_vid_wallpapers_apply" = {
|
||||
format = "";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Set video wallpaper";
|
||||
on-click = "qs-vid-wallpapers-apply";
|
||||
};
|
||||
"group/qs_wallpapers" = {
|
||||
orientation = "inherit";
|
||||
modules = [
|
||||
"custom/qs_wallpapers_apply"
|
||||
"custom/sep_gap"
|
||||
"custom/qs_vid_wallpapers_apply"
|
||||
];
|
||||
};
|
||||
|
||||
# Narrow spacer for QS icons
|
||||
"custom/sep_gap" = {
|
||||
format = " ";
|
||||
tooltip = false;
|
||||
};
|
||||
# Spacer between startmenu and first QS icon
|
||||
"custom/sep_gap_left" = {
|
||||
format = " ";
|
||||
tooltip = false;
|
||||
};
|
||||
"custom/notification" = {
|
||||
tooltip = false;
|
||||
format = "{icon} {}";
|
||||
format-icons = {
|
||||
notification = "<span foreground='red'><sup></sup></span>";
|
||||
none = "";
|
||||
dnd-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-none = "";
|
||||
inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
inhibited-none = "";
|
||||
dnd-inhibited-notification = "<span foreground='red'><sup></sup></span>";
|
||||
dnd-inhibited-none = "";
|
||||
};
|
||||
return-type = "json";
|
||||
exec-if = "which swaync-client";
|
||||
exec = "swaync-client -swb";
|
||||
on-click = "swaync-client -t";
|
||||
escape = true;
|
||||
};
|
||||
"custom/weather" = {
|
||||
return-type = "json";
|
||||
exec = "sh -lc 'WEATHER_ICON_STYLE=emoji WEATHER_TOOLTIP_MARKUP=1 ~/.config/waybar/scripts/Weather.py'";
|
||||
interval = 600;
|
||||
tooltip = true;
|
||||
};
|
||||
pulseaudio = {
|
||||
format = "{icon} {volume}% {format_source}";
|
||||
format-bluetooth = "{volume}% {icon} {format_source}";
|
||||
format-bluetooth-muted = " {icon} {format_source}";
|
||||
format-muted = " {format_source}";
|
||||
format-source = " {volume}%";
|
||||
format-source-muted = "";
|
||||
format-icons = {
|
||||
headphone = "";
|
||||
hands-free = "";
|
||||
headset = "";
|
||||
phone = "";
|
||||
portable = "";
|
||||
car = "";
|
||||
default = [
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
};
|
||||
on-click = "pavucontrol";
|
||||
};
|
||||
"custom/power" = {
|
||||
format = " ⏻ ";
|
||||
tooltip = true;
|
||||
"tooltip-format" = "Power menu: Left-click for QS logout, Right-click for rofi power menu";
|
||||
"on-click" = "qs-wlogout";
|
||||
"on-click-right" = "~/.config/waybar/scripts/power-menu.sh";
|
||||
};
|
||||
}
|
||||
];
|
||||
style = concatStrings [
|
||||
''
|
||||
@define-color bg #1a1b26;
|
||||
@define-color fg #a9b1d6;
|
||||
@define-color blk #32344a;
|
||||
@define-color red #f7768e;
|
||||
@define-color grn #9ece6a;
|
||||
@define-color ylw #e0af68;
|
||||
@define-color blu #7aa2f7;
|
||||
@define-color mag #ad8ee6;
|
||||
@define-color cyn #0db9d7;
|
||||
@define-color brblk #444b6a;
|
||||
@define-color white #ffffff;
|
||||
|
||||
* {
|
||||
font-family: "JetBrainsMono Nerd Font", monospace;
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
background-color: @bg;
|
||||
color: @fg;
|
||||
}
|
||||
|
||||
#workspaces button {
|
||||
padding: 0 6px;
|
||||
color: @cyn;
|
||||
background: transparent;
|
||||
border-bottom: 3px solid @bg;
|
||||
}
|
||||
#workspaces button.active {
|
||||
color: @cyn;
|
||||
border-bottom: 3px solid @mag;
|
||||
}
|
||||
#workspaces button.empty {
|
||||
color: @white;
|
||||
}
|
||||
#workspaces button.empty.active {
|
||||
color: @cyn;
|
||||
border-bottom: 3px solid @mag;
|
||||
}
|
||||
|
||||
#workspaces button.urgent {
|
||||
background-color: @red;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
background: inherit;
|
||||
box-shadow: inset 0 -3px #ffffff;
|
||||
}
|
||||
|
||||
#clock,
|
||||
#custom-sep,
|
||||
#battery,
|
||||
#cpu,
|
||||
#memory,
|
||||
#disk,
|
||||
#network,
|
||||
#tray,
|
||||
#pulseaudio,
|
||||
#idle_inhibitor,
|
||||
#custom-notification,
|
||||
#custom-power {
|
||||
padding: 0 8px;
|
||||
color: @white;
|
||||
}
|
||||
/* Rounded, raised bottom effect for center/right modules */
|
||||
#clock,
|
||||
#battery,
|
||||
#cpu,
|
||||
#memory,
|
||||
#disk,
|
||||
#network,
|
||||
#tray,
|
||||
#pulseaudio,
|
||||
#idle_inhibitor,
|
||||
#custom-notification,
|
||||
#custom-power {
|
||||
border-bottom-left-radius: 10px;
|
||||
border-bottom-right-radius: 10px;
|
||||
box-shadow: inset 0 -2px rgba(255,255,255,0.07);
|
||||
}
|
||||
/* Tighten spacing between the two QS buttons */
|
||||
#group-qs_wallpapers { margin: 0; padding: 0; }
|
||||
|
||||
/* Make QS icons match startmenu color and background (bright green) */
|
||||
/* Start menu stays bright green; QS icons switch to clock blue (@cyn) */
|
||||
#custom-startmenu {
|
||||
color: @grn;
|
||||
background: transparent;
|
||||
font-size: 21px; /* ~30% larger than base 16px */
|
||||
}
|
||||
#custom-qs_wallpapers_apply,
|
||||
#custom-qs_vid_wallpapers_apply {
|
||||
color: @cyn; /* match clock color */
|
||||
background: transparent;
|
||||
font-size: 21px; /* ~30% larger than base 16px */
|
||||
}
|
||||
/* Prevent QS icons from being clipped; add a tiny internal pad */
|
||||
#custom-qs_wallpapers_apply,
|
||||
#custom-qs_vid_wallpapers_apply {
|
||||
padding: 0 2px;
|
||||
min-width: 20px;
|
||||
}
|
||||
#custom-startmenu { margin-right: 6px; }
|
||||
|
||||
#custom-sep {
|
||||
color: @brblk;
|
||||
}
|
||||
/* Width for gap spacer between QS icons */
|
||||
#custom-sep_gap { padding: 0 1px; }
|
||||
#custom-sep_gap_left { padding: 0 2px; }
|
||||
|
||||
#clock {
|
||||
color: @cyn;
|
||||
border-bottom: 4px solid @cyn;
|
||||
}
|
||||
|
||||
#battery {
|
||||
color: @mag;
|
||||
border-bottom: 4px solid @mag;
|
||||
}
|
||||
|
||||
#disk {
|
||||
color: @ylw;
|
||||
border-bottom: 4px solid @ylw;
|
||||
}
|
||||
|
||||
#memory {
|
||||
color: @mag;
|
||||
border-bottom: 4px solid @mag;
|
||||
}
|
||||
|
||||
#cpu {
|
||||
color: @grn;
|
||||
border-bottom: 4px solid @grn;
|
||||
}
|
||||
|
||||
#network {
|
||||
color: @blu;
|
||||
border-bottom: 4px solid @blu;
|
||||
}
|
||||
|
||||
#network.disconnected {
|
||||
background-color: @red;
|
||||
}
|
||||
|
||||
#pulseaudio {
|
||||
color: @blu;
|
||||
border-bottom: 4px solid @blu;
|
||||
}
|
||||
|
||||
/* Center the idle_inhibitor icon within its pill */
|
||||
#idle_inhibitor {
|
||||
/* Center visually via symmetric padding + fixed min width */
|
||||
padding-left: 10px;
|
||||
padding-right: 10px;
|
||||
min-width: 26px; /* keep a consistent hit area */
|
||||
border-bottom: 4px solid @brblk; /* default raised strip */
|
||||
border-bottom-left-radius: 10px;
|
||||
border-bottom-right-radius: 10px;
|
||||
}
|
||||
#idle_inhibitor label {
|
||||
margin: 0; /* remove any label offset */
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
#idle_inhibitor.deactivated {
|
||||
color: @red;
|
||||
border-bottom: 4px solid @red;
|
||||
}
|
||||
|
||||
#idle_inhibitor.activated {
|
||||
color: @grn;
|
||||
border-bottom: 4px solid @grn;
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
#custom-notification {
|
||||
color: @grn; /* default green */
|
||||
border-bottom: 4px solid @grn;
|
||||
}
|
||||
/* Turn red on new alerts */
|
||||
#custom-notification.notification,
|
||||
#custom-notification.dnd-notification,
|
||||
#custom-notification.inhibited-notification {
|
||||
color: @red;
|
||||
border-bottom: 4px solid @red;
|
||||
}
|
||||
/* Add subtle raised effect to center modules too */
|
||||
#custom-notification,
|
||||
#idle_inhibitor {
|
||||
box-shadow: inset 0 -3px @brblk;
|
||||
}
|
||||
|
||||
#tray {
|
||||
background-color: @bg; /* match bar background */
|
||||
border-bottom: 4px solid @brblk; /* restore raised strip */
|
||||
border-bottom-left-radius: 10px;
|
||||
border-bottom-right-radius: 10px;
|
||||
}
|
||||
|
||||
#custom-power {
|
||||
color: @red;
|
||||
border-bottom: 4px solid @red;
|
||||
}
|
||||
|
||||
''
|
||||
];
|
||||
};
|
||||
}
|
||||