Compare commits

..

2 commits

Author SHA1 Message Date
Don Williams
13f5e8f65f Fixed binding for qs-wallpapers-apply
On branch stable-2.5.5
 Your branch is up to date with 'origin/stable-2.5.5'.

 Changes to be committed:
	modified:   modules/home/hyprland/binds.nix
2025-12-12 17:59:48 -05:00
Don Williams
91ab6a5451 Fixed branch clone comes from
On branch stable-2.5.5
 Your branch is up to date with 'origin/stable-2.5.5'.

 Changes to be committed:
	modified:   install-zaneyos.sh
2025-12-12 12:23:04 -05:00
76 changed files with 893 additions and 2429 deletions

View file

@ -5,456 +5,7 @@
---
# 🚀 **Current Release - ZaneyOS v2.6.1**
- Removed `discord` and `discord-canary`
- They use an outdated `electron`
- That build uses and `openssl v1.1.1w`
- That ius OEL and marked insecure in NIXOS
- Users can use an alternativve client until discord is updated
- Disabled `zen browser` in `zaneyos/modules/home/default.nix`
- Needs to be migrated to being enabled via host variable
- Changed from `zen` to `latest` kernel
- Linux kernel v7.0 is much better than 6.19_zen
- Disabled `vfr = true;` in hyprland config
- It's not supportorted after `v54.3`
- Disabling now to avoid error on next update
- Added `awww` as flake input for installs < 25.11
- Fixed eval warnings:
- `gtk.gtk4.theme` set to `null`
- `git.signing.format` set to `null`
- `nixvim` lualine theme set to `auto`
- Changed to NixOS unstable branch
- Ported `DropTerminal` from `KoolDots` to ZaneyOS
- Replaces pyprland and some python dependencies
- Hyprland updated to v0.54
- Added support for scrolling and monocle layouts
- Fixed hyprland float-all bindings
- Updated Window Rules for new Hyprland format
- Disabled steam by default
- Removed `adb.enable` no longer supported and not needed for ZaneyOS
- Changed `nixfmt-rfc-style` package for updated `nitfmt`
- `nixfmt-rfc-style` no longer supported
- Fixed other evaluation warnings with `Xorg` package changes
# 🚀 **Current Release - ZaneyOS v2.6.0**
#### 📅 **Updated: April 3rd, 2026**
- Swapped `awww` for `swww`
- `swww` is no longer maintained
- removed `--format xrgb` flag also no needed
#### 📅 **Updated: February 19th, 2026**
- Fixed `zcli` GPU detection for newer AMD GPUs
- Fixed the fix to properly detect VMs
- `nixvim.nix` changes
- Disabled Zig language server
- Disabled marksman language server
- Caused dotnet lib to be compiled (takes hours)
#### 📅 **Updated: February 16th, 2026**
- Removed `hyprpanel`
- No longer maintained
- Vendor created `wayle` to replace it
- Replaced in ZaneyOS with 'noctalia-shell'
- `webkitgtk` being built from source
- Removed audacity is called `wxwidgets`
- Created overlay for `tumbler` to disable `libepub`
- These caused the build from source issue
- Building `webkitgtk` takes hours every rebuild/update
#### 📅 **Updated: January 31st, 2026**
- Changed default login manager to `TUI`
- Issues recently (again) with SDDM and some GPUs
- Often related to SDDM wayland support option
- Some GPUs need it enabled, others disabled
#### 📅 **Updated: January 28th, 2026**
- Disabled gnome in stylix. Caused install failure
#### 📅 **Updated: January 26th, 2026**
- `noctalia-shell` regression:
- Removed `noctalia-shell` systemd service
- Caused old version of `noctalia-shell`
- Adjusted `noctalia-shell` bindings to match change
- Default applications now settable
- Globally for all hosts
- `zaneyos/modules/home/xdg.nix`
- Per host
- `zaneyos/hosts/HOSTNAME/variables.nix`
- Host settings override `xdg.nix` settings
#### 📅 **Updated: January 23rd, 2026**
- Added additional fonts
- Fixed issue with Hypridle and Home Manager
- Added `systemdTarget = "hyprland-session.target";`
- Thank you `Yang Kexuan` for the fix
- Reference issue: [5899](https://github.com/nix-community/home-manager/issues/5899)
#### 📅 **Updated: January 5th, 2026**
- Removed extra newline in `exec-once.nix`
- Fixed typo in `noctalia.nix`
- Added docs reference per systemd spec
- Improved code overall
- Thanks `lichen.gel.calm` for finding these issues
- Disabled `noctalia-shell` systemd service
- Caused older revision of `noctalia-shell` to load
- Now started from hyprland
#### 📅 **Updated: December 29th, 2025**
- Removed extra `noctalia-shell` startup
- Added initial support for AMD, NVIDIA Hybrid laptops
- Keypress to recover from DPMS now enabled by default
#### 📅 **Updated: December 21st, 2025**
- Added user systemd service for `noctalia-shell`
- Updated Hyprland bindings to accomodate change
- Updated `nixvim`
## `nixvim` Features Migrated from Bugsvim
#### Custom Diagnostic Icons
```lua
Error = " "
Warn = " "
Hint = ""
Info = ""
```
- Custom unicode symbols for each diagnostic severity level
- Integrated into vim.diagnostic.config() for gutter display
#### Diagnostic Display Options
- **Sign Column**: Shows diagnostic icons in the gutter with custom text and highlight groups
- **Virtual Text**: Inline diagnostics with custom prefix (`●`) and 2-space spacing
- **Virtual Lines**: Enhanced visibility for error context without cluttering
- **Underline**: Visual underline for error locations
- **Floating Window**: Hover diagnostics with rounded borders and source attribution
- **Severity Sorting**: Errors prioritized over warnings
### 2. Text Yank Highlighting
**Migration**: Highlight yanked text for 200ms (IncSearch highlight group)
- Autocmd-based implementation in extraConfigLua
- Uses vim.hl.on_yank for smooth visual feedback
### 3. LSP Attachment Keybindings
**Enhanced LSP Integration** with on-attach callbacks:
```
K - Hover documentation
gd - Goto definition
gD - Goto declaration
gi - Goto implementation
gr - References
<leader>rn - Rename symbol
<leader>ca - Code action
```
- Buffer-local scope prevents global pollution
- Guard against multiple registrations with flag check
### 4. Startup Dashboard
**Migration**: alpha-nvim with custom banner generation
#### Dynamic Header Generation
- Primary: `toilet -f ansi-shadow NIXOS`
- Secondary: `figlet -f "ANSI Shadow" NIXOS`
- Tertiary: `figlet NIXOS`
- Fallback: ASCII art banner (9 lines)
#### Dashboard Buttons
| Shortcut | Action | Command |
|----------|--------|---------|
| `f` | Find file | Telescope find_files |
| `r` | Recent files | Telescope oldfiles |
| `g` | Live grep | Telescope live_grep |
| `n` | New file | :enew |
| `e` | File browser | Neotree toggle |
| `q` | Quit | :qa |
#### Footer
Dynamic version display: `NixVim • Neovim X.Y.Z`
### 5. Theme Integration
**Migration**: Tokyo Night colorscheme with Stylix integration
- Tokyo Night colors for status line (lualine)
- Notify background color tied to Stylix palette: `#${config.lib.stylix.colors.base01}`
- Consistent color management across UI components
## Comprehensive Feature Set
### UI/Visuals Migrated
- Lualine status line (Tokyo Night theme)
- Bufferline for buffer management
- Indent-blankline for visual indentation
- Colorizer for inline color display
- Illuminate for reference highlighting
- Which-key for keybinding discovery (Helix preset)
### Core Editing
- Treesitter for syntax highlighting
- Neo-tree file browser
- Telescope fuzzy finder with media_files extension
- Project.nvim for project management
- Hop/Leap motion plugins
- vim-surround for text manipulation
- Comment.nvim for toggle comments
### Advanced Features
- snacks.nvim ecosystem (terminal, scratch buffers, zen mode, git integration, notifier)
- Noice for enhanced UI/messages
- Notify for notifications
- todo-comments for task navigation
- nvim-autopairs with Treesitter support
### Language Support
**LSP Servers**: nil_ls, lua_ls, pyright, ts_ls, html, cssls, clangd, zls, marksman, hyprls, tailwindcss, bashls
**Formatters**:
- Nix: alejandra
- Lua: stylua
- JavaScript/TypeScript: prettierd
- Shell: shfmt
**Completion**: blink-cmp with luasnip snippets
### Development Tools
- Git integration: gitsigns + diffview
- Markdown preview
- Trouble diagnostics panel
- Terminal: toggleterm with float direction
## Implementation Details
### Module Structure
- **File**: `modules/home/editors/nixvim.nix` (743 lines)
- **Framework**: Nixvim home-manager module
- **Theme**: Tokyo Night (primary), Catppuccin (fallback)
- **Runtime Tools**: 23+ packages (bat, chafa, fd, figlet, lazygit, prettierd, ripgrep, etc.)
## Keybinding Highlights
```
jk - Exit insert mode
<leader>ff - Find files
<leader>fm - Find media files
<leader>lg - Live grep
<leader>fe - File explorer toggle
<leader>t - Toggle terminal
<leader>. - Toggle comment (line/visual)
<leader>z - Zen mode
<leader>Z - Zoom
<leader>gg - Lazygit
<c-/> - Terminal (via snacks)
]t / [t - Next/prev TODO comment
<leader>n - Notification history
```
#### 📅 **Updated: December 21st, 2025**
- Added user systemd service for `noctalia-shell`
- Updated Hyprland bindings to accomodate change
- Updated `nixvim`
## `nixvim` Features Migrated from Bugsvim
#### Custom Diagnostic Icons
```lua
Error = " "
Warn = " "
Hint = ""
Info = ""
```
- Custom unicode symbols for each diagnostic severity level
- Integrated into vim.diagnostic.config() for gutter display
#### Diagnostic Display Options
- **Sign Column**: Shows diagnostic icons in the gutter with custom text and highlight groups
- **Virtual Text**: Inline diagnostics with custom prefix (`●`) and 2-space spacing
- **Virtual Lines**: Enhanced visibility for error context without cluttering
- **Underline**: Visual underline for error locations
- **Floating Window**: Hover diagnostics with rounded borders and source attribution
- **Severity Sorting**: Errors prioritized over warnings
### 2. Text Yank Highlighting
**Migration**: Highlight yanked text for 200ms (IncSearch highlight group)
- Autocmd-based implementation in extraConfigLua
- Uses vim.hl.on_yank for smooth visual feedback
### 3. LSP Attachment Keybindings
**Enhanced LSP Integration** with on-attach callbacks:
```
K - Hover documentation
gd - Goto definition
gD - Goto declaration
gi - Goto implementation
gr - References
<leader>rn - Rename symbol
<leader>ca - Code action
```
- Buffer-local scope prevents global pollution
- Guard against multiple registrations with flag check
### 4. Startup Dashboard
**Migration**: alpha-nvim with custom banner generation
#### Dynamic Header Generation
- Primary: `toilet -f ansi-shadow NIXOS`
- Secondary: `figlet -f "ANSI Shadow" NIXOS`
- Tertiary: `figlet NIXOS`
- Fallback: ASCII art banner (9 lines)
#### Dashboard Buttons
| Shortcut | Action | Command |
|----------|--------|---------|
| `f` | Find file | Telescope find_files |
| `r` | Recent files | Telescope oldfiles |
| `g` | Live grep | Telescope live_grep |
| `n` | New file | :enew |
| `e` | File browser | Neotree toggle |
| `q` | Quit | :qa |
#### Footer
Dynamic version display: `NixVim • Neovim X.Y.Z`
### 5. Theme Integration
**Migration**: Tokyo Night colorscheme with Stylix integration
- Tokyo Night colors for status line (lualine)
- Notify background color tied to Stylix palette: `#${config.lib.stylix.colors.base01}`
- Consistent color management across UI components
## Comprehensive Feature Set
### UI/Visuals Migrated
- Lualine status line (Tokyo Night theme)
- Bufferline for buffer management
- Indent-blankline for visual indentation
- Colorizer for inline color display
- Illuminate for reference highlighting
- Which-key for keybinding discovery (Helix preset)
### Core Editing
- Treesitter for syntax highlighting
- Neo-tree file browser
- Telescope fuzzy finder with media_files extension
- Project.nvim for project management
- Hop/Leap motion plugins
- vim-surround for text manipulation
- Comment.nvim for toggle comments
### Advanced Features
- snacks.nvim ecosystem (terminal, scratch buffers, zen mode, git integration, notifier)
- Noice for enhanced UI/messages
- Notify for notifications
- todo-comments for task navigation
- nvim-autopairs with Treesitter support
### Language Support
**LSP Servers**: nil_ls, lua_ls, pyright, ts_ls, html, cssls, clangd, zls, marksman, hyprls, tailwindcss, bashls
**Formatters**:
- Nix: alejandra
- Lua: stylua
- JavaScript/TypeScript: prettierd
- Shell: shfmt
**Completion**: blink-cmp with luasnip snippets
### Development Tools
- Git integration: gitsigns + diffview
- Markdown preview
- Trouble diagnostics panel
- Terminal: toggleterm with float direction
## Implementation Details
### Module Structure
- **File**: `modules/home/editors/nixvim.nix` (743 lines)
- **Framework**: Nixvim home-manager module
- **Theme**: Tokyo Night (primary), Catppuccin (fallback)
- **Runtime Tools**: 23+ packages (bat, chafa, fd, figlet, lazygit, prettierd, ripgrep, etc.)
## Keybinding Highlights
```
jk - Exit insert mode
<leader>ff - Find files
<leader>fm - Find media files
<leader>lg - Live grep
<leader>fe - File explorer toggle
<leader>t - Toggle terminal
<leader>. - Toggle comment (line/visual)
<leader>z - Zen mode
<leader>Z - Zoom
<leader>gg - Lazygit
<c-/> - Terminal (via snacks)
]t / [t - Next/prev TODO comment
<leader>n - Notification history
```
#### 📅 **Updated: December 21st, 2025**
- Updated:
- `nixvim.nix` now uses `blink-cmp` for completion/suggestions
- This replaces `nvim-cmp`
- `blink-cmp` is better, integrated in nixvim
- Removed LUA code related to `nvim-cmp`
- Fixed:
- Output of `zcli list-gens` corrected
- Thanks `@codingismy11to71`
#### 📅 **Updated: December 14th, 2025**
- Fixed:
- hyprlock background image
- `--diff-always` to `nh` rebuilds
- Removed extra `Ghz` in `fastfetch` output
- Fixed hard coded directory for cheatsheets path
- Removed hard coded title
- Focus follows mouse
- Consistent with hyprland
- Turned off resize overlay
- Added curosr wrap shader
- Thanks to Steven Scott for the fixes
# 🚀 **Current Release - ZaneyOS v2.5.6**
#### 📅 **Updated: December 12th, 2025**

View file

@ -1,8 +1,8 @@
[English](FAQ.md) | [Español](FAQ.es.md)
# 💬 Preguntas frecuentes de ZaneyOS
# 💬 Preguntas frecuentes de ZaneyOS para v2.5.5
- **Fecha:** 14 de deciembre de 2025
- **Fecha:** 12 de deciembre de 2025
**⌨ ¿Dónde puedo ver los atajos de teclado de Hyprland?**
@ -139,32 +139,6 @@ zcli doom status # Verifica estado de instalación
</div>
</details>
<details>
<summary>**¿Cómo configuro aplicaciones predeterminadas (PDF, navegador) por host?**</summary>
- Edita `~/zaneyos/hosts/<HOSTNAME>/variables.nix` y descomenta `mimeDefaultApps`.
- Home Manager usará esto vía `modules/home/xdg.nix` para escribir tu `~/.config/mimeapps.list`.
- Usa IDs `.desktop` reales de `/usr/share/applications` o `~/.local/share/applications`.
```nix
# hosts/<HOSTNAME>/variables.nix
# Aplicaciones predeterminadas a nivel de host (consumidas por xdg.mimeApps)
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Navegador web
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # o brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Archivos
# "inode/directory" = ["thunar.desktop"]; # gestor de archivos
# "text/plain" = ["nvim.desktop"]; # o code.desktop
# };
```
</details>
## Atajos Principales de Hyprland
A continuación se muestran los atajos de teclado para Hyprland, formateados para
@ -413,9 +387,9 @@ Edita la línea `extraMonitorSettings`. **Ejemplos:**
- Monitor Único: `extraMonitorSettings = "monitor=eDP-1,1920x1080@60,auto,1";`
- Monitores Múltiples:
`extraMonitorSettings = "
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
- Para configuraciones multi-monitor más complejas, puedes usar la aplicación
GUI, `nwg-displays` Esta mostrará tus monitores conectados actualmente
@ -825,7 +799,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
<summary>** ¿Cómo puedo establecer un temporizador para cambiar el wallpaper automáticamente? **</summary>
1. Edita el archivo `~/zaneyos/modules/home/hyprland/config.nix` file.
2. Comenta la línea `sleep 1.5 && awww img ...`
2. Comenta la línea `sleep 1.5 && swww img ...`
3. Agrega nueva línea después de eso con `sleep 1 && wallsetter`
```json
@ -833,13 +807,13 @@ settings = {
exec-once = [
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"killall -q awww;sleep .5 && awww init"
"killall -q swww;sleep .5 && swww init"
"killall -q waybar;sleep .5 && waybar"
"killall -q swaync;sleep .5 && swaync"
"nm-applet --indicator"
"lxqt-policykit-agent"
"pypr &"
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
#"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
"sleep 1 && wallsetter"
];
```

54
FAQ.md
View file

@ -1,8 +1,8 @@
[English](FAQ.md) | [Español](FAQ.es.md)
# 💬 ZaneyOS FAQ
# 💬 ZaneyOS FAQ for v2.5.5
- **Date:** 14-Decemnber-2025
- **Date:** 12-Decemnber-2025
**⌨ Where can I see the Hyprland keybindings?**
@ -228,32 +228,6 @@ Below are the keybindings for Hyprland, formatted for easy reference.
<div style="margin-left: 20px;">
<details>
<summary>**How do I set default apps (PDF, browser) per host?**</summary>
- Edit `~/zaneyos/hosts/<HOSTNAME>/variables.nix` and uncomment `mimeDefaultApps`.
- Home Manager will consume these via `modules/home/xdg.nix` to write your `~/.config/mimeapps.list`.
- Use real `.desktop` IDs from `/usr/share/applications` or `~/.local/share/applications`.
```nix
# hosts/<HOSTNAME>/variables.nix
# Host-level default applications (picked up by Home Manager xdg.mimeApps)
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Files
# "inode/directory" = ["thunar.desktop"]; # file manager
# "text/plain" = ["nvim.desktop"]; # or code.desktop
# };
```
</details>
<details>
<summary>**How to I add flatpaks? ?**</summary>
@ -401,9 +375,9 @@ Edit the `extraMonitorSettings` line. **Examples:**
- Single Monitor: `extraMonitorSettings = "monitor=eDP-1,1920x1080@60,auto,1";`
- Multiple Monitors:
`extraMonitorSettings = "
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
- For more complex, multi-monitor configurations, you may wish to use the GUI
application, `nwg-displays` This will show your currently connected monitors
@ -811,7 +785,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
<summary>** How can I set a timer to change the wallpaper automatically? **</summary>
1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file.
2. Comment out the line `sleep 1.5 && awww img ...`
2. Comment out the line `sleep 1.5 && swww img ...`
3. Add new line after that with `sleep 1 && wallsetter`
```json
@ -819,13 +793,13 @@ settings = {
exec-once = [
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"killall -q awww;sleep .5 && awww init"
"killall -q swww;sleep .5 && swww init"
"killall -q waybar;sleep .5 && waybar"
"killall -q swaync;sleep .5 && swaync"
"nm-applet --indicator"
"lxqt-policykit-agent"
"pypr &"
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
#"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
"sleep 1 && wallsetter"
];
```
@ -1596,9 +1570,9 @@ Edit the `extraMonitorSettings` line. **Examples:**
- Single Monitor: `extraMonitorSettings = "monitor=eDP-1,1920x1080@60,auto,1";`
- Multiple Monitors:
`extraMonitorSettings = "
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
monitor=eDP-1,1920x1080@60,auto,auto
monitor=HDMI-A-1,2560x1440@75,auto,auto
";`
- For more complex, multi-monitor configurations, you may wish to use the GUI
application, `nwg-displays` This will show your currently connected monitors
@ -2002,7 +1976,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
<summary>** How can I set a timer to change the wallpaper automatically? **</summary>
1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file.
2. Comment out the line `sleep 1.5 && awww img ...`
2. Comment out the line `sleep 1.5 && swww img ...`
3. Add new line after that with `sleep 1 && wallsetter`
```json
@ -2010,13 +1984,13 @@ settings = {
exec-once = [
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"killall -q awww;sleep .5 && awww init"
"killall -q swww;sleep .5 && swww init"
"killall -q waybar;sleep .5 && waybar"
"killall -q swaync;sleep .5 && swaync"
"nm-applet --indicator"
"lxqt-policykit-agent"
"pypr &"
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
#"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
"sleep 1 && wallsetter"
];
```

View file

@ -4,7 +4,7 @@
## ZaneyOS 🟰 Mejores Configs ❄️ NixOS
\*\* Actualizado: 16 de enero de 2026
\*\* Actualizado: 8 de deciembre de 2025
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.
@ -47,6 +47,13 @@ Incluye el fondo de pantalla, scripts, aplicaciones, archivos de configuración
- Guía para Principiantes de Nix: [English](cheatsheets/nix-beginner-guide.md) | [Español](cheatsheets/nix-beginner-guide.es.md)
- Guía de Personalización de Hyprland: [English](cheatsheets/hyprland-customization-guide.md) | [Español](cheatsheets/hyprland-customization-guide.es.md)
### Ten en cuenta:
> **Este proyecto tiene un [Wiki](https://zaney.org/wiki/zaneyos-2.3/). ¡Aprende a usar ZaneyOS aquí!**
> **ddubs ha puesto mucho esfuerzo en el
> [FAQ](https://zaney.org/wiki/zaneyos-2.3/faq), así que debería ser preciso.
> Sin embargo, si notas que algo está mal, crea un issue o contáctanos en Discord.**
#### 🍖 Requisitos
- Debes estar ejecutando NixOS, versión 23.11+.
@ -82,6 +89,13 @@ Incluye el fondo de pantalla, scripts, aplicaciones, archivos de configuración
- Muchas personas pacientes y con ganas de ayudar te apoyan usando ZaneyOS.
- No dudes en pasar por el Discord para pedir ayuda.
<div align="center">
Hazte un favor y
[lee el wiki](https://zaney.org/wiki/zaneyos-2.3/).
</div>
#### 📦 ¿Cómo instalo paquetes?
- Puedes buscar en [Nix Packages](https://search.nixos.org/packages?) y
@ -95,7 +109,9 @@ Incluye el fondo de pantalla, scripts, aplicaciones, archivos de configuración
- Siéntete libre de abrir un issue en el repo. Por favor etiqueta las solicitudes
de funcionalidades comenzando el título con [feature request], ¡gracias!
- Contáctanos también en [Discord](https://discord.gg/XhZmNTnhtp) para una respuesta potencialmente más rápida.
- Contáctanos también en [Discord](https://discord.gg/2cRdBs8) para una respuesta potencialmente más rápida.
- No olvides revisar el [FAQ](https://zaney.org/wiki/zaneyos-2.3/faq)
# Atajos de Hyprland
@ -224,7 +240,7 @@ Luego:
![Comando del script de instalación de ZaneyOS](img/install-script.jpg)
```
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/stable-2.4/install-zaneyos.sh)
```
#### El proceso de instalación se verá así:
@ -255,7 +271,7 @@ nix-shell -p git vim
2. Clona este repo y entra:
```
cd && git clone https://gitlab.com/zaney/zaneyos.git -b main --depth=1 ~/zaneyos
cd && git clone https://gitlab.com/zaney/zaneyos.git -b stable-2.4 --depth=1 ~/zaneyos
cd zaneyos
También puedes ejecutar el script `install.sh` si quieres.
@ -295,9 +311,8 @@ Ahora, cuando quieras reconstruir, tienes el alias `fr` que reconstruye el flake
Gracias por toda su ayuda
- KoolDots https://github.com/LinuxBeginnings
- Jakookit https://github.com/jakookit
- Justaguylinux https://codeberg.org/Justaguylinux
- Justaguylinux https://github.com/drewgrif
- Jerry Starke https://github.com/JerrySM64
## ¡Disfruta!

View file

@ -4,7 +4,7 @@
## ZaneyOS 🟰 Best ❄️ NixOS Configs
\*\* Updated: January 16th, 2026
\*\* Updated: December 8th,2025
ZaneyOS is a simple way of reproducing my configuration on any NixOS system.
This includes the wallpaper, scripts, applications, config files, and more.
@ -55,6 +55,14 @@ This includes the wallpaper, scripts, applications, config files, and more.
[English](cheatsheets/hyprland-customization-guide.md) |
[Español](cheatsheets/hyprland-customization-guide.es.md)
### Please note:
> **This project has a [Wiki](https://zaney.org/wiki/zaneyos-2.3/). Find out how
> to use ZaneyOS here!** **ddubs has put a lot of effort into the
> [FAQ](https://zaney.org/wiki/zaneyos-2.3/faq) so it should be accurate.
> However, please if you notice that something is wrong with it create an issue
> or reach out to us on Discord.**
#### 🍖 Requirements
- You must be running on NixOS, version 24.05+.
@ -94,6 +102,13 @@ This includes the wallpaper, scripts, applications, config files, and more.
running ZaneyOS.
- Feel free to reach out on the Discord for any help with anything.
<div align="center">
Please do yourself a favor and
[read the wiki](https://zaney.org/wiki/zaneyos-2.3/).
</div>
#### 📦 How To Install Packages?
- You can search the [Nix Packages](https://search.nixos.org/packages?) &
@ -108,9 +123,11 @@ This includes the wallpaper, scripts, applications, config files, and more.
- Please feel free to raise an issue on the repo, please label a feature request
with the title beginning with [feature request], thank you!
- Contact us on [Discord](https://discord.gg/XhZmNTnhtp) as well, for a potentially
- Contact us on [Discord](https://discord.gg/2cRdBs8) as well, for a potentially
faster response.
- Don't forget to checkout the [FAQ](https://zaney.org/wiki/zaneyos-2.3/faq)
# Hyprland Keybindings
Below are the keybindings for Hyprland, formatted for easy reference. The right
@ -245,7 +262,7 @@ Then:
![ZaneyOS Install Script Command](img/install-script.jpg)
```
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/stable-2.4/install-zaneyos.sh)
```
#### The install process will look something like this:
@ -276,7 +293,7 @@ nix-shell -p git vim
2. Clone this repo & enter it:
```
cd && git clone https://gitlab.com/zaney/zaneyos.git -b main --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.
@ -291,33 +308,36 @@ cp -r hosts/default hosts/<your-desired-hostname>
git add .
```
4. Edit `hosts/<your-desired-hostname>/variables.nix`
```nixos-generate-config --show-hardware-config > hosts/<your-desired-hostname>/hardware.nix```
4. Edit `hosts/<your-desired-hostname>/variables.nix`.
5. Edit `flake.nix` and fill in your username, profile, and hostname.
6. Generate your hardware.nix like so:
```
nixos-generate-config --show-hardware-config > hosts/<your-desired-hostname>/hardware.nix
```
7. Run this to enable flakes and install the flake replacing hostname with
profile. I.e. `intel`, `nvidia`, `nvidia-laptop`, `amd-hybrid`, or `vm`
```
NIX_CONFIG="experimental-features = nix-command flakes"
sudo nixos-rebuild switch --flake .#profile
```
Now when you want to rebuild the configuration you have access to an alias
called `fr` that will rebuild the flake and you do not have to be in the
`zaneyos` folder for it to work.
</details>
### Special Recognitions:
Thank you for all your assistance
- KoolDots https://github.com/LinuxBeginnings
- JakKoolit https://github.com/Jakoolit
- Justaguylinux https://codeberg.org/Justaguylinux
- Jakookit https://github.com/jakookit
- Justaguylinux https://github.com/drewgrif
- Jerry Starke https://github.com/JerrySM64
## Hope you enjoy!
```

View file

@ -1,58 +0,0 @@
# Add GNOME Desktop (overview)
This guide gives **basic steps** and **which files to edit** to add GNOME to ZaneyOS.
In NixOS, you enable it through NixOS options in a module (a `.nix` file), then pick a display manager (login screen).
This repo already has **SDDM** (graphical) and **LY** (text) login support. You can keep using either — both can start GNOME sessions.
## Files to edit (minimal list)
1. `modules/core/default.nix`
- Import your new GNOME module so it becomes part of the system config.
2. `modules/core/xserver.nix`
- GNOME needs `services.xserver.enable = true;` (this file currently disables X11).
3. `modules/core/gnome.nix` (new file you create)
- Turn on GNOME’s desktop manager.
4. `hosts/<hostname>/variables.nix`
- Make sure your `displayManager` is set to either `"sddm"` or `"tui"` (for LY), since those are already supported here.
## Suggested minimal GNOME module (example)
```nix path=null start=null
{ ... }:
{
services.xserver = {
enable = true;
desktopManager.gnome.enable = true;
};
}
```
## Where to import the GNOME module
In `modules/core/default.nix`, add your GNOME file to the imports list:
```nix path=null start=null
imports = [
# ...
./gnome.nix
# ...
];
```
## Flatpak: GNOME Extensions Manager
To add the Flatpak app **Extension Manager** (for GNOME extensions), edit `modules/core/flatpak.nix` and add its ID:
```nix path=null start=null
services.flatpak.packages = [
"com.mattjakeman.ExtensionManager"
];
```
## `git add .` and rebuild
Once you have the file created. In the ZaneyOS directory run `git add . ` then `zcli rebuild`

422
flake.lock generated
View file

@ -9,11 +9,11 @@
]
},
"locked": {
"lastModified": 1777149230,
"narHash": "sha256-pu6dVB6NrIj90rrqCgJ5pPlBzS76pW4WA6rE1rD1Gp8=",
"lastModified": 1751513446,
"narHash": "sha256-pnRh5ysSgMSOQxvL82sNJRwD/CiSYWplrGRU2WLoNKQ=",
"owner": "kamadorueda",
"repo": "alejandra",
"rev": "8c4a4a572bee519b04e9bb9207e7d993f55ecb4f",
"rev": "c68bef57c1db3add865493d9cb741a14618bdc28",
"type": "github"
},
"original": {
@ -30,11 +30,11 @@
]
},
"locked": {
"lastModified": 1776411505,
"narHash": "sha256-7HILfdTOvWzAMmfS3lQV3MDmVrr2Epj8x4c9F3mzOSE=",
"lastModified": 1764970352,
"narHash": "sha256-Gs4DuTFMij3TgBzIRXaYfCQviqas2hL7hdcoROo+dXg=",
"owner": "jacopone",
"repo": "antigravity-nix",
"rev": "9f31d28882185d30c0e3082fbc52dab1cd4e879f",
"rev": "e23c1c7becfa74615b9e882fb60518e8a4d66b24",
"type": "github"
},
"original": {
@ -43,28 +43,6 @@
"type": "github"
}
},
"awww": {
"inputs": {
"flake-compat": "flake-compat",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1777136912,
"narHash": "sha256-owyQdC2vi0kYC119fzyVQp0J4G0t1n4xXUwryhlBbqA=",
"ref": "refs/heads/main",
"rev": "f66e12a76dbc4c669b2f1375f78bce49f5b19d66",
"revCount": 1363,
"type": "git",
"url": "https://codeberg.org/LGFae/awww"
},
"original": {
"type": "git",
"url": "https://codeberg.org/LGFae/awww"
}
},
"base16": {
"inputs": {
"fromYaml": "fromYaml"
@ -86,28 +64,28 @@
"base16-fish": {
"flake": false,
"locked": {
"lastModified": 1765809053,
"narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
"lastModified": 1754405784,
"narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
"owner": "tomyun",
"repo": "base16-fish",
"rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
"type": "github"
},
"original": {
"owner": "tomyun",
"repo": "base16-fish",
"rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
"type": "github"
}
},
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1776754714,
"narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
"lastModified": 1760703920,
"narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
"rev": "d646af9b7d14bff08824538164af99d0c521b185",
"type": "github"
},
"original": {
@ -142,11 +120,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1768113825,
"narHash": "sha256-f09fAifGPEuRrz1DFY910jexq0DaBuQBbq7WcxQIUgs=",
"lastModified": 1730615655,
"narHash": "sha256-2HBR3zLn57LXKNRtxBb+O+uDqHM4n0pz51rPayMl4cg=",
"owner": "nix-community",
"repo": "fenix",
"rev": "55106e04d905c6a7726d0f6be77ed39a99f66a61",
"rev": "efeb50e2535b17ffd4a135e6e3e5fd60a525180c",
"type": "github"
},
"original": {
@ -158,11 +136,11 @@
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1776136500,
"narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=",
"lastModified": 1764724327,
"narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "0f8ba203d475587f477e7ae12661bd8459e225b7",
"rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
"type": "github"
},
"original": {
@ -172,22 +150,6 @@
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1761588595,
"narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1751685974,
@ -211,11 +173,11 @@
]
},
"locked": {
"lastModified": 1777988971,
"narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
"lastModified": 1763759067,
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"type": "github"
},
"original": {
@ -232,11 +194,11 @@
]
},
"locked": {
"lastModified": 1769996383,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"lastModified": 1760948891,
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
"type": "github"
},
"original": {
@ -253,11 +215,11 @@
]
},
"locked": {
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"lastModified": 1763759067,
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"type": "github"
},
"original": {
@ -284,14 +246,32 @@
"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"
}
},
"flakeCompat": {
"flake": false,
"locked": {
"lastModified": 1767039857,
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
@ -319,18 +299,20 @@
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1767737596,
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
"host": "gitlab.gnome.org",
"lastModified": 1764524476,
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "github"
"rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
"type": "gitlab"
},
"original": {
"host": "gitlab.gnome.org",
"owner": "GNOME",
"ref": "gnome-49",
"repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "github"
"type": "gitlab"
}
},
"home-manager": {
@ -340,16 +322,16 @@
]
},
"locked": {
"lastModified": 1778503501,
"narHash": "sha256-08L/X4/do7nET4rzidJ76eV/1r+mB7DchVpdPypsghc=",
"lastModified": 1765170903,
"narHash": "sha256-O8VTGey1xxiRW+Fpb+Ps9zU7ShmxUA1a7cMTcENCVNg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "85ba629c79449badf4338117c27f0ee92b4b9f1a",
"rev": "20561be440a11ec57a89715480717baf19fe6343",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "master",
"ref": "release-25.11",
"repo": "home-manager",
"type": "github"
}
@ -362,11 +344,11 @@
]
},
"locked": {
"lastModified": 1777594677,
"narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=",
"lastModified": 1762964643,
"narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "899c08a15beae5da51a5cecd6b2b994777a948da",
"rev": "827f2a23373a774a8805f84ca5344654c31f354b",
"type": "github"
},
"original": {
@ -375,13 +357,41 @@
"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": 1777828893,
"narHash": "sha256-gVWVnmyNr74BVKfhMMZDWkhx2699dhmZ2g0W8TTHtkk=",
"lastModified": 1758834834,
"narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
"owner": "Gerg-L",
"repo": "mnw",
"rev": "c1c0b544bfabe6669b5a6a0383ccb475fe60258b",
"rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
"type": "github"
},
"original": {
@ -390,35 +400,13 @@
"type": "github"
}
},
"ndg": {
"inputs": {
"nixpkgs": [
"nvf",
"nixpkgs"
]
},
"locked": {
"lastModified": 1776882296,
"narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=",
"owner": "feel-co",
"repo": "ndg",
"rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e",
"type": "github"
},
"original": {
"owner": "feel-co",
"ref": "refs/tags/v2.6.0",
"repo": "ndg",
"type": "github"
}
},
"nix-flatpak": {
"locked": {
"lastModified": 1767983141,
"narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=",
"lastModified": 1739444422,
"narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
"owner": "gmodena",
"repo": "nix-flatpak",
"rev": "440818969ac2cbd77bfe025e884d0aa528991374",
"rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
"type": "github"
},
"original": {
@ -430,48 +418,48 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1777954456,
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
"lastModified": 1765170393,
"narHash": "sha256-rrIFbnlGNu/iljpuSHX5T4NOARZ8Fq3IBrwa0gv3gvE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
"rev": "87fa37f7bb685f6888fa6f1dcd8066184a38b755",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"ref": "release-25.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1774386573,
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
"lastModified": 1761880412,
"narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
"rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1777268161,
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
"lastModified": 1764522689,
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "nixos-25.11",
"repo": "nixpkgs",
"type": "github"
}
@ -482,18 +470,20 @@
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_2"
"nuschtosSearch": "nuschtosSearch",
"systems": "systems_3"
},
"locked": {
"lastModified": 1778510615,
"narHash": "sha256-cMNCx8mQTJnVkA6kt3B3ArGpCOOniYn644hH0mJHSsw=",
"lastModified": 1765027122,
"narHash": "sha256-yeJjXWkzK7B6j+tiN9aGc1yZNxuH16O5kR68m8Axu8w=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "fa8cd368d27cf9541f086485884928315abdcc8c",
"rev": "cb9357fe1068cbcec1e6ddc525ab5226f7781d09",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "nixos-25.11",
"repo": "nixvim",
"type": "github"
}
@ -502,15 +492,14 @@
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"noctalia-qs": "noctalia-qs"
]
},
"locked": {
"lastModified": 1778464608,
"narHash": "sha256-tZRvyaKVP0DJ9DSFrr6K/l3X74Orfirk3Jjo7+br4Qs=",
"lastModified": 1765147737,
"narHash": "sha256-gB7SYd9o5QL5y+heFVl/lH1qsOlcBTFRqT3MU0dFOGc=",
"owner": "noctalia-dev",
"repo": "noctalia-shell",
"rev": "761869a561548874fe7e293b157fd7841576b367",
"rev": "f3b6c1d60bcdf8cc68d5177c7bc3d2332419bf4b",
"type": "github"
},
"original": {
@ -519,29 +508,6 @@
"type": "github"
}
},
"noctalia-qs": {
"inputs": {
"nixpkgs": [
"noctalia",
"nixpkgs"
],
"systems": "systems_3",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1778377995,
"narHash": "sha256-uUzHDHqQF1rdVNiTa05L0mML3/d7fpbAShjCRWxbrBQ=",
"owner": "noctalia-dev",
"repo": "noctalia-qs",
"rev": "d8327a723eed6dd9aebe8e0b162126f390e827df",
"type": "github"
},
"original": {
"owner": "noctalia-dev",
"repo": "noctalia-qs",
"type": "github"
}
},
"nur": {
"inputs": {
"flake-parts": [
@ -554,11 +520,11 @@
]
},
"locked": {
"lastModified": 1777598946,
"narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
"lastModified": 1764773531,
"narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
"owner": "nix-community",
"repo": "NUR",
"rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
"rev": "1d9616689e98beded059ad0384b9951e967a17fa",
"type": "github"
},
"original": {
@ -567,21 +533,43 @@
"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_2",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts_2",
"mnw": "mnw",
"ndg": "ndg",
"nixpkgs": "nixpkgs_2",
"systems": "systems_4"
},
"locked": {
"lastModified": 1778408907,
"narHash": "sha256-QXjdRz5fssxAWDrtfBYxvjMtTqJzQAbnAmX3u22xCck=",
"lastModified": 1765119282,
"narHash": "sha256-iI0fuBBYJMnOprGD2L+rum2P8lHMcZ5n35hzdlpwayI=",
"owner": "notashelf",
"repo": "nvf",
"rev": "e86a92e4b29b499e5f1285b737b7612115103da9",
"rev": "26c4a7e3c33e739d474ddaf52aa4c5f3d11922ba",
"type": "github"
},
"original": {
@ -594,7 +582,6 @@
"inputs": {
"alejandra": "alejandra",
"antigravity-nix": "antigravity-nix",
"awww": "awww",
"home-manager": "home-manager",
"nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs",
@ -608,11 +595,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1768083390,
"narHash": "sha256-TGWPJq2mXwxfAe83iZ18DIqXC4sOSj7RkW9b59h6Ox4=",
"lastModified": 1730555913,
"narHash": "sha256-KNHZUlqsEibg3YtfUyOFQSofP8hp1HKoY+laoesBxRM=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "e42e8ff582ba12a88b6845525d08b6428e6d0fb9",
"rev": "f17a5bbfd0969ba2e63a74505a80e55ecb174ed9",
"type": "github"
},
"original": {
@ -622,27 +609,6 @@
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"nixpkgs": [
"awww",
"nixpkgs"
]
},
"locked": {
"lastModified": 1764038373,
"narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"stylix": {
"inputs": {
"base16": "base16",
@ -655,22 +621,23 @@
"nixpkgs": "nixpkgs_3",
"nur": "nur",
"systems": "systems_5",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1778104276,
"narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=",
"lastModified": 1765065096,
"narHash": "sha256-abrrONk8vzRtY6fHEkjZOyRJpKHjPlFqMBE0+/DxfAU=",
"owner": "danth",
"repo": "stylix",
"rev": "18ed8d270231e067fe2739998479ed5d7c659c2c",
"rev": "84d9d55885d463d461234f3aac07b2389a2577d8",
"type": "github"
},
"original": {
"owner": "danth",
"ref": "master",
"ref": "release-25.11",
"repo": "stylix",
"type": "github"
}
@ -707,16 +674,16 @@
},
"systems_3": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"repo": "default",
"type": "github"
}
},
@ -750,6 +717,23 @@
"type": "github"
}
},
"tinted-foot": {
"flake": false,
"locked": {
"lastModified": 1726913040,
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
}
},
"tinted-kitty": {
"flake": false,
"locked": {
@ -769,11 +753,11 @@
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1777041405,
"narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
"lastModified": 1763914658,
"narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
"rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
"type": "github"
},
"original": {
@ -785,11 +769,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1777169200,
"narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
"lastModified": 1764465359,
"narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
"rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
"type": "github"
},
"original": {
@ -801,11 +785,11 @@
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1777463218,
"narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
"lastModified": 1764464512,
"narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
"rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
"type": "github"
},
"original": {
@ -814,28 +798,6 @@
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"noctalia",
"noctalia-qs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1775636079,
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"zen-browser": {
"inputs": {
"home-manager": "home-manager_2",
@ -844,11 +806,11 @@
]
},
"locked": {
"lastModified": 1778377655,
"narHash": "sha256-wHsd+tesB3FtwUZbGjU/sWMZhw0m0yYBSXufMDVyQmc=",
"lastModified": 1764825646,
"narHash": "sha256-QkKEkj3GXpkPxJz9S1RgaMlxstkyaj5IKVWvxIbtC8w=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "101d6731d7b163ef4f6fab8c6eea7da4ddb52ec3",
"rev": "8c9284cc227a5c7cd8f1e1fa7a6882b0907187c8",
"type": "github"
},
"original": {

View file

@ -3,12 +3,12 @@
inputs = {
home-manager = {
url = "github:nix-community/home-manager/master";
url = "github:nix-community/home-manager/release-25.11";
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs.url = "github:nixos/nixpkgs/release-25.11";
nvf.url = "github:notashelf/nvf";
stylix.url = "github:danth/stylix/master";
stylix.url = "github:danth/stylix/release-25.11";
nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest";
noctalia = {
@ -18,7 +18,7 @@
# Checking nixvim to see if it's better
nixvim = {
url = "github:nix-community/nixvim";
url = "github:nix-community/nixvim/nixos-25.11";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -36,10 +36,6 @@
url = "github:kamadorueda/alejandra";
inputs.nixpkgs.follows = "nixpkgs";
};
awww = {
url = "git+https://codeberg.org/LGFae/awww";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs = {
@ -76,7 +72,7 @@
amd = mkNixosConfig "amd";
nvidia = mkNixosConfig "nvidia";
nvidia-laptop = mkNixosConfig "nvidia-laptop";
amd-nvidia-hybrid = mkNixosConfig "amd-nvidia-hybrid";
amd-hybrid = mkNixosConfig "amd-hybrid";
intel = mkNixosConfig "intel";
vm = mkNixosConfig "vm";
};

View file

@ -1,28 +1,7 @@
{configs, pkgs, ...}: {
{pkgs, ...}: {
environment.systemPackages = with pkgs; [
# Add local pacakaged here
audacity
discord
nodejs
];
# Add host specific flatpaks here
services = {
flatpak = {
packages = [
];
};
};
services.auto-cpufreq.enable = false;
services.auto-cpufreq.settings = {
battery = {
governor = "powersave";
turbo = "never";
};
charger = {
governor = "performance";
turbo = "auto";
};
};
}

View file

@ -1,13 +1,13 @@
{
# Git Configuration ( For Pulling Software Repos )
gitUsername = "Don Williams";
gitEmail = "don.e.williams@gmail.com";
gitUsername = "Tyler Kelley";
gitEmail = "tylerzanekelley@gmail.com";
# Set Displau Manager
# `tui` for Text login
# `sddm` for graphical GUI (default)
# SDDM background is set with stylixImage
displayManager = "tui";
displayManager = "sddm";
# Emable/disable bundled applications
tmuxEnable = false;
@ -20,7 +20,7 @@
helixEnable = false;
#To install: Enable here, zcli rebuild, then run zcli doom install
doomEmacsEnable = false;
# Python development tools are included by default
# Hyprland Settings
@ -30,7 +30,7 @@
# You can configure multiple monitors.
# Inside the quotes, create a new line for each monitor.
extraMonitorSettings = "
monitor = Virtual-1,1920x1080@60,auto,1
";
# Bar/Shell Settings
@ -47,21 +47,6 @@
# or as a flatpak
browser = "brave";
# Host-level default applications (picked up by Home Manager xdg.mimeApps)
# Uncomment and adjust the .desktop IDs to set per-host defaults.
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Files
# "inode/directory" = ["thunar.desktop"]; # file manager
# "text/plain" = ["nvim.desktop"]; # or code.desktop
# };
# Available Options:
# Kitty, ghostty, wezterm, aalacrity
# Note: kitty, wezterm, alacritty have to be enabled in `variables.nix`
@ -84,8 +69,8 @@
printEnable = false;
# Enable Thunar GUI File Manager
# Yazi is alternate File Manager
thunarEnable = true;
# Yazi is default File Manager
thunarEnable = false;
# Themes, waybar and animation.
# Only uncomment your selection
@ -95,17 +80,17 @@
# 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-wallpaper-stripes-logo.png;
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
# Set Waybar
# Available Options:
#waybarChoice = ../../modules/home/waybar/waybar-curved.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;
@ -124,12 +109,12 @@
#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-mangowc-jak-catppuccin.nix;
#waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix;
# Set Animation style
# Available options are:
#animChoice = ../../modules/home/hyprland/animations-def.nix;
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;
@ -138,7 +123,7 @@
#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-classic.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;

View file

@ -0,0 +1,6 @@
{...}: {
imports = [
./hardware.nix
./host-packages.nix
];
}

View file

@ -0,0 +1,59 @@
{
config,
lib,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot = {
initrd = {
availableKernelModules = [
"xhci_pci"
"ehci_pci"
"ahci"
"nvme"
"usbhid"
"sd_mod"
];
kernelModules = [];
luks.devices = {
"luks-8941ac93-f043-46d1-b128-37d5e846303f".device = "/dev/disk/by-uuid/8941ac93-f043-46d1-b128-37d5e846303f";
};
};
kernelModules = ["kvm-intel"];
extraModulePackages = [];
};
fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/8bac633b-c4e6-44bc-83b3-97b5472594e8";
fsType = "ext4";
};
"/boot" = {
device = "/dev/disk/by-uuid/BC0C-F843";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
"/home/zaney/BFD" = {
device = "/dev/disk/by-uuid/5A30E2CC30E2AE67";
fsType = "ntfs";
options = [
"defaults"
"umask=000"
"dmask=027"
"fmask=137"
"uid=1000"
"gid=1000"
"windows_names"
];
};
};
swapDevices = [];
networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View file

@ -0,0 +1,13 @@
{pkgs, ...}: {
environment.systemPackages = with pkgs; [
audacity
discord
nodejs
obs-studio
handbrake
yt-dlp
android-studio
android-studio-tools
android-tools
];
}

View file

@ -0,0 +1,112 @@
{
# Git Configuration ( For Pulling Software Repos )
gitUsername = "Tyler Kelly";
gitEmail = "tylerzanekelly@gmail.com";
# Set Displau Manager
# `tui` for Text login
# `sddm` for graphical GUI
# SDDM background is set with stylixImage
displayManager = "sddm";
# Emable/disable bundled applications
tmuxEnable = false;
alacrittyEnable = false;
weztermEnable = false;
ghosttyEnable = false;
vscodeEnable = false;
antigravityEnable = false; # Google port of vscodium
helixEnable = false;
#To install rebuild, then run zcli doom install
doomEmacsEnable = false;
# Python development tools
pythonEnable = false;
# P10K or starship prompt
userPrompt = "starship";
# Hyprland Settings
extraMonitorSettings = "monitor=Virtual-1,1920x1080@75,auto,1";
# Bar/Shell Settings
# Choose between noctalia or waybar
barChoice = "noctalia";
# Waybar Settings (used when barChoice = "waybar")
clock24h = false;
# Program Options
browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome)
terminal = "kitty"; # Set Default System Terminal
keyboardLayout = "us";
consoleKeyMap = "us";
# For hybrid support (Intel/NVIDIA Prime or AMD/NVIDIA)
intelID = "PCI:1:0:0";
amdgpuID = "PCI:5:0:0";
nvidiaID = "PCI:0:2:0";
# Enable NFS
enableNFS = true;
# Enable Printing Support
printEnable = false;
# Enable Thunar GUI File Manager
thunarEnable = true;
# Set Stylix Image
# This will set your color palette
# Default background
# Add new images to ~/zaneyos/wallpapers
#stylixImage = ../../wallpapers/mountainscapedark.jpg;
stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
#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-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:
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
hostId = "5ab03f50";
}

View file

@ -1,4 +1,7 @@
{pkgs, ...}: {
environment.systemPackages = with pkgs; [
audacity
discord
nodejs
];
}

View file

@ -22,7 +22,7 @@
doomEmacsEnable = true;
# Python development tools
pythonEnable = false;
pythonEnable = true;
# Hyprland Settings
# Examples:
@ -36,7 +36,7 @@
# Bar/Shell Settings
# Choose between noctalia or waybar
barChoice = "noctalia";
barChoice = "waybar";
# Waybar Settings (used when barChoice = "waybar")
clock24h = false;
@ -46,22 +46,7 @@
# This does NOT install your browser
# You need to install it by adding it to the `packages.nix`
# or as a flatpak
browser = "google-chrome";
# Host-level default applications (picked up by Home Manager xdg.mimeApps)
# Uncomment and adjust the .desktop IDs to set per-host defaults.
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Files
# "inode/directory" = ["thunar.desktop"]; # file manager
# "text/plain" = ["nvim.desktop"]; # or code.desktop
# };
browser = "brave";
# Available Options:
# Kitty, ghostty, wezterm, aalacrity
@ -99,8 +84,8 @@
#stylixImage = ../../wallpapers/mountainscapedark.jpg;
#stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
#stylixImage = ../../wallpapers/Anime-Purple-eyes.png;
stylixImage = ../../wallpapers/Rainnight.jpg;
#stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
#stylixImage = ../../wallpapers/Rainnight.jpg;
stylixImage = ../../wallpapers/zaney-wallpaper.jpg;
#stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg;
#stylixImage = ../../wallpapers/beautifulmountainscape.jpg;
@ -136,10 +121,10 @@
#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-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-classic.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix;
#animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix;

View file

@ -1,10 +1,12 @@
{pkgs, ...}: {
environment.systemPackages = with pkgs; [
nodejs
atop
bottom
dua
fd
gping
lunarvim
luarocks
mission-center
resources

View file

@ -19,7 +19,7 @@
helixEnable = true;
#To install rebuild, then run zcli doom install
doomEmacsEnable = false;
# Python development tools
pythonEnable = false;
@ -38,22 +38,6 @@
# Program Options
browser = "brave"; # Set Default Browser (google-chrome-stable for google-chrome)
# Host-level default applications (picked up by Home Manager xdg.mimeApps)
# Uncomment and adjust the .desktop IDs to set per-host defaults.
# mimeDefaultApps = {
# # PDFs
# "application/pdf" = ["okular.desktop"];
# "application/x-pdf" = ["okular.desktop"];
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
# # Files
# "inode/directory" = ["thunar.desktop"]; # file manager
# "text/plain" = ["nvim.desktop"]; # or code.desktop
# };
terminal = "kitty"; # Set Default System Terminal
keyboardLayout = "us";
keyboardVariant = "";

View file

@ -138,51 +138,24 @@ has_nvidia=false
has_intel=false
has_amd=false
has_vm=false
detect_vm() {
if command -v systemd-detect-virt &>/dev/null; then
if systemd-detect-virt --quiet; then
return 0
fi
fi
for f in /sys/class/dmi/id/product_name /sys/class/dmi/id/sys_vendor; do
if [ -r "$f" ] && grep -Eqi 'qemu|kvm|vmware|virtualbox|hyper-v|microsoft corporation|xen|parallels' "$f"; then
return 0
fi
done
return 1
}
if detect_vm; then
has_vm=true
fi
if lspci | grep -qi 'vga\|3d\|display'; then
if lspci | grep -qi 'vga\|3d'; then
while read -r line; do
if echo "$line" | grep -Eq '\[10de:'; then
if echo "$line" | grep -qi 'nvidia'; then
has_nvidia=true
elif echo "$line" | grep -Eq '\[1002:'; then
has_amd=true
elif echo "$line" | grep -Eq '\[8086:'; then
has_intel=true
elif echo "$line" | grep -Eq '\[(1af4|15ad|80ee|1b36|1414|1234|1013):'; then
has_vm=true
elif echo "$line" | grep -qi 'nvidia'; then
has_nvidia=true
elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then
elif echo "$line" | grep -qi 'amd'; then
has_amd=true
elif echo "$line" | grep -qi 'intel'; then
has_intel=true
elif echo "$line" | grep -Eqi 'virtio|vmware|virtualbox|qxl|hyper-v|microsoft corporation|parallels|qemu|bochs|cirrus|svga|virtual'; then
elif echo "$line" | grep -qi 'virtio\|vmware'; then
has_vm=true
fi
done < <(lspci -nn | grep -i 'vga\|3d\|display')
done < <(lspci | grep -i 'vga\|3d')
if $has_vm; then
DETECTED_PROFILE="vm"
elif $has_nvidia && $has_amd; then
DETECTED_PROFILE="amd-nvidia-hybrid"
elif $has_nvidia && $has_intel; then
DETECTED_PROFILE="nvidia-laptop"
DETECTED_PROFILE="hybrid"
elif $has_nvidia; then
DETECTED_PROFILE="nvidia"
elif $has_amd; then
@ -210,10 +183,9 @@ if [ -z "$profile" ]; then
read -rp "Enter Your Hardware Profile (GPU)
Options:
[ amd ]
amd-nvidia-hybrid
intel
nvidia
nvidia-laptop
intel
vm
Please type out your choice: " profile
if [ -z "$profile" ]; then
@ -262,7 +234,7 @@ else
fi
print_header "Cloning ZaneyOS Repository"
git clone https://gitlab.com/zaney/zaneyos.git -b main --depth=1 ~/zaneyos
git clone https://gitlab.com/zaney/zaneyos.git -b stable-2.5.5 --depth=1 ~/zaneyos
cd ~/zaneyos || exit 1
print_header "Git Configuration"

View file

@ -4,7 +4,7 @@
...
}: {
boot = {
kernelPackages = pkgs.linuxPackages_latest;
kernelPackages = pkgs.linuxPackages_zen;
kernelModules = ["v4l2loopback"];
extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
kernel.sysctl = {"vm.max_map_count" = 2147483642;};

View file

@ -15,7 +15,7 @@
#"com.github.tchx84.Flatseal" #Manage flatpak permissions - should always have this
#"com.rtosta.zapzap" # WhatsApp client
#"io.github.flattool.Warehouse" # Manage flatpaks, clean data, remove flatpaks and deps
#"it.mijorus.gearlever" # Manage and support AppImages
#"it.mijorus.gearlever" # Manage and support AppImages
#"io.github.freedoom.Phase1" # Classic Doom FPS 1
#"io.github.freedoom.Phase2" # Classic Doom FPS 2
#"io.github.dvlv.boxbuddyrs" # Manage distroboxes

View file

@ -14,11 +14,6 @@
minecraftia
nerd-fonts.im-writing
nerd-fonts.blex-mono
nerd-fonts.iosevka-term
nerd-fonts.lilex
nerd-fonts.ubuntu
nerd-fonts.jetbrains-mono
nerd-fonts.fira-mono
noto-fonts
noto-fonts-color-emoji
noto-fonts-cjk-sans

View file

@ -30,4 +30,4 @@ in {
};
};
};
}
}

View file

@ -2,13 +2,5 @@
nixpkgs.overlays = [
# Provide pkgs.google-antigravity via antigravity-nix overlay
inputs.antigravity-nix.overlays.default
# Build tumbler without EPUB thumbnailer (libgepub) to avoid webkitgtk
(_final: prev: {
xfce = prev.xfce // {
tumbler = prev.xfce.tumbler.overrideAttrs (old: {
buildInputs = prev.lib.remove prev.libgepub old.buildInputs;
});
};
})
];
}

View file

@ -1,5 +1,4 @@
{
inputs,
pkgs,
host,
...
@ -13,7 +12,6 @@
with pkgs; [
matugen # color palette generator needed for noctalia-shell
app2unit # launcher for noctalia-shell
gpu-screen-recorder # needed for nnoctalia-shell
]
else [];
in {
@ -31,6 +29,7 @@ in {
seahorse.enable = true;
fuse.userAllowOther = true;
mtr.enable = true;
adb.enable = true;
hyprlock.enable = true;
gnupg.agent = {
enable = true;
@ -39,13 +38,9 @@ in {
};
nixpkgs.config.allowUnfree = true;
nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
environment.systemPackages = with pkgs;
[
inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww
]
++ noctaliaPkgs
noctaliaPkgs
++ [
alejandra # nix formatter
amfora # Fancy Terminal Browser For Gemini Protocol
@ -55,14 +50,16 @@ in {
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
gearlever # Manage / run Appimages
icu # dep for gearlever
gedit # Simple Graphical Text Editor
gemini-cli # CLI AI client ONLY (optional)
gimp # Great Photo Editor
gpu-screen-recorder # needed for nnoctalia-shell
power-profiles-daemon # needed for noctalia-shell power cycle
@ -79,7 +76,7 @@ in {
mdcat # CLI markdown parser
mpv # Incredible Video Player
ncdu # Disk Usage Analyzer With Ncurses Interface
nixfmt # Nix Formatter
nixfmt-rfc-style # Nix Formatter
nwg-displays # configure monitor configs via GUI
nwg-drawer # Application launcher for wayland
nwg-dock-hyprland # Dock for hyprland
@ -100,6 +97,7 @@ in {
upower # noctalia shell battery
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

View file

@ -1,7 +1,7 @@
{pkgs, ...}: {
programs = {
steam = {
enable = false;
enable = true;
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = false;
gamescopeSession.enable = true;

View file

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

View file

@ -8,9 +8,9 @@ in {
programs = {
thunar = {
enable = thunarEnable;
plugins = [
pkgs.thunar-archive-plugin
pkgs.thunar-volman
plugins = with pkgs.xfce; [
thunar-archive-plugin
thunar-volman
];
};
};

View file

@ -10,23 +10,22 @@ in {
options.drivers.nvidia-amd-hybrid = {
enable = mkEnableOption "Enable AMD iGPU + NVIDIA dGPU (Prime offload)";
# AMD iGPU Bus ID (e.g., PCI:5:0:0). Expose as option for future host wiring.
amdgpuBusId = mkOption {
amdgpuBusID = mkOption {
type = types.str;
default = "PCI:5:0:0";
description = "PCI Bus ID for AMD iGPU";
description = "PCI Bus ID for AMD iGPU (amdgpuBusId)";
};
# NVIDIA dGPU Bus ID (e.g., PCI:1:0:0)
nvidiaBusId = mkOption {
nvidiaBusID = mkOption {
type = types.str;
default = "PCI:1:0:0";
description = "PCI Bus ID for NVIDIA dGPU";
description = "PCI Bus ID for NVIDIA dGPU (nvidiaBusId)";
};
};
config = mkIf cfg.enable {
# Enforce kernel 6.12 when this hybrid config is selected
# Not sure this is still neeeded but leaving just in case
# boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12;
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12;
services.xserver.videoDrivers = ["nvidia"];
@ -48,8 +47,8 @@ in {
};
# Wire from options
amdgpuBusId = cfg.amdgpuBusId;
nvidiaBusId = cfg.nvidiaBusId;
amdgpuBusId = cfg.amdgpuBusID;
nvidiaBusId = cfg.nvidiaBusID;
};
};
};

View file

@ -3,7 +3,6 @@
in {
programs.git = {
enable = true;
signing.format = null;
settings = {
user = {

View file

@ -58,7 +58,7 @@ in {
./wlogout
./xdg.nix
./yazi
#./zen-browser.nix
./zen-browser.nix
./zoxide.nix
./zsh
]

View file

@ -9,8 +9,7 @@ in {
jsonnet-language-server
luaformatter
lua-language-server
#marksman # causes dotnet and dotnet-swr to build which takes hours
multimarkdown
marksman
taplo
nil
jq-lsp

View file

@ -44,9 +44,6 @@
settings = {
flavour = "mocha";
transparent_background = false;
integrations = {
lualine = true;
};
};
};
@ -56,7 +53,7 @@
lualine = {
enable = true;
settings = {
options = {theme = "auto";};
options = {theme = "catppuccin";};
};
};
bufferline.enable = true;
@ -77,16 +74,11 @@
treesitter-context.enable = false;
# Project management
project-nvim = {
enable = true;
settings = {
history.save_dir = "${config.home.homeDirectory}/.local/share/nvim/project_nvim";
};
};
project-nvim.enable = true;
# Notifications and UI polish
notify.enable = true;
noice.enable = false;
noice.enable = true;
# Startup dashboard
alpha = {
@ -132,38 +124,14 @@
markdown-preview.enable = true;
# Completion and snippets
blink-cmp = {
cmp = {
enable = true;
settings = {
keymap = {
preset = "default";
"<CR>" = ["accept" "fallback"];
"<Tab>" = ["select_next" "fallback"];
"<S-Tab>" = ["select_prev" "fallback"];
};
appearance = {
nerd_font_variant = "mono";
};
completion = {
documentation = {
auto_show = true;
auto_show_delay_ms = 500;
};
};
sources = {
default = ["lsp" "path" "snippets" "buffer"];
};
snippets = {
preset = "luasnip";
};
fuzzy = {
implementation = "prefer_rust_with_warning";
};
signature = {
enabled = 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;
@ -182,8 +150,8 @@
html.enable = true;
cssls.enable = true;
clangd.enable = true;
zls.enable = false;
marksman.enable = false;
zls.enable = true;
marksman.enable = true;
hyprls.enable = true;
# hyprls is optional; keep tools available via extraPackages
};
@ -334,14 +302,13 @@
lazygit
nil
hyprls
typescript-language-server
typescript
nodePackages.typescript-language-server
nodePackages.typescript
vscode-langservers-extracted
pyright
lua-language-server
zls
marksman
multimarkdown
clang-tools
prettierd
stylua
@ -349,8 +316,6 @@
nixpkgs-fmt
figlet
toilet
bash-language-server
tailwindcss-language-server
];
# Diagnostic UI and notify background tweaks
@ -396,6 +361,44 @@
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
@ -418,18 +421,17 @@
return #lines > 0 and lines or nil
end
header_lines = gen_banner('toilet -f ansi-shadow NIXVIM 2>/dev/null')
or gen_banner('figlet -f "ANSI Shadow" NIXVIM 2>/dev/null')
or gen_banner('figlet NIXVIM 2>/dev/null')
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
@ -460,9 +462,4 @@
end
'';
};
home.activation.projectNvimHistory = ''
mkdir -p "$HOME/.local/share/nvim/project_nvim"
find "$HOME/.local/share/nvim/project_nvim" -type f -size 0 -delete 2>/dev/null || true
'';
}

View file

@ -90,5 +90,4 @@ in {
};
};
nixpkgs.config.allowUnfree = true;
nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
}

View file

@ -90,7 +90,7 @@
}
{
type = "cpu";
format = "{1} ({3}) @ {7}";
format = "{1} ({3}) @ {7} GHz";
key = " ├ ";
keyColor = "33";
}

View file

@ -1,6 +1,5 @@
{config, pkgs, ...}: {
{pkgs, ...}: {
gtk = {
gtk4.theme = null;
iconTheme = {
name = "Papirus-Dark";
package = pkgs.papirus-icon-theme;

View file

@ -11,17 +11,16 @@
if barChoice == "noctalia"
then [
"$modifier,D, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle"
"$modifier SHIFT,Return, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle"
"$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory"
"$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard"
"$modifier SHIFT,Return, Noctalia Launcher, exec, noctalia-shell ipc call launcher toggle"
"$modifier,M, Noctalia Notifications, exec, noctalia-shell ipc call notifications toggleHistory"
"$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard"
"$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle"
"$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle"
"$modifier CTRL,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockscreen lock"
"$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend"
"$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle"
"$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle"
"$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle"
"$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle"
"$modifier SHIFT,R, Restart Noctalia shell, exec, restart.noctalia"
"$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle"
"$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle"
"$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle"
]
else [];
# Rofi launcher bindings (only included when barChoice != "noctalia")
@ -54,7 +53,7 @@ in {
# ============= APPLICATION LAUNCHERS =============
"$modifier,K, Keybinds Search Tool, exec, qs-keybinds"
"$modifier CTRL,C, Cheatsheets Viewer, exec, qs-cheatsheets"
"$modifier SHIFT,K, Keybinds Search Tool, exec, qs-keybinds"
"$modifier SHIFT,K, Legacy Keybinds Menu, exec, list-keybinds"
"$modifier SHIFT,D, Discord, exec, discord"
"$modifier ALT,W, Web Search, exec, web-search"
"$modifier SHIFT,W, QS Wallpaper Setter, exec, qs-wallpapers-apply"
@ -70,22 +69,16 @@ in {
"$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, sh -lc 'DropTerminal'"
"$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 SHIFT,I, Toggle Split, layoutmsg, togglesplit"
"$modifier SHIFT,I, Toggle Split, togglesplit,"
"$modifier,F, Maximize, fullscreen,"
"$modifier SHIFT,F, Toggle Floating, togglefloating,"
"$modifier ALT,F, Float All Windows, exec, hyprland-float-all"
# ============= LAYOUTS =============
"$modifier ALT,L, Toggle Layouts, exec, hyprland-change-layout toggle"
"$modifier ALT,1, Layout Dwindle, exec, hyprland-change-layout dwindle"
"$modifier ALT,2, Layout Master, exec, hyprland-change-layout master"
"$modifier ALT,3, Layout Scrolling, exec, hyprland-change-layout scrolling"
"$modifier ALT,4, Layout Monocle, exec, hyprland-change-layout monocle"
"$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"

View file

@ -9,6 +9,7 @@ in {
./hypridle.nix
./hyprland.nix
./hyprlock.nix
./pyprland.nix
./windowrules.nix
];
}

View file

@ -13,19 +13,18 @@
"pkill waybar"
"killall -q swaync"
"pkill swaync"
"noctalia-shell &"
"noctalia-shell"
]
else [];
# Waybar-specific startup commands
waybarExec =
if barChoice != "noctalia"
then [
"killall -q awww;sleep .5 && awww-daemon"
"killall -q swww;sleep .5 && swww-daemon"
"killall -q waybar;sleep .5 && waybar"
"killall -q swaync;sleep .5 && swaync"
"nm-applet --indicator"
# Delayed-only restore so Stylix finishes first, then user's wallpaper wins with a single change
"sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend awww) >/dev/null 2>&1 || true'"
"sleep 1.0 && swww img ${stylixImage}"
]
else [];
in {
@ -34,11 +33,12 @@ in {
[
"wl-paste --type text --watch cliphist store" # Saves text
"wl-paste --type image --watch cliphist store" # Saves images
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
"
"systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
"systemctl --user start hyprpolkitagent"
"pypr &"
"qs -c overview" # Start quickshell-overview daemon
"hyprland-change-layout init"
]
++ noctaliaExec ++ waybarExec;
};

View file

@ -2,7 +2,6 @@
services = {
hypridle = {
enable = true;
systemdTarget = "hyprland-session.target";
settings = {
general = {
after_sleep_cmd = "hyprctl dispatch dpms on";

View file

@ -44,6 +44,7 @@
hyprKbVariant = variantFinal;
in {
home.packages = with pkgs; [
swww
grim
slurp
wl-clipboard
@ -51,7 +52,6 @@ in {
ydotool
hyprpolkitagent
hyprshot
hyprshutdown
hyprpicker
#hyprland-qtutils # needed for banners and ANR messages
];
@ -108,18 +108,9 @@ in {
workspace_swipe_create_new = true;
workspace_swipe_forever = true;
};
"$modifier" = "SUPER";
scrolling = {
column_width = 0.80;
fullscreen_on_one_column = true;
direction = "right";
follow_focus = true;
};
monocle = {};
general = {
"$modifier" = "SUPER";
layout = "dwindle";
gaps_in = 6;
gaps_out = 8;
@ -133,11 +124,11 @@ in {
layers_hog_keyboard_focus = true;
initial_workspace_tracking = 0;
mouse_move_enables_dpms = true;
key_press_enables_dpms = true;
key_press_enables_dpms = false;
disable_hyprland_logo = true;
disable_splash_rendering = true;
enable_swallow = false;
# vfr = true; # Variable Frame Rate Not supported post v0.54.3
vfr = true; # Variable Frame Rate
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
@ -148,15 +139,9 @@ in {
};
dwindle = {
pseudotile = false;
pseudotile = true;
preserve_split = true;
smart_resizing = true;
use_active_for_splits = true;
smart_split = false;
default_split_ratio = 1.0;
split_bias = 0;
precise_mouse_move = false;
special_scale_factor = 0.8;
force_split = 2;
};
decoration = {
@ -197,16 +182,9 @@ in {
};
master = {
new_status = "slave";
new_on_top = false;
new_on_active = "none";
orientation = "left";
mfact = 0.55;
slave_count_for_center_master = 2;
center_master_fallback = "left";
smart_resizing = true;
drop_at_cursor = true;
always_keep_position = false;
new_status = "master";
new_on_top = 1;
mfact = 0.5;
};
# Ensure Xwayland windows render at integer scale; compositor scales them

View file

@ -1,8 +1,4 @@
{
config,
username,
...
}: {
{username, ...}: {
programs.hyprlock = {
enable = true;
settings = {
@ -14,7 +10,7 @@
};
background = [
{
path = config.stylix.image;
path = "/home/${username}/Pictures/Wallpapers/beautifulmountainscape.jpg";
blur_passes = 3;
blur_size = 8;
}

View file

@ -0,0 +1,18 @@
{pkgs, ...}: {
home.packages = with pkgs; [pyprland];
home.file.".config/hypr/pyprland.toml".text = ''
[pyprland]
plugins = [
"scratchpads",
]
[scratchpads.term]
animation = "fromTop"
command = "kitty --class kitty-dropterm"
class = "kitty-dropterm"
size = "70% 70%"
max_size = "1920px 100%"
position = "150px 150px"
'';
}

View file

@ -1,436 +1,130 @@
_: {
{host, ...}: let
inherit
(import ../../../hosts/${host}/variables.nix)
extraMonitorSettings
;
in {
wayland.windowManager.hyprland = {
extraConfig = ''
# Set float and centering for dialog boxes
rule = float(true), match:modal:1
rule = center(true), match:modal:1
settings = {
windowrule = [
#"noblur, xwayland:1" # Helps prevent odd borders/shadows for xwayland apps
# downside it can impact other xwayland apps
# This rule is a template for a more targeted approach
"noblur, class:^(\bresolve\b)$, xwayland:1" # Window rule for just resolve
"tag +file-manager, class:^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$"
"tag +terminal, class:^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm)$"
"tag +browser, class:^(Brave-browser(-beta|-dev|-unstable)?)$"
"tag +browser, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$"
"tag +browser, class:^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$"
"tag +browser, class:^([Tt]horium-browser|[Cc]achy-browser)$"
"tag +projects, class:^(codium|codium-url-handler|VSCodium)$"
"tag +projects, class:^(VSCode|code-url-handler)$"
"tag +im, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$"
"tag +im, class:^([Ff]erdium)$"
"tag +im, class:^([Ww]hatsapp-for-linux)$"
"tag +im, class:^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$"
"tag +im, class:^(teams-for-linux)$"
"tag +games, class:^(gamescope)$"
"tag +games, class:^(steam_app_\d+)$"
"tag +gamestore, class:^([Ss]team)$"
"tag +gamestore, title:^([Ll]utris)$"
"tag +gamestore, class:^(com.heroicgameslauncher.hgl)$"
"tag +settings, class:^(gnome-disks|wihotspot(-gui)?)$"
"tag +settings, class:^([Rr]ofi)$"
"tag +settings, class:^(file-roller|org.gnome.FileRoller)$"
"tag +settings, class:^(nm-applet|nm-connection-editor|blueman-manager)$"
"tag +settings, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$"
"tag +settings, class:^(nwg-look|qt5ct|qt6ct|[Yy]ad)$"
"tag +settings, class:(xdg-desktop-portal-gtk)"
"tag +settings, class:(.blueman-manager-wrapped)"
"tag +settings, class:(nwg-displays)"
"move 72% 7%,title:^(Picture-in-Picture)$"
# qs-keybinds floating viewer
"float, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$"
"center, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$"
"size 55% 66%, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$"
# qs-cheatsheets floating viewer
"float, title:^(Cheatsheets Viewer)$"
"center, title:^(Cheatsheets Viewer)$"
"size 65% 60%, title:^(Cheatsheets Viewer)$"
"center, class:^([Ff]erdium)$"
"float, class:^([Ww]aypaper)$"
"float, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$"
"float, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$"
"center, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$"
"float, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$"
"center, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$"
"float, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$"
"center, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$"
"noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$"
"noblur, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$"
"rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$"
# qs-keybinds, qs-docs, qs-chevron floating viewer
"float, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$"
"center, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$"
"size 55% 66%, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$"
"center, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$"
"center, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)"
"center, title:^(Authentication Required)$"
"idleinhibit fullscreen, class:^(*)$"
"idleinhibit fullscreen, title:^(*)$"
"idleinhibit fullscreen, fullscreen:1"
"float, tag:settings*"
"float, class:^([Ff]erdium)$"
"float, title:^(Picture-in-Picture)$"
"float, class:^(mpv|com.github.rafostar.Clapper)$"
"float, title:^(Authentication Required)$"
"float, class:(codium|codium-url-handler|VSCodium), title:negative:(.*codium.*|.*VSCodium.*)"
"float, class:^(com.heroicgameslauncher.hgl)$, title:negative:(Heroic Games Launcher)"
"float, class:^([Ss]team)$, title:negative:^([Ss]team)$"
"float, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)"
"float, initialTitle:(Add Folder to Workspace)"
"float, initialTitle:(Open Files)"
"float, initialTitle:(wants to save)"
"size 70% 60%, initialTitle:(Open Files)"
"size 70% 60%, initialTitle:(Add Folder to Workspace)"
"size 70% 70%, tag:settings*"
"size 60% 70%, class:^([Ff]erdium)$"
"opacity 1.0 1.0, tag:browser*"
"opacity 0.9 0.8, tag:projects*"
"opacity 0.94 0.86, tag:im*"
"opacity 0.9 0.8, tag:file-manager*"
"opacity 0.8 0.7, tag:terminal*"
"opacity 0.8 0.7, tag:settings*"
"opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor|mousepad)$"
"opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui"
"opacity 0.95 0.75, title:^(Picture-in-Picture)$"
"pin, title:^(Picture-in-Picture)$"
"keepaspectratio, title:^(Picture-in-Picture)$"
"noblur, tag:games*"
"fullscreen, tag:games*"
];
windowrulev2 = [
# qs-wallpapers styling via compositor
"noborder, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$"
"noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$"
"noblur, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$"
"rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$"
windowrule {
name = Resolve
match:class = ^(\bresolve\b)$
match:xwayland = 1
no_blur = on
}
# qs-vid-wallpapers styling via compositor
"noborder, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$"
"noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$"
"noblur, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$"
"rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$"
windowrule {
name = Thunar
match:class = ^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$
tag = +file-manager
}
# qs-wlogout styling via compositor - power menu overlay
"noborder, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$"
"rounding 20, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$"
"opacity 1.0 1.0, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$"
windowrule {
name = Terminals
match:class = ^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm|dropterminal)$
tag = +terminal
}
windowrule {
name = Brave-browser
match:class = ^(Brave-browser(-beta|-dev|-unstable)?)$
tag = +browser
}
windowrule {
name = Firefox
match:class = ^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$
tag = +browser
}
windowrule {
name = Google-chrome
match:class = ^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$
tag = +browser
}
windowrule {
name = Thorium-browser
match:class = ^([Tt]horium-browser|[Cc]achy-browser)$
tag = +browser
}
windowrule {
name = vscodium
match:class = ^(codium|codium-url-handler|VSCodium)$
tag = +projects
}
windowrule {
name = vscode
match:class = ^(VSCode|code-url-handler)$
tag = +projects
}
windowrule {
name = Discord
match:class = ^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$
tag = +im
}
windowrule {
name = Ferdium
match:class = ^([Ff]erdium)$
center = on
float = on
size = 60% = 70%
tag = +im
}
windowrule {
name = Whatsapp
match:class = ^([Ww]hatsapp-for-linux)$
tag = +im
}
windowrule {
name = Telegram-desktop
match:class = ^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$
tag = +im
}
windowrule {
name = teams-for-linux
match:class = ^(teams-for-linux)$
tag = +im
}
windowrule {
name = gamescope
match:class = ^(gamescope)$
tag = +games
}
windowrule {
name = steam-app
match:class = ^(steam_app\d+)$
tag = +games
}
windowrule {
name = Steam
match:class = ^([Ss]team)$
tag = +gamestore
}
windowrule {
name = Lutris
match:title = ^([Ll]utris)$
tag = +gamestore
}
windowrule {
name = heroicgameslauncher
match:class = ^(com.heroicgameslauncher.hgl)$
tag = +gamestore
}
windowrule {
name = gnome-disks
match:class = ^(gnome-disks|wihotspot(-gui)?)$
tag = +settings
}
windowrule {
name = rofi
match:class = ^([Rr]ofi)$
tag = +settings
no_blur = off
}
windowrule {
name = FileRoller
match:class = ^(file-roller|org.gnome.FileRoller)$
tag = +settings
}
windowrule {
name = NetworkManger
match:class = ^(nm-applet|nm-connection-editor|blueman-manager)$
tag = +settings
}
windowrule {
name = PlusAudio
match:class = ^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$
center = on
tag = +settings
no_blur = off
}
windowrule {
name = nwg-look
match:class = ^(nwg-look|qt5ct|qt6ct|[Yy]ad)$
tag = +settings
}
windowrule {
name = xdg-desktop-portal-gtk
match:class = (xdg-desktop-portal-gtk)
tag = +settings
}
windowrule {
name = blueman
match:class = (.blueman-manager-wrapped)
tag = +settings
}
windowrule {
name = nwg-displays
match:class = (nwg-displays)
tag = +settings
}
windowrule {
name = Picture-in-Picture
match:title = ^(Picture-in-Picture)$
float = on
move = 72% = 7%
opacity = 0.95 = 0.75
pin = 0
keep_aspect_ratio = on
}
windowrule {
name = ThunarFileMgr
match:class = ([Tt]hunar)
match:title = negative:(.*[Tt]hunar.*)
center = on
float = on
}
windowrule {
name = Authentication-Required
match:title = ^(Authentication Required)$
center = on
float = on
}
windowrule {
name = IdleInhibit-fullscreen-1
match:class = ^(*)$
idle_inhibit = fullscreen
}
windowrule {
name = IdleInhibit-fullscreen-2
match:title = ^(*)$
idle_inhibit = fullscreen
}
windowrule {
name = IdleInhibit-fullscreen-3
match:fullscreen = 1
idle_inhibit = fullscreen
}
windowrule {
name = Settings-Tag
match:tag = settings*
float = on
opacity = 0.8 = 0.7
size = 70% = 70%
no_blur = off
}
windowrule {
name = WayPaper
match:class = ^([Ww]aypaper)$
float = on
no_blur = off
}
windowrule {
name = mpv-or-clapper
match:class = ^(mpv|com.github.rafostar.Clapper)$
float = on
}
windowrule {
name = codium-url-handler
match:class = (codium|codium-url-handler|VSCodium)
match:title = negative:(.*codium.*|.*VSCodium.*)
float = on
}
windowrule {
name = heroicgameslauncher-1
match:class = ^(com.heroicgameslauncher.hgl)$
match:title = negative:(Heroic Games Launcher)
float = on
}
windowrule {
name = Steam
match:class = ^([Ss]team)$
match:title = negative:^([Ss]team)$
float = on
}
windowrule {
name = Add-Folder
match:initial_title = (Add Folder to Workspace)
float = on
size = 70% = 60%
}
windowrule {
name = Open-File
match:initial_title = (Open Files)
float = on
size = 70% = 60%
}
windowrule {
name = Wants-to-Save
match:initial_title = (wants to save)
float = on
}
windowrule {
name = Browsers
match:tag = browser*
opacity = 1.0 = 1.0
}
windowrule {
name = Projects
match:tag = projects*
opacity = 0.9 = 0.8
}
windowrule {
name = Instant-Messaging
match:tag = im*
opacity = 0.94 = 0.86
}
windowrule {
name = File-Managers
match:tag = file-manager*
opacity = 0.9 = 0.8
}
windowrule {
name = Terminals-opacity
match:tag = terminal*
opacity = 0.8 = 0.7
no_blur = off
}
windowrule {
name = windowrule-77
match:class = ^(gedit|org.gnome.TextEditor|mousepad)$
opacity = 0.8 = 0.7
}
windowrule {
name = windowrule-78
match:class = ^(seahorse)$
opacity = 0.9 = 0.8
}
windowrule {
name = windowrule-79
match:tag = games*
no_blur = on
}
windowrule {
name = windowrule-80
match:tag = games*
fullscreen = on
}
windowrule {
name = qs-keybinds
match:title = ^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$
float = on
center = on
size = 55% = 66%
}
windowrule {
name = qs-cheatsheets
match:title = ^(Cheatsheets Viewer)$
float = on
center = on
size = 65% = 60%
}
windowrule {
name = qs-extended-viewers
match:title = ^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$
float = on
center = on
size = 55% = 66%
}
windowrule {
name = QS-Wallpapers
match:class = ^(org\.qt-project\.qml)$
match:title = ^(Wallpapers)$
border_size = 0
float = on
no_blur = on
no_shadow = on
rounding = 12
}
windowrule {
name = QA-Video-Wallpapers
match:class = ^(org\.qt-project\.qml)$
match:title = ^(Video Wallpapers)$
border_size = 0
center = on
float = on
no_blur = on
no_shadow = on
rounding = 12
}
windowrule {
name = QS-wlogout
match:class = ^(org\.qt-project\.qml)$
match:title = ^(qs-wlogout)$
border_size = 0
center = on
float = on
opacity = 1.0 = 1.0
rounding = 20
}
windowrule {
name = QA-Panels
match:class = ^(org\.qt-project\.qml)$
match:title = ^(Panels)$
center = on
float = on
no_blur = on
no_shadow = on
rounding = 12
}
windowrule {
name = QS-Cheatsheets
match:class = ^(org\.qt-project\.qml)$
match:title = ^(Cheatsheets Viewer)$
border_size = 0
center = on
float = on
no_shadow = on
rounding = 12
}
windowrule {
name = QS-Documentation-Viewer
match:class = ^(org\.qt-project\.qml)$
match:title = ^(Documentation Viewer)$
border_size = 0
center = on
float = on
no_shadow = on
rounding = 12
}
'';
# qs-docs / qs-cheatsheets overlay windows
"noborder, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$"
"noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$"
"rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$"
"noborder, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$"
"noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$"
"rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$"
];
};
};
}

View file

@ -102,18 +102,18 @@ has_intel=false
has_amd=false
has_vm=false
if lspci | grep -qi 'vga\|3d\|display'; then
if lspci | grep -qi 'vga\|3d'; then
while read -r line; do
if echo "$line" | grep -qi 'nvidia'; then
has_nvidia=true
elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then
elif echo "$line" | grep -qi 'amd'; then
has_amd=true
elif echo "$line" | grep -qi 'intel'; then
has_intel=true
elif echo "$line" | grep -qi 'virtio\|vmware'; then
has_vm=true
fi
done < <(lspci | grep -i 'vga\|3d\|display')
done < <(lspci | grep -i 'vga\|3d')
if $has_vm; then
DETECTED_PROFILE="vm"

View file

@ -1,29 +1,30 @@
{
config,
pkgs,
inputs,
lib,
...
}: let
system = pkgs.stdenv.hostPlatform.system;
noctaliaPkg = inputs.noctalia.packages.${system}.default;
configDir = "${noctaliaPkg}/share/noctalia-shell";
noctaliaPath = inputs.noctalia.packages.${system}.default;
configDir = "${noctaliaPath}/share/noctalia-shell";
in {
# Install the Noctalia package
# Install the Noctalia package for this user (CLI, assets, etc.)
home.packages = [
noctaliaPkg
pkgs.quickshell # Ensure quickshell is available for the service
noctaliaPath
];
# Seed the configuration
# 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
$DRY_RUN_CMD mkdir -p "$HOME/.config/quickshell"
$DRY_RUN_CMD cp -R "$SRC" "$DEST"
$DRY_RUN_CMD chmod -R u+rwX "$DEST"
mkdir -p "$HOME/.config/quickshell"
cp -R "$SRC" "$DEST"
chmod -R u+rwX "$DEST"
fi
'';
}

View file

@ -14,7 +14,7 @@
[global]
user = true
'';
# Set environment variables for Python development
home.sessionVariables = {
PIP_USER = "1";
@ -25,7 +25,7 @@
text = ''
#!/bin/sh
# Use python3 with the correct package path
exec ${pkgs.python3.withPackages (p: [p.requests])}/bin/python3 $HOME/.config/waybar/scripts/Weather.py "$@"
exec ${pkgs.python3.withPackages(p: [p.requests])}/bin/python3 $HOME/.config/waybar/scripts/Weather.py "$@"
'';
executable = true;
};

View file

@ -1,446 +0,0 @@
{pkgs}:
pkgs.writeShellScriptBin "DropTerminal" ''
#!/usr/bin/env bash
# Dropdown Terminal for Hyprland (Nix-managed)
# Source: adapted from Dropterminal.sh by Kiran George (SherLock707)
# Usage:
# DropTerminal [-d] [<terminal_command>]
# Behavior:
# - If <terminal_command> is omitted, uses $TERM, with fallback to kitty when $TERM is unset/empty
set -euo pipefail
DEBUG=false
# Use a dedicated special workspace so preload never flashes on screen
SPECIAL_WS="special:dropterminal"
ADDR_FILE="/tmp/dropdown_terminal_addr"
SPAWN_ONLY=false # if true, just create hidden in scratchpad and exit
# Sanitize Hyprland JSON to strict JSON (work around NaN/Inf issues)
hyprjson() {
# Usage: hyprjson <hyprctl subcommand...>
# Emits strict JSON, replacing invalid numeric literals with null
hyprctl "$@" -j 2>/dev/null | sed -E 's/: *nan([,}])/ : null\1/gi; s/: *-nan([,}])/ : null\1/gi; s/: *inf([,}])/ : null\1/gi; s/: *-inf([,}])/ : null\1/gi'
}
# Dropdown size and position configuration (percentages)
WIDTH_PERCENT=65 # Width as percentage of screen width
HEIGHT_PERCENT=65 # Height as percentage of screen height
Y_PERCENT=10 # Y position as percentage from top (X is auto-centered)
# Animation settings
ANIMATION_DURATION=100 # milliseconds
SLIDE_STEPS=5
SLIDE_DELAY=5 # milliseconds between steps
# Parse arguments
if [ "''${1-}" = "-d" ] || [ "''${1-}" = "--debug" ]; then
DEBUG=true
shift || true
fi
if [ "''${1-}" = "-S" ] || [ "''${1-}" = "--spawn-only" ]; then
SPAWN_ONLY=true
shift || true
fi
# Env override for startup usage
if [ "''${DROPTERM_SPAWN_ONLY-}" = "1" ]; then
SPAWN_ONLY=true
fi
# Terminal command: prefer explicit arg; otherwise always use kitty
TERMINAL_CMD="''${1-}"
if [ -z "''${TERMINAL_CMD}" ]; then
TERMINAL_CMD="kitty"
fi
# Debug echo function
debug_echo() {
if [ "$DEBUG" = true ]; then
echo "$@" >&2
fi
}
# Wait until Hyprland returns sane JSON (monitors/workspace ready)
wait_for_hypr() {
for i in $(seq 1 60); do
if hyprjson monitors | ${pkgs.jq}/bin/jq -e 'length > 0' >/dev/null 2>&1 \
&& hyprjson activeworkspace | ${pkgs.jq}/bin/jq -e '.id | numbers' >/dev/null 2>&1; then
return 0
fi
sleep 0.05
done
return 0
}
# Function to get window geometry
get_window_geometry() {
local addr="$1"
hyprjson clients | ${pkgs.jq}/bin/jq -r --arg ADDR "$addr" '.[] | select(.address == $ADDR) | "\(.at[0]) \(.at[1]) \(.size[0]) \(.size[1])"'
}
# Ensure a window is floating
ensure_floating() {
local addr="$1"
local is_float=$(hyprjson clients | ${pkgs.jq}/bin/jq -r --arg ADDR "$addr" '.[] | select(.address == $ADDR) | .floating // false')
if [ "$is_float" != "true" ]; then
hyprctl dispatch togglefloating "address:$addr" >/dev/null 2>&1 || true
sleep 0.02
fi
}
# Function to animate window slide down (show)
animate_slide_down() {
local addr="$1"
local target_x="$2"
local target_y="$3"
local width="$4"
local height="$5"
if ! [[ "$target_x" =~ ^-?[0-9]+$ ]] || ! [[ "$target_y" =~ ^-?[0-9]+$ ]] || \
! [[ "$width" =~ ^[0-9]+$ ]] || ! [[ "$height" =~ ^[0-9]+$ ]]; then
debug_echo "Invalid geometry for slide down; skipping animation"
return 1
fi
debug_echo "Animating slide down for window $addr to position $target_x,$target_y"
# Start position (above screen)
local start_y=$((target_y - height - 50))
# Calculate step size
local step_y=$(((target_y - start_y) / SLIDE_STEPS))
# Move window to start position instantly (off-screen)
hyprctl dispatch movewindowpixel "exact $target_x $start_y,address:$addr" >/dev/null 2>&1
sleep 0.05
# Animate slide down
for i in $(seq 1 $SLIDE_STEPS); do
local current_y=$((start_y + (step_y * i)))
hyprctl dispatch movewindowpixel "exact $target_x $current_y,address:$addr" >/dev/null 2>&1
sleep 0.03
done
# Ensure final position is exact
hyprctl dispatch movewindowpixel "exact $target_x $target_y,address:$addr" >/dev/null 2>&1
}
# Function to animate window slide up (hide)
animate_slide_up() {
local addr="$1"
local start_x="$2"
local start_y="$3"
local width="$4"
local height="$5"
if ! [[ "$start_x" =~ ^-?[0-9]+$ ]] || ! [[ "$start_y" =~ ^-?[0-9]+$ ]] || \
! [[ "$width" =~ ^[0-9]+$ ]] || ! [[ "$height" =~ ^[0-9]+$ ]]; then
debug_echo "Invalid geometry for slide up; skipping animation"
return 1
fi
debug_echo "Animating slide up for window $addr from position $start_x,$start_y"
# End position (above screen)
local end_y=$((start_y - height - 50))
# Calculate step size
local step_y=$(((start_y - end_y) / SLIDE_STEPS))
# Animate slide up
for i in $(seq 1 $SLIDE_STEPS); do
local current_y=$((start_y - (step_y * i)))
hyprctl dispatch movewindowpixel "exact $start_x $current_y,address:$addr" >/dev/null 2>&1
sleep 0.03
done
debug_echo "Slide up animation completed"
}
# Function to get monitor info including scale and name of focused monitor
get_monitor_info() {
local monitor_data=$(hyprjson monitors | ${pkgs.jq}/bin/jq -r '.[] | select(.focused == true) | "\(.x) \(.y) \(.width) \(.height) \(.scale // 1) \(.name)"')
if [ -z "$monitor_data" ] || [[ "$monitor_data" =~ ^null ]]; then
debug_echo "Error: Could not get focused monitor information"
return 1
fi
echo "$monitor_data"
}
# Function to calculate dropdown position with proper scaling and centering
calculate_dropdown_position() {
local monitor_info=$(get_monitor_info)
if [ $? -ne 0 ] || [ -z "$monitor_info" ]; then
debug_echo "Error: Failed to get monitor info, using fallback values"
echo "100 100 800 600 fallback-monitor"
return 1
fi
local mon_x=$(echo $monitor_info | cut -d' ' -f1)
local mon_y=$(echo $monitor_info | cut -d' ' -f2)
local mon_width=$(echo $monitor_info | cut -d' ' -f3)
local mon_height=$(echo $monitor_info | cut -d' ' -f4)
local mon_scale=$(echo $monitor_info | cut -d' ' -f5)
local mon_name=$(echo $monitor_info | cut -d' ' -f6)
# Ensure geometry values are numeric; Hyprland can emit non-JSON status lines during startup
if ! [[ "$mon_x" =~ ^-?[0-9]+$ ]] || ! [[ "$mon_y" =~ ^-?[0-9]+$ ]] || \
! [[ "$mon_width" =~ ^[0-9]+$ ]] || ! [[ "$mon_height" =~ ^[0-9]+$ ]]; then
debug_echo "Error: Non-numeric monitor geometry; using fallback values"
echo "100 100 800 600 fallback-monitor"
return 1
fi
debug_echo "Monitor info: x=$mon_x, y=$mon_y, width=$mon_width, height=$mon_height, scale=$mon_scale"
# Validate scale value and provide fallback
if [ -z "$mon_scale" ] || [ "$mon_scale" = "null" ] || [ "$mon_scale" = "0" ]; then
debug_echo "Invalid scale value, using 1.0 as fallback"
mon_scale="1.0"
fi
# Calculate logical dimensions by dividing physical dimensions by scale
local logical_width logical_height
if [ -x "${pkgs.bc}/bin/bc" ]; then
logical_width=$(echo "scale=0; $mon_width / $mon_scale" | ${pkgs.bc}/bin/bc | cut -d'.' -f1)
logical_height=$(echo "scale=0; $mon_height / $mon_scale" | ${pkgs.bc}/bin/bc | cut -d'.' -f1)
else
# Fallback to integer math (multiply by 100 for precision, then divide)
local scale_int=$(echo "$mon_scale" | sed 's/\.///' | sed 's/^0*//')
if [ -z "$scale_int" ]; then scale_int=100; fi
logical_width=$(((mon_width * 100) / scale_int))
logical_height=$(((mon_height * 100) / scale_int))
fi
# Ensure we have valid integer values
if ! [[ "$logical_width" =~ ^-?[0-9]+$ ]]; then logical_width=$mon_width; fi
if ! [[ "$logical_height" =~ ^-?[0-9]+$ ]]; then logical_height=$mon_height; fi
debug_echo "Physical resolution: ''${mon_width}x''${mon_height}"
debug_echo "Logical resolution: ''${logical_width}x''${logical_height} (physical ÷ scale)"
# Calculate window dimensions based on LOGICAL space percentages
local width=$((logical_width * WIDTH_PERCENT / 100))
local height=$((logical_height * HEIGHT_PERCENT / 100))
# Calculate Y position from top based on percentage of LOGICAL height
local y_offset=$((logical_height * Y_PERCENT / 100))
# Calculate centered X position in LOGICAL space
local x_offset=$(((logical_width - width) / 2))
# Apply monitor offset to get final positions in logical coordinates
local final_x=$((mon_x + x_offset))
local final_y=$((mon_y + y_offset))
debug_echo "Window size: ''${width}x''${height} (logical pixels)"
debug_echo "Final position: x=$final_x, y=$final_y (logical coordinates)"
debug_echo "Hyprland will scale these to physical coordinates automatically"
echo "$final_x $final_y $width $height $mon_name"
}
# Ensure Hyprland is ready and get the current workspace
wait_for_hypr
CURRENT_WS=$(hyprjson activeworkspace | ${pkgs.jq}/bin/jq -r '.id // empty')
if [ -z "''${CURRENT_WS}" ]; then
# Try once more after a short wait
sleep 0.1
CURRENT_WS=$(hyprjson activeworkspace | ${pkgs.jq}/bin/jq -r '.id // empty')
fi
if [ -z "''${CURRENT_WS}" ]; then
debug_echo "Warning: unable to read active workspace; using workspace 1"
CURRENT_WS="1"
fi
# Function to get stored terminal address
get_terminal_address() {
if [ -f "$ADDR_FILE" ] && [ -s "$ADDR_FILE" ]; then
cut -d' ' -f1 "$ADDR_FILE"
fi
}
# Function to get stored monitor name
get_terminal_monitor() {
if [ -f "$ADDR_FILE" ] && [ -s "$ADDR_FILE" ]; then
cut -d' ' -f2- "$ADDR_FILE"
fi
}
# Function to check if terminal exists
terminal_exists() {
local addr=$(get_terminal_address)
if [ -n "$addr" ]; then
hyprjson clients | ${pkgs.jq}/bin/jq -e --arg ADDR "$addr" 'map(select(.address == $ADDR)) | any' >/dev/null 2>&1
else
return 1
fi
}
# Function to check if terminal is in special workspace
terminal_in_special() {
local addr=$(get_terminal_address)
if [ -n "$addr" ]; then
hyprjson clients | ${pkgs.jq}/bin/jq -e --arg ADDR "$addr" --arg WS "$SPECIAL_WS" 'map(select(.address == $ADDR and .workspace.name == $WS)) | any' >/dev/null 2>&1
else
return 1
fi
}
# Function to spawn terminal and capture its address
spawn_terminal() {
debug_echo "Creating new dropdown terminal with command: $TERMINAL_CMD"
# Calculate dropdown position for later use
local pos_info=$(calculate_dropdown_position)
if [ $? -ne 0 ]; then
debug_echo "Warning: Using fallback positioning"
fi
local target_x target_y width height monitor_name
read -r target_x target_y width height monitor_name <<<"$pos_info"
if ! [[ "$target_x" =~ ^-?[0-9]+$ ]] || ! [[ "$target_y" =~ ^-?[0-9]+$ ]] || \
! [[ "$width" =~ ^[0-9]+$ ]] || ! [[ "$height" =~ ^[0-9]+$ ]]; then
debug_echo "Invalid position parsed; using fallback values"
target_x=100
target_y=100
width=800
height=600
monitor_name="fallback-monitor"
fi
debug_echo "Target position: ''${target_x},''${target_y}, size: ''${width}x''${height}"
# Create a unique title so we can robustly identify the new window
local token=$(date +%s%N)
local title="dropterm-$token"
local spawn_cmd="$TERMINAL_CMD --class dropterminal --instance-group dropterminal --title $title"
# Launch in scratchpad to avoid visible spawn; size will be enforced after detection
hyprctl dispatch exec "[float; workspace $SPECIAL_WS silent] $spawn_cmd" >/dev/null 2>&1 || true
# Wait for the new window with our unique class/title (up to ~3s)
local new_addr=""
for i in $(seq 1 60); do
new_addr=$(hyprjson clients | ${pkgs.jq}/bin/jq -r --arg CLS "dropterminal" --arg TITLE "$title" \
'.[] | select(.class == $CLS and .title == $TITLE) | .address' | head -1)
if [ -n "$new_addr" ]; then break; fi
sleep 0.05
done
if [ -n "$new_addr" ] && [ "$new_addr" != "null" ]; then
# Store the address and monitor name
echo "$new_addr $monitor_name" >"$ADDR_FILE"
debug_echo "Terminal created with address: $new_addr in special workspace on monitor $monitor_name"
# Ensure scratchpad placement (in case exec flags were ignored)
hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$new_addr" >/dev/null 2>&1 || true
ensure_floating "$new_addr"
hyprctl dispatch resizewindowpixel "exact $width $height,address:$new_addr" >/dev/null 2>&1 || true
if [ "$SPAWN_ONLY" = true ]; then
# Keep it hidden for startup preload
debug_echo "Spawn-only: leaving terminal hidden in scratchpad"
return 0
fi
# Bring to current workspace and set up geometry/animation
hyprctl dispatch movetoworkspacesilent "$CURRENT_WS,address:$new_addr"
ensure_floating "$new_addr"
hyprctl dispatch pin "address:$new_addr"
hyprctl dispatch resizewindowpixel "exact $width $height,address:$new_addr"
animate_slide_down "$new_addr" "$target_x" "$target_y" "$width" "$height"
return 0
fi
debug_echo "Failed to detect new kitty window; aborting spawn"
return 1
}
# Main logic
if terminal_exists; then
TERMINAL_ADDR=$(get_terminal_address)
debug_echo "Found existing terminal: $TERMINAL_ADDR"
focused_monitor=$(get_monitor_info | awk '{print $6}')
dropdown_monitor=$(get_terminal_monitor)
if [ "$focused_monitor" != "$dropdown_monitor" ]; then
debug_echo "Monitor focus changed: moving dropdown to $focused_monitor"
# Calculate new position for focused monitor
pos_info=$(calculate_dropdown_position)
read -r target_x target_y width height monitor_name <<<"$pos_info"
if ! [[ "$target_x" =~ ^-?[0-9]+$ ]] || ! [[ "$target_y" =~ ^-?[0-9]+$ ]] || \
! [[ "$width" =~ ^[0-9]+$ ]] || ! [[ "$height" =~ ^[0-9]+$ ]]; then
debug_echo "Invalid position parsed; using fallback values"
target_x=100
target_y=100
width=800
height=600
monitor_name="fallback-monitor"
fi
# Move and resize window
hyprctl dispatch movewindowpixel "exact $target_x $target_y,address:$TERMINAL_ADDR"
hyprctl dispatch resizewindowpixel "exact $width $height,address:$TERMINAL_ADDR"
# Update ADDR_FILE
echo "$TERMINAL_ADDR $monitor_name" >"$ADDR_FILE"
fi
if terminal_in_special; then
debug_echo "Bringing terminal from scratchpad with slide down animation"
# Calculate target position
pos_info=$(calculate_dropdown_position)
read -r target_x target_y width height monitor_name <<<"$pos_info"
if ! [[ "$target_x" =~ ^-?[0-9]+$ ]] || ! [[ "$target_y" =~ ^-?[0-9]+$ ]] || \
! [[ "$width" =~ ^[0-9]+$ ]] || ! [[ "$height" =~ ^[0-9]+$ ]]; then
debug_echo "Invalid position parsed; using fallback values"
target_x=100
target_y=100
width=800
height=600
fi
# Use movetoworkspacesilent to avoid affecting workspace history
hyprctl dispatch movetoworkspacesilent "$CURRENT_WS,address:$TERMINAL_ADDR"
ensure_floating "$TERMINAL_ADDR"
hyprctl dispatch pin "address:$TERMINAL_ADDR"
# Set size and animate slide down
hyprctl dispatch resizewindowpixel "exact $width $height,address:$TERMINAL_ADDR"
animate_slide_down "$TERMINAL_ADDR" "$target_x" "$target_y" "$width" "$height"
hyprctl dispatch focuswindow "address:$TERMINAL_ADDR"
else
debug_echo "Hiding terminal to scratchpad with slide up animation"
# Get current geometry for animation
geometry=$(get_window_geometry "$TERMINAL_ADDR")
if [ -n "$geometry" ]; then
curr_x=$(echo $geometry | cut -d' ' -f1)
curr_y=$(echo $geometry | cut -d' ' -f2)
curr_width=$(echo $geometry | cut -d' ' -f3)
curr_height=$(echo $geometry | cut -d' ' -f4)
debug_echo "Current geometry: ''${curr_x},''${curr_y} ''${curr_width}x''${curr_height}"
# Animate slide up first
animate_slide_up "$TERMINAL_ADDR" "$curr_x" "$curr_y" "$curr_width" "$curr_height"
# Small delay then move to special workspace and unpin
sleep 0.1
hyprctl dispatch pin "address:$TERMINAL_ADDR" # Unpin (toggle)
hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$TERMINAL_ADDR"
else
debug_echo "Could not get window geometry, moving to scratchpad without animation"
hyprctl dispatch pin "address:$TERMINAL_ADDR"
hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$TERMINAL_ADDR"
fi
fi
else
debug_echo "No existing terminal found, creating new one"
if spawn_terminal; then
TERMINAL_ADDR=$(get_terminal_address)
if [ "$SPAWN_ONLY" = false ] && [ -n "$TERMINAL_ADDR" ]; then
hyprctl dispatch focuswindow "address:$TERMINAL_ADDR"
fi
fi
fi
''

View file

@ -1,7 +1,5 @@
{
config,
pkgs,
inputs,
username,
profile,
...
@ -18,31 +16,27 @@
(import ./screenshootin.nix {inherit pkgs;})
(import ./squirtle.nix {inherit pkgs;})
(import ./task-waybar.nix {inherit pkgs;})
(import ./DropTerminal.nix {inherit pkgs;})
(import ./wallsetter.nix {
inherit pkgs inputs;
inherit pkgs;
inherit username;
})
(import ./web-search.nix {inherit pkgs;})
# Cheatsheets viewer + parser
(import ./cheatsheets-parser.nix {inherit pkgs;})
(import ./qs-cheatsheets.nix {inherit config pkgs;})
(import ./qs-cheatsheets.nix {inherit pkgs;})
(import ./docs-parser.nix {inherit pkgs;})
# QuickShell scripts
(import ./qs-vid-wallpapers.nix {inherit pkgs;})
(import ./qs-vid-wallpapers-apply.nix {inherit pkgs;})
(import ./qs-vid-wallpapers-watchdog.nix {inherit pkgs;})
(import ./qs-wallpapers.nix {inherit pkgs;})
(import ./qs-wallpapers-apply.nix {inherit pkgs inputs;})
(import ./qs-wallpapers-restore.nix {inherit pkgs inputs;})
(import ./qs-wallpapers-apply.nix {inherit pkgs;})
(import ./qs-wallpapers-restore.nix {inherit pkgs;})
(import ./qs-wlogout.nix {inherit pkgs;})
(import ./qs-docs.nix {inherit pkgs;})
(import ./docs-parser.nix {inherit pkgs;})
(import ./hyprland-float-all.nix {inherit pkgs;})
(import ./hyprland-change-layout.nix {inherit pkgs;})
(import ./launch-nwg-menu.nix {inherit pkgs;})
(import ./hyprland-dock.nix {inherit pkgs;})
(import ./restart.noctalia.nix {inherit pkgs;})
(import ./zcli.nix {
inherit pkgs profile;
backupFiles = [
@ -50,15 +44,4 @@
];
})
];
xdg.desktopEntries.dropterminal = {
name = "Drop Terminal";
comment = "Dropdown terminal (Hyprland)";
exec = "DropTerminal";
terminal = false;
type = "Application";
icon = "kitty";
settings.StartupWMClass = "dropterminal";
categories = ["System" "Utility" "TerminalEmulator"];
};
}

View file

@ -16,7 +16,7 @@ pkgs.writeShellScriptBin "docs-parser" ''
Usage: docs-parser [MODE] [CATEGORY] [LANGUAGE]
MODE: files|content
CATEGORY: AI|Zed|ddubsos|etc.
CATEGORY: AI|Hyprpanel|Zed|ddubsos|etc.
LANGUAGE: en|es
Examples:

View file

@ -1,85 +0,0 @@
{pkgs}:
pkgs.writeShellScriptBin "hyprland-change-layout" ''
#!/usr/bin/env bash
set -euo pipefail
notif="''${XDG_CONFIG_HOME:-$HOME/.config}/swaync/images/catppuccin-macchiato.png"
layouts=(dwindle master scrolling monocle)
get_layout() {
${pkgs.hyprland}/bin/hyprctl -j getoption general:layout | ${pkgs.jq}/bin/jq -r '.str'
}
next_layout() {
local current="$1"
local i
for i in "''${!layouts[@]}"; do
if [[ "''${layouts[i]}" == "$current" ]]; then
echo "''${layouts[((i + 1) % ''${#layouts[@]})]}"
return
fi
done
echo "''${layouts[0]}"
}
set_layout() {
local target="$1"
${pkgs.hyprland}/bin/hyprctl keyword general:layout "$target"
${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,J || true
${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,K || true
${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,O || true
${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER_SHIFT,M || true
case "$target" in
"dwindle")
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,cyclenext
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,cyclenext,prev
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,O,layoutmsg,togglesplit
${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Dwindle Layout"
;;
"master")
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,layoutmsg,cyclenext
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,layoutmsg,cycleprev
${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Master Layout"
;;
"scrolling")
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,cyclenext
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,cyclenext,prev
${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Scrolling Layout"
;;
"monocle")
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,layoutmsg,cyclenext
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,layoutmsg,cycleprev
${pkgs.hyprland}/bin/hyprctl keyword bind SUPER_SHIFT,M,layoutmsg,swapnext
${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Monocle Layout"
;;
*)
echo "Unknown layout: $target" >&2
return 1
;;
esac
}
current="$(get_layout)"
arg="''${1:-toggle}"
case "$arg" in
init)
set_layout "$current"
;;
toggle|next)
set_layout "$(next_layout "$current")"
;;
set)
set_layout "''${2:-}"
;;
master|dwindle|scrolling|monocle)
set_layout "$arg"
;;
*)
echo "Usage: $(basename "$0") [toggle|next|init|set <layout>|master|dwindle|scrolling|monocle]" >&2
exit 1
;;
esac
''

View file

@ -1,11 +0,0 @@
{pkgs}:
pkgs.writeShellScriptBin "hyprland-float-all" ''
#!/usr/bin/env bash
set -euo pipefail
ws="$(${pkgs.hyprland}/bin/hyprctl activeworkspace -j | ${pkgs.jq}/bin/jq -r .id)"
${pkgs.hyprland}/bin/hyprctl clients -j | ${pkgs.jq}/bin/jq -r --arg ws "$ws" '.[] | select(.workspace.id == ($ws|tonumber)) | .address' \
| while read -r addr; do
[ -n "''${addr:-}" ] && ${pkgs.hyprland}/bin/hyprctl dispatch togglefloating "address:$addr"
done
''

View file

@ -271,7 +271,7 @@ pkgs.writeShellScriptBin "keybinds-parser" ''
else if (low ~ /(emacs|code|vscode|nvim|vim)/) category="editor"
else if (low ~ /(rofi|wofi|dmenu|launcher)/) category="launcher"
else if (low ~ /(chrome|chromium|firefox|brave|browser)/) category="browser"
else if (low ~ /(awww|wallpaper)/) category="wallpaper"
else if (low ~ /(swww|wallpaper)/) category="wallpaper"
else if (low ~ /(playerctl|wpctl|pactl|pamixer|brightnessctl|volume|brightness)/) category="media"
else category="app"
} else {

View file

@ -1,7 +1,4 @@
{
config,
pkgs,
}:
{pkgs}:
pkgs.writeShellScriptBin "qs-cheatsheets" ''
#!/usr/bin/env bash
set -euo pipefail
@ -266,9 +263,9 @@ pkgs.writeShellScriptBin "qs-cheatsheets" ''
// Handle root directory files
var filePath;
if (selectedCategory === "root") {
filePath = "${config.home.homeDirectory}/zaneyos/cheatsheets/" + filename;
filePath = "/home/dwilliams/zaneyos/cheatsheets/" + filename;
} else {
filePath = "${config.home.homeDirectory}/zaneyos/cheatsheets/" + selectedCategory + "/" + filename;
filePath = "/home/dwilliams/zaneyos/cheatsheets/" + selectedCategory + "/" + filename;
}
const xhr = new XMLHttpRequest();

View file

@ -12,7 +12,7 @@ pkgs.writeShellScriptBin "qs-docs" ''
Usage: qs-docs [options]
Options:
-c CATEGORY Category to display (AI|Zed|ddubsos) (default: AI)
-c CATEGORY Category to display (AI|Hyprpanel|Zed|ddubsos) (default: AI)
-l LANGUAGE Language (en|es) (default: en)
-h Show this help
EOF
@ -316,7 +316,7 @@ pkgs.writeShellScriptBin "qs-docs" ''
win.availableCategories = result;
} catch (e) {
console.error("Failed to parse categories JSON:", e);
win.availableCategories = ["AI", "Zed", "ddubsos"];
win.availableCategories = ["AI", "Hyprpanel", "Zed", "ddubsos"];
}
}
}

View file

@ -5,6 +5,7 @@ pkgs.writeShellScriptBin "qs-panels" ''
# Detect current active panel/bar (robust matching, no regex metachar)
active=""
if pgrep -x hyprpanel >/dev/null 2>&1; then active="hyprpanel"; fi
if pgrep -x waybar >/dev/null 2>&1; then active="waybar"; fi
if pgrep -x dms >/dev/null 2>&1 || pgrep -fa dms | grep -q "\bdms\b.*\brun\b"; then active="dms"; fi
if pgrep -fa quickshell | grep -q "noctalia-shell"; then active="noctalia"; fi
@ -65,7 +66,8 @@ pkgs.writeShellScriptBin "qs-panels" ''
model: [
{ key: "noctalia", label: "Noctalia" },
{ key: "dms", label: "DMS" },
{ key: "waybar", label: "Waybar" }
{ key: "waybar", label: "Waybar" },
{ key: "hyprpanel",label: "Hyprpanel" }
]
delegate: Rectangle {
width: 180; height: 52
@ -147,6 +149,7 @@ pkgs.writeShellScriptBin "qs-panels" ''
noctalia) run_and_exit noctalia-run ;;
dms) run_and_exit dms-run ;;
waybar) run_and_exit waybar-run ;;
hyprpanel)run_and_exit hyprpanel-run ;;
*) exit 0 ;;
esac
''

View file

@ -67,8 +67,8 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers-apply" ''
case "$BACKEND" in
mpvpaper)
log "Stopping awww-daemon, hyprpaper, mpvpaper if running"
${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
log "Stopping swww-daemon, hyprpaper, mpvpaper if running"
${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
log "Sleeping briefly before starting mpvpaper"
@ -88,7 +88,7 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers-apply" ''
-o "$opts" \
'*' "$sel" >/dev/null 2>&1 &
fi
disown || true
disown
log "mpvpaper launched"
exit 0
;;

View file

@ -2,47 +2,47 @@
pkgs.writeShellScriptBin "qs-vid-wallpapers-watchdog" ''
#!/usr/bin/env bash
set -euo pipefail
[ -n "''${QS_DEBUG:-}" ] && set -x
DEBUG="''${QS_DEBUG:-}"
log() { if [ -n "$DEBUG" ]; then echo "[qs-vid-watchdog] $*" >&2; fi }
log "Starting video wallpaper watchdog"
# Get the current video wallpaper if any
STATE_DIR="''${XDG_STATE_HOME:-$HOME/.local/state}/qs-wallpapers"
STATE_FILE_JSON="$STATE_DIR/current.json"
if [ -f "$STATE_FILE_JSON" ]; then
CURRENT_VIDEO="$(${pkgs.jq}/bin/jq -r '.path // empty' "$STATE_FILE_JSON" 2>/dev/null || true)"
if [ -n "$CURRENT_VIDEO" ] && [ -f "$CURRENT_VIDEO" ]; then
log "Monitoring video wallpaper: $CURRENT_VIDEO"
# Monitor and restart if needed
while true; do
# Check if mpvpaper is running with video files
if ! ${pkgs.procps}/bin/pgrep -f "mpvpaper.*\.\(mp4|m4v|mp4v|mov|webm|avi|mkv|mpeg|mpg|wmv|avchd|flv|ogv|m2ts|ts|3gp\)" > /dev/null; then
log "Video wallpaper stopped, restarting..."
# Get audio preference from state if available
AUDIO="OFF"
# Start mpvpaper with same options as the original script
opts="--loop=inf --no-audio --no-osc --no-osd-bar --keep-open=yes --keepaspect=yes --hwdec=auto"
${pkgs.mpvpaper}/bin/mpvpaper \
-o "$opts" \
'*' "$CURRENT_VIDEO" >/dev/null 2>&1 &
# Let it start
sleep 3
fi
# Check every 10 seconds
sleep 10
done
fi
fi
log "No video wallpaper to monitor"
''
''

View file

@ -509,8 +509,6 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers" ''
# Prepare QML runtime environment (Qt6)
export QT_QPA_PLATFORM="wayland;xcb"
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
export QT_LOGGING_TO_CONSOLE="1"
export QT_FORCE_STDERR_LOGGING="1"
export QT_PLUGIN_PATH="${pkgs.qt6.qtbase}/lib/qt-6/plugins:${pkgs.qt6.qtwayland}/lib/qt-6/plugins"
export QML_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml:${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtsvg}/lib/qt-6/qml"
export QML2_IMPORT_PATH="$QML_IMPORT_PATH"

View file

@ -1,6 +1,4 @@
{pkgs, inputs}: let
awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww;
in
{pkgs}:
pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
#!/usr/bin/env bash
set -euo pipefail
@ -11,26 +9,19 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
PRINT_ONLY=0
SHELL_ONLY=0
RESTORE_ONLY=0
while [ $# -gt 0 ]; do
case "$1" in
--print-only) PRINT_ONLY=1; shift ;;
--shell-only) SHELL_ONLY=1; shift ;;
--restore) RESTORE_ONLY=1; shift ;;
*) break ;;
esac
done
if [ $RESTORE_ONLY -eq 1 ]; then
log "Restore requested; delegating to qs-wallpapers-restore"
exec qs-wallpapers-restore
fi
BACKEND="''${WALLPAPER_BACKEND:-}"
# Auto-detect sensible default backend per compositor when not provided via env
if [ -z "''${BACKEND:-}" ]; then
if [ "''${XDG_SESSION_DESKTOP:-}" = "Niri" ] || [ "''${XDG_CURRENT_DESKTOP:-}" = "Niri" ] || command -v niri >/dev/null 2>&1; then
BACKEND="awww"
BACKEND="swww"
else
BACKEND="mpvpaper"
fi
@ -84,12 +75,6 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
${pkgs.coreutils}/bin/printf '%s\n' "$sel" > "$tmp_txt"
${pkgs.coreutils}/bin/mv -f "$tmp_txt" "$STATE_FILE_TXT"
# Maintain a convenient symlink for other tools and themes
PIC_DIR="$HOME/Pictures"
CUR_LINK="$PIC_DIR/current_wallpaper"
${pkgs.coreutils}/bin/mkdir -p "$PIC_DIR"
${pkgs.coreutils}/bin/ln -sfn "$sel" "$CUR_LINK" || true
# Update hyprlock wallpaper link if tool is available
if command -v hyprlock-update-wallpaper-link >/dev/null 2>&1; then
hyprlock-update-wallpaper-link >/dev/null 2>&1 || true
@ -98,8 +83,8 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
case "$BACKEND" in
mpvpaper)
# Stop other wallpaper daemons to avoid conflicts
log "Stopping awww-daemon, hyprpaper, mpvpaper if running"
${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
log "Stopping swww-daemon, hyprpaper, mpvpaper if running"
${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
# Give the compositor a moment to release layers
@ -117,21 +102,21 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
-o "$MPV_OPTS" \
'*' "$sel" >/dev/null 2>&1 &
fi
disown || true
disown
log "mpvpaper launched"
exit 0
;;
awww)
swww)
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
# Start awww-daemon if needed (newer awww has no 'init' subcommand)
if ! ${awwwPkg}/bin/awww query >/dev/null 2>&1; then
log "Starting awww-daemon"
${awwwPkg}/bin/awww-daemon >/dev/null 2>&1 & disown || true
# Start swww-daemon if needed (newer swww has no 'init' subcommand)
if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then
log "Starting swww-daemon"
${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown
# wait briefly for the daemon to be ready
for i in $(${pkgs.coreutils}/bin/seq 1 50); do
if ${awwwPkg}/bin/awww query >/dev/null 2>&1; then
log "awww-daemon ready"
if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then
log "swww-daemon ready"
break
fi
${pkgs.coreutils}/bin/sleep 0.1
@ -141,26 +126,26 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true
# Robust resize: if WALLPAPER_RESIZE is set, use it; otherwise try fill -> fit -> crop
run_awww_img() {
run_swww_img() {
if [ -n "''${WALLPAPER_RESIZE:-}" ]; then
log "awww img --resize ''${WALLPAPER_RESIZE} $sel"
${awwwPkg}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$sel"
log "swww img --resize ''${WALLPAPER_RESIZE} $sel"
${pkgs.swww}/bin/swww img --resize "''${WALLPAPER_RESIZE}" "$sel"
return $?
fi
log "Trying awww resize modes: fill -> fit -> crop"
${awwwPkg}/bin/awww img --resize fill "$sel" || \
${awwwPkg}/bin/awww img --resize fit "$sel" || \
${awwwPkg}/bin/awww img --resize crop "$sel"
log "Trying swww resize modes: fill -> fit -> crop"
${pkgs.swww}/bin/swww img --resize fill "$sel" || \
${pkgs.swww}/bin/swww img --resize fit "$sel" || \
${pkgs.swww}/bin/swww img --resize crop "$sel"
}
# Niri: generic apply has proven to work more reliably than per-output here
run_awww_img
run_swww_img
exit $?
;;
hyprpaper)
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
# Generate a minimal hyprpaper config and start it
_TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d)
_CFG="$_TMPDIR/hyprpaper.conf"
@ -179,7 +164,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
else
${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 &
fi
disown || true
disown
exit 0
;;

View file

@ -1,6 +1,4 @@
{pkgs, inputs}: let
awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww;
in
{pkgs}:
pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
#!/usr/bin/env bash
set -euo pipefail
@ -32,8 +30,8 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
hyprlock-update-wallpaper-link >/dev/null 2>&1 || true
fi
# Order: recorded backend first, then awww -> hyprpaper -> mpvpaper -> waypaper
ORDER_DEFAULT="awww,hyprpaper,mpvpaper,waypaper"
# Order: recorded backend first, then swww -> hyprpaper -> mpvpaper -> waypaper
ORDER_DEFAULT="swww,hyprpaper,mpvpaper,waypaper"
ORDER_COMBINED="$BACKEND_J,$ORDER_DEFAULT"
# De-duplicate while preserving order (awk trick)
ORDER=$({ echo "$ORDER_COMBINED" | ${pkgs.coreutils}/bin/tr ',' '\n' | ${pkgs.gawk}/bin/awk 'NF{ if (!seen[$0]++) print $0 }' | ${pkgs.coreutils}/bin/tr '\n' ','; echo; } | ${pkgs.coreutils}/bin/tr -s ',' | ${pkgs.gnused}/bin/sed 's/^,\|,$//g')
@ -52,35 +50,48 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
return 1
}
start_awww() {
start_swww() {
# Honor Hyprpanel requirement: do not start swww-daemon before Hyprpanel
local wait_sec="''${QS_RESTORE_WAIT_HYPRPANEL_SECONDS:-15}"
if ${pkgs.procps}/bin/pgrep -x hyprpanel >/dev/null 2>&1; then
log "hyprpanel detected; proceeding"
else
# If waybar is already running, it's fine to proceed immediately
if ${pkgs.procps}/bin/pgrep -x waybar >/dev/null 2>&1; then
log "waybar detected; proceeding without waiting for hyprpanel"
else
log "Waiting up to ''${wait_sec}s for hyprpanel before starting swww-daemon"
wait_for_proc hyprpanel "$wait_sec" || log "hyprpanel not detected after ''${wait_sec}s; proceeding"
fi
fi
# Stop conflicting daemons if we intend to use awww
# Stop conflicting daemons if we intend to use swww
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true
if ! ${awwwPkg}/bin/awww query >/dev/null 2>&1; then
log "Starting awww-daemon"
${awwwPkg}/bin/awww-daemon >/dev/null 2>&1 & disown || true
if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then
log "Starting swww-daemon"
${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown
for i in $(${pkgs.coreutils}/bin/seq 1 50); do
if ${awwwPkg}/bin/awww query >/dev/null 2>&1; then break; fi
if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then break; fi
${pkgs.coreutils}/bin/sleep 0.1
done
fi
# Robust resize: use explicit WALLPAPER_RESIZE if provided; otherwise try fill -> fit -> crop
if [ -n "''${WALLPAPER_RESIZE:-}" ]; then
log "awww img --resize ''${WALLPAPER_RESIZE} $PATH_J"
${awwwPkg}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J"
log "swww img --resize ''${WALLPAPER_RESIZE} $PATH_J"
${pkgs.swww}/bin/swww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J"
else
log "Trying awww resize modes: fill -> fit -> crop"
${awwwPkg}/bin/awww img --resize fill "$PATH_J" || \
${awwwPkg}/bin/awww img --resize fit "$PATH_J" || \
${awwwPkg}/bin/awww img --resize crop "$PATH_J"
log "Trying swww resize modes: fill -> fit -> crop"
${pkgs.swww}/bin/swww img --resize fill "$PATH_J" || \
${pkgs.swww}/bin/swww img --resize fit "$PATH_J" || \
${pkgs.swww}/bin/swww img --resize crop "$PATH_J"
fi
}
start_hyprpaper() {
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
_TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d)
_CFG="$_TMPDIR/hyprpaper.conf"
{
@ -92,21 +103,21 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
echo "wallpaper = $mon,$PATH_J" >> "$_CFG"
done
log "Starting hyprpaper"
${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 & disown || true
${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 & disown
}
start_mpvpaper() {
${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true
local MPV_OPTS="--no-audio --loop-file=inf --image-display-duration=inf --no-osc --no-osd-bar --keep-open=yes --keepaspect=yes --panscan=1.0"
log "Starting mpvpaper"
${pkgs.mpvpaper}/bin/mpvpaper -o "$MPV_OPTS" '*' "$PATH_J" >/dev/null 2>&1 & disown || true
${pkgs.mpvpaper}/bin/mpvpaper -o "$MPV_OPTS" '*' "$PATH_J" >/dev/null 2>&1 & disown
}
start_waypaper() {
if command -v waypaper >/dev/null 2>&1; then
log "Trying waypaper"
waypaper --backend awww --wallpaper "$PATH_J" >/dev/null 2>&1 || return 1
waypaper --backend swww --wallpaper "$PATH_J" >/dev/null 2>&1 || return 1
else
return 1
fi
@ -115,7 +126,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
IFS=',' read -r -a tools <<<"$ORDER"
for t in "''${tools[@]}"; do
case "$t" in
awww) start_awww && exit 0 || log "awww failed; falling back" ;;
swww) start_swww && exit 0 || log "swww failed; falling back" ;;
hyprpaper) start_hyprpaper && exit 0 || log "hyprpaper failed; falling back" ;;
mpvpaper) start_mpvpaper && exit 0 || log "mpvpaper failed; falling back" ;;
waypaper) start_waypaper && exit 0 || log "waypaper failed; falling back" ;;

View file

@ -361,8 +361,6 @@ pkgs.writeShellScriptBin "qs-wallpapers" ''
# Prepare QML runtime environment (Qt6)
export QT_QPA_PLATFORM="wayland;xcb"
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
export QT_LOGGING_TO_CONSOLE="1"
export QT_FORCE_STDERR_LOGGING="1"
export QT_PLUGIN_PATH="${pkgs.qt6.qtbase}/lib/qt-6/plugins:${pkgs.qt6.qtwayland}/lib/qt-6/plugins"
export QML_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml:${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtsvg}/lib/qt-6/qml"
export QML2_IMPORT_PATH="$QML_IMPORT_PATH"

View file

@ -232,8 +232,6 @@ in
# Setup Qt6 environment with proper app identification
export QT_QPA_PLATFORM="wayland;xcb"
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
export QT_LOGGING_TO_CONSOLE="1"
export QT_FORCE_STDERR_LOGGING="1"
export QT_PLUGIN_PATH="${pkgs.qt6.qtbase}/lib/qt-6/plugins:${pkgs.qt6.qtwayland}/lib/qt-6/plugins"
export QML_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml:${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtsvg}/lib/qt-6/qml"
export QML2_IMPORT_PATH="$QML_IMPORT_PATH"

View file

@ -1,54 +0,0 @@
#!/usr/bin/env bash
set -euo pipefail
# Restart the Noctalia QuickShell session by terminating only the noctalia-shell
# processes, avoiding any signals to unrelated process groups (e.g. Hyprland).
log() { printf "[restart.noctalia] %s\n" "$*"; }
list_target_pids() {
# Collect only PIDs whose command explicitly runs noctalia-shell
# - direct wrapper: ".../noctalia-shell"
# - quickshell/qs with "-c noctalia-shell"
ps -eo pid=,cmd= \
| ${GREP:-grep} -E "(^|/)(noctalia-shell)( |$)|(^| )((qs|quickshell))( | ).*-c( |=)?noctalia-shell( |$)" \
| awk '{print $1}'
}
terminate_targets() {
local pids left tries
mapfile -t pids < <(list_target_pids || true)
if ((${#pids[@]} > 0)); then
kill -TERM "${pids[@]}" 2>/dev/null || true
fi
# Wait up to ~3s for clean exit
for tries in {1..15}; do
mapfile -t left < <(list_target_pids || true)
((${#left[@]} == 0)) && break
sleep 0.2
done
# Force kill leftovers only (do not touch anything else)
if ((${#left[@]} > 0)); then
kill -KILL "${left[@]}" 2>/dev/null || true
fi
}
start_noctalia() {
# Prefer the noctalia-shell wrapper to ensure proper env and runtime flags
if command -v noctalia-shell >/dev/null 2>&1; then
nohup setsid noctalia-shell >/dev/null 2>&1 &
elif command -v quickshell >/dev/null 2>&1; then
nohup setsid quickshell -c noctalia-shell >/dev/null 2>&1 &
elif command -v qs >/dev/null 2>&1; then
nohup setsid qs -c noctalia-shell >/dev/null 2>&1 &
else
echo "Error: noctalia-shell/quickshell/qs not found in PATH" >&2
exit 1
fi
}
terminate_targets
start_noctalia

View file

@ -1,24 +0,0 @@
{pkgs, ...}: let
binPath = pkgs.lib.makeBinPath [
pkgs.coreutils
pkgs.procps
pkgs.psmisc
pkgs.gnugrep
pkgs.findutils
pkgs.util-linux
pkgs.bash
];
script = builtins.readFile ./restart.noctalia;
in
pkgs.writeShellScriptBin "restart.noctalia" ''
set -euo pipefail
export PATH=${binPath}:$PATH
tmp_script=$(mktemp)
trap 'rm -f "$tmp_script"' EXIT
cat > "$tmp_script" <<'BASH_EOF'
${script}
BASH_EOF
chmod +x "$tmp_script"
exec ${pkgs.bash}/bin/bash "$tmp_script" "$@"
''

View file

@ -1,6 +1,4 @@
{pkgs, inputs, ...}: let
awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww;
in
{pkgs, ...}:
pkgs.writeShellScriptBin "wallsetter" ''
TIMEOUT=720
@ -19,7 +17,7 @@ pkgs.writeShellScriptBin "wallsetter" ''
PREVIOUS=$WALLPAPER
${awwwPkg}/bin/awww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60
${pkgs.swww}/bin/swww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60
sleep $TIMEOUT
done
''

View file

@ -130,7 +130,7 @@ in
# --- Configuration ---
PROJECT="zaneyos" #ddubos or zaneyos
PROFILE_DEFAULT="${profile}"
PROFILE="${profile}"
BACKUP_FILES_STR="${backupFilesString}"
VERSION="1.0.2"
FLAKE_NIX_PATH="$HOME/$PROJECT/flake.nix"
@ -138,13 +138,6 @@ in
read -r -a BACKUP_FILES <<< "$BACKUP_FILES_STR"
# --- Helper Functions ---
get_flake_profile() {
local flake_profile=""
if [ -f "$FLAKE_NIX_PATH" ]; then
flake_profile=$(${pkgs.gnugrep}/bin/grep -E '^[[:space:]]*profile[[:space:]]*=' "$FLAKE_NIX_PATH" | ${pkgs.gnused}/bin/sed 's/.*=[[:space:]]*"\([^"]*\)".*/\1/')
fi
echo "$flake_profile"
}
verify_hostname() {
local current_hostname
local flake_hostname
@ -237,45 +230,32 @@ in
local has_intel=false
local has_amd=false
local has_vm=false
# Prefer hypervisor detection first to avoid misclassifying VMs as AMD
if ${pkgs.systemd}/bin/systemd-detect-virt -q; then
echo "vm"
return
fi
if ${pkgs.pciutils}/bin/lspci &> /dev/null; then # Check if lspci is available
if ${pkgs.pciutils}/bin/lspci -nn | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d\|display'; then
if ${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d'; then
while read -r line; do
if echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[10de:'; then
if echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'nvidia'; then
has_nvidia=true
elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[1002:'; then
has_amd=true
elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[8086:'; then
has_intel=true
elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[(1af4|15ad|80ee|1b36|1414|1234|1013):'; then
has_vm=true
elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'nvidia'; then
has_nvidia=true
elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'amd\|ati\|advanced micro devices'; then
elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'amd'; then
has_amd=true
elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'intel'; then
has_intel=true
elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware\|virtualbox\|qxl\|hyper-v\|microsoft corporation\|parallels\|qemu\|bochs\|cirrus\|svga\|virtual'; then
elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware'; then
has_vm=true
fi
done < <(${pkgs.pciutils}/bin/lspci -nn | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d\|display')
done < <(${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d')
if $has_vm; then
if "$has_vm"; then
detected_profile="vm"
elif $has_nvidia && $has_intel; then
elif "$has_nvidia" && "$has_intel"; then
detected_profile="nvidia-laptop"
elif $has_nvidia && $has_amd; then
elif "$has_nvidia" && "$has_amd"; then
detected_profile="amd-hybrid"
elif $has_nvidia; then
elif "$has_nvidia"; then
detected_profile="nvidia"
elif $has_amd; then
elif "$has_amd"; then
detected_profile="amd"
elif $has_intel; then
elif "$has_intel"; then
detected_profile="intel"
fi
fi
@ -356,10 +336,6 @@ in
}
# --- Main Logic ---
PROFILE="$(get_flake_profile)"
if [ -z "$PROFILE" ]; then
PROFILE="$PROFILE_DEFAULT"
fi
if [ "$#" -eq 0 ]; then
echo "Error: No command provided." >&2
print_help
@ -406,10 +382,10 @@ in
;;
list-gens)
echo "--- User Generations ---"
${pkgs.nix}/bin/nix-env --list-generations || echo "Could not list user generations."
${pkgs.nix}/bin/nix-env --list-generations | ${pkgs.coreutils}/bin/cat || echo "Could not list user generations."
echo ""
echo "--- System Generations ---"
${pkgs.nix}/bin/nix profile history --profile /nix/var/nix/profiles/system || echo "Could not list system generations."
${pkgs.nix}/bin/nix profile history --profile /nix/var/nix/profiles/system | ${pkgs.coreutils}/bin/cat || echo "Could not list system generations."
;;
rebuild)
verify_hostname
@ -419,7 +395,7 @@ in
extra_args=$(parse_nh_args "$@")
echo "Starting NixOS rebuild for host: $(${pkgs.nettools}/bin/hostname)"
if eval "${pkgs.nh}/bin/nh os switch --diff always --hostname '$PROFILE' $extra_args"; then
if eval "${pkgs.nh}/bin/nh os switch --hostname '$PROFILE' $extra_args"; then
echo "Rebuild finished successfully"
else
echo "Rebuild Failed" >&2
@ -435,7 +411,7 @@ in
echo "Starting NixOS rebuild (boot) for host: $(${pkgs.nettools}/bin/hostname)"
echo "Note: Configuration will be activated on next reboot"
if eval "${pkgs.nh}/bin/nh os boot --diff always --hostname '$PROFILE' $extra_args"; then
if eval "${pkgs.nh}/bin/nh os boot --hostname '$PROFILE' $extra_args"; then
echo "Rebuild-boot finished successfully"
echo "New configuration set as boot default - restart to activate"
else
@ -463,7 +439,7 @@ in
extra_args=$(parse_nh_args "$@")
echo "Updating flake and rebuilding system for host: $(${pkgs.nettools}/bin/hostname)"
if eval "${pkgs.nh}/bin/nh os switch --diff always --hostname '$PROFILE' --update $extra_args"; then
if eval "${pkgs.nh}/bin/nh os switch --hostname '$PROFILE' --update $extra_args"; then
echo "Update and rebuild finished successfully"
else
echo "Update and rebuild Failed" >&2
@ -645,7 +621,7 @@ in
echo "Enabling Doom Emacs in $host_vars_file..."
ensure_doom_enabled
echo "Rebuilding system so user modules are applied..."
if ${pkgs.nh}/bin/nh os switch --diff always --hostname "$PROFILE"; then
if ${pkgs.nh}/bin/nh os switch --hostname "$PROFILE"; then
echo "Rebuild complete. Proceeding with Doom installation."
else
echo "Error: Rebuild failed. Please fix the build and re-run 'zcli doom install'." >&2

View file

@ -1,7 +1,5 @@
_: {
stylix.targets = {
# Avoid fetching GNOME Shell sources on non-GNOME systems (breaks on some remotes)
gnome.enable = false;
waybar.enable = false;
rofi.enable = false;
hyprland.enable = false;

View file

@ -1,6 +1,4 @@
{config, ...}: {
home.file."${config.xdg.configHome}/swaync/images/catppuccin-macchiato.png".source =
./swaync/images/catppuccin-macchiato.png;
services.swaync = {
enable = true;
settings = {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

View file

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

View file

@ -181,7 +181,7 @@
home.file."${config.xdg.configHome}/kitty/kitty-bg.conf".text = lib.mkForce ''
include ./kitty.conf
# Background image managed by wrapper via symlink
background_image ${config.home.homeDirectory}/Pictures/current_image_kitty
background_image ${config.home.homeDirectory}/Pictures/current_image
background_image_layout scaled
background_tint 0.95
background_opacity 1.0
@ -236,7 +236,7 @@
Options:
-s, --source DIR Source directory of images (default: ~/Pictures/Wallpapers)
-l, --link PATH Symlink path (default: ~/Pictures/current_image_kitty)
-l, --link PATH Symlink path (default: ~/Pictures/current_image)
--no-launch Only update symlink; do not launch kitty
--foreground Run kitty in the foreground (default is background)
-h, --help Show this help

View file

@ -154,7 +154,7 @@ in {
persistent-workspaces = {
"*" = 10;
};
};
};)
# Integrated CAVA visualizer using the inline script above
"custom/cava_mviz" = {

View file

@ -1,40 +1,9 @@
{pkgs, host, lib, ...}: let
vars = import ../../hosts/${host}/variables.nix;
in {
{pkgs, ...}: {
xdg = {
enable = true;
mime.enable = true;
mimeApps = {
enable = true;
# If the host defines mimeDefaultApps in hosts/${host}/variables.nix,
# use it to set per-host default applications.
defaultApplications = lib.mkIf (vars ? mimeDefaultApps) vars.mimeDefaultApps;
# Example: set default handlers for MIME types and URL schemes.
# Uncomment the block below and adjust .desktop IDs to your preferred apps.
# defaultApplications = {
# # PDFs
# "application/pdf" = ["okular.desktop"]; # change to your preferred reader
# "application/x-pdf" = ["okular.desktop"]; # legacy alias
#
# # Web browser
# "x-scheme-handler/http" = ["google-chrome.desktop"]; # or brave-browser.desktop, firefox.desktop, etc.
# "x-scheme-handler/https" = ["google-chrome.desktop"];
# "text/html" = ["google-chrome.desktop"];
#
# # Text files
# "text/plain" = ["nvim.desktop"]; # or code.desktop, org.gnome.TextEditor.desktop
#
# # Images and video
# "image/png" = ["imv.desktop"]; # or org.gnome.eog.desktop
# "video/mp4" = ["mpv.desktop"]; # or vlc.desktop
#
# # Archives
# "application/zip" = ["org.gnome.FileRoller.desktop"]; # or xarchiver.desktop, peazip.desktop
#
# # Folders (file manager)
# "inode/directory" = ["thunar.desktop"]; # or org.gnome.Nautilus.desktop, org.kde.dolphin.desktop
# };
};
portal = {
enable = true;

View file

@ -2,7 +2,6 @@
profile,
pkgs,
lib,
config,
...
}: {
imports = [
@ -11,7 +10,6 @@
programs.zsh = {
enable = true;
dotDir = config.home.homeDirectory;
autosuggestion.enable = true;
syntaxHighlighting = {
enable = true;

View file

@ -10,8 +10,8 @@ in {
# Enable AMD+NVIDIA hybrid drivers (Prime offload with AMD as primary)
drivers.nvidia-amd-hybrid = {
enable = true;
amdgpuBusId = "${amdgpuID}";
nvidiaBusId = "${nvidiaID}";
amdgpuBusID = "${amdgpuID}";
nvidiaBusID = "${nvidiaID}";
};
# Ensure other driver toggles are off for this profile