diff --git a/CHANGELOG.md b/CHANGELOG.md
index 269eda2..d474662 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,23 +7,6 @@
# 🚀 **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
@@ -39,12 +22,6 @@
# 🚀 **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
diff --git a/FAQ.es.md b/FAQ.es.md
index 5a08953..7b9bcbc 100644
--- a/FAQ.es.md
+++ b/FAQ.es.md
@@ -825,7 +825,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
** ¿Cómo puedo establecer un temporizador para cambiar el wallpaper automáticamente? **
1. Edita el archivo `~/zaneyos/modules/home/hyprland/config.nix` file.
-2. Comenta la lÃnea `sleep 1.5 && awww img ...`
+2. Comenta la lÃnea `sleep 1.5 && swww img ...`
3. Agrega nueva lÃnea después de eso con `sleep 1 && wallsetter`
```json
@@ -833,13 +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 awww;sleep .5 && awww init"
+ "killall -q swww;sleep .5 && swww init"
"killall -q waybar;sleep .5 && waybar"
"killall -q swaync;sleep .5 && swaync"
"nm-applet --indicator"
"lxqt-policykit-agent"
"pypr &"
- #"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
+ #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
"sleep 1 && wallsetter"
];
```
diff --git a/FAQ.md b/FAQ.md
index 32c6708..1c1b2ab 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -811,7 +811,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
** How can I set a timer to change the wallpaper automatically? **
1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file.
-2. Comment out the line `sleep 1.5 && awww img ...`
+2. Comment out the line `sleep 1.5 && swww img ...`
3. Add new line after that with `sleep 1 && wallsetter`
```json
@@ -819,13 +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 awww;sleep .5 && awww init"
+ "killall -q swww;sleep .5 && swww init"
"killall -q waybar;sleep .5 && waybar"
"killall -q swaync;sleep .5 && swaync"
"nm-applet --indicator"
"lxqt-policykit-agent"
"pypr &"
- #"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
+ #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
"sleep 1 && wallsetter"
];
```
@@ -2002,7 +2002,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg;
** How can I set a timer to change the wallpaper automatically? **
1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file.
-2. Comment out the line `sleep 1.5 && awww img ...`
+2. Comment out the line `sleep 1.5 && swww img ...`
3. Add new line after that with `sleep 1 && wallsetter`
```json
@@ -2010,13 +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 awww;sleep .5 && awww init"
+ "killall -q swww;sleep .5 && swww init"
"killall -q waybar;sleep .5 && waybar"
"killall -q swaync;sleep .5 && swaync"
"nm-applet --indicator"
"lxqt-policykit-agent"
"pypr &"
- #"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
+ #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg"
"sleep 1 && wallsetter"
];
```
diff --git a/flake.lock b/flake.lock
index e53589f..8628ca4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -9,11 +9,11 @@
]
},
"locked": {
- "lastModified": 1777149230,
- "narHash": "sha256-pu6dVB6NrIj90rrqCgJ5pPlBzS76pW4WA6rE1rD1Gp8=",
+ "lastModified": 1768155355,
+ "narHash": "sha256-s0TBsxvGjl3Z4O3McFlKKq5CKCjFLYd/WGaROb3VkX0=",
"owner": "kamadorueda",
"repo": "alejandra",
- "rev": "8c4a4a572bee519b04e9bb9207e7d993f55ecb4f",
+ "rev": "8f47c5e82ee8e6e8adcc1748be0056a1e349f7e8",
"type": "github"
},
"original": {
@@ -30,11 +30,11 @@
]
},
"locked": {
- "lastModified": 1776411505,
- "narHash": "sha256-7HILfdTOvWzAMmfS3lQV3MDmVrr2Epj8x4c9F3mzOSE=",
+ "lastModified": 1772867847,
+ "narHash": "sha256-nIXWsnURXPqK4bAwYciu0bLzxHGB9UsmhOmQdeLpegk=",
"owner": "jacopone",
"repo": "antigravity-nix",
- "rev": "9f31d28882185d30c0e3082fbc52dab1cd4e879f",
+ "rev": "a610db44f5c24da9cbde3bbd22f1dd4690d9553e",
"type": "github"
},
"original": {
@@ -43,28 +43,6 @@
"type": "github"
}
},
- "awww": {
- "inputs": {
- "flake-compat": "flake-compat",
- "nixpkgs": [
- "nixpkgs"
- ],
- "rust-overlay": "rust-overlay"
- },
- "locked": {
- "lastModified": 1777136912,
- "narHash": "sha256-owyQdC2vi0kYC119fzyVQp0J4G0t1n4xXUwryhlBbqA=",
- "ref": "refs/heads/main",
- "rev": "f66e12a76dbc4c669b2f1375f78bce49f5b19d66",
- "revCount": 1363,
- "type": "git",
- "url": "https://codeberg.org/LGFae/awww"
- },
- "original": {
- "type": "git",
- "url": "https://codeberg.org/LGFae/awww"
- }
- },
"base16": {
"inputs": {
"fromYaml": "fromYaml"
@@ -103,11 +81,11 @@
"base16-helix": {
"flake": false,
"locked": {
- "lastModified": 1776754714,
- "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
+ "lastModified": 1760703920,
+ "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
"owner": "tinted-theming",
"repo": "base16-helix",
- "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
+ "rev": "d646af9b7d14bff08824538164af99d0c521b185",
"type": "github"
},
"original": {
@@ -158,11 +136,11 @@
"firefox-gnome-theme": {
"flake": false,
"locked": {
- "lastModified": 1776136500,
- "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=",
+ "lastModified": 1764873433,
+ "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
- "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7",
+ "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
"type": "github"
},
"original": {
@@ -172,22 +150,6 @@
}
},
"flake-compat": {
- "flake": false,
- "locked": {
- "lastModified": 1761588595,
- "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
- "owner": "edolstra",
- "repo": "flake-compat",
- "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
- "type": "github"
- },
- "original": {
- "owner": "edolstra",
- "repo": "flake-compat",
- "type": "github"
- }
- },
- "flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1751685974,
@@ -211,11 +173,11 @@
]
},
"locked": {
- "lastModified": 1777988971,
- "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
+ "lastModified": 1769996383,
+ "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
+ "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
"type": "github"
},
"original": {
@@ -253,11 +215,11 @@
]
},
"locked": {
- "lastModified": 1775087534,
- "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=",
+ "lastModified": 1767609335,
+ "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b",
+ "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
"type": "github"
},
"original": {
@@ -319,18 +281,20 @@
"gnome-shell": {
"flake": false,
"locked": {
+ "host": "gitlab.gnome.org",
"lastModified": 1767737596,
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
- "type": "github"
+ "type": "gitlab"
},
"original": {
+ "host": "gitlab.gnome.org",
"owner": "GNOME",
+ "ref": "gnome-49",
"repo": "gnome-shell",
- "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
- "type": "github"
+ "type": "gitlab"
}
},
"home-manager": {
@@ -340,11 +304,11 @@
]
},
"locked": {
- "lastModified": 1778503501,
- "narHash": "sha256-08L/X4/do7nET4rzidJ76eV/1r+mB7DchVpdPypsghc=",
+ "lastModified": 1772845525,
+ "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "85ba629c79449badf4338117c27f0ee92b4b9f1a",
+ "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0",
"type": "github"
},
"original": {
@@ -362,11 +326,11 @@
]
},
"locked": {
- "lastModified": 1777594677,
- "narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=",
+ "lastModified": 1772330611,
+ "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "899c08a15beae5da51a5cecd6b2b994777a948da",
+ "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400",
"type": "github"
},
"original": {
@@ -377,11 +341,11 @@
},
"mnw": {
"locked": {
- "lastModified": 1777828893,
- "narHash": "sha256-gVWVnmyNr74BVKfhMMZDWkhx2699dhmZ2g0W8TTHtkk=",
+ "lastModified": 1770419553,
+ "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=",
"owner": "Gerg-L",
"repo": "mnw",
- "rev": "c1c0b544bfabe6669b5a6a0383ccb475fe60258b",
+ "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957",
"type": "github"
},
"original": {
@@ -398,11 +362,11 @@
]
},
"locked": {
- "lastModified": 1776882296,
- "narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=",
+ "lastModified": 1768214250,
+ "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
"owner": "feel-co",
"repo": "ndg",
- "rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e",
+ "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
"type": "github"
},
"original": {
@@ -430,11 +394,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1777954456,
- "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
+ "lastModified": 1772773019,
+ "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
+ "rev": "aca4d95fce4914b3892661bcb80b8087293536c6",
"type": "github"
},
"original": {
@@ -446,11 +410,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1774386573,
- "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
+ "lastModified": 1771008912,
+ "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
+ "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
"type": "github"
},
"original": {
@@ -462,11 +426,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1777268161,
- "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
+ "lastModified": 1767767207,
+ "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
+ "rev": "5912c1772a44e31bf1c63c0390b90501e5026886",
"type": "github"
},
"original": {
@@ -485,11 +449,11 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1778510615,
- "narHash": "sha256-cMNCx8mQTJnVkA6kt3B3ArGpCOOniYn644hH0mJHSsw=",
+ "lastModified": 1772402258,
+ "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "fa8cd368d27cf9541f086485884928315abdcc8c",
+ "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
"type": "github"
},
"original": {
@@ -506,11 +470,11 @@
"noctalia-qs": "noctalia-qs"
},
"locked": {
- "lastModified": 1778464608,
- "narHash": "sha256-tZRvyaKVP0DJ9DSFrr6K/l3X74Orfirk3Jjo7+br4Qs=",
+ "lastModified": 1772925400,
+ "narHash": "sha256-I0Gb+CO6bXi1U5PYgCqnuvI1B+R9kZtamLwhVvOywSo=",
"owner": "noctalia-dev",
"repo": "noctalia-shell",
- "rev": "761869a561548874fe7e293b157fd7841576b367",
+ "rev": "5f319987a5003c383678f4aae0cf71f78c7ea49e",
"type": "github"
},
"original": {
@@ -524,16 +488,14 @@
"nixpkgs": [
"noctalia",
"nixpkgs"
- ],
- "systems": "systems_3",
- "treefmt-nix": "treefmt-nix"
+ ]
},
"locked": {
- "lastModified": 1778377995,
- "narHash": "sha256-uUzHDHqQF1rdVNiTa05L0mML3/d7fpbAShjCRWxbrBQ=",
+ "lastModified": 1772673824,
+ "narHash": "sha256-TLHXPoELZA6VeuzC1Zpx+MnSsYzrJs+DSieMgfjAOJc=",
"owner": "noctalia-dev",
"repo": "noctalia-qs",
- "rev": "d8327a723eed6dd9aebe8e0b162126f390e827df",
+ "rev": "f8531192cd09b9ea2e78d18e9cfc9d3dba498690",
"type": "github"
},
"original": {
@@ -554,11 +516,11 @@
]
},
"locked": {
- "lastModified": 1777598946,
- "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=",
+ "lastModified": 1767810917,
+ "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "5d55af01c0f86be583931fe99207fc56c14134b3",
+ "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
"type": "github"
},
"original": {
@@ -569,19 +531,19 @@
},
"nvf": {
"inputs": {
- "flake-compat": "flake-compat_2",
+ "flake-compat": "flake-compat",
"flake-parts": "flake-parts_2",
"mnw": "mnw",
"ndg": "ndg",
"nixpkgs": "nixpkgs_2",
- "systems": "systems_4"
+ "systems": "systems_3"
},
"locked": {
- "lastModified": 1778408907,
- "narHash": "sha256-QXjdRz5fssxAWDrtfBYxvjMtTqJzQAbnAmX3u22xCck=",
+ "lastModified": 1772875143,
+ "narHash": "sha256-ENBRe7vCCp/SIG2WRKI2pyAxwnrc9CPuwZ4CtMu4KU4=",
"owner": "notashelf",
"repo": "nvf",
- "rev": "e86a92e4b29b499e5f1285b737b7612115103da9",
+ "rev": "6681e33727409d4ccfa687de981b594110a735d6",
"type": "github"
},
"original": {
@@ -594,7 +556,6 @@
"inputs": {
"alejandra": "alejandra",
"antigravity-nix": "antigravity-nix",
- "awww": "awww",
"home-manager": "home-manager",
"nix-flatpak": "nix-flatpak",
"nixpkgs": "nixpkgs",
@@ -622,27 +583,6 @@
"type": "github"
}
},
- "rust-overlay": {
- "inputs": {
- "nixpkgs": [
- "awww",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1764038373,
- "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=",
- "owner": "oxalica",
- "repo": "rust-overlay",
- "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9",
- "type": "github"
- },
- "original": {
- "owner": "oxalica",
- "repo": "rust-overlay",
- "type": "github"
- }
- },
"stylix": {
"inputs": {
"base16": "base16",
@@ -654,18 +594,19 @@
"gnome-shell": "gnome-shell",
"nixpkgs": "nixpkgs_3",
"nur": "nur",
- "systems": "systems_5",
+ "systems": "systems_4",
+ "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed"
},
"locked": {
- "lastModified": 1778104276,
- "narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=",
+ "lastModified": 1772296853,
+ "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
"owner": "danth",
"repo": "stylix",
- "rev": "18ed8d270231e067fe2739998479ed5d7c659c2c",
+ "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
"type": "github"
},
"original": {
@@ -707,16 +648,16 @@
},
"systems_3": {
"locked": {
- "lastModified": 1689347949,
- "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
- "repo": "default-linux",
- "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
- "repo": "default-linux",
+ "repo": "default",
"type": "github"
}
},
@@ -735,18 +676,20 @@
"type": "github"
}
},
- "systems_5": {
+ "tinted-foot": {
+ "flake": false,
"locked": {
- "lastModified": 1681028828,
- "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
- "owner": "nix-systems",
- "repo": "default",
- "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "lastModified": 1726913040,
+ "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
+ "owner": "tinted-theming",
+ "repo": "tinted-foot",
+ "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
},
"original": {
- "owner": "nix-systems",
- "repo": "default",
+ "owner": "tinted-theming",
+ "repo": "tinted-foot",
+ "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
}
},
@@ -769,11 +712,11 @@
"tinted-schemes": {
"flake": false,
"locked": {
- "lastModified": 1777041405,
- "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=",
+ "lastModified": 1767710407,
+ "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
"owner": "tinted-theming",
"repo": "schemes",
- "rev": "5f868b3a338b6904c47f3833b9c411be641983a8",
+ "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
"type": "github"
},
"original": {
@@ -785,11 +728,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
- "lastModified": 1777169200,
- "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=",
+ "lastModified": 1767489635,
+ "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
- "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac",
+ "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
"type": "github"
},
"original": {
@@ -801,11 +744,11 @@
"tinted-zed": {
"flake": false,
"locked": {
- "lastModified": 1777463218,
- "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=",
+ "lastModified": 1767488740,
+ "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
"owner": "tinted-theming",
"repo": "base16-zed",
- "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae",
+ "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
"type": "github"
},
"original": {
@@ -814,28 +757,6 @@
"type": "github"
}
},
- "treefmt-nix": {
- "inputs": {
- "nixpkgs": [
- "noctalia",
- "noctalia-qs",
- "nixpkgs"
- ]
- },
- "locked": {
- "lastModified": 1775636079,
- "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=",
- "owner": "numtide",
- "repo": "treefmt-nix",
- "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba",
- "type": "github"
- },
- "original": {
- "owner": "numtide",
- "repo": "treefmt-nix",
- "type": "github"
- }
- },
"zen-browser": {
"inputs": {
"home-manager": "home-manager_2",
@@ -844,11 +765,11 @@
]
},
"locked": {
- "lastModified": 1778377655,
- "narHash": "sha256-wHsd+tesB3FtwUZbGjU/sWMZhw0m0yYBSXufMDVyQmc=",
+ "lastModified": 1772858378,
+ "narHash": "sha256-VPRlTud1REOz0GPjq3XQNjk5GpH/xNbeadiul4gkPGA=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
- "rev": "101d6731d7b163ef4f6fab8c6eea7da4ddb52ec3",
+ "rev": "42e1e9a1cb5b507789a51193113d56f8f1bb08d9",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 9ca5d5b..e3a88f6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -36,10 +36,6 @@
url = "github:kamadorueda/alejandra";
inputs.nixpkgs.follows = "nixpkgs";
};
- awww = {
- url = "git+https://codeberg.org/LGFae/awww";
- inputs.nixpkgs.follows = "nixpkgs";
- };
};
outputs = {
diff --git a/hosts/default/host-packages.nix b/hosts/default/host-packages.nix
index 8f9f927..0febf63 100644
--- a/hosts/default/host-packages.nix
+++ b/hosts/default/host-packages.nix
@@ -1,5 +1,4 @@
-{configs, pkgs, ...}: {
-
+{pkgs, ...}: {
environment.systemPackages = with pkgs; [
# Add local pacakaged here
];
@@ -10,19 +9,4 @@
];
};
};
-
-
- services.auto-cpufreq.enable = false;
- services.auto-cpufreq.settings = {
- battery = {
- governor = "powersave";
- turbo = "never";
- };
- charger = {
- governor = "performance";
- turbo = "auto";
- };
- };
-
-
}
diff --git a/hosts/zaneyos-24-vm/variables.nix b/hosts/zaneyos-24-vm/variables.nix
index ab6507d..05dfff9 100644
--- a/hosts/zaneyos-24-vm/variables.nix
+++ b/hosts/zaneyos-24-vm/variables.nix
@@ -22,7 +22,7 @@
doomEmacsEnable = true;
# Python development tools
- pythonEnable = false;
+ pythonEnable = true;
# Hyprland Settings
# Examples:
diff --git a/install-zaneyos.sh b/install-zaneyos.sh
index 657492d..3060e09 100755
--- a/install-zaneyos.sh
+++ b/install-zaneyos.sh
@@ -138,44 +138,19 @@ 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 -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
+ if 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 -Eqi 'virtio|vmware|virtualbox|qxl|hyper-v|microsoft corporation|parallels|qemu|bochs|cirrus|svga|virtual'; then
+ elif echo "$line" | grep -qi 'virtio\|vmware'; then
has_vm=true
fi
- done < <(lspci -nn | grep -i 'vga\|3d\|display')
+ done < <(lspci | grep -i 'vga\|3d\|display')
if $has_vm; then
DETECTED_PROFILE="vm"
diff --git a/modules/core/boot.nix b/modules/core/boot.nix
index 51a5da5..47011ff 100644
--- a/modules/core/boot.nix
+++ b/modules/core/boot.nix
@@ -4,7 +4,7 @@
...
}: {
boot = {
- kernelPackages = pkgs.linuxPackages_latest;
+ kernelPackages = pkgs.linuxPackages_zen;
kernelModules = ["v4l2loopback"];
extraModulePackages = [config.boot.kernelPackages.v4l2loopback];
kernel.sysctl = {"vm.max_map_count" = 2147483642;};
diff --git a/modules/core/flatpak.nix b/modules/core/flatpak.nix
index 2862127..e513739 100644
--- a/modules/core/flatpak.nix
+++ b/modules/core/flatpak.nix
@@ -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
diff --git a/modules/core/packages.nix b/modules/core/packages.nix
index 5c7a7a9..3b7d27d 100644
--- a/modules/core/packages.nix
+++ b/modules/core/packages.nix
@@ -1,5 +1,4 @@
{
- inputs,
pkgs,
host,
...
@@ -39,13 +38,9 @@ in {
};
nixpkgs.config.allowUnfree = true;
- nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
environment.systemPackages = with pkgs;
- [
- inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww
- ]
- ++ noctaliaPkgs
+ noctaliaPkgs
++ [
alejandra # nix formatter
amfora # Fancy Terminal Browser For Gemini Protocol
@@ -55,14 +50,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
diff --git a/modules/home/cli/git.nix b/modules/home/cli/git.nix
index 996b394..5a509ad 100644
--- a/modules/home/cli/git.nix
+++ b/modules/home/cli/git.nix
@@ -3,7 +3,6 @@
in {
programs.git = {
enable = true;
- signing.format = null;
settings = {
user = {
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 4b1a69f..f6b29e7 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -58,7 +58,7 @@ in {
./wlogout
./xdg.nix
./yazi
- #./zen-browser.nix
+ ./zen-browser.nix
./zoxide.nix
./zsh
]
diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix
index af1676d..2b0203e 100644
--- a/modules/home/editors/nixvim.nix
+++ b/modules/home/editors/nixvim.nix
@@ -44,9 +44,6 @@
settings = {
flavour = "mocha";
transparent_background = false;
- integrations = {
- lualine = true;
- };
};
};
@@ -56,7 +53,7 @@
lualine = {
enable = true;
settings = {
- options = {theme = "auto";};
+ options = {theme = "catppuccin";};
};
};
bufferline.enable = true;
@@ -77,16 +74,11 @@
treesitter-context.enable = false;
# Project management
- project-nvim = {
- enable = true;
- settings = {
- history.save_dir = "${config.home.homeDirectory}/.local/share/nvim/project_nvim";
- };
- };
+ project-nvim.enable = true;
# Notifications and UI polish
notify.enable = true;
- noice.enable = false;
+ noice.enable = true;
# Startup dashboard
alpha = {
@@ -334,13 +326,13 @@
lazygit
nil
hyprls
- typescript-language-server
- typescript
+ nodePackages.typescript-language-server
+ nodePackages.typescript
vscode-langservers-extracted
pyright
lua-language-server
zls
- marksman
+ #marksman
multimarkdown
clang-tools
prettierd
@@ -349,8 +341,6 @@
nixpkgs-fmt
figlet
toilet
- bash-language-server
- tailwindcss-language-server
];
# Diagnostic UI and notify background tweaks
@@ -460,9 +450,4 @@
end
'';
};
-
- home.activation.projectNvimHistory = ''
- mkdir -p "$HOME/.local/share/nvim/project_nvim"
- find "$HOME/.local/share/nvim/project_nvim" -type f -size 0 -delete 2>/dev/null || true
- '';
}
diff --git a/modules/home/editors/vscode.nix b/modules/home/editors/vscode.nix
index 4f3ce02..8b2d3dc 100644
--- a/modules/home/editors/vscode.nix
+++ b/modules/home/editors/vscode.nix
@@ -90,5 +90,4 @@ in {
};
};
nixpkgs.config.allowUnfree = true;
- nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
}
diff --git a/modules/home/gtk.nix b/modules/home/gtk.nix
index 12fe645..cec72b3 100644
--- a/modules/home/gtk.nix
+++ b/modules/home/gtk.nix
@@ -1,6 +1,5 @@
-{config, pkgs, ...}: {
+{pkgs, ...}: {
gtk = {
- gtk4.theme = null;
iconTheme = {
name = "Papirus-Dark";
package = pkgs.papirus-icon-theme;
diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix
index edb5f50..130233a 100644
--- a/modules/home/hyprland/exec-once.nix
+++ b/modules/home/hyprland/exec-once.nix
@@ -20,12 +20,12 @@
waybarExec =
if barChoice != "noctalia"
then [
- "killall -q awww;sleep .5 && awww-daemon"
+ "killall -q swww;sleep .5 && swww-daemon"
"killall -q waybar;sleep .5 && waybar"
"killall -q swaync;sleep .5 && swaync"
"nm-applet --indicator"
# Delayed-only restore so Stylix finishes first, then user's wallpaper wins with a single change
- "sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend awww) >/dev/null 2>&1 || true'"
+ "sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend swww) >/dev/null 2>&1 || true'"
]
else [];
in {
diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix
index 635c6c7..367e28a 100644
--- a/modules/home/hyprland/hyprland.nix
+++ b/modules/home/hyprland/hyprland.nix
@@ -44,6 +44,7 @@
hyprKbVariant = variantFinal;
in {
home.packages = with pkgs; [
+ swww
grim
slurp
wl-clipboard
@@ -51,7 +52,6 @@ in {
ydotool
hyprpolkitagent
hyprshot
- hyprshutdown
hyprpicker
#hyprland-qtutils # needed for banners and ANR messages
];
@@ -137,7 +137,7 @@ in {
disable_hyprland_logo = true;
disable_splash_rendering = true;
enable_swallow = false;
- # vfr = true; # Variable Frame Rate Not supported post v0.54.3
+ vfr = true; # Variable Frame Rate
vrr = 2; # Variable Refresh Rate Might need to set to 0 for NVIDIA/AQ_DRM_DEVICES
# Screen flashing to black momentarily or going black when app is fullscreen
# Try setting vrr to 0
diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix
index 4874006..6e99baa 100644
--- a/modules/home/scripts/default.nix
+++ b/modules/home/scripts/default.nix
@@ -1,7 +1,6 @@
{
config,
pkgs,
- inputs,
username,
profile,
...
@@ -20,7 +19,7 @@
(import ./task-waybar.nix {inherit pkgs;})
(import ./DropTerminal.nix {inherit pkgs;})
(import ./wallsetter.nix {
- inherit pkgs inputs;
+ inherit pkgs;
inherit username;
})
(import ./web-search.nix {inherit pkgs;})
@@ -33,8 +32,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 inputs;})
- (import ./qs-wallpapers-restore.nix {inherit pkgs inputs;})
+ (import ./qs-wallpapers-apply.nix {inherit pkgs;})
+ (import ./qs-wallpapers-restore.nix {inherit pkgs;})
(import ./qs-wlogout.nix {inherit pkgs;})
(import ./qs-docs.nix {inherit pkgs;})
(import ./docs-parser.nix {inherit pkgs;})
diff --git a/modules/home/scripts/keybinds-parser.nix b/modules/home/scripts/keybinds-parser.nix
index 0d2ef32..5451e94 100644
--- a/modules/home/scripts/keybinds-parser.nix
+++ b/modules/home/scripts/keybinds-parser.nix
@@ -271,7 +271,7 @@ pkgs.writeShellScriptBin "keybinds-parser" ''
else if (low ~ /(emacs|code|vscode|nvim|vim)/) category="editor"
else if (low ~ /(rofi|wofi|dmenu|launcher)/) category="launcher"
else if (low ~ /(chrome|chromium|firefox|brave|browser)/) category="browser"
- else if (low ~ /(awww|wallpaper)/) category="wallpaper"
+ else if (low ~ /(swww|wallpaper)/) category="wallpaper"
else if (low ~ /(playerctl|wpctl|pactl|pamixer|brightnessctl|volume|brightness)/) category="media"
else category="app"
} else {
diff --git a/modules/home/scripts/qs-vid-wallpapers-apply.nix b/modules/home/scripts/qs-vid-wallpapers-apply.nix
index 61be824..c3f7dd8 100644
--- a/modules/home/scripts/qs-vid-wallpapers-apply.nix
+++ b/modules/home/scripts/qs-vid-wallpapers-apply.nix
@@ -67,8 +67,8 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers-apply" ''
case "$BACKEND" in
mpvpaper)
- log "Stopping awww-daemon, hyprpaper, mpvpaper if running"
- ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
+ log "Stopping swww-daemon, hyprpaper, mpvpaper if running"
+ ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
log "Sleeping briefly before starting mpvpaper"
diff --git a/modules/home/scripts/qs-wallpapers-apply.nix b/modules/home/scripts/qs-wallpapers-apply.nix
index 2bc1818..1f9d77c 100644
--- a/modules/home/scripts/qs-wallpapers-apply.nix
+++ b/modules/home/scripts/qs-wallpapers-apply.nix
@@ -1,6 +1,4 @@
-{pkgs, inputs}: let
- awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww;
-in
+{pkgs}:
pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
#!/usr/bin/env bash
set -euo pipefail
@@ -30,7 +28,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="awww"
+ BACKEND="swww"
else
BACKEND="mpvpaper"
fi
@@ -98,8 +96,8 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
case "$BACKEND" in
mpvpaper)
# Stop other wallpaper daemons to avoid conflicts
- log "Stopping awww-daemon, hyprpaper, mpvpaper if running"
- ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
+ log "Stopping swww-daemon, hyprpaper, mpvpaper if running"
+ ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
# Give the compositor a moment to release layers
@@ -122,16 +120,16 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
exit 0
;;
- awww)
+ swww)
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
- # Start awww-daemon if needed (newer awww has no 'init' subcommand)
- if ! ${awwwPkg}/bin/awww query >/dev/null 2>&1; then
- log "Starting awww-daemon"
- ${awwwPkg}/bin/awww-daemon >/dev/null 2>&1 & disown || true
+ # Start swww-daemon if needed (newer swww has no 'init' subcommand)
+ if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then
+ log "Starting swww-daemon"
+ ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown || true
# wait briefly for the daemon to be ready
for i in $(${pkgs.coreutils}/bin/seq 1 50); do
- if ${awwwPkg}/bin/awww query >/dev/null 2>&1; then
- log "awww-daemon ready"
+ if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then
+ log "swww-daemon ready"
break
fi
${pkgs.coreutils}/bin/sleep 0.1
@@ -141,26 +139,26 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" ''
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true
# Robust resize: if WALLPAPER_RESIZE is set, use it; otherwise try fill -> fit -> crop
- run_awww_img() {
+ run_swww_img() {
if [ -n "''${WALLPAPER_RESIZE:-}" ]; then
- log "awww img --resize ''${WALLPAPER_RESIZE} $sel"
- ${awwwPkg}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$sel"
+ log "swww img --resize ''${WALLPAPER_RESIZE} $sel"
+ ${pkgs.swww}/bin/swww img --resize "''${WALLPAPER_RESIZE}" "$sel"
return $?
fi
- log "Trying awww resize modes: fill -> fit -> crop"
- ${awwwPkg}/bin/awww img --resize fill "$sel" || \
- ${awwwPkg}/bin/awww img --resize fit "$sel" || \
- ${awwwPkg}/bin/awww img --resize crop "$sel"
+ log "Trying swww resize modes: fill -> fit -> crop"
+ ${pkgs.swww}/bin/swww img --resize fill "$sel" || \
+ ${pkgs.swww}/bin/swww img --resize fit "$sel" || \
+ ${pkgs.swww}/bin/swww img --resize crop "$sel"
}
# Niri: generic apply has proven to work more reliably than per-output here
- run_awww_img
+ run_swww_img
exit $?
;;
hyprpaper)
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
- ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
+ ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
# Generate a minimal hyprpaper config and start it
_TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d)
_CFG="$_TMPDIR/hyprpaper.conf"
diff --git a/modules/home/scripts/qs-wallpapers-restore.nix b/modules/home/scripts/qs-wallpapers-restore.nix
index 81a3554..9f0052f 100644
--- a/modules/home/scripts/qs-wallpapers-restore.nix
+++ b/modules/home/scripts/qs-wallpapers-restore.nix
@@ -1,6 +1,4 @@
-{pkgs, inputs}: let
- awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww;
-in
+{pkgs}:
pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
#!/usr/bin/env bash
set -euo pipefail
@@ -32,8 +30,8 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
hyprlock-update-wallpaper-link >/dev/null 2>&1 || true
fi
- # Order: recorded backend first, then awww -> hyprpaper -> mpvpaper -> waypaper
- ORDER_DEFAULT="awww,hyprpaper,mpvpaper,waypaper"
+ # Order: recorded backend first, then swww -> hyprpaper -> mpvpaper -> waypaper
+ ORDER_DEFAULT="swww,hyprpaper,mpvpaper,waypaper"
ORDER_COMBINED="$BACKEND_J,$ORDER_DEFAULT"
# De-duplicate while preserving order (awk trick)
ORDER=$({ echo "$ORDER_COMBINED" | ${pkgs.coreutils}/bin/tr ',' '\n' | ${pkgs.gawk}/bin/awk 'NF{ if (!seen[$0]++) print $0 }' | ${pkgs.coreutils}/bin/tr '\n' ','; echo; } | ${pkgs.coreutils}/bin/tr -s ',' | ${pkgs.gnused}/bin/sed 's/^,\|,$//g')
@@ -52,35 +50,35 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
return 1
}
- start_awww() {
+ start_swww() {
- # Stop conflicting daemons if we intend to use awww
+ # Stop conflicting daemons if we intend to use swww
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true
- if ! ${awwwPkg}/bin/awww query >/dev/null 2>&1; then
- log "Starting awww-daemon"
- ${awwwPkg}/bin/awww-daemon >/dev/null 2>&1 & disown || true
+ if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then
+ log "Starting swww-daemon"
+ ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown || true
for i in $(${pkgs.coreutils}/bin/seq 1 50); do
- if ${awwwPkg}/bin/awww query >/dev/null 2>&1; then break; fi
+ if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then break; fi
${pkgs.coreutils}/bin/sleep 0.1
done
fi
# Robust resize: use explicit WALLPAPER_RESIZE if provided; otherwise try fill -> fit -> crop
if [ -n "''${WALLPAPER_RESIZE:-}" ]; then
- log "awww img --resize ''${WALLPAPER_RESIZE} $PATH_J"
- ${awwwPkg}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J"
+ log "swww img --resize ''${WALLPAPER_RESIZE} $PATH_J"
+ ${pkgs.swww}/bin/swww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J"
else
- log "Trying awww resize modes: fill -> fit -> crop"
- ${awwwPkg}/bin/awww img --resize fill "$PATH_J" || \
- ${awwwPkg}/bin/awww img --resize fit "$PATH_J" || \
- ${awwwPkg}/bin/awww img --resize crop "$PATH_J"
+ log "Trying swww resize modes: fill -> fit -> crop"
+ ${pkgs.swww}/bin/swww img --resize fill "$PATH_J" || \
+ ${pkgs.swww}/bin/swww img --resize fit "$PATH_J" || \
+ ${pkgs.swww}/bin/swww img --resize crop "$PATH_J"
fi
}
start_hyprpaper() {
${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true
- ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
+ ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
_TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d)
_CFG="$_TMPDIR/hyprpaper.conf"
{
@@ -96,7 +94,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
}
start_mpvpaper() {
- ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true
+ ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true
${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true
local MPV_OPTS="--no-audio --loop-file=inf --image-display-duration=inf --no-osc --no-osd-bar --keep-open=yes --keepaspect=yes --panscan=1.0"
log "Starting mpvpaper"
@@ -106,7 +104,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
start_waypaper() {
if command -v waypaper >/dev/null 2>&1; then
log "Trying waypaper"
- waypaper --backend awww --wallpaper "$PATH_J" >/dev/null 2>&1 || return 1
+ waypaper --backend swww --wallpaper "$PATH_J" >/dev/null 2>&1 || return 1
else
return 1
fi
@@ -115,7 +113,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" ''
IFS=',' read -r -a tools <<<"$ORDER"
for t in "''${tools[@]}"; do
case "$t" in
- awww) start_awww && exit 0 || log "awww failed; falling back" ;;
+ swww) start_swww && exit 0 || log "swww failed; falling back" ;;
hyprpaper) start_hyprpaper && exit 0 || log "hyprpaper failed; falling back" ;;
mpvpaper) start_mpvpaper && exit 0 || log "mpvpaper failed; falling back" ;;
waypaper) start_waypaper && exit 0 || log "waypaper failed; falling back" ;;
diff --git a/modules/home/scripts/wallsetter.nix b/modules/home/scripts/wallsetter.nix
index 59c5226..a2ae7d5 100644
--- a/modules/home/scripts/wallsetter.nix
+++ b/modules/home/scripts/wallsetter.nix
@@ -1,6 +1,4 @@
-{pkgs, inputs, ...}: let
- awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww;
-in
+{pkgs, ...}:
pkgs.writeShellScriptBin "wallsetter" ''
TIMEOUT=720
@@ -19,7 +17,7 @@ pkgs.writeShellScriptBin "wallsetter" ''
PREVIOUS=$WALLPAPER
- ${awwwPkg}/bin/awww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60
+ ${pkgs.swww}/bin/swww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60
sleep $TIMEOUT
done
''
diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix
index 05eae32..407238f 100644
--- a/modules/home/scripts/zcli.nix
+++ b/modules/home/scripts/zcli.nix
@@ -244,38 +244,30 @@ in
fi
if ${pkgs.pciutils}/bin/lspci &> /dev/null; then # Check if lspci is available
- if ${pkgs.pciutils}/bin/lspci -nn | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d\|display'; then
+ if ${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d\|display'; then
while read -r line; do
- 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
+ if 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\|virtualbox\|qxl\|hyper-v\|microsoft corporation\|parallels\|qemu\|bochs\|cirrus\|svga\|virtual'; then
+ elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware\|qxl\|qemu\|virtualbox\|bochs\|hyper-v\|microsoft'; then
has_vm=true
fi
- done < <(${pkgs.pciutils}/bin/lspci -nn | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d\|display')
+ done < <(${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d\|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