Compare commits

..

30 commits

Author SHA1 Message Date
dwilliams
fb12d82468 Updated flake 2026-05-11 14:36:06 -04:00
Don Williams
93c05ad88e Added cpufreq to default but left disabled
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   hosts/default/host-packages.nix
2026-05-09 14:48:57 -04:00
dwilliams
927e38e5dc Updated flake 2026-05-08 10:59:48 -04:00
dwilliams
b2165ec35e Updated flake to resolve install issues (hopefully)
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   flake.lock
2026-05-05 15:43:09 -04:00
dwilliams
145d98da1d Updated FLAKE 2026-05-01 11:28:53 -04:00
Don Williams
60b97fe42c Added override for openssl-v.1.1.1w alert
discord and direnv use older pkgs that call it, it's EOL

 On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   modules/core/packages.nix
	modified:   modules/home/editors/vscode.nix
2026-05-01 11:22:23 -04:00
dwilliams
affa1f0ce6 Updated CHANGELOG 2026-04-30 12:58:25 -04:00
dwilliams
6fe106eccc Upd: flake, removed discord, disabled zen browser
Discord uses a version of electron that uses openssl 1.1.1w
Which is end-of-life and nixos flags as insecure
Discord will have to either update or ppl can use vesktop
or other alternative clients

Disabled zen broswer in `zaneyos/modules/home/default.nix``

It needs to be enabled via a variable

 On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   flake.lock
	modified:   hosts/zaneyos-24-vm/variables.nix
	modified:   modules/core/packages.nix
	modified:   modules/home/default.nix
2026-04-30 12:52:18 -04:00
Don Williams
72de16b9bf Trying to fix project history 2026-04-25 05:25:06 -04:00
Don Williams
05550da619 Fixed projects error on startup
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   modules/home/editors/nixvim.nix
2026-04-25 05:18:58 -04:00
Don Williams
6607eb598f set projects.nvim to local writable dir for history
On branch main
 Your branch is behind 'origin/main' by 1 commit, and can be fast-forwarded.
   (use "git pull" to update your local branch)

 Changes to be committed:
	modified:   modules/home/editors/nixvim.nix
2026-04-25 05:13:35 -04:00
dwilliams
6027ada4d1 Upd flake, changed to latest kernel, disable HL vfr
Linux 7.0 is better kernel than current 6.19_zen

VTR isn't supported in hyprland post v0.54.3

 On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   flake.lock
	modified:   modules/core/boot.nix
	modified:   modules/home/hyprland/hyprland.nix
2026-04-25 03:21:01 -04:00
dwilliams
f5106616b5 Updted flake - add: Nixpkg gearlever
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   flake.lock
	modified:   modules/core/flatpak.nix
	modified:   modules/core/packages.nix
2026-04-17 08:44:25 -04:00
Don Williams
b797cac700 Aligned zlci gpu code with install-zaneyos.sh
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   install-zaneyos.sh
	modified:   modules/home/scripts/zcli.nix
2026-04-09 18:41:13 -04:00
dwilliams
f95a583a96 Upd: Flake to fix CVE with NIX
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   flake.lock
2026-04-07 19:59:31 -04:00
Don Williams
605b66fbb4 Added hyprshutdown 2026-04-05 17:33:55 -04:00
Don Williams
400f8510dc Fixing gpu detection in install and zcli
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   install-zaneyos.sh
	modified:   modules/home/scripts/zcli.nix
2026-04-04 06:11:20 -04:00
Don Williams
e81ea5a023 Fixed GPU detection was always reporting AMD
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   install-zaneyos.sh
2026-04-04 05:47:06 -04:00
Don Williams
6b7acb7fa5 Fixed syntax error
On branch main

 Changes to be committed:
	modified:   modules/core/packages.nix
2026-04-04 05:33:00 -04:00
Don Williams
4f02995d0d Forgot to add inputs to pacakges.nix (duh)
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   modules/core/packages.nix
2026-04-04 05:29:39 -04:00
Don Williams
2e29f9fabc Removed nodePackages not supported
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   modules/home/editors/nixvim.nix
2026-04-04 05:26:57 -04:00
Don Williams
d2c0128e01 had to change form pkgs.awww to awwwPkg variable
Moving to a flake input I  updated the awww references

 On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   modules/home/scripts/default.nix
	modified:   modules/home/scripts/qs-wallpapers-apply.nix
	modified:   modules/home/scripts/qs-wallpapers-restore.nix
	modified:   modules/home/scripts/wallsetter.nix
2026-04-04 05:16:16 -04:00
Don Williams
0bbcb7866d Added awww as falke input to support 25.11
When installing from 25.11 or earlier awww isn't there
in  nixpkgs Added awww as flake input

  On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   flake.nix
	modified:   modules/core/packages.nix
	modified:   modules/home/hyprland/hyprland.nix
2026-04-04 05:08:45 -04:00
Don Williams
10f3587c6a Updated CHANGELOG 2026-04-03 14:06:14 -04:00
Don Williams
4f7e54a218 Changed SWWW to AWWW as it's no longer maintined
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   FAQ.es.md
	modified:   FAQ.md
	modified:   modules/home/hyprland/exec-once.nix
	modified:   modules/home/hyprland/hyprland.nix
	modified:   modules/home/scripts/keybinds-parser.nix
	modified:   modules/home/scripts/qs-vid-wallpapers-apply.nix
	modified:   modules/home/scripts/qs-wallpapers-apply.nix
	modified:   modules/home/scripts/qs-wallpapers-restore.nix
	modified:   modules/home/scripts/wallsetter.nix
2026-04-03 14:00:55 -04:00
dwilliams
27ba6b3935 Updated flake to check reported issue 2026-03-24 14:14:39 -04:00
Don Williams
9bc46719d5 Fixed nvim error, and eval warnings for GTK/GIT
On branch main
 Your branch is up to date with 'origin/main'.

 Changes to be committed:
	modified:   CHANGELOG.md
	modified:   modules/home/cli/git.nix
	modified:   modules/home/editors/nixvim.nix
	modified:   modules/home/gtk.nix
2026-03-24 00:59:16 -04:00
Don Williams
34ab1c370e Fixed nvim config error, set lualine theme 2026-03-24 00:53:01 -04:00
dwilliams
8e16811c60 Updated flakie 2026-03-24 00:52:07 -04:00
dwilliams
9ba72c53fa Updated flake HL 0.54.2 2026-03-20 22:44:06 -04:00
25 changed files with 367 additions and 182 deletions

View file

@ -7,6 +7,23 @@
# 🚀 **Current Release - ZaneyOS v2.6.1**
- Removed `discord` and `discord-canary`
- They use an outdated `electron`
- That build uses and `openssl v1.1.1w`
- That ius OEL and marked insecure in NIXOS
- Users can use an alternativve client until discord is updated
- Disabled `zen browser` in `zaneyos/modules/home/default.nix`
- Needs to be migrated to being enabled via host variable
- Changed from `zen` to `latest` kernel
- Linux kernel v7.0 is much better than 6.19_zen
- Disabled `vfr = true;` in hyprland config
- It's not supportorted after `v54.3`
- Disabling now to avoid error on next update
- Added `awww` as flake input for installs < 25.11
- Fixed eval warnings:
- `gtk.gtk4.theme` set to `null`
- `git.signing.format` set to `null`
- `nixvim` lualine theme set to `auto`
- Changed to NixOS unstable branch
- Ported `DropTerminal` from `KoolDots` to ZaneyOS
- Replaces pyprland and some python dependencies
@ -22,6 +39,12 @@
# 🚀 **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

View file

@ -825,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
@ -833,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"
];
```

12
FAQ.md
View file

@ -811,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
@ -819,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"
];
```
@ -2002,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
@ -2010,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"
];
```

267
flake.lock generated
View file

@ -9,11 +9,11 @@
]
},
"locked": {
"lastModified": 1768155355,
"narHash": "sha256-s0TBsxvGjl3Z4O3McFlKKq5CKCjFLYd/WGaROb3VkX0=",
"lastModified": 1777149230,
"narHash": "sha256-pu6dVB6NrIj90rrqCgJ5pPlBzS76pW4WA6rE1rD1Gp8=",
"owner": "kamadorueda",
"repo": "alejandra",
"rev": "8f47c5e82ee8e6e8adcc1748be0056a1e349f7e8",
"rev": "8c4a4a572bee519b04e9bb9207e7d993f55ecb4f",
"type": "github"
},
"original": {
@ -30,11 +30,11 @@
]
},
"locked": {
"lastModified": 1772867847,
"narHash": "sha256-nIXWsnURXPqK4bAwYciu0bLzxHGB9UsmhOmQdeLpegk=",
"lastModified": 1776411505,
"narHash": "sha256-7HILfdTOvWzAMmfS3lQV3MDmVrr2Epj8x4c9F3mzOSE=",
"owner": "jacopone",
"repo": "antigravity-nix",
"rev": "a610db44f5c24da9cbde3bbd22f1dd4690d9553e",
"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": {
@ -136,11 +158,11 @@
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1764873433,
"narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
"lastModified": 1776136500,
"narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
"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": 1769996383,
"narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"lastModified": 1777988971,
"narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
"type": "github"
},
"original": {
@ -215,11 +253,11 @@
]
},
"locked": {
"lastModified": 1767609335,
"narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
"lastModified": 1775087534,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "250481aafeb741edfe23d29195671c19b36b6dca",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
"type": "github"
},
"original": {
@ -281,20 +319,18 @@
"gnome-shell": {
"flake": false,
"locked": {
"host": "gitlab.gnome.org",
"lastModified": 1767737596,
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "gitlab"
"type": "github"
},
"original": {
"host": "gitlab.gnome.org",
"owner": "GNOME",
"ref": "gnome-49",
"repo": "gnome-shell",
"type": "gitlab"
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "github"
}
},
"home-manager": {
@ -304,11 +340,11 @@
]
},
"locked": {
"lastModified": 1772845525,
"narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=",
"lastModified": 1778503501,
"narHash": "sha256-08L/X4/do7nET4rzidJ76eV/1r+mB7DchVpdPypsghc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0",
"rev": "85ba629c79449badf4338117c27f0ee92b4b9f1a",
"type": "github"
},
"original": {
@ -326,11 +362,11 @@
]
},
"locked": {
"lastModified": 1772330611,
"narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=",
"lastModified": 1777594677,
"narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400",
"rev": "899c08a15beae5da51a5cecd6b2b994777a948da",
"type": "github"
},
"original": {
@ -341,11 +377,11 @@
},
"mnw": {
"locked": {
"lastModified": 1770419553,
"narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
"lastModified": 1777828893,
"narHash": "sha256-gVWVnmyNr74BVKfhMMZDWkhx2699dhmZ2g0W8TTHtkk=",
"owner": "Gerg-L",
"repo": "mnw",
"rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
"rev": "c1c0b544bfabe6669b5a6a0383ccb475fe60258b",
"type": "github"
},
"original": {
@ -362,11 +398,11 @@
]
},
"locked": {
"lastModified": 1768214250,
"narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
"lastModified": 1776882296,
"narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=",
"owner": "feel-co",
"repo": "ndg",
"rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
"rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e",
"type": "github"
},
"original": {
@ -394,11 +430,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1772773019,
"narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
"lastModified": 1777954456,
"narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
"rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
"type": "github"
},
"original": {
@ -410,11 +446,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1771008912,
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
"lastModified": 1774386573,
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a82ccc39b39b621151d6732718e3e250109076fa",
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
"type": "github"
},
"original": {
@ -426,11 +462,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1767767207,
"narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
"lastModified": 1777268161,
"narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
"rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
"type": "github"
},
"original": {
@ -449,11 +485,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1772402258,
"narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
"lastModified": 1778510615,
"narHash": "sha256-cMNCx8mQTJnVkA6kt3B3ArGpCOOniYn644hH0mJHSsw=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
"rev": "fa8cd368d27cf9541f086485884928315abdcc8c",
"type": "github"
},
"original": {
@ -470,11 +506,11 @@
"noctalia-qs": "noctalia-qs"
},
"locked": {
"lastModified": 1772925400,
"narHash": "sha256-I0Gb+CO6bXi1U5PYgCqnuvI1B+R9kZtamLwhVvOywSo=",
"lastModified": 1778464608,
"narHash": "sha256-tZRvyaKVP0DJ9DSFrr6K/l3X74Orfirk3Jjo7+br4Qs=",
"owner": "noctalia-dev",
"repo": "noctalia-shell",
"rev": "5f319987a5003c383678f4aae0cf71f78c7ea49e",
"rev": "761869a561548874fe7e293b157fd7841576b367",
"type": "github"
},
"original": {
@ -488,14 +524,16 @@
"nixpkgs": [
"noctalia",
"nixpkgs"
]
],
"systems": "systems_3",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1772673824,
"narHash": "sha256-TLHXPoELZA6VeuzC1Zpx+MnSsYzrJs+DSieMgfjAOJc=",
"lastModified": 1778377995,
"narHash": "sha256-uUzHDHqQF1rdVNiTa05L0mML3/d7fpbAShjCRWxbrBQ=",
"owner": "noctalia-dev",
"repo": "noctalia-qs",
"rev": "f8531192cd09b9ea2e78d18e9cfc9d3dba498690",
"rev": "d8327a723eed6dd9aebe8e0b162126f390e827df",
"type": "github"
},
"original": {
@ -516,11 +554,11 @@
]
},
"locked": {
"lastModified": 1767810917,
"narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
"lastModified": 1777598946,
"narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
"owner": "nix-community",
"repo": "NUR",
"rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
"rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
"type": "github"
},
"original": {
@ -531,19 +569,19 @@
},
"nvf": {
"inputs": {
"flake-compat": "flake-compat",
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_2",
"mnw": "mnw",
"ndg": "ndg",
"nixpkgs": "nixpkgs_2",
"systems": "systems_3"
"systems": "systems_4"
},
"locked": {
"lastModified": 1772875143,
"narHash": "sha256-ENBRe7vCCp/SIG2WRKI2pyAxwnrc9CPuwZ4CtMu4KU4=",
"lastModified": 1778408907,
"narHash": "sha256-QXjdRz5fssxAWDrtfBYxvjMtTqJzQAbnAmX3u22xCck=",
"owner": "notashelf",
"repo": "nvf",
"rev": "6681e33727409d4ccfa687de981b594110a735d6",
"rev": "e86a92e4b29b499e5f1285b737b7612115103da9",
"type": "github"
},
"original": {
@ -556,6 +594,7 @@
"inputs": {
"alejandra": "alejandra",
"antigravity-nix": "antigravity-nix",
"awww": "awww",
"home-manager": "home-manager",
"nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs",
@ -583,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",
@ -594,19 +654,18 @@
"gnome-shell": "gnome-shell",
"nixpkgs": "nixpkgs_3",
"nur": "nur",
"systems": "systems_4",
"tinted-foot": "tinted-foot",
"systems": "systems_5",
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1772296853,
"narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
"lastModified": 1778104276,
"narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=",
"owner": "danth",
"repo": "stylix",
"rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
"rev": "18ed8d270231e067fe2739998479ed5d7c659c2c",
"type": "github"
},
"original": {
@ -648,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"
}
},
@ -676,20 +735,18 @@
"type": "github"
}
},
"tinted-foot": {
"flake": false,
"systems_5": {
"locked": {
"lastModified": 1726913040,
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
@ -712,11 +769,11 @@
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1767710407,
"narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
"lastModified": 1777041405,
"narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
"rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
"type": "github"
},
"original": {
@ -728,11 +785,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1767489635,
"narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
"lastModified": 1777169200,
"narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
"rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
"type": "github"
},
"original": {
@ -744,11 +801,11 @@
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1767488740,
"narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
"lastModified": 1777463218,
"narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
"rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
"type": "github"
},
"original": {
@ -757,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",
@ -765,11 +844,11 @@
]
},
"locked": {
"lastModified": 1772858378,
"narHash": "sha256-VPRlTud1REOz0GPjq3XQNjk5GpH/xNbeadiul4gkPGA=",
"lastModified": 1778377655,
"narHash": "sha256-wHsd+tesB3FtwUZbGjU/sWMZhw0m0yYBSXufMDVyQmc=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "42e1e9a1cb5b507789a51193113d56f8f1bb08d9",
"rev": "101d6731d7b163ef4f6fab8c6eea7da4ddb52ec3",
"type": "github"
},
"original": {

View file

@ -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 = {

View file

@ -1,4 +1,5 @@
{pkgs, ...}: {
{configs, pkgs, ...}: {
environment.systemPackages = with pkgs; [
# Add local pacakaged here
];
@ -9,4 +10,19 @@
];
};
};
services.auto-cpufreq.enable = false;
services.auto-cpufreq.settings = {
battery = {
governor = "powersave";
turbo = "never";
};
charger = {
governor = "performance";
turbo = "auto";
};
};
}

View file

@ -22,7 +22,7 @@
doomEmacsEnable = true;
# Python development tools
pythonEnable = true;
pythonEnable = false;
# Hyprland Settings
# Examples:

View file

@ -138,19 +138,44 @@ has_nvidia=false
has_intel=false
has_amd=false
has_vm=false
detect_vm() {
if command -v systemd-detect-virt &>/dev/null; then
if systemd-detect-virt --quiet; then
return 0
fi
fi
for f in /sys/class/dmi/id/product_name /sys/class/dmi/id/sys_vendor; do
if [ -r "$f" ] && grep -Eqi 'qemu|kvm|vmware|virtualbox|hyper-v|microsoft corporation|xen|parallels' "$f"; then
return 0
fi
done
return 1
}
if detect_vm; then
has_vm=true
fi
if lspci | grep -qi 'vga\|3d\|display'; then
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 -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\|display')
done < <(lspci -nn | grep -i 'vga\|3d\|display')
if $has_vm; then
DETECTED_PROFILE="vm"

View file

@ -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;};

View file

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

View file

@ -1,4 +1,5 @@
{
inputs,
pkgs,
host,
...
@ -38,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
@ -50,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

View file

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

View file

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

View file

@ -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 = {
@ -326,13 +334,13 @@
lazygit
nil
hyprls
nodePackages.typescript-language-server
nodePackages.typescript
typescript-language-server
typescript
vscode-langservers-extracted
pyright
lua-language-server
zls
#marksman
marksman
multimarkdown
clang-tools
prettierd
@ -341,6 +349,8 @@
nixpkgs-fmt
figlet
toilet
bash-language-server
tailwindcss-language-server
];
# Diagnostic UI and notify background tweaks
@ -450,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
'';
}

View file

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

View file

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

View file

@ -20,12 +20,12 @@
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 {

View file

@ -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
];
@ -137,7 +137,7 @@ in {
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

View file

@ -1,6 +1,7 @@
{
config,
pkgs,
inputs,
username,
profile,
...
@ -19,7 +20,7 @@
(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;})
@ -32,8 +33,8 @@
(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;})

View file

@ -271,7 +271,7 @@ pkgs.writeShellScriptBin "keybinds-parser" ''
else if (low ~ /(emacs|code|vscode|nvim|vim)/) category="editor"
else if (low ~ /(rofi|wofi|dmenu|launcher)/) category="launcher"
else if (low ~ /(chrome|chromium|firefox|brave|browser)/) category="browser"
else if (low ~ /(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 {

View file

@ -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"

View file

@ -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
@ -120,16 +122,16 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
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 || true
# Start awww-daemon if needed (newer awww has no 'init' subcommand)
if ! ${awwwPkg}/bin/awww query >/dev/null 2>&1; then
log "Starting awww-daemon"
${awwwPkg}/bin/awww-daemon >/dev/null 2>&1 & disown || true
# 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"

View file

@ -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,35 +52,35 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
return 1
}
start_swww() {
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 || true
if ! ${awwwPkg}/bin/awww query >/dev/null 2>&1; then
log "Starting awww-daemon"
${awwwPkg}/bin/awww-daemon >/dev/null 2>&1 & disown || true
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"
{
@ -94,7 +96,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
}
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"
@ -104,7 +106,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
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
@ -113,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" ;;

View file

@ -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
''

View file

@ -244,30 +244,38 @@ in
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\|display'; 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 -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\|qxl\|qemu\|virtualbox\|bochs\|hyper-v\|microsoft'; 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\|display')
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