Compare commits
96 commits
stable-2.5
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fb12d82468 | ||
|
|
93c05ad88e | ||
|
|
927e38e5dc | ||
|
|
b2165ec35e | ||
|
|
145d98da1d | ||
|
|
60b97fe42c | ||
|
|
affa1f0ce6 | ||
|
|
6fe106eccc | ||
|
|
72de16b9bf | ||
|
|
05550da619 | ||
|
|
6607eb598f | ||
|
|
6027ada4d1 | ||
|
|
f5106616b5 | ||
|
|
b797cac700 | ||
|
|
f95a583a96 | ||
|
|
605b66fbb4 | ||
|
|
400f8510dc | ||
|
|
e81ea5a023 | ||
|
|
6b7acb7fa5 | ||
|
|
4f02995d0d | ||
|
|
2e29f9fabc | ||
|
|
d2c0128e01 | ||
|
|
0bbcb7866d | ||
|
|
10f3587c6a | ||
|
|
4f7e54a218 | ||
|
|
27ba6b3935 | ||
|
|
9bc46719d5 | ||
|
|
34ab1c370e | ||
|
|
8e16811c60 | ||
|
|
9ba72c53fa | ||
|
|
c5b6ec2840 | ||
|
|
33476ce562 | ||
|
|
a7753d4945 | ||
|
|
3773b596a3 | ||
|
|
d3880758b2 | ||
|
|
856ea7d37b | ||
|
|
0a3e015b22 | ||
|
|
60f11d70c3 | ||
|
|
117b4c0039 | ||
|
|
d10a9bc6de | ||
|
|
39b8117fcf | ||
|
|
2ababcca8b | ||
|
|
a9c573e59e | ||
|
|
0d2b750e37 | ||
|
|
da962b3169 | ||
|
|
4f8d983ab3 | ||
|
|
a5c1fb2064 | ||
|
|
bd7e402430 | ||
|
|
5957df54fd | ||
|
|
e3c98cd633 | ||
|
|
abd97421cb | ||
|
|
e5dac51840 | ||
|
|
6a2df211f9 | ||
|
|
6dc70452ef | ||
|
|
3a7a54c208 | ||
|
|
11134e8cd2 | ||
|
|
ce02cc2ead | ||
|
|
127ff7cf1e | ||
|
|
6583ee73ab | ||
|
|
e2bd8d74cb | ||
|
|
1f55d99d33 | ||
|
|
dc3b40e0e9 | ||
|
|
e3cb8291c5 | ||
|
|
a453eb5a8e | ||
|
|
0862894fa9 | ||
|
|
3ec7b4cbc5 | ||
|
|
1af724aba9 | ||
|
|
d1c93fe273 | ||
|
|
e94ac6f918 | ||
|
|
f612693b8f | ||
|
|
220d94c798 | ||
|
|
694cc69cc4 | ||
|
|
7901507f74 | ||
|
|
4afc385c16 | ||
|
|
90409769ad | ||
|
|
278a680f15 | ||
|
|
b52b0b635e | ||
|
|
75a72df7ae | ||
|
|
7322a8ed85 | ||
|
|
ae758cccef | ||
|
|
80f8bfb41a | ||
|
|
e9272827a8 | ||
|
|
8ab6f8d444 | ||
|
|
49f7fb1819 | ||
|
|
0c443c1efb | ||
|
|
d26b8450fa | ||
|
|
6740674304 | ||
|
|
6f408c9732 | ||
|
|
1eaa3e3e36 | ||
|
|
d207b2481f | ||
|
|
3f9126b8e8 | ||
|
|
8011d85dc4 | ||
|
|
3f13aed775 | ||
|
|
ed3883a36c | ||
|
|
5e815311f8 | ||
|
|
b1188be273 |
68 changed files with 2103 additions and 832 deletions
270
CHANGELOG.md
270
CHANGELOG.md
|
|
@ -5,9 +5,275 @@
|
|||
|
||||
---
|
||||
|
||||
# 🚀 **Current Release - ZaneyOS v2.5.8**
|
||||
# 🚀 **Current Release - ZaneyOS v2.6.1**
|
||||
|
||||
#### 📅 **Updated: December 26st, 2025**
|
||||
- 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
|
||||
|
|
|
|||
32
FAQ.es.md
32
FAQ.es.md
|
|
@ -139,6 +139,32 @@ 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
|
||||
|
|
@ -799,7 +825,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 && swww img ...`
|
||||
2. Comenta la línea `sleep 1.5 && awww img ...`
|
||||
3. Agrega nueva línea después de eso con `sleep 1 && wallsetter`
|
||||
|
||||
```json
|
||||
|
|
@ -807,13 +833,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 swww;sleep .5 && swww init"
|
||||
"killall -q awww;sleep .5 && awww init"
|
||||
"killall -q waybar;sleep .5 && waybar"
|
||||
"killall -q swaync;sleep .5 && swaync"
|
||||
"nm-applet --indicator"
|
||||
"lxqt-policykit-agent"
|
||||
"pypr &"
|
||||
#"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
"sleep 1 && wallsetter"
|
||||
];
|
||||
```
|
||||
|
|
|
|||
38
FAQ.md
38
FAQ.md
|
|
@ -228,6 +228,32 @@ 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>
|
||||
|
||||
|
|
@ -785,7 +811,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 && swww img ...`
|
||||
2. Comment out the line `sleep 1.5 && awww img ...`
|
||||
3. Add new line after that with `sleep 1 && wallsetter`
|
||||
|
||||
```json
|
||||
|
|
@ -793,13 +819,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 swww;sleep .5 && swww init"
|
||||
"killall -q awww;sleep .5 && awww init"
|
||||
"killall -q waybar;sleep .5 && waybar"
|
||||
"killall -q swaync;sleep .5 && swaync"
|
||||
"nm-applet --indicator"
|
||||
"lxqt-policykit-agent"
|
||||
"pypr &"
|
||||
#"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
"sleep 1 && wallsetter"
|
||||
];
|
||||
```
|
||||
|
|
@ -1976,7 +2002,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 && swww img ...`
|
||||
2. Comment out the line `sleep 1.5 && awww img ...`
|
||||
3. Add new line after that with `sleep 1 && wallsetter`
|
||||
|
||||
```json
|
||||
|
|
@ -1984,13 +2010,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 swww;sleep .5 && swww init"
|
||||
"killall -q awww;sleep .5 && awww init"
|
||||
"killall -q waybar;sleep .5 && waybar"
|
||||
"killall -q swaync;sleep .5 && swaync"
|
||||
"nm-applet --indicator"
|
||||
"lxqt-policykit-agent"
|
||||
"pypr &"
|
||||
#"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
#"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
|
||||
"sleep 1 && wallsetter"
|
||||
];
|
||||
```
|
||||
|
|
|
|||
27
README.es.md
27
README.es.md
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
## ZaneyOS 🟰 Mejores Configs ❄️ NixOS
|
||||
|
||||
\*\* Actualizado: 8 de deciembre de 2025
|
||||
\*\* Actualizado: 16 de enero de 2026
|
||||
|
||||
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,13 +47,6 @@ 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+.
|
||||
|
|
@ -89,13 +82,6 @@ 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
|
||||
|
|
@ -109,9 +95,7 @@ Hazte un favor y
|
|||
|
||||
- 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/2cRdBs8) para una respuesta potencialmente más rápida.
|
||||
|
||||
- No olvides revisar el [FAQ](https://zaney.org/wiki/zaneyos-2.3/faq)
|
||||
- Contáctanos también en [Discord](https://discord.gg/XhZmNTnhtp) para una respuesta potencialmente más rápida.
|
||||
|
||||
# Atajos de Hyprland
|
||||
|
||||
|
|
@ -240,7 +224,7 @@ Luego:
|
|||

|
||||
|
||||
```
|
||||
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/stable-2.4/install-zaneyos.sh)
|
||||
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)
|
||||
```
|
||||
|
||||
#### El proceso de instalación se verá así:
|
||||
|
|
@ -271,7 +255,7 @@ nix-shell -p git vim
|
|||
2. Clona este repo y entra:
|
||||
|
||||
```
|
||||
cd && git clone https://gitlab.com/zaney/zaneyos.git -b stable-2.4 --depth=1 ~/zaneyos
|
||||
cd && git clone https://gitlab.com/zaney/zaneyos.git -b main --depth=1 ~/zaneyos
|
||||
cd zaneyos
|
||||
|
||||
También puedes ejecutar el script `install.sh` si quieres.
|
||||
|
|
@ -311,8 +295,9 @@ 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://github.com/drewgrif
|
||||
- Justaguylinux https://codeberg.org/Justaguylinux
|
||||
- Jerry Starke https://github.com/JerrySM64
|
||||
|
||||
## ¡Disfruta!
|
||||
|
|
|
|||
44
README.md
44
README.md
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
## ZaneyOS 🟰 Best ❄️ NixOS Configs
|
||||
|
||||
\*\* Updated: December 26th,2025
|
||||
\*\* Updated: January 16th, 2026
|
||||
|
||||
ZaneyOS is a simple way of reproducing my configuration on any NixOS system.
|
||||
This includes the wallpaper, scripts, applications, config files, and more.
|
||||
|
|
@ -55,14 +55,6 @@ 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+.
|
||||
|
|
@ -102,13 +94,6 @@ 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?) &
|
||||
|
|
@ -123,11 +108,9 @@ Please do yourself a favor and
|
|||
|
||||
- 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/2cRdBs8) as well, for a potentially
|
||||
- Contact us on [Discord](https://discord.gg/XhZmNTnhtp) 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
|
||||
|
|
@ -262,7 +245,7 @@ Then:
|
|||

|
||||
|
||||
```
|
||||
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/stable-2.4/install-zaneyos.sh)
|
||||
sh <(curl -L https://gitlab.com/Zaney/zaneyos/-/raw/main/install-zaneyos.sh)
|
||||
```
|
||||
|
||||
#### The install process will look something like this:
|
||||
|
|
@ -293,7 +276,7 @@ nix-shell -p git vim
|
|||
2. Clone this repo & enter it:
|
||||
|
||||
```
|
||||
cd && git clone https://gitlab.com/zaney/zaneyos.git -b stable-2.4 --depth=1 ~/zaneyos
|
||||
cd && git clone https://gitlab.com/zaney/zaneyos.git -b main --depth=1 ~/zaneyos
|
||||
cd zaneyos
|
||||
|
||||
You can still run the `install.sh` script if you want to.
|
||||
|
|
@ -308,36 +291,33 @@ cp -r hosts/default hosts/<your-desired-hostname>
|
|||
git add .
|
||||
```
|
||||
|
||||
4. Edit `hosts/<your-desired-hostname>/variables.nix`.
|
||||
4. Edit `hosts/<your-desired-hostname>/variables.nix`
|
||||
```nixos-generate-config --show-hardware-config > hosts/<your-desired-hostname>/hardware.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
|
||||
|
||||
- Jakookit https://github.com/jakookit
|
||||
- Justaguylinux https://github.com/drewgrif
|
||||
- KoolDots https://github.com/LinuxBeginnings
|
||||
- JakKoolit https://github.com/Jakoolit
|
||||
- Justaguylinux https://codeberg.org/Justaguylinux
|
||||
- Jerry Starke https://github.com/JerrySM64
|
||||
|
||||
## Hope you enjoy!
|
||||
```
|
||||
|
|
|
|||
58
cheatsheets/add-gnome.md
Normal file
58
cheatsheets/add-gnome.md
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
# 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`
|
||||
425
flake.lock
generated
425
flake.lock
generated
|
|
@ -9,11 +9,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1751513446,
|
||||
"narHash": "sha256-pnRh5ysSgMSOQxvL82sNJRwD/CiSYWplrGRU2WLoNKQ=",
|
||||
"lastModified": 1777149230,
|
||||
"narHash": "sha256-pu6dVB6NrIj90rrqCgJ5pPlBzS76pW4WA6rE1rD1Gp8=",
|
||||
"owner": "kamadorueda",
|
||||
"repo": "alejandra",
|
||||
"rev": "c68bef57c1db3add865493d9cb741a14618bdc28",
|
||||
"rev": "8c4a4a572bee519b04e9bb9207e7d993f55ecb4f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -30,11 +30,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1766394679,
|
||||
"narHash": "sha256-huyKMNTvsqawI1mHocntSV4UcthHNfg21J9PQ3fByHg=",
|
||||
"lastModified": 1776411505,
|
||||
"narHash": "sha256-7HILfdTOvWzAMmfS3lQV3MDmVrr2Epj8x4c9F3mzOSE=",
|
||||
"owner": "jacopone",
|
||||
"repo": "antigravity-nix",
|
||||
"rev": "89f5f9da4a42f7af91cd941ed8d1b81e99c5007d",
|
||||
"rev": "9f31d28882185d30c0e3082fbc52dab1cd4e879f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -43,6 +43,28 @@
|
|||
"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"
|
||||
|
|
@ -81,11 +103,11 @@
|
|||
"base16-helix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1760703920,
|
||||
"narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
|
||||
"lastModified": 1776754714,
|
||||
"narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-helix",
|
||||
"rev": "d646af9b7d14bff08824538164af99d0c521b185",
|
||||
"rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -120,11 +142,11 @@
|
|||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730615655,
|
||||
"narHash": "sha256-2HBR3zLn57LXKNRtxBb+O+uDqHM4n0pz51rPayMl4cg=",
|
||||
"lastModified": 1768113825,
|
||||
"narHash": "sha256-f09fAifGPEuRrz1DFY910jexq0DaBuQBbq7WcxQIUgs=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "efeb50e2535b17ffd4a135e6e3e5fd60a525180c",
|
||||
"rev": "55106e04d905c6a7726d0f6be77ed39a99f66a61",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -136,11 +158,11 @@
|
|||
"firefox-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1764724327,
|
||||
"narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
|
||||
"lastModified": 1776136500,
|
||||
"narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=",
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
|
||||
"rev": "0f8ba203d475587f477e7ae12661bd8459e225b7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -150,6 +172,22 @@
|
|||
}
|
||||
},
|
||||
"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,
|
||||
|
|
@ -173,11 +211,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765835352,
|
||||
"narHash": "sha256-XswHlK/Qtjasvhd1nOa1e8MgZ8GS//jBoTqWtrS1Giw=",
|
||||
"lastModified": 1777988971,
|
||||
"narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "a34fae9c08a15ad73f295041fec82323541400a9",
|
||||
"rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -194,11 +232,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1760948891,
|
||||
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
|
||||
"lastModified": 1769996383,
|
||||
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
|
||||
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -215,11 +253,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763759067,
|
||||
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||
"lastModified": 1775087534,
|
||||
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -246,32 +284,14 @@
|
|||
"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": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"lastModified": 1767039857,
|
||||
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -299,20 +319,18 @@
|
|||
"gnome-shell": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"host": "gitlab.gnome.org",
|
||||
"lastModified": 1764524476,
|
||||
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
|
||||
"lastModified": 1767737596,
|
||||
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
|
||||
"owner": "GNOME",
|
||||
"repo": "gnome-shell",
|
||||
"rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
|
||||
"type": "gitlab"
|
||||
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"host": "gitlab.gnome.org",
|
||||
"owner": "GNOME",
|
||||
"ref": "gnome-49",
|
||||
"repo": "gnome-shell",
|
||||
"type": "gitlab"
|
||||
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
|
|
@ -322,16 +340,16 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1766553861,
|
||||
"narHash": "sha256-ZbnG01yA3O8Yr1vUm3+NQ2qk9iRhS5bloAnuXHHy7+c=",
|
||||
"lastModified": 1778503501,
|
||||
"narHash": "sha256-08L/X4/do7nET4rzidJ76eV/1r+mB7DchVpdPypsghc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e",
|
||||
"rev": "85ba629c79449badf4338117c27f0ee92b4b9f1a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.11",
|
||||
"ref": "master",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -344,11 +362,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765682243,
|
||||
"narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=",
|
||||
"lastModified": 1777594677,
|
||||
"narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03",
|
||||
"rev": "899c08a15beae5da51a5cecd6b2b994777a948da",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -357,41 +375,13 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ixx": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754860581,
|
||||
"narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "ixx",
|
||||
"rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"ref": "v0.1.1",
|
||||
"repo": "ixx",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"mnw": {
|
||||
"locked": {
|
||||
"lastModified": 1758834834,
|
||||
"narHash": "sha256-Y7IvY4F8vajZyp3WGf+KaiIVwondEkMFkt92Cr9NZmg=",
|
||||
"lastModified": 1777828893,
|
||||
"narHash": "sha256-gVWVnmyNr74BVKfhMMZDWkhx2699dhmZ2g0W8TTHtkk=",
|
||||
"owner": "Gerg-L",
|
||||
"repo": "mnw",
|
||||
"rev": "cfbc7d1cc832e318d0863a5fc91d940a96034001",
|
||||
"rev": "c1c0b544bfabe6669b5a6a0383ccb475fe60258b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -402,29 +392,33 @@
|
|||
},
|
||||
"ndg": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
"nixpkgs": [
|
||||
"nvf",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765720983,
|
||||
"narHash": "sha256-tWtukpABmux6EC/FuCJEgA1kmRjcRPtED44N+GGPq+4=",
|
||||
"lastModified": 1776882296,
|
||||
"narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=",
|
||||
"owner": "feel-co",
|
||||
"repo": "ndg",
|
||||
"rev": "f399ace8bb8e1f705dd8942b24d207aa4d75c936",
|
||||
"rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "feel-co",
|
||||
"ref": "refs/tags/v2.6.0",
|
||||
"repo": "ndg",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-flatpak": {
|
||||
"locked": {
|
||||
"lastModified": 1739444422,
|
||||
"narHash": "sha256-iAVVHi7X3kWORftY+LVbRiStRnQEob2TULWyjMS6dWg=",
|
||||
"lastModified": 1767983141,
|
||||
"narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=",
|
||||
"owner": "gmodena",
|
||||
"repo": "nix-flatpak",
|
||||
"rev": "5e54c3ca05a7c7d968ae1ddeabe01d2a9bc1e177",
|
||||
"rev": "440818969ac2cbd77bfe025e884d0aa528991374",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -436,31 +430,31 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1766622938,
|
||||
"narHash": "sha256-Eovt/DOCYjFFBZuYbbG9j5jhklzxdNbUGVYYxh3lG3s=",
|
||||
"lastModified": 1777954456,
|
||||
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5900a0a8850cbba98e16d5a7a6ed389402dfcf4f",
|
||||
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "release-25.11",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1764242076,
|
||||
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
|
||||
"owner": "NixOS",
|
||||
"lastModified": 1774386573,
|
||||
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
|
||||
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
|
|
@ -468,32 +462,16 @@
|
|||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1764081664,
|
||||
"narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "dc205f7b4fdb04c8b7877b43edb7b73be7730081",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixpkgs-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1764522689,
|
||||
"narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=",
|
||||
"lastModified": 1777268161,
|
||||
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f",
|
||||
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.11",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -504,20 +482,18 @@
|
|||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nuschtosSearch": "nuschtosSearch",
|
||||
"systems": "systems_3"
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1766455379,
|
||||
"narHash": "sha256-aajoMAR81hZX4PZho2Hvx8Y95M1MtgQHF/8CwyJquZ4=",
|
||||
"lastModified": 1778510615,
|
||||
"narHash": "sha256-cMNCx8mQTJnVkA6kt3B3ArGpCOOniYn644hH0mJHSsw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "35688970083857d26bf6c57934541eb906f96249",
|
||||
"rev": "fa8cd368d27cf9541f086485884928315abdcc8c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixvim",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -526,14 +502,15 @@
|
|||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
],
|
||||
"noctalia-qs": "noctalia-qs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1766626087,
|
||||
"narHash": "sha256-85SoTgGK4/QTcrrH73CW3JWxbARQMeKZO1tIdH2OarI=",
|
||||
"lastModified": 1778464608,
|
||||
"narHash": "sha256-tZRvyaKVP0DJ9DSFrr6K/l3X74Orfirk3Jjo7+br4Qs=",
|
||||
"owner": "noctalia-dev",
|
||||
"repo": "noctalia-shell",
|
||||
"rev": "c689d16dff078bc4efbc66336cb11c36fcdf7734",
|
||||
"rev": "761869a561548874fe7e293b157fd7841576b367",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -542,6 +519,29 @@
|
|||
"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 +554,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764773531,
|
||||
"narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
|
||||
"lastModified": 1777598946,
|
||||
"narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "1d9616689e98beded059ad0384b9951e967a17fa",
|
||||
"rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -567,44 +567,21 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nuschtosSearch": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
"ixx": "ixx",
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761730856,
|
||||
"narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nvf": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"mnw": "mnw",
|
||||
"ndg": "ndg",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"systems": "systems_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1766596669,
|
||||
"narHash": "sha256-9C72hpMDa99n4MbqZqsBkrBQZe+HEN9lnu7Sme67nmU=",
|
||||
"lastModified": 1778408907,
|
||||
"narHash": "sha256-QXjdRz5fssxAWDrtfBYxvjMtTqJzQAbnAmX3u22xCck=",
|
||||
"owner": "notashelf",
|
||||
"repo": "nvf",
|
||||
"rev": "ef1f22efaf4aa37ba9382a7d1807fa8ac9c097fd",
|
||||
"rev": "e86a92e4b29b499e5f1285b737b7612115103da9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -617,6 +594,7 @@
|
|||
"inputs": {
|
||||
"alejandra": "alejandra",
|
||||
"antigravity-nix": "antigravity-nix",
|
||||
"awww": "awww",
|
||||
"home-manager": "home-manager",
|
||||
"nix-flatpak": "nix-flatpak",
|
||||
"nixpkgs": "nixpkgs",
|
||||
|
|
@ -630,11 +608,11 @@
|
|||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1730555913,
|
||||
"narHash": "sha256-KNHZUlqsEibg3YtfUyOFQSofP8hp1HKoY+laoesBxRM=",
|
||||
"lastModified": 1768083390,
|
||||
"narHash": "sha256-TGWPJq2mXwxfAe83iZ18DIqXC4sOSj7RkW9b59h6Ox4=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "f17a5bbfd0969ba2e63a74505a80e55ecb174ed9",
|
||||
"rev": "e42e8ff582ba12a88b6845525d08b6428e6d0fb9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -644,6 +622,27 @@
|
|||
"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",
|
||||
|
|
@ -653,26 +652,25 @@
|
|||
"firefox-gnome-theme": "firefox-gnome-theme",
|
||||
"flake-parts": "flake-parts_3",
|
||||
"gnome-shell": "gnome-shell",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"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": 1766603740,
|
||||
"narHash": "sha256-F0BovrhzY/siRQYBRUFn2sZH7TJEuwetOJiGgKtITjk=",
|
||||
"lastModified": 1778104276,
|
||||
"narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "cfe89cabaae6ea1bbf80709bd53181494566a1b0",
|
||||
"rev": "18ed8d270231e067fe2739998479ed5d7c659c2c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "danth",
|
||||
"ref": "release-25.11",
|
||||
"ref": "master",
|
||||
"repo": "stylix",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -709,16 +707,16 @@
|
|||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"lastModified": 1689347949,
|
||||
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"repo": "default-linux",
|
||||
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"repo": "default-linux",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -752,23 +750,6 @@
|
|||
"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": {
|
||||
|
|
@ -788,11 +769,11 @@
|
|||
"tinted-schemes": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1763914658,
|
||||
"narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
|
||||
"lastModified": 1777041405,
|
||||
"narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "schemes",
|
||||
"rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
|
||||
"rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -804,11 +785,11 @@
|
|||
"tinted-tmux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1764465359,
|
||||
"narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
|
||||
"lastModified": 1777169200,
|
||||
"narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-tmux",
|
||||
"rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
|
||||
"rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -820,11 +801,11 @@
|
|||
"tinted-zed": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1764464512,
|
||||
"narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
|
||||
"lastModified": 1777463218,
|
||||
"narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-zed",
|
||||
"rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
|
||||
"rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -833,6 +814,28 @@
|
|||
"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",
|
||||
|
|
@ -841,11 +844,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1766359145,
|
||||
"narHash": "sha256-/HbtppVEx4kkyNWHE+4yQXwx413qNam4Tix4WiJakog=",
|
||||
"lastModified": 1778377655,
|
||||
"narHash": "sha256-wHsd+tesB3FtwUZbGjU/sWMZhw0m0yYBSXufMDVyQmc=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "5a0d4afa5a67a4e6df8116f97e27c10c9d47de6b",
|
||||
"rev": "101d6731d7b163ef4f6fab8c6eea7da4ddb52ec3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
14
flake.nix
14
flake.nix
|
|
@ -3,12 +3,12 @@
|
|||
|
||||
inputs = {
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-25.11";
|
||||
url = "github:nix-community/home-manager/master";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixpkgs.url = "github:nixos/nixpkgs/release-25.11";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nvf.url = "github:notashelf/nvf";
|
||||
stylix.url = "github:danth/stylix/release-25.11";
|
||||
stylix.url = "github:danth/stylix/master";
|
||||
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/nixos-25.11";
|
||||
url = "github:nix-community/nixvim";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
|
|
@ -36,6 +36,10 @@
|
|||
url = "github:kamadorueda/alejandra";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
awww = {
|
||||
url = "git+https://codeberg.org/LGFae/awww";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = {
|
||||
|
|
@ -72,7 +76,7 @@
|
|||
amd = mkNixosConfig "amd";
|
||||
nvidia = mkNixosConfig "nvidia";
|
||||
nvidia-laptop = mkNixosConfig "nvidia-laptop";
|
||||
amd-hybrid = mkNixosConfig "amd-hybrid";
|
||||
amd-nvidia-hybrid = mkNixosConfig "amd-nvidia-hybrid";
|
||||
intel = mkNixosConfig "intel";
|
||||
vm = mkNixosConfig "vm";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,7 +1,28 @@
|
|||
{pkgs, ...}: {
|
||||
{configs, pkgs, ...}: {
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
audacity
|
||||
discord
|
||||
nodejs
|
||||
# Add local pacakaged here
|
||||
];
|
||||
# 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";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{
|
||||
# Git Configuration ( For Pulling Software Repos )
|
||||
gitUsername = "Tyler Kelley";
|
||||
gitEmail = "tylerzanekelley@gmail.com";
|
||||
gitUsername = "Don Williams";
|
||||
gitEmail = "don.e.williams@gmail.com";
|
||||
|
||||
# Set Displau Manager
|
||||
# `tui` for Text login
|
||||
# `sddm` for graphical GUI (default)
|
||||
# SDDM background is set with stylixImage
|
||||
displayManager = "sddm";
|
||||
displayManager = "tui";
|
||||
|
||||
# Emable/disable bundled applications
|
||||
tmuxEnable = false;
|
||||
|
|
@ -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,6 +47,21 @@
|
|||
# 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`
|
||||
|
|
@ -69,8 +84,8 @@
|
|||
printEnable = false;
|
||||
|
||||
# Enable Thunar GUI File Manager
|
||||
# Yazi is default File Manager
|
||||
thunarEnable = false;
|
||||
# Yazi is alternate File Manager
|
||||
thunarEnable = true;
|
||||
|
||||
# Themes, waybar and animation.
|
||||
# Only uncomment your selection
|
||||
|
|
@ -80,17 +95,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;
|
||||
|
|
@ -109,12 +124,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;
|
||||
|
|
@ -123,7 +138,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;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +0,0 @@
|
|||
{...}: {
|
||||
imports = [
|
||||
./hardware.nix
|
||||
./host-packages.nix
|
||||
];
|
||||
}
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
{
|
||||
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;
|
||||
}
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
audacity
|
||||
discord
|
||||
nodejs
|
||||
obs-studio
|
||||
handbrake
|
||||
yt-dlp
|
||||
android-studio
|
||||
android-studio-tools
|
||||
android-tools
|
||||
];
|
||||
}
|
||||
|
|
@ -1,112 +0,0 @@
|
|||
{
|
||||
# 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";
|
||||
}
|
||||
|
|
@ -1,7 +1,4 @@
|
|||
{pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
audacity
|
||||
discord
|
||||
nodejs
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
doomEmacsEnable = true;
|
||||
|
||||
# Python development tools
|
||||
pythonEnable = true;
|
||||
pythonEnable = false;
|
||||
|
||||
# Hyprland Settings
|
||||
# Examples:
|
||||
|
|
@ -46,7 +46,22 @@
|
|||
# This does NOT install your browser
|
||||
# You need to install it by adding it to the `packages.nix`
|
||||
# or as a flatpak
|
||||
browser = "brave";
|
||||
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
|
||||
# };
|
||||
|
||||
# Available Options:
|
||||
# Kitty, ghostty, wezterm, aalacrity
|
||||
|
|
@ -84,8 +99,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;
|
||||
|
||||
|
|
@ -116,7 +131,7 @@
|
|||
# Set Animation style
|
||||
# Available options are:
|
||||
#animChoice = ../../modules/home/hyprland/animations-def.nix;
|
||||
animChoice = ../../modules/home/hyprland/animations-end4.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end4.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end4-slide.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-end-slide.nix;
|
||||
#animChoice = ../../modules/home/hyprland/animations-dynamic.nix;
|
||||
|
|
@ -124,7 +139,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;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,12 +1,10 @@
|
|||
{pkgs, ...}: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
nodejs
|
||||
atop
|
||||
bottom
|
||||
dua
|
||||
fd
|
||||
gping
|
||||
lunarvim
|
||||
luarocks
|
||||
mission-center
|
||||
resources
|
||||
|
|
|
|||
|
|
@ -38,6 +38,22 @@
|
|||
|
||||
# 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 = "";
|
||||
|
|
|
|||
|
|
@ -138,24 +138,51 @@ 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 lspci | grep -qi 'vga\|3d'; then
|
||||
if detect_vm; then
|
||||
has_vm=true
|
||||
fi
|
||||
|
||||
if lspci | grep -qi 'vga\|3d\|display'; then
|
||||
while read -r line; do
|
||||
if echo "$line" | grep -qi 'nvidia'; then
|
||||
if echo "$line" | grep -Eq '\[10de:'; then
|
||||
has_nvidia=true
|
||||
elif echo "$line" | grep -qi 'amd'; then
|
||||
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
|
||||
has_amd=true
|
||||
elif echo "$line" | grep -qi 'intel'; then
|
||||
has_intel=true
|
||||
elif echo "$line" | grep -qi 'virtio\|vmware'; then
|
||||
elif echo "$line" | grep -Eqi 'virtio|vmware|virtualbox|qxl|hyper-v|microsoft corporation|parallels|qemu|bochs|cirrus|svga|virtual'; then
|
||||
has_vm=true
|
||||
fi
|
||||
done < <(lspci | grep -i 'vga\|3d')
|
||||
done < <(lspci -nn | grep -i 'vga\|3d\|display')
|
||||
|
||||
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="hybrid"
|
||||
DETECTED_PROFILE="nvidia-laptop"
|
||||
elif $has_nvidia; then
|
||||
DETECTED_PROFILE="nvidia"
|
||||
elif $has_amd; then
|
||||
|
|
@ -183,9 +210,10 @@ 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
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
...
|
||||
}: {
|
||||
boot = {
|
||||
kernelPackages = pkgs.linuxPackages_zen;
|
||||
kernelPackages = pkgs.linuxPackages_latest;
|
||||
kernelModules = ["v4l2loopback"];
|
||||
extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
|
||||
kernel.sysctl = {"vm.max_map_count" = 2147483642;};
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -14,6 +14,11 @@
|
|||
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
|
||||
|
|
|
|||
|
|
@ -2,5 +2,13 @@
|
|||
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;
|
||||
});
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
{
|
||||
inputs,
|
||||
pkgs,
|
||||
host,
|
||||
...
|
||||
|
|
@ -30,7 +31,6 @@ in {
|
|||
seahorse.enable = true;
|
||||
fuse.userAllowOther = true;
|
||||
mtr.enable = true;
|
||||
adb.enable = true;
|
||||
hyprlock.enable = true;
|
||||
gnupg.agent = {
|
||||
enable = true;
|
||||
|
|
@ -39,9 +39,13 @@ in {
|
|||
};
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
|
||||
|
||||
environment.systemPackages = with pkgs;
|
||||
noctaliaPkgs
|
||||
[
|
||||
inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww
|
||||
]
|
||||
++ noctaliaPkgs
|
||||
++ [
|
||||
alejandra # nix formatter
|
||||
amfora # Fancy Terminal Browser For Gemini Protocol
|
||||
|
|
@ -51,14 +55,14 @@ 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
|
||||
gimp # Great Photo Editor
|
||||
gpu-screen-recorder # needed for nnoctalia-shell
|
||||
power-profiles-daemon # needed for noctalia-shell power cycle
|
||||
|
|
@ -75,7 +79,7 @@ in {
|
|||
mdcat # CLI markdown parser
|
||||
mpv # Incredible Video Player
|
||||
ncdu # Disk Usage Analyzer With Ncurses Interface
|
||||
nixfmt-rfc-style # Nix Formatter
|
||||
nixfmt # Nix Formatter
|
||||
nwg-displays # configure monitor configs via GUI
|
||||
nwg-drawer # Application launcher for wayland
|
||||
nwg-dock-hyprland # Dock for hyprland
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{pkgs, ...}: {
|
||||
programs = {
|
||||
steam = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
remotePlay.openFirewall = true;
|
||||
dedicatedServer.openFirewall = false;
|
||||
gamescopeSession.enable = true;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ in {
|
|||
};
|
||||
environment.variables = {
|
||||
NIXOS_OZONE_WL = "1";
|
||||
ZANEYOS_VERSION = "2.5.8";
|
||||
ZANEYOS_VERSION = "2.6.1";
|
||||
ZANEYOS = "true";
|
||||
};
|
||||
console.keyMap = "${consoleKeyMap}";
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ in {
|
|||
programs = {
|
||||
thunar = {
|
||||
enable = thunarEnable;
|
||||
plugins = with pkgs.xfce; [
|
||||
thunar-archive-plugin
|
||||
thunar-volman
|
||||
plugins = [
|
||||
pkgs.thunar-archive-plugin
|
||||
pkgs.thunar-volman
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,22 +10,23 @@ 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 (amdgpuBusId)";
|
||||
description = "PCI Bus ID for AMD iGPU";
|
||||
};
|
||||
# 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 (nvidiaBusId)";
|
||||
description = "PCI Bus ID for NVIDIA dGPU";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
# Enforce kernel 6.12 when this hybrid config is selected
|
||||
boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12;
|
||||
# Not sure this is still neeeded but leaving just in case
|
||||
# boot.kernelPackages = lib.mkForce pkgs.linuxPackages_6_12;
|
||||
|
||||
services.xserver.videoDrivers = ["nvidia"];
|
||||
|
||||
|
|
@ -47,8 +48,8 @@ in {
|
|||
};
|
||||
|
||||
# Wire from options
|
||||
amdgpuBusId = cfg.amdgpuBusID;
|
||||
nvidiaBusId = cfg.nvidiaBusID;
|
||||
amdgpuBusId = cfg.amdgpuBusId;
|
||||
nvidiaBusId = cfg.nvidiaBusId;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
in {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
signing.format = null;
|
||||
|
||||
settings = {
|
||||
user = {
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ in {
|
|||
./wlogout
|
||||
./xdg.nix
|
||||
./yazi
|
||||
./zen-browser.nix
|
||||
#./zen-browser.nix
|
||||
./zoxide.nix
|
||||
./zsh
|
||||
]
|
||||
|
|
|
|||
|
|
@ -9,7 +9,8 @@ in {
|
|||
jsonnet-language-server
|
||||
luaformatter
|
||||
lua-language-server
|
||||
marksman
|
||||
#marksman # causes dotnet and dotnet-swr to build which takes hours
|
||||
multimarkdown
|
||||
taplo
|
||||
nil
|
||||
jq-lsp
|
||||
|
|
|
|||
|
|
@ -44,6 +44,9 @@
|
|||
settings = {
|
||||
flavour = "mocha";
|
||||
transparent_background = false;
|
||||
integrations = {
|
||||
lualine = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -53,7 +56,7 @@
|
|||
lualine = {
|
||||
enable = true;
|
||||
settings = {
|
||||
options = {theme = "catppuccin";};
|
||||
options = {theme = "auto";};
|
||||
};
|
||||
};
|
||||
bufferline.enable = true;
|
||||
|
|
@ -74,11 +77,16 @@
|
|||
treesitter-context.enable = false;
|
||||
|
||||
# Project management
|
||||
project-nvim.enable = true;
|
||||
project-nvim = {
|
||||
enable = true;
|
||||
settings = {
|
||||
history.save_dir = "${config.home.homeDirectory}/.local/share/nvim/project_nvim";
|
||||
};
|
||||
};
|
||||
|
||||
# Notifications and UI polish
|
||||
notify.enable = true;
|
||||
noice.enable = true;
|
||||
noice.enable = false;
|
||||
|
||||
# Startup dashboard
|
||||
alpha = {
|
||||
|
|
@ -174,8 +182,8 @@
|
|||
html.enable = true;
|
||||
cssls.enable = true;
|
||||
clangd.enable = true;
|
||||
zls.enable = true;
|
||||
marksman.enable = true;
|
||||
zls.enable = false;
|
||||
marksman.enable = false;
|
||||
hyprls.enable = true;
|
||||
# hyprls is optional; keep tools available via extraPackages
|
||||
};
|
||||
|
|
@ -326,13 +334,14 @@
|
|||
lazygit
|
||||
nil
|
||||
hyprls
|
||||
nodePackages.typescript-language-server
|
||||
nodePackages.typescript
|
||||
typescript-language-server
|
||||
typescript
|
||||
vscode-langservers-extracted
|
||||
pyright
|
||||
lua-language-server
|
||||
zls
|
||||
marksman
|
||||
multimarkdown
|
||||
clang-tools
|
||||
prettierd
|
||||
stylua
|
||||
|
|
@ -340,6 +349,8 @@
|
|||
nixpkgs-fmt
|
||||
figlet
|
||||
toilet
|
||||
bash-language-server
|
||||
tailwindcss-language-server
|
||||
];
|
||||
|
||||
# Diagnostic UI and notify background tweaks
|
||||
|
|
@ -449,4 +460,9 @@
|
|||
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
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -90,4 +90,5 @@ in {
|
|||
};
|
||||
};
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
{pkgs, ...}: {
|
||||
{config, pkgs, ...}: {
|
||||
gtk = {
|
||||
gtk4.theme = null;
|
||||
iconTheme = {
|
||||
name = "Papirus-Dark";
|
||||
package = pkgs.papirus-icon-theme;
|
||||
|
|
|
|||
|
|
@ -10,17 +10,18 @@
|
|||
noctaliaBind =
|
||||
if barChoice == "noctalia"
|
||||
then [
|
||||
"$modifier,D, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle"
|
||||
"$modifier SHIFT,Return, Noctalia Launcher, exec, qs -c noctalia-shell ipc call launcher toggle"
|
||||
"$modifier,M, Noctalia Notifications, exec, qs -c noctalia-shell ipc call notifications toggleHistory"
|
||||
"$modifier,V, Noctalia Clipboard, exec, qs -c noctalia-shell ipc call launcher clipboard"
|
||||
"$modifier ALT,P, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle"
|
||||
"$modifier SHIFT,comma, Noctalia Settings, exec, qs -c noctalia-shell ipc call settings toggle"
|
||||
"$modifier ALT,L, Noctalia Lock Screen, exec, qs -c noctalia-shell ipc call sessionMenu lockAndSuspend"
|
||||
"$modifier SHIFT,W, Noctalia Wallpaper, exec, qs -c noctalia-shell ipc call wallpaper toggle"
|
||||
"$modifier,X, Noctalia Power Menu, exec, qs -c noctalia-shell ipc call sessionMenu toggle"
|
||||
"$modifier,C, Noctalia Control Center, exec, qs -c noctalia-shell ipc call controlCenter toggle"
|
||||
"$modifier CTRL,R, Noctalia Screen Recorder, exec, qs -c noctalia-shell ipc call screenRecorder toggle"
|
||||
"$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 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 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"
|
||||
]
|
||||
else [];
|
||||
# Rofi launcher bindings (only included when barChoice != "noctalia")
|
||||
|
|
@ -53,7 +54,7 @@ in {
|
|||
# ============= APPLICATION LAUNCHERS =============
|
||||
"$modifier,K, Keybinds Search Tool, exec, qs-keybinds"
|
||||
"$modifier CTRL,C, Cheatsheets Viewer, exec, qs-cheatsheets"
|
||||
"$modifier SHIFT,K, Legacy Keybinds Menu, exec, list-keybinds"
|
||||
"$modifier SHIFT,K, Keybinds Search Tool, exec, qs-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"
|
||||
|
|
@ -69,16 +70,22 @@ 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, pypr toggle term"
|
||||
"$modifier SHIFT,T, Dropdown Terminal, exec, sh -lc 'DropTerminal'"
|
||||
"$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, togglesplit,"
|
||||
"$modifier SHIFT,I, Toggle Split, layoutmsg, togglesplit"
|
||||
"$modifier,F, Maximize, fullscreen,"
|
||||
"$modifier SHIFT,F, Toggle Floating, togglefloating,"
|
||||
"$modifier ALT,F, Float All Windows, workspaceopt, allfloat"
|
||||
"$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 SHIFT,C, Exit/Logout of Hyprland, exit,"
|
||||
# ============= WINDOW MOVEMENT (ARROW KEYS) =============
|
||||
"$modifier SHIFT,left, Move Left, movewindow, l"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ in {
|
|||
./hypridle.nix
|
||||
./hyprland.nix
|
||||
./hyprlock.nix
|
||||
./pyprland.nix
|
||||
./windowrules.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,19 +13,19 @@
|
|||
"pkill waybar"
|
||||
"killall -q swaync"
|
||||
"pkill swaync"
|
||||
"noctalia-shell"
|
||||
"noctalia-shell &"
|
||||
]
|
||||
else [];
|
||||
# Waybar-specific startup commands
|
||||
waybarExec =
|
||||
if barChoice != "noctalia"
|
||||
then [
|
||||
"killall -q swww;sleep .5 && swww-daemon"
|
||||
"killall -q awww;sleep .5 && awww-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 swww) >/dev/null 2>&1 || true'"
|
||||
"sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend awww) >/dev/null 2>&1 || true'"
|
||||
]
|
||||
else [];
|
||||
in {
|
||||
|
|
@ -34,12 +34,11 @@ 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;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
services = {
|
||||
hypridle = {
|
||||
enable = true;
|
||||
systemdTarget = "hyprland-session.target";
|
||||
settings = {
|
||||
general = {
|
||||
after_sleep_cmd = "hyprctl dispatch dpms on";
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@
|
|||
hyprKbVariant = variantFinal;
|
||||
in {
|
||||
home.packages = with pkgs; [
|
||||
swww
|
||||
grim
|
||||
slurp
|
||||
wl-clipboard
|
||||
|
|
@ -52,6 +51,7 @@ in {
|
|||
ydotool
|
||||
hyprpolkitagent
|
||||
hyprshot
|
||||
hyprshutdown
|
||||
hyprpicker
|
||||
#hyprland-qtutils # needed for banners and ANR messages
|
||||
];
|
||||
|
|
@ -108,9 +108,18 @@ 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;
|
||||
|
|
@ -124,11 +133,11 @@ in {
|
|||
layers_hog_keyboard_focus = true;
|
||||
initial_workspace_tracking = 0;
|
||||
mouse_move_enables_dpms = true;
|
||||
key_press_enables_dpms = false;
|
||||
key_press_enables_dpms = true;
|
||||
disable_hyprland_logo = true;
|
||||
disable_splash_rendering = true;
|
||||
enable_swallow = false;
|
||||
vfr = true; # Variable Frame Rate
|
||||
# vfr = true; # Variable Frame Rate Not supported post v0.54.3
|
||||
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
|
||||
|
|
@ -139,9 +148,15 @@ in {
|
|||
};
|
||||
|
||||
dwindle = {
|
||||
pseudotile = true;
|
||||
pseudotile = false;
|
||||
preserve_split = true;
|
||||
force_split = 2;
|
||||
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;
|
||||
};
|
||||
|
||||
decoration = {
|
||||
|
|
@ -182,9 +197,16 @@ in {
|
|||
};
|
||||
|
||||
master = {
|
||||
new_status = "master";
|
||||
new_on_top = 1;
|
||||
mfact = 0.5;
|
||||
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;
|
||||
};
|
||||
|
||||
# Ensure Xwayland windows render at integer scale; compositor scales them
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
{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"
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,130 +1,436 @@
|
|||
{host, ...}: let
|
||||
inherit
|
||||
(import ../../../hosts/${host}/variables.nix)
|
||||
extraMonitorSettings
|
||||
;
|
||||
in {
|
||||
_: {
|
||||
wayland.windowManager.hyprland = {
|
||||
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)$"
|
||||
extraConfig = ''
|
||||
# Set float and centering for dialog boxes
|
||||
rule = float(true), match:modal:1
|
||||
rule = center(true), match:modal:1
|
||||
|
||||
# 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 = Resolve
|
||||
match:class = ^(\bresolve\b)$
|
||||
match:xwayland = 1
|
||||
no_blur = on
|
||||
}
|
||||
|
||||
# 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 = Thunar
|
||||
match:class = ^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$
|
||||
tag = +file-manager
|
||||
}
|
||||
|
||||
# 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)$"
|
||||
];
|
||||
};
|
||||
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
|
||||
}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -102,18 +102,18 @@ has_intel=false
|
|||
has_amd=false
|
||||
has_vm=false
|
||||
|
||||
if lspci | grep -qi 'vga\|3d'; then
|
||||
if lspci | grep -qi 'vga\|3d\|display'; then
|
||||
while read -r line; do
|
||||
if echo "$line" | grep -qi 'nvidia'; then
|
||||
has_nvidia=true
|
||||
elif echo "$line" | grep -qi 'amd'; then
|
||||
elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; 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')
|
||||
done < <(lspci | grep -i 'vga\|3d\|display')
|
||||
|
||||
if $has_vm; then
|
||||
DETECTED_PROFILE="vm"
|
||||
|
|
|
|||
|
|
@ -1,53 +1,29 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
system = pkgs.stdenv.hostPlatform.system;
|
||||
noctaliaPath = inputs.noctalia.packages.${system}.default;
|
||||
configDir = "${noctaliaPath}/share/noctalia-shell";
|
||||
noctaliaPkg = inputs.noctalia.packages.${system}.default;
|
||||
configDir = "${noctaliaPkg}/share/noctalia-shell";
|
||||
in {
|
||||
# Install the Noctalia package for this user (CLI, assets, etc.)
|
||||
# Install the Noctalia package
|
||||
home.packages = [
|
||||
noctaliaPath
|
||||
noctaliaPkg
|
||||
pkgs.quickshell # Ensure quickshell is available for the service
|
||||
];
|
||||
|
||||
# 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.
|
||||
# Seed the configuration
|
||||
home.activation.seedNoctaliaShellCode = lib.hm.dag.entryAfter ["writeBoundary"] ''
|
||||
set -eu
|
||||
DEST="$HOME/.config/quickshell/noctalia-shell"
|
||||
SRC="${configDir}"
|
||||
|
||||
if [ ! -d "$DEST" ]; then
|
||||
mkdir -p "$HOME/.config/quickshell"
|
||||
cp -R "$SRC" "$DEST"
|
||||
chmod -R u+rwX "$DEST"
|
||||
$DRY_RUN_CMD mkdir -p "$HOME/.config/quickshell"
|
||||
$DRY_RUN_CMD cp -R "$SRC" "$DEST"
|
||||
$DRY_RUN_CMD chmod -R u+rwX "$DEST"
|
||||
fi
|
||||
'';
|
||||
|
||||
# Enable the noctalia-shell systemd user service
|
||||
systemd.user.services.noctalia-shell = {
|
||||
Unit = {
|
||||
Description = "Noctalia Shell - Wayland desktop shell";
|
||||
Documentation = "https://docs.noctalia.dev/docs";
|
||||
PartOf = ["graphical-session.target"];
|
||||
After = ["graphical-session-pre.target"];
|
||||
Wants = ["graphical-session-target"];
|
||||
};
|
||||
Service = {
|
||||
ExecStart = "${pkgs.quickshell}/bin/quickshell --path %h/.config/quickshell/noctalia-shell";
|
||||
Restart = "always";
|
||||
RestartSec = 5;
|
||||
Environment = [
|
||||
"QML_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml"
|
||||
"QML2_IMPORT_PATH=${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtbase}/lib/qt-6/qml"
|
||||
];
|
||||
};
|
||||
Install = {
|
||||
WantedBy = ["graphical-session.target"];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
446
modules/home/scripts/DropTerminal.nix
Normal file
446
modules/home/scripts/DropTerminal.nix
Normal file
|
|
@ -0,0 +1,446 @@
|
|||
{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
|
||||
''
|
||||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
username,
|
||||
profile,
|
||||
...
|
||||
|
|
@ -17,8 +18,9 @@
|
|||
(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;
|
||||
inherit pkgs inputs;
|
||||
inherit username;
|
||||
})
|
||||
(import ./web-search.nix {inherit pkgs;})
|
||||
|
|
@ -31,13 +33,16 @@
|
|||
(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;})
|
||||
(import ./qs-wallpapers-restore.nix {inherit pkgs;})
|
||||
(import ./qs-wallpapers-apply.nix {inherit pkgs inputs;})
|
||||
(import ./qs-wallpapers-restore.nix {inherit pkgs inputs;})
|
||||
(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 = [
|
||||
|
|
@ -45,4 +50,15 @@
|
|||
];
|
||||
})
|
||||
];
|
||||
|
||||
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"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ pkgs.writeShellScriptBin "docs-parser" ''
|
|||
Usage: docs-parser [MODE] [CATEGORY] [LANGUAGE]
|
||||
|
||||
MODE: files|content
|
||||
CATEGORY: AI|Hyprpanel|Zed|ddubsos|etc.
|
||||
CATEGORY: AI|Zed|ddubsos|etc.
|
||||
LANGUAGE: en|es
|
||||
|
||||
Examples:
|
||||
|
|
|
|||
85
modules/home/scripts/hyprland-change-layout.nix
Normal file
85
modules/home/scripts/hyprland-change-layout.nix
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
{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
|
||||
''
|
||||
11
modules/home/scripts/hyprland-float-all.nix
Normal file
11
modules/home/scripts/hyprland-float-all.nix
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
{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
|
||||
''
|
||||
|
|
@ -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 ~ /(swww|wallpaper)/) category="wallpaper"
|
||||
else if (low ~ /(awww|wallpaper)/) category="wallpaper"
|
||||
else if (low ~ /(playerctl|wpctl|pactl|pamixer|brightnessctl|volume|brightness)/) category="media"
|
||||
else category="app"
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ pkgs.writeShellScriptBin "qs-docs" ''
|
|||
Usage: qs-docs [options]
|
||||
|
||||
Options:
|
||||
-c CATEGORY Category to display (AI|Hyprpanel|Zed|ddubsos) (default: AI)
|
||||
-c CATEGORY Category to display (AI|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", "Hyprpanel", "Zed", "ddubsos"];
|
||||
win.availableCategories = ["AI", "Zed", "ddubsos"];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ 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
|
||||
|
|
@ -66,8 +65,7 @@ pkgs.writeShellScriptBin "qs-panels" ''
|
|||
model: [
|
||||
{ key: "noctalia", label: "Noctalia" },
|
||||
{ key: "dms", label: "DMS" },
|
||||
{ key: "waybar", label: "Waybar" },
|
||||
{ key: "hyprpanel",label: "Hyprpanel" }
|
||||
{ key: "waybar", label: "Waybar" }
|
||||
]
|
||||
delegate: Rectangle {
|
||||
width: 180; height: 52
|
||||
|
|
@ -149,7 +147,6 @@ 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
|
||||
''
|
||||
|
|
|
|||
|
|
@ -67,8 +67,8 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers-apply" ''
|
|||
|
||||
case "$BACKEND" in
|
||||
mpvpaper)
|
||||
log "Stopping swww-daemon, hyprpaper, mpvpaper if running"
|
||||
${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
|
||||
log "Stopping awww-daemon, hyprpaper, mpvpaper if running"
|
||||
${pkgs.procps}/bin/pkill -x awww-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
|
||||
disown || true
|
||||
log "mpvpaper launched"
|
||||
exit 0
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -509,6 +509,8 @@ 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"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{pkgs}:
|
||||
{pkgs, inputs}: let
|
||||
awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww;
|
||||
in
|
||||
pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
|
@ -28,7 +30,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
|
|||
# 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="swww"
|
||||
BACKEND="awww"
|
||||
else
|
||||
BACKEND="mpvpaper"
|
||||
fi
|
||||
|
|
@ -96,8 +98,8 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
|
|||
case "$BACKEND" in
|
||||
mpvpaper)
|
||||
# Stop other wallpaper daemons to avoid conflicts
|
||||
log "Stopping swww-daemon, hyprpaper, mpvpaper if running"
|
||||
${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
|
||||
log "Stopping awww-daemon, hyprpaper, mpvpaper if running"
|
||||
${pkgs.procps}/bin/pkill -x awww-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
|
||||
|
|
@ -115,21 +117,21 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
|
|||
-o "$MPV_OPTS" \
|
||||
'*' "$sel" >/dev/null 2>&1 &
|
||||
fi
|
||||
disown
|
||||
disown || true
|
||||
log "mpvpaper launched"
|
||||
exit 0
|
||||
;;
|
||||
|
||||
swww)
|
||||
awww)
|
||||
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || 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
|
||||
# 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
|
||||
# wait briefly for the daemon to be ready
|
||||
for i in $(${pkgs.coreutils}/bin/seq 1 50); do
|
||||
if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then
|
||||
log "swww-daemon ready"
|
||||
if ${awwwPkg}/bin/awww query >/dev/null 2>&1; then
|
||||
log "awww-daemon ready"
|
||||
break
|
||||
fi
|
||||
${pkgs.coreutils}/bin/sleep 0.1
|
||||
|
|
@ -139,26 +141,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_swww_img() {
|
||||
run_awww_img() {
|
||||
if [ -n "''${WALLPAPER_RESIZE:-}" ]; then
|
||||
log "swww img --resize ''${WALLPAPER_RESIZE} $sel"
|
||||
${pkgs.swww}/bin/swww img --resize "''${WALLPAPER_RESIZE}" "$sel"
|
||||
log "awww img --resize ''${WALLPAPER_RESIZE} $sel"
|
||||
${awwwPkg}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$sel"
|
||||
return $?
|
||||
fi
|
||||
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"
|
||||
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"
|
||||
}
|
||||
|
||||
# Niri: generic apply has proven to work more reliably than per-output here
|
||||
run_swww_img
|
||||
run_awww_img
|
||||
exit $?
|
||||
;;
|
||||
|
||||
hyprpaper)
|
||||
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
|
||||
# Generate a minimal hyprpaper config and start it
|
||||
_TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d)
|
||||
_CFG="$_TMPDIR/hyprpaper.conf"
|
||||
|
|
@ -177,7 +179,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
|
|||
else
|
||||
${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 &
|
||||
fi
|
||||
disown
|
||||
disown || true
|
||||
exit 0
|
||||
;;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{pkgs}:
|
||||
{pkgs, inputs}: let
|
||||
awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww;
|
||||
in
|
||||
pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
|
||||
#!/usr/bin/env bash
|
||||
set -euo pipefail
|
||||
|
|
@ -30,8 +32,8 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
|
|||
hyprlock-update-wallpaper-link >/dev/null 2>&1 || true
|
||||
fi
|
||||
|
||||
# Order: recorded backend first, then swww -> hyprpaper -> mpvpaper -> waypaper
|
||||
ORDER_DEFAULT="swww,hyprpaper,mpvpaper,waypaper"
|
||||
# Order: recorded backend first, then awww -> hyprpaper -> mpvpaper -> waypaper
|
||||
ORDER_DEFAULT="awww,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')
|
||||
|
|
@ -50,48 +52,35 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
|
|||
return 1
|
||||
}
|
||||
|
||||
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
|
||||
start_awww() {
|
||||
|
||||
# Stop conflicting daemons if we intend to use swww
|
||||
# Stop conflicting daemons if we intend to use awww
|
||||
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || 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
|
||||
if ! ${awwwPkg}/bin/awww query >/dev/null 2>&1; then
|
||||
log "Starting awww-daemon"
|
||||
${awwwPkg}/bin/awww-daemon >/dev/null 2>&1 & disown || true
|
||||
for i in $(${pkgs.coreutils}/bin/seq 1 50); do
|
||||
if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then break; fi
|
||||
if ${awwwPkg}/bin/awww 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 "swww img --resize ''${WALLPAPER_RESIZE} $PATH_J"
|
||||
${pkgs.swww}/bin/swww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J"
|
||||
log "awww img --resize ''${WALLPAPER_RESIZE} $PATH_J"
|
||||
${awwwPkg}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J"
|
||||
else
|
||||
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"
|
||||
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"
|
||||
fi
|
||||
}
|
||||
|
||||
start_hyprpaper() {
|
||||
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
|
||||
_TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d)
|
||||
_CFG="$_TMPDIR/hyprpaper.conf"
|
||||
{
|
||||
|
|
@ -103,21 +92,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
|
||||
${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 & disown || true
|
||||
}
|
||||
|
||||
start_mpvpaper() {
|
||||
${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
|
||||
${pkgs.procps}/bin/pkill -x awww-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
|
||||
${pkgs.mpvpaper}/bin/mpvpaper -o "$MPV_OPTS" '*' "$PATH_J" >/dev/null 2>&1 & disown || true
|
||||
}
|
||||
|
||||
start_waypaper() {
|
||||
if command -v waypaper >/dev/null 2>&1; then
|
||||
log "Trying waypaper"
|
||||
waypaper --backend swww --wallpaper "$PATH_J" >/dev/null 2>&1 || return 1
|
||||
waypaper --backend awww --wallpaper "$PATH_J" >/dev/null 2>&1 || return 1
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
|
|
@ -126,7 +115,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
|
|||
IFS=',' read -r -a tools <<<"$ORDER"
|
||||
for t in "''${tools[@]}"; do
|
||||
case "$t" in
|
||||
swww) start_swww && exit 0 || log "swww failed; falling back" ;;
|
||||
awww) start_awww && exit 0 || log "awww 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" ;;
|
||||
|
|
|
|||
|
|
@ -361,6 +361,8 @@ 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"
|
||||
|
|
|
|||
|
|
@ -232,6 +232,8 @@ 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"
|
||||
|
|
|
|||
54
modules/home/scripts/restart.noctalia
Normal file
54
modules/home/scripts/restart.noctalia
Normal file
|
|
@ -0,0 +1,54 @@
|
|||
#!/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
|
||||
24
modules/home/scripts/restart.noctalia.nix
Normal file
24
modules/home/scripts/restart.noctalia.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{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" "$@"
|
||||
''
|
||||
|
|
@ -1,4 +1,6 @@
|
|||
{pkgs, ...}:
|
||||
{pkgs, inputs, ...}: let
|
||||
awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww;
|
||||
in
|
||||
pkgs.writeShellScriptBin "wallsetter" ''
|
||||
|
||||
TIMEOUT=720
|
||||
|
|
@ -17,7 +19,7 @@ pkgs.writeShellScriptBin "wallsetter" ''
|
|||
|
||||
PREVIOUS=$WALLPAPER
|
||||
|
||||
${pkgs.swww}/bin/swww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60
|
||||
${awwwPkg}/bin/awww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60
|
||||
sleep $TIMEOUT
|
||||
done
|
||||
''
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ in
|
|||
|
||||
# --- Configuration ---
|
||||
PROJECT="zaneyos" #ddubos or zaneyos
|
||||
PROFILE="${profile}"
|
||||
PROFILE_DEFAULT="${profile}"
|
||||
BACKUP_FILES_STR="${backupFilesString}"
|
||||
VERSION="1.0.2"
|
||||
FLAKE_NIX_PATH="$HOME/$PROJECT/flake.nix"
|
||||
|
|
@ -138,6 +138,13 @@ 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
|
||||
|
|
@ -230,32 +237,45 @@ 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 | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d'; then
|
||||
if ${pkgs.pciutils}/bin/lspci -nn | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d\|display'; then
|
||||
while read -r line; do
|
||||
if echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'nvidia'; then
|
||||
if echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[10de:'; then
|
||||
has_nvidia=true
|
||||
elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'amd'; then
|
||||
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
|
||||
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'; then
|
||||
elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware\|virtualbox\|qxl\|hyper-v\|microsoft corporation\|parallels\|qemu\|bochs\|cirrus\|svga\|virtual'; then
|
||||
has_vm=true
|
||||
fi
|
||||
done < <(${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d')
|
||||
done < <(${pkgs.pciutils}/bin/lspci -nn | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d\|display')
|
||||
|
||||
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
|
||||
|
|
@ -336,6 +356,10 @@ 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
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
_: {
|
||||
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;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
{config, ...}: {
|
||||
home.file."${config.xdg.configHome}/swaync/images/catppuccin-macchiato.png".source =
|
||||
./swaync/images/catppuccin-macchiato.png;
|
||||
services.swaync = {
|
||||
enable = true;
|
||||
settings = {
|
||||
|
|
|
|||
BIN
modules/home/swaync/images/catppuccin-macchiato.png
Normal file
BIN
modules/home/swaync/images/catppuccin-macchiato.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 25 KiB |
|
|
@ -154,7 +154,7 @@ in {
|
|||
persistent-workspaces = {
|
||||
"*" = 10;
|
||||
};
|
||||
};)
|
||||
};
|
||||
|
||||
# Integrated CAVA visualizer using the inline script above
|
||||
"custom/cava_mviz" = {
|
||||
|
|
|
|||
|
|
@ -1,9 +1,40 @@
|
|||
{pkgs, ...}: {
|
||||
{pkgs, host, lib, ...}: let
|
||||
vars = import ../../hosts/${host}/variables.nix;
|
||||
in {
|
||||
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;
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
profile,
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
|
|
@ -10,6 +11,7 @@
|
|||
|
||||
programs.zsh = {
|
||||
enable = true;
|
||||
dotDir = config.home.homeDirectory;
|
||||
autosuggestion.enable = true;
|
||||
syntaxHighlighting = {
|
||||
enable = true;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
Loading…
Add table
Add a link
Reference in a new issue