From 9ba72c53face44c98098955deff105ed0d069b58 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Fri, 20 Mar 2026 22:44:06 -0400 Subject: [PATCH 01/30] Updated flake HL 0.54.2 --- flake.lock | 119 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 85 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 8628ca4..74454c2 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1772867847, - "narHash": "sha256-nIXWsnURXPqK4bAwYciu0bLzxHGB9UsmhOmQdeLpegk=", + "lastModified": 1773854383, + "narHash": "sha256-ra8jcAG9WHDsGvqgumqK7Bq6DQqOrbYm18S+TMKaots=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "a610db44f5c24da9cbde3bbd22f1dd4690d9553e", + "rev": "54f7caf3dff6ae6131669e91203fb06f2f82db3a", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1772845525, - "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", + "lastModified": 1774007980, + "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", "owner": "nix-community", "repo": "home-manager", - "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", + "rev": "9670de2921812bc4e0452f6e3efd8c859696c183", "type": "github" }, "original": { @@ -326,11 +326,11 @@ ] }, "locked": { - "lastModified": 1772330611, - "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", + "lastModified": 1773422513, + "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", + "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", "type": "github" }, "original": { @@ -394,11 +394,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772773019, - "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", + "lastModified": 1773821835, + "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", + "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", "type": "github" }, "original": { @@ -409,6 +409,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1770107345, + "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1771008912, "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", @@ -424,7 +440,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1767767207, "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", @@ -470,11 +486,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1772925400, - "narHash": "sha256-I0Gb+CO6bXi1U5PYgCqnuvI1B+R9kZtamLwhVvOywSo=", + "lastModified": 1774060240, + "narHash": "sha256-D71RQ9AHhosaqotzlPLURm0Dy0b301Tmqfo0IKLzskE=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "5f319987a5003c383678f4aae0cf71f78c7ea49e", + "rev": "b9a02cccc7b8388c3dedd0785812f31e02c8f26d", "type": "github" }, "original": { @@ -488,14 +504,16 @@ "nixpkgs": [ "noctalia", "nixpkgs" - ] + ], + "systems": "systems_3", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1772673824, - "narHash": "sha256-TLHXPoELZA6VeuzC1Zpx+MnSsYzrJs+DSieMgfjAOJc=", + "lastModified": 1773842483, + "narHash": "sha256-oRqz+5AbNKfUWWwN5c83CsSOsUWVGITh0HZg+wX5Q/8=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "f8531192cd09b9ea2e78d18e9cfc9d3dba498690", + "rev": "3962ff1e0b59ef067c57199d31271ddbf23b29cd", "type": "github" }, "original": { @@ -535,15 +553,15 @@ "flake-parts": "flake-parts_2", "mnw": "mnw", "ndg": "ndg", - "nixpkgs": "nixpkgs_2", - "systems": "systems_3" + "nixpkgs": "nixpkgs_3", + "systems": "systems_4" }, "locked": { - "lastModified": 1772875143, - "narHash": "sha256-ENBRe7vCCp/SIG2WRKI2pyAxwnrc9CPuwZ4CtMu4KU4=", + "lastModified": 1773970322, + "narHash": "sha256-xyO9ZV+cZk+HVmjS6P5Jzwl6ioRCKgeLQSSbUFtPrZk=", "owner": "notashelf", "repo": "nvf", - "rev": "6681e33727409d4ccfa687de981b594110a735d6", + "rev": "8aad181ec9057c56b6fe5d6081a399427e1d1dec", "type": "github" }, "original": { @@ -592,9 +610,9 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur", - "systems": "systems_4", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -602,11 +620,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1772296853, - "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", + "lastModified": 1773792048, + "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=", "owner": "danth", "repo": "stylix", - "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", + "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1", "type": "github" }, "original": { @@ -647,6 +665,21 @@ } }, "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -661,7 +694,7 @@ "type": "github" } }, - "systems_4": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -757,6 +790,24 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1772660329, + "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", @@ -765,11 +816,11 @@ ] }, "locked": { - "lastModified": 1772858378, - "narHash": "sha256-VPRlTud1REOz0GPjq3XQNjk5GpH/xNbeadiul4gkPGA=", + "lastModified": 1773661718, + "narHash": "sha256-MYm1EKp/gbBi9wMEf7Lx0agIVnej/P61sg97EruWzrU=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "42e1e9a1cb5b507789a51193113d56f8f1bb08d9", + "rev": "3ac6ea223b32ff63c45e3577712df991a35aaf33", "type": "github" }, "original": { From 8e16811c60bdc53ece3520da22c51db5a4c25ddc Mon Sep 17 00:00:00 2001 From: dwilliams Date: Tue, 24 Mar 2026 00:52:07 -0400 Subject: [PATCH 02/30] Updated flakie --- flake.lock | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 74454c2..6fb8e06 100644 --- a/flake.lock +++ b/flake.lock @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1774007980, - "narHash": "sha256-FOnZjElEI8pqqCvB6K/1JRHTE8o4rer8driivTpq2uo=", + "lastModified": 1774293042, + "narHash": "sha256-OEBV+Y5I4Ldu98k0KvGXRfJYh+jjE8ocCSL/dxTGs1s=", "owner": "nix-community", "repo": "home-manager", - "rev": "9670de2921812bc4e0452f6e3efd8c859696c183", + "rev": "bc357c75e3142a31b849ba49c5299fb52c61cf59", "type": "github" }, "original": { @@ -394,11 +394,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { @@ -465,11 +465,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1772402258, - "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=", + "lastModified": 1774309640, + "narHash": "sha256-8oWL7YLwElBY9ebYri1LlSlhf/gd1Qoqj0nbBwG2yso=", "owner": "nix-community", "repo": "nixvim", - "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10", + "rev": "28c58bf023bf537354f78d6e496a349d7a0ed554", "type": "github" }, "original": { @@ -486,11 +486,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774060240, - "narHash": "sha256-D71RQ9AHhosaqotzlPLURm0Dy0b301Tmqfo0IKLzskE=", + "lastModified": 1774318883, + "narHash": "sha256-7+Tyq7NCzk2tu65SsP98c7cPGxr+G0OvnYOZkh5/HIA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "b9a02cccc7b8388c3dedd0785812f31e02c8f26d", + "rev": "b725f32e27ffddac8c31022f78ad75ca56c079d4", "type": "github" }, "original": { @@ -509,11 +509,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773842483, - "narHash": "sha256-oRqz+5AbNKfUWWwN5c83CsSOsUWVGITh0HZg+wX5Q/8=", + "lastModified": 1774304440, + "narHash": "sha256-JVLdoEuZUxS6Iujt0rC+Pyxw1pP6JSddGexqD6+yZ64=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "3962ff1e0b59ef067c57199d31271ddbf23b29cd", + "rev": "2ddc0266025b9cc196fc28a46f0ed89146834c4c", "type": "github" }, "original": { @@ -557,11 +557,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1773970322, - "narHash": "sha256-xyO9ZV+cZk+HVmjS6P5Jzwl6ioRCKgeLQSSbUFtPrZk=", + "lastModified": 1774302228, + "narHash": "sha256-uGe/9XdfviGQbidgmk6Uu0vu2Ly5nqmtYzUqGU5ejDc=", "owner": "notashelf", "repo": "nvf", - "rev": "8aad181ec9057c56b6fe5d6081a399427e1d1dec", + "rev": "84fbbc801ff1a7a9747bff71688ad376b83b2f7b", "type": "github" }, "original": { @@ -620,11 +620,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1773792048, - "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=", + "lastModified": 1774124764, + "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=", "owner": "danth", "repo": "stylix", - "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1", + "rev": "e31c79f571c5595a155f84b9d77ce53a84745494", "type": "github" }, "original": { From 34ab1c370e3723ee39efbe2d282bdeec8d5b4692 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 24 Mar 2026 00:52:57 -0400 Subject: [PATCH 03/30] Fixed nvim config error, set lualine theme --- modules/home/editors/nixvim.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index 2b0203e..cc911c9 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -44,6 +44,9 @@ settings = { flavour = "mocha"; transparent_background = false; + integrations = { + lualine = true; + }; }; }; From 9bc46719d5a6a1465e47a16b2a130fe3ad512c2b Mon Sep 17 00:00:00 2001 From: Don Williams Date: Tue, 24 Mar 2026 00:59:16 -0400 Subject: [PATCH 04/30] 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 --- CHANGELOG.md | 4 ++++ modules/home/cli/git.nix | 1 + modules/home/editors/nixvim.nix | 2 +- modules/home/gtk.nix | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d474662..d6218d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ # 🚀 **Current Release - ZaneyOS v2.6.1** +- 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 diff --git a/modules/home/cli/git.nix b/modules/home/cli/git.nix index 5a509ad..996b394 100644 --- a/modules/home/cli/git.nix +++ b/modules/home/cli/git.nix @@ -3,6 +3,7 @@ in { programs.git = { enable = true; + signing.format = null; settings = { user = { diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index cc911c9..21dd6dd 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -56,7 +56,7 @@ lualine = { enable = true; settings = { - options = {theme = "catppuccin";}; + options = {theme = "auto";}; }; }; bufferline.enable = true; diff --git a/modules/home/gtk.nix b/modules/home/gtk.nix index cec72b3..12fe645 100644 --- a/modules/home/gtk.nix +++ b/modules/home/gtk.nix @@ -1,5 +1,6 @@ -{pkgs, ...}: { +{config, pkgs, ...}: { gtk = { + gtk4.theme = null; iconTheme = { name = "Papirus-Dark"; package = pkgs.papirus-icon-theme; From 27ba6b39350271a85cfe6f0f5f6f0273682315d8 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Tue, 24 Mar 2026 14:14:39 -0400 Subject: [PATCH 05/30] Updated flake to check reported issue --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 6fb8e06..f5261a6 100644 --- a/flake.lock +++ b/flake.lock @@ -304,11 +304,11 @@ ] }, "locked": { - "lastModified": 1774293042, - "narHash": "sha256-OEBV+Y5I4Ldu98k0KvGXRfJYh+jjE8ocCSL/dxTGs1s=", + "lastModified": 1774371786, + "narHash": "sha256-ag1HUJv0SDBqKAYxwWlvAE2gBsEk3XYFvWtmdAHFz7E=", "owner": "nix-community", "repo": "home-manager", - "rev": "bc357c75e3142a31b849ba49c5299fb52c61cf59", + "rev": "b8cb89f2c4f7006b17b4aa5d8b39b95b93b559d8", "type": "github" }, "original": { @@ -486,11 +486,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774318883, - "narHash": "sha256-7+Tyq7NCzk2tu65SsP98c7cPGxr+G0OvnYOZkh5/HIA=", + "lastModified": 1774374378, + "narHash": "sha256-topcCacFpMQeu/TlKBgQwGtA61JU2MzvzwVisu42g0M=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "b725f32e27ffddac8c31022f78ad75ca56c079d4", + "rev": "d1c0374f73ea687ae33b30fe6c4257dc0995d4f3", "type": "github" }, "original": { @@ -557,11 +557,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1774302228, - "narHash": "sha256-uGe/9XdfviGQbidgmk6Uu0vu2Ly5nqmtYzUqGU5ejDc=", + "lastModified": 1774375131, + "narHash": "sha256-d22VIgsDXagQQWnAnebYeQWGHlmF81YRwuGCzAgNZAQ=", "owner": "notashelf", "repo": "nvf", - "rev": "84fbbc801ff1a7a9747bff71688ad376b83b2f7b", + "rev": "d847d401bea4dcb1478d02a61a3209fa8512f71d", "type": "github" }, "original": { From 4f7e54a2184dd30696dcd405cc7f30595841c919 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 3 Apr 2026 14:00:55 -0400 Subject: [PATCH 06/30] 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 --- FAQ.es.md | 6 +-- FAQ.md | 12 +++--- modules/home/hyprland/exec-once.nix | 4 +- modules/home/hyprland/hyprland.nix | 2 +- modules/home/scripts/keybinds-parser.nix | 2 +- .../home/scripts/qs-vid-wallpapers-apply.nix | 4 +- modules/home/scripts/qs-wallpapers-apply.nix | 38 +++++++++---------- .../home/scripts/qs-wallpapers-restore.nix | 36 +++++++++--------- modules/home/scripts/wallsetter.nix | 2 +- 9 files changed, 53 insertions(+), 53 deletions(-) diff --git a/FAQ.es.md b/FAQ.es.md index 7b9bcbc..5a08953 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 && 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" ]; ``` diff --git a/FAQ.md b/FAQ.md index 1c1b2ab..32c6708 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 && 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; ** 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 && 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" ]; ``` diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index 130233a..edb5f50 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 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 { diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 367e28a..ce8b937 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -44,7 +44,7 @@ hyprKbVariant = variantFinal; in { home.packages = with pkgs; [ - swww + awww grim slurp wl-clipboard diff --git a/modules/home/scripts/keybinds-parser.nix b/modules/home/scripts/keybinds-parser.nix index 5451e94..0d2ef32 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 ~ /(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 { diff --git a/modules/home/scripts/qs-vid-wallpapers-apply.nix b/modules/home/scripts/qs-vid-wallpapers-apply.nix index c3f7dd8..61be824 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 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" diff --git a/modules/home/scripts/qs-wallpapers-apply.nix b/modules/home/scripts/qs-wallpapers-apply.nix index 1f9d77c..d256418 100644 --- a/modules/home/scripts/qs-wallpapers-apply.nix +++ b/modules/home/scripts/qs-wallpapers-apply.nix @@ -28,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="swww" + BACKEND="awww" else BACKEND="mpvpaper" fi @@ -96,8 +96,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 +120,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 ! ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + log "Starting awww-daemon" + ${pkgs.awww}/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 ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + log "awww-daemon ready" break fi ${pkgs.coreutils}/bin/sleep 0.1 @@ -139,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_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" + ${pkgs.awww}/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" + ${pkgs.awww}/bin/awww img --resize fill "$sel" || \ + ${pkgs.awww}/bin/awww img --resize fit "$sel" || \ + ${pkgs.awww}/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" diff --git a/modules/home/scripts/qs-wallpapers-restore.nix b/modules/home/scripts/qs-wallpapers-restore.nix index 9f0052f..9a4b10f 100644 --- a/modules/home/scripts/qs-wallpapers-restore.nix +++ b/modules/home/scripts/qs-wallpapers-restore.nix @@ -30,8 +30,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 +50,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 ! ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + log "Starting awww-daemon" + ${pkgs.awww}/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 ${pkgs.awww}/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" + ${pkgs.awww}/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" + ${pkgs.awww}/bin/awww img --resize fill "$PATH_J" || \ + ${pkgs.awww}/bin/awww img --resize fit "$PATH_J" || \ + ${pkgs.awww}/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 +94,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 +104,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 +113,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" ;; diff --git a/modules/home/scripts/wallsetter.nix b/modules/home/scripts/wallsetter.nix index a2ae7d5..c2371fe 100644 --- a/modules/home/scripts/wallsetter.nix +++ b/modules/home/scripts/wallsetter.nix @@ -17,7 +17,7 @@ pkgs.writeShellScriptBin "wallsetter" '' PREVIOUS=$WALLPAPER - ${pkgs.swww}/bin/swww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60 + ${pkgs.awww}/bin/awww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60 sleep $TIMEOUT done '' From 10f3587c6af15995df132eaeaa165f8e4828472f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 3 Apr 2026 14:06:14 -0400 Subject: [PATCH 07/30] Updated CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d6218d8..0ed1bd2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,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 From 0bbcb7866d147ad2c125afa997d310b2b20216df Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 05:08:45 -0400 Subject: [PATCH 08/30] 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 --- CHANGELOG.md | 1 + flake.nix | 4 ++++ modules/core/packages.nix | 1 + modules/home/hyprland/hyprland.nix | 1 - 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ed1bd2..bfa50ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ # 🚀 **Current Release - ZaneyOS v2.6.1** +- Added `awww` as flake input for installs < 25.11 - Fixed eval warnings: - `gtk.gtk4.theme` set to `null` - `git.signing.format` set to `null` diff --git a/flake.nix b/flake.nix index e3a88f6..9ca5d5b 100644 --- a/flake.nix +++ b/flake.nix @@ -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 = { diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 3b7d27d..5b2a570 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -40,6 +40,7 @@ in { nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; + inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww noctaliaPkgs ++ [ alejandra # nix formatter diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index ce8b937..ee38d41 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -44,7 +44,6 @@ hyprKbVariant = variantFinal; in { home.packages = with pkgs; [ - awww grim slurp wl-clipboard From d2c0128e01d9aace82a076b46c5de3109e53745b Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 05:16:16 -0400 Subject: [PATCH 09/30] 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 --- modules/home/scripts/default.nix | 7 ++++--- modules/home/scripts/qs-wallpapers-apply.nix | 18 ++++++++++-------- modules/home/scripts/qs-wallpapers-restore.nix | 18 ++++++++++-------- modules/home/scripts/wallsetter.nix | 6 ++++-- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index 6e99baa..4874006 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -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;}) diff --git a/modules/home/scripts/qs-wallpapers-apply.nix b/modules/home/scripts/qs-wallpapers-apply.nix index d256418..2bc1818 100644 --- a/modules/home/scripts/qs-wallpapers-apply.nix +++ b/modules/home/scripts/qs-wallpapers-apply.nix @@ -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 @@ -123,12 +125,12 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' awww) ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true # Start awww-daemon if needed (newer awww has no 'init' subcommand) - if ! ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + if ! ${awwwPkg}/bin/awww query >/dev/null 2>&1; then log "Starting awww-daemon" - ${pkgs.awww}/bin/awww-daemon >/dev/null 2>&1 & disown || true + ${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.awww}/bin/awww query >/dev/null 2>&1; then + if ${awwwPkg}/bin/awww query >/dev/null 2>&1; then log "awww-daemon ready" break fi @@ -142,13 +144,13 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' run_awww_img() { if [ -n "''${WALLPAPER_RESIZE:-}" ]; then log "awww img --resize ''${WALLPAPER_RESIZE} $sel" - ${pkgs.awww}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$sel" + ${awwwPkg}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$sel" return $? fi log "Trying awww resize modes: fill -> fit -> crop" - ${pkgs.awww}/bin/awww img --resize fill "$sel" || \ - ${pkgs.awww}/bin/awww img --resize fit "$sel" || \ - ${pkgs.awww}/bin/awww img --resize crop "$sel" + ${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 diff --git a/modules/home/scripts/qs-wallpapers-restore.nix b/modules/home/scripts/qs-wallpapers-restore.nix index 9a4b10f..81a3554 100644 --- a/modules/home/scripts/qs-wallpapers-restore.nix +++ b/modules/home/scripts/qs-wallpapers-restore.nix @@ -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 @@ -56,23 +58,23 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true - if ! ${pkgs.awww}/bin/awww query >/dev/null 2>&1; then + if ! ${awwwPkg}/bin/awww query >/dev/null 2>&1; then log "Starting awww-daemon" - ${pkgs.awww}/bin/awww-daemon >/dev/null 2>&1 & disown || true + ${awwwPkg}/bin/awww-daemon >/dev/null 2>&1 & disown || true for i in $(${pkgs.coreutils}/bin/seq 1 50); do - if ${pkgs.awww}/bin/awww 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 "awww img --resize ''${WALLPAPER_RESIZE} $PATH_J" - ${pkgs.awww}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J" + ${awwwPkg}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J" else log "Trying awww resize modes: fill -> fit -> crop" - ${pkgs.awww}/bin/awww img --resize fill "$PATH_J" || \ - ${pkgs.awww}/bin/awww img --resize fit "$PATH_J" || \ - ${pkgs.awww}/bin/awww img --resize crop "$PATH_J" + ${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 } diff --git a/modules/home/scripts/wallsetter.nix b/modules/home/scripts/wallsetter.nix index c2371fe..59c5226 100644 --- a/modules/home/scripts/wallsetter.nix +++ b/modules/home/scripts/wallsetter.nix @@ -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.awww}/bin/awww 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 '' From 2e29f9fabcead3e202c1842aec5bbd086c1afad2 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 05:26:57 -0400 Subject: [PATCH 10/30] 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 --- modules/home/editors/nixvim.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index 21dd6dd..8a6bb69 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -329,13 +329,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 @@ -344,6 +344,8 @@ nixpkgs-fmt figlet toilet + bash-language-server + tailwindcss-language-server ]; # Diagnostic UI and notify background tweaks From 4f02995d0d3b2a10d752c28efcd7eb365e297222 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 05:29:39 -0400 Subject: [PATCH 11/30] 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 --- modules/core/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 5b2a570..b444ee6 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -1,4 +1,5 @@ { + inputs, pkgs, host, ... From 6b7acb7fa5bd6ae248be9d4b167ee8f50098844f Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 05:33:00 -0400 Subject: [PATCH 12/30] Fixed syntax error On branch main Changes to be committed: modified: modules/core/packages.nix --- modules/core/packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/core/packages.nix b/modules/core/packages.nix index b444ee6..afc4846 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -41,8 +41,10 @@ in { nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; - inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww - noctaliaPkgs + [ + inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww + ] + ++ noctaliaPkgs ++ [ alejandra # nix formatter amfora # Fancy Terminal Browser For Gemini Protocol From e81ea5a023cff9df768f4cedbd79f15c131a3341 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 05:47:06 -0400 Subject: [PATCH 13/30] 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 --- install-zaneyos.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 3060e09..560dd4d 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -141,13 +141,13 @@ has_vm=false if lspci | grep -qi 'vga\|3d\|display'; then while read -r line; do - if echo "$line" | grep -qi 'nvidia'; then + if echo "$line" | grep -Eqi '\b(nvidia)\b'; then has_nvidia=true - elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then + elif echo "$line" | grep -Eqi '\b(amd|ati|advanced micro devices)\b'; then has_amd=true - elif echo "$line" | grep -qi 'intel'; then + elif echo "$line" | grep -Eqi '\b(intel)\b'; then has_intel=true - elif echo "$line" | grep -qi 'virtio\|vmware'; then + elif echo "$line" | grep -Eqi '\b(virtio|vmware)\b'; then has_vm=true fi done < <(lspci | grep -i 'vga\|3d\|display') From 400f8510dcb1068e1f58f9ce33293b61b6b088ec Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 4 Apr 2026 06:11:20 -0400 Subject: [PATCH 14/30] 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 --- install-zaneyos.sh | 14 +++++++------- modules/home/scripts/zcli.nix | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 560dd4d..cbf8690 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -139,23 +139,23 @@ has_intel=false has_amd=false has_vm=false -if lspci | grep -qi 'vga\|3d\|display'; then +if lspci -nn | grep -qi 'vga\|3d\|display'; then while read -r line; do - if echo "$line" | grep -Eqi '\b(nvidia)\b'; then + if echo "$line" | grep -Eqi '\[10de\]'; then has_nvidia=true - elif echo "$line" | grep -Eqi '\b(amd|ati|advanced micro devices)\b'; then + elif echo "$line" | grep -Eqi '\[1002\]'; then has_amd=true - elif echo "$line" | grep -Eqi '\b(intel)\b'; then + elif echo "$line" | grep -Eqi '\[8086\]'; then has_intel=true - elif echo "$line" | grep -Eqi '\b(virtio|vmware)\b'; then + elif echo "$line" | grep -Eqi '\b(virtio|vmware|qxl|qemu|virtualbox|bochs|hyper-v|microsoft)\b'; 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" elif $has_nvidia && $has_amd; then - DETECTED_PROFILE="amd-nvidia-hybrid" + DETECTED_PROFILE="amd-hybrid" elif $has_nvidia && $has_intel; then DETECTED_PROFILE="nvidia-laptop" elif $has_nvidia; then diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index 407238f..95a0c61 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -244,18 +244,18 @@ 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 -Eqi '\[10de\]'; then has_nvidia=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'amd\|ati\|advanced micro devices'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eqi '\[1002\]'; then has_amd=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'intel'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eqi '\[8086\]'; 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 -Eqi 'virtio\|vmware\|qxl\|qemu\|virtualbox\|bochs\|hyper-v\|microsoft'; 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 detected_profile="vm" From 605b66fbb49cbe02ee047c32dbfdbc41e3c0eb02 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sun, 5 Apr 2026 17:33:55 -0400 Subject: [PATCH 15/30] Added hyprshutdown --- modules/home/hyprland/hyprland.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index ee38d41..e99709c 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -51,6 +51,7 @@ in { ydotool hyprpolkitagent hyprshot + hyprshutdown hyprpicker #hyprland-qtutils # needed for banners and ANR messages ]; From f95a583a96a0f1dcc2516cf03ffa7d2a5c9c365e Mon Sep 17 00:00:00 2001 From: dwilliams Date: Tue, 7 Apr 2026 19:59:31 -0400 Subject: [PATCH 16/30] 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 --- flake.lock | 236 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 132 insertions(+), 104 deletions(-) diff --git a/flake.lock b/flake.lock index f5261a6..d783d53 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1768155355, - "narHash": "sha256-s0TBsxvGjl3Z4O3McFlKKq5CKCjFLYd/WGaROb3VkX0=", + "lastModified": 1775260434, + "narHash": "sha256-Km+QqtLb3RiO0J3WG44rSffzuEaRW4YFOADgH4VEZaY=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "8f47c5e82ee8e6e8adcc1748be0056a1e349f7e8", + "rev": "633579fda5c8fb0c1e08779c568bad3cff915947", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1773854383, - "narHash": "sha256-ra8jcAG9WHDsGvqgumqK7Bq6DQqOrbYm18S+TMKaots=", + "lastModified": 1774942619, + "narHash": "sha256-AxUTNmWQA7+l+ArgLc8ZAHMEvGNf8Gdx+jVx0zOu66Q=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "54f7caf3dff6ae6131669e91203fb06f2f82db3a", + "rev": "638e265b165f9cca9bd827abb52a864de1001aaf", "type": "github" }, "original": { @@ -43,6 +43,28 @@ "type": "github" } }, + "awww": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1774191766, + "narHash": "sha256-bvO+gfuUOVUiBEwAJ5A2RjpysPzCfyXD+DM8piOa1+4=", + "ref": "refs/heads/main", + "rev": "7a8fc2e646b97e5ae508a44d3449e3b41345d456", + "revCount": 1336, + "type": "git", + "url": "https://codeberg.org/LGFae/awww" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/LGFae/awww" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -136,11 +158,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1764873433, - "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", + "lastModified": 1775176642, + "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", + "rev": "179704030c5286c729b5b0522037d1d51341022c", "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, @@ -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": 1774371786, - "narHash": "sha256-ag1HUJv0SDBqKAYxwWlvAE2gBsEk3XYFvWtmdAHFz7E=", + "lastModified": 1775598298, + "narHash": "sha256-FZRwskiertE+8wgFKjLoc/41UrVqzR2V3QseMBHuo/g=", "owner": "nix-community", "repo": "home-manager", - "rev": "b8cb89f2c4f7006b17b4aa5d8b39b95b93b559d8", + "rev": "98b4d61cfaf825c8b691afae0b6e152f0cc05c86", "type": "github" }, "original": { @@ -326,11 +362,11 @@ ] }, "locked": { - "lastModified": 1773422513, - "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", + "lastModified": 1774991950, + "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", + "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", "type": "github" }, "original": { @@ -394,11 +430,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774106199, - "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", + "lastModified": 1775423009, + "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", + "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", "type": "github" }, "original": { @@ -410,27 +446,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", + "lastModified": 1774386573, + "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1771008912, - "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a82ccc39b39b621151d6732718e3e250109076fa", + "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", "type": "github" }, "original": { @@ -440,13 +460,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1767767207, - "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", + "lastModified": 1775036866, + "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", + "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", "type": "github" }, "original": { @@ -465,11 +485,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1774309640, - "narHash": "sha256-8oWL7YLwElBY9ebYri1LlSlhf/gd1Qoqj0nbBwG2yso=", + "lastModified": 1775307257, + "narHash": "sha256-y9hEecHH4ennFwIcw1n480YCGh73DkEmizmQnyXuvgg=", "owner": "nix-community", "repo": "nixvim", - "rev": "28c58bf023bf537354f78d6e496a349d7a0ed554", + "rev": "2e008bb941f72379d5b935d5bfe70ed8b7c793ff", "type": "github" }, "original": { @@ -486,11 +506,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774374378, - "narHash": "sha256-topcCacFpMQeu/TlKBgQwGtA61JU2MzvzwVisu42g0M=", + "lastModified": 1775593740, + "narHash": "sha256-P2bAFa/lx2wzMVVHwIbUOBXTpejzWsAMJACDtEdHXMU=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "d1c0374f73ea687ae33b30fe6c4257dc0995d4f3", + "rev": "48fe0f91a5fa514ca37863b2078b8c20a97fb66b", "type": "github" }, "original": { @@ -509,11 +529,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1774304440, - "narHash": "sha256-JVLdoEuZUxS6Iujt0rC+Pyxw1pP6JSddGexqD6+yZ64=", + "lastModified": 1775491791, + "narHash": "sha256-elzmRpudiwtYQNCKk9TAEhlYQV0+yUM81poo01Z7FfQ=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "2ddc0266025b9cc196fc28a46f0ed89146834c4c", + "rev": "9e2736531ef7a1a336abf7ec72255d0b192273b6", "type": "github" }, "original": { @@ -534,11 +554,11 @@ ] }, "locked": { - "lastModified": 1767810917, - "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", + "lastModified": 1775228139, + "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", "owner": "nix-community", "repo": "NUR", - "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", + "rev": "601971b9c89e0304561977f2c28fa25e73aa7132", "type": "github" }, "original": { @@ -549,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_3", + "nixpkgs": "nixpkgs_2", "systems": "systems_4" }, "locked": { - "lastModified": 1774375131, - "narHash": "sha256-d22VIgsDXagQQWnAnebYeQWGHlmF81YRwuGCzAgNZAQ=", + "lastModified": 1775567832, + "narHash": "sha256-jAnxLY0qPW+qR4f5GTLp2qbtku8b4E2XuJ8mavSIPfY=", "owner": "notashelf", "repo": "nvf", - "rev": "d847d401bea4dcb1478d02a61a3209fa8512f71d", + "rev": "d6746a7510ba15e9a3577322a2e5387ab983f970", "type": "github" }, "original": { @@ -574,6 +594,7 @@ "inputs": { "alejandra": "alejandra", "antigravity-nix": "antigravity-nix", + "awww": "awww", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", @@ -601,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", @@ -610,21 +652,20 @@ "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": 1774124764, - "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=", + "lastModified": 1775429060, + "narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=", "owner": "danth", "repo": "stylix", - "rev": "e31c79f571c5595a155f84b9d77ce53a84745494", + "rev": "d27951a6539951d87f75cf0a7cda8a3a24016019", "type": "github" }, "original": { @@ -709,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": { @@ -745,11 +769,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767710407, - "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", + "lastModified": 1772661346, + "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", "owner": "tinted-theming", "repo": "schemes", - "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", + "rev": "13b5b0c299982bb361039601e2d72587d6846294", "type": "github" }, "original": { @@ -761,11 +785,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1767489635, - "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", + "lastModified": 1772934010, + "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", + "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", "type": "github" }, "original": { @@ -777,11 +801,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1767488740, - "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", + "lastModified": 1772909925, + "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", + "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", "type": "github" }, "original": { @@ -792,14 +816,18 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "noctalia", + "noctalia-qs", + "nixpkgs" + ] }, "locked": { - "lastModified": 1772660329, - "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", + "lastModified": 1775125835, + "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3710e0e1218041bbad640352a0440114b1e10428", + "rev": "75925962939880974e3ab417879daffcba36c4a3", "type": "github" }, "original": { @@ -816,11 +844,11 @@ ] }, "locked": { - "lastModified": 1773661718, - "narHash": "sha256-MYm1EKp/gbBi9wMEf7Lx0agIVnej/P61sg97EruWzrU=", + "lastModified": 1775367672, + "narHash": "sha256-nGC6qrRsWysfR7/8wsSooq0X71rfJjhq1b+dFI6oQtY=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3ac6ea223b32ff63c45e3577712df991a35aaf33", + "rev": "33cd729244914f1e121477c5de148639c5e73c4a", "type": "github" }, "original": { From b797cac7007e11c14d4deb822d103d71f756c248 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Thu, 9 Apr 2026 18:41:13 -0400 Subject: [PATCH 17/30] 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 --- install-zaneyos.sh | 37 +++++++++++++++++++++++++++++------ modules/home/scripts/zcli.nix | 28 ++++++++++++++++---------- 2 files changed, 49 insertions(+), 16 deletions(-) diff --git a/install-zaneyos.sh b/install-zaneyos.sh index cbf8690..657492d 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -138,16 +138,41 @@ 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 -nn | grep -qi 'vga\|3d\|display'; 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 -Eqi '\[10de\]'; then + if echo "$line" | grep -Eq '\[10de:'; then has_nvidia=true - elif echo "$line" | grep -Eqi '\[1002\]'; then + elif echo "$line" | grep -Eq '\[1002:'; then has_amd=true - elif echo "$line" | grep -Eqi '\[8086\]'; then + elif echo "$line" | grep -Eq '\[8086:'; then has_intel=true - elif echo "$line" | grep -Eqi '\b(virtio|vmware|qxl|qemu|virtualbox|bochs|hyper-v|microsoft)\b'; then + 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 -Eqi 'virtio|vmware|virtualbox|qxl|hyper-v|microsoft corporation|parallels|qemu|bochs|cirrus|svga|virtual'; then has_vm=true fi done < <(lspci -nn | grep -i 'vga\|3d\|display') @@ -155,7 +180,7 @@ if lspci -nn | grep -qi 'vga\|3d\|display'; then if $has_vm; then DETECTED_PROFILE="vm" elif $has_nvidia && $has_amd; then - DETECTED_PROFILE="amd-hybrid" + DETECTED_PROFILE="amd-nvidia-hybrid" elif $has_nvidia && $has_intel; then DETECTED_PROFILE="nvidia-laptop" elif $has_nvidia; then diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index 95a0c61..05eae32 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -246,28 +246,36 @@ in 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 while read -r line; do - if echo "$line" | ${pkgs.gnugrep}/bin/grep -Eqi '\[10de\]'; then + if echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[10de:'; then has_nvidia=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eqi '\[1002\]'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[1002:'; then has_amd=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eqi '\[8086\]'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[8086:'; then has_intel=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eqi 'virtio\|vmware\|qxl\|qemu\|virtualbox\|bochs\|hyper-v\|microsoft'; then + 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\|virtualbox\|qxl\|hyper-v\|microsoft corporation\|parallels\|qemu\|bochs\|cirrus\|svga\|virtual'; then has_vm=true fi 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 From f5106616b5d789a35456b4984b68c31d4e7620dd Mon Sep 17 00:00:00 2001 From: dwilliams Date: Fri, 17 Apr 2026 08:43:34 -0400 Subject: [PATCH 18/30] 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 --- flake.lock | 80 +++++++++++++++++++-------------------- modules/core/flatpak.nix | 2 +- modules/core/packages.nix | 2 + 3 files changed, 43 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index d783d53..d6ea328 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1775260434, - "narHash": "sha256-Km+QqtLb3RiO0J3WG44rSffzuEaRW4YFOADgH4VEZaY=", + "lastModified": 1775937104, + "narHash": "sha256-JpU/iDNArShDxtRMse2ZVG4lDsjOHuDRrqt5OsTGXw8=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "633579fda5c8fb0c1e08779c568bad3cff915947", + "rev": "6d808e1c36b430b1e4762085912db3ccf5b2efdf", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1774942619, - "narHash": "sha256-AxUTNmWQA7+l+ArgLc8ZAHMEvGNf8Gdx+jVx0zOu66Q=", + "lastModified": 1776411505, + "narHash": "sha256-7HILfdTOvWzAMmfS3lQV3MDmVrr2Epj8x4c9F3mzOSE=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "638e265b165f9cca9bd827abb52a864de1001aaf", + "rev": "9f31d28882185d30c0e3082fbc52dab1cd4e879f", "type": "github" }, "original": { @@ -52,11 +52,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1774191766, - "narHash": "sha256-bvO+gfuUOVUiBEwAJ5A2RjpysPzCfyXD+DM8piOa1+4=", + "lastModified": 1776083220, + "narHash": "sha256-78QngptaPiKhlDuhUMrN/GDSHhXtEgMqnRSe3sjhjhM=", "ref": "refs/heads/main", - "rev": "7a8fc2e646b97e5ae508a44d3449e3b41345d456", - "revCount": 1336, + "rev": "27d68a7b8b81b3b9afced39b32e06639d470c040", + "revCount": 1353, "type": "git", "url": "https://codeberg.org/LGFae/awww" }, @@ -211,11 +211,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1775087534, + "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "type": "github" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1775598298, - "narHash": "sha256-FZRwskiertE+8wgFKjLoc/41UrVqzR2V3QseMBHuo/g=", + "lastModified": 1776373306, + "narHash": "sha256-iAJIzHngGZeLIkjzuuWI6VBsYJ1n89a/Esq0m8R1vjs=", "owner": "nix-community", "repo": "home-manager", - "rev": "98b4d61cfaf825c8b691afae0b6e152f0cc05c86", + "rev": "d401492e2acd4fea42f7705a3c266cea739c9c36", "type": "github" }, "original": { @@ -430,11 +430,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1775423009, - "narHash": "sha256-vPKLpjhIVWdDrfiUM8atW6YkIggCEKdSAlJPzzhkQlw=", + "lastModified": 1776169885, + "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "68d8aa3d661f0e6bd5862291b5bb263b2a6595c9", + "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1775307257, - "narHash": "sha256-y9hEecHH4ennFwIcw1n480YCGh73DkEmizmQnyXuvgg=", + "lastModified": 1776350339, + "narHash": "sha256-Rl+tnpvdpf66e/3m+LPNzUoebV3jpiJz7oMxas8FB3I=", "owner": "nix-community", "repo": "nixvim", - "rev": "2e008bb941f72379d5b935d5bfe70ed8b7c793ff", + "rev": "4f75992439d3d554a3681880510e4b645ca2d15b", "type": "github" }, "original": { @@ -506,11 +506,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1775593740, - "narHash": "sha256-P2bAFa/lx2wzMVVHwIbUOBXTpejzWsAMJACDtEdHXMU=", + "lastModified": 1776302695, + "narHash": "sha256-xZc9o1JLQpmWn2Dqui323+Tq2Ai4sSdtdvbFZCs4qLo=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "48fe0f91a5fa514ca37863b2078b8c20a97fb66b", + "rev": "a7c724181fca5d1aff2d47b18fa733504cfdbda2", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775491791, - "narHash": "sha256-elzmRpudiwtYQNCKk9TAEhlYQV0+yUM81poo01Z7FfQ=", + "lastModified": 1775957204, + "narHash": "sha256-d4CVRtAty2GzDYXx4xYQmR+nlOjjKovyprQfZhgLckU=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "9e2736531ef7a1a336abf7ec72255d0b192273b6", + "rev": "68e82fe34c68ee839a9c37e3466820e266af0c86", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1775567832, - "narHash": "sha256-jAnxLY0qPW+qR4f5GTLp2qbtku8b4E2XuJ8mavSIPfY=", + "lastModified": 1776376181, + "narHash": "sha256-N/I4lxWjes7E8n4NEOYaNxxvJ9db+RKHJSH8oDdqR8o=", "owner": "notashelf", "repo": "nvf", - "rev": "d6746a7510ba15e9a3577322a2e5387ab983f970", + "rev": "029ca6d34ad8d830afb56a9963e4baed53848da6", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1775429060, - "narHash": "sha256-wbFF5cRxQOCzL/wHOKYm21t5AHPH2Lfp0mVPCOAvEoc=", + "lastModified": 1776170745, + "narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=", "owner": "danth", "repo": "stylix", - "rev": "d27951a6539951d87f75cf0a7cda8a3a24016019", + "rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9", "type": "github" }, "original": { @@ -823,11 +823,11 @@ ] }, "locked": { - "lastModified": 1775125835, - "narHash": "sha256-2qYcPgzFhnQWchHo0SlqLHrXpux5i6ay6UHA+v2iH4U=", + "lastModified": 1775636079, + "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "75925962939880974e3ab417879daffcba36c4a3", + "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "type": "github" }, "original": { @@ -844,11 +844,11 @@ ] }, "locked": { - "lastModified": 1775367672, - "narHash": "sha256-nGC6qrRsWysfR7/8wsSooq0X71rfJjhq1b+dFI6oQtY=", + "lastModified": 1775699406, + "narHash": "sha256-YpDALorsidLjSyS5ozvsNI7Gz/bkmDs/ls/9oHKPv40=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "33cd729244914f1e121477c5de148639c5e73c4a", + "rev": "b05c87c1a474cdd6979a4e5f7058edf4073554df", "type": "github" }, "original": { diff --git a/modules/core/flatpak.nix b/modules/core/flatpak.nix index e513739..2862127 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 afc4846..513b2aa 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -62,6 +62,8 @@ in { 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 From 6027ada4d1849ad4a637c632c2047401558cecc9 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Sat, 25 Apr 2026 03:21:01 -0400 Subject: [PATCH 19/30] 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 --- CHANGELOG.md | 5 +++ flake.lock | 60 +++++++++++++++--------------- modules/core/boot.nix | 2 +- modules/home/hyprland/hyprland.nix | 2 +- 4 files changed, 37 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bfa50ea..28bb55d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ # 🚀 **Current Release - ZaneyOS v2.6.1** +- 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` diff --git a/flake.lock b/flake.lock index d6ea328..c15ba0e 100644 --- a/flake.lock +++ b/flake.lock @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1776373306, - "narHash": "sha256-iAJIzHngGZeLIkjzuuWI6VBsYJ1n89a/Esq0m8R1vjs=", + "lastModified": 1777086106, + "narHash": "sha256-hlNpIN18pw3xo34Lsrp6vAMUPn0aB/zFBqL0QXI1Pmk=", "owner": "nix-community", "repo": "home-manager", - "rev": "d401492e2acd4fea42f7705a3c266cea739c9c36", + "rev": "5826802354a74af18540aef0b01bc1320f82cc17", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1774991950, - "narHash": "sha256-kScKj3qJDIWuN9/6PMmgy5esrTUkYinrO5VvILik/zw=", + "lastModified": 1776184304, + "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f2d3e04e278422c7379e067e323734f3e8c585a7", + "rev": "3c7524c68348ef79ce48308e0978611a050089b2", "type": "github" }, "original": { @@ -398,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": { @@ -430,11 +430,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776169885, - "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "lastModified": 1776877367, + "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1776350339, - "narHash": "sha256-Rl+tnpvdpf66e/3m+LPNzUoebV3jpiJz7oMxas8FB3I=", + "lastModified": 1777080231, + "narHash": "sha256-gpx+FmYpBAO4toBmQzcmdR6gVvVxT969UlB7Xz2jbFA=", "owner": "nix-community", "repo": "nixvim", - "rev": "4f75992439d3d554a3681880510e4b645ca2d15b", + "rev": "f6fd130ad3b95c3c039fd7f882825c49f7e70bde", "type": "github" }, "original": { @@ -506,11 +506,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1776302695, - "narHash": "sha256-xZc9o1JLQpmWn2Dqui323+Tq2Ai4sSdtdvbFZCs4qLo=", + "lastModified": 1777079905, + "narHash": "sha256-TvYEXwkZnRFQRuFyyqTNSfPnU2tMdhtiBOXSk2AWLJA=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "a7c724181fca5d1aff2d47b18fa733504cfdbda2", + "rev": "a50c92167c8d438000270f7eca36f6eea74f388e", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1775957204, - "narHash": "sha256-d4CVRtAty2GzDYXx4xYQmR+nlOjjKovyprQfZhgLckU=", + "lastModified": 1776585574, + "narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "68e82fe34c68ee839a9c37e3466820e266af0c86", + "rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1776376181, - "narHash": "sha256-N/I4lxWjes7E8n4NEOYaNxxvJ9db+RKHJSH8oDdqR8o=", + "lastModified": 1777062815, + "narHash": "sha256-RWwgP/R2nIcyOTPYJdApqvj/dVc4+n/4kOCNlRnfb7U=", "owner": "notashelf", "repo": "nvf", - "rev": "029ca6d34ad8d830afb56a9963e4baed53848da6", + "rev": "41394699260ffc533a688d0ca5b8888bd5e64233", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1776170745, - "narHash": "sha256-Tl1aZVP5EIlT+k0+iAKH018GLHJpLz3hhJ0LNQOWxCc=", + "lastModified": 1776893932, + "narHash": "sha256-AFD5cf9eNqXq1brHS63xeZy2xKZMgG9J86XJ9I2eLn8=", "owner": "danth", "repo": "stylix", - "rev": "e3861617645a43c9bbefde1aa6ac54dd0a44bfa9", + "rev": "84971726c7ef0bb3669a5443e151cc226e65c518", "type": "github" }, "original": { @@ -844,11 +844,11 @@ ] }, "locked": { - "lastModified": 1775699406, - "narHash": "sha256-YpDALorsidLjSyS5ozvsNI7Gz/bkmDs/ls/9oHKPv40=", + "lastModified": 1777058936, + "narHash": "sha256-H7XdcjRBA4UROm6KNi+mR+E22LW8vb0jRfoz1GHpPCo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "b05c87c1a474cdd6979a4e5f7058edf4073554df", + "rev": "9027d5218172c3aa2060d43e599d3304c9c13bc0", "type": "github" }, "original": { diff --git a/modules/core/boot.nix b/modules/core/boot.nix index 47011ff..51a5da5 100644 --- a/modules/core/boot.nix +++ b/modules/core/boot.nix @@ -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;}; diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index e99709c..635c6c7 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -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 From 6607eb598f13da49af0d63acee27ca5647e10b6d Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 25 Apr 2026 05:12:52 -0400 Subject: [PATCH 20/30] 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 --- modules/home/editors/nixvim.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index 8a6bb69..3a2a3cc 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -77,11 +77,16 @@ treesitter-context.enable = false; # Project management - project-nvim.enable = true; + project-nvim = { + enable = true; + settings = { + datapath = "${config.home.homeDirectory}/.local/share/nvim/project_nvim"; + }; + }; # Notifications and UI polish notify.enable = true; - noice.enable = true; + noice.enable = false; # Startup dashboard alpha = { From 05550da6195d75b527953663c5d24fc265445650 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 25 Apr 2026 05:18:58 -0400 Subject: [PATCH 21/30] 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 --- modules/home/editors/nixvim.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index 3a2a3cc..172ff0e 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -80,7 +80,7 @@ project-nvim = { enable = true; settings = { - datapath = "${config.home.homeDirectory}/.local/share/nvim/project_nvim"; + history.save_dir = "${config.home.homeDirectory}/.local/share/nvim/project_nvim"; }; }; From 72de16b9bfb96cb952c2808b89c98a2f18b66833 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 25 Apr 2026 05:25:06 -0400 Subject: [PATCH 22/30] Trying to fix project history --- modules/home/editors/nixvim.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index 172ff0e..af1676d 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -460,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 + ''; } From 6fe106eccce2e96d230b8ef49c73f9179d9fbbdf Mon Sep 17 00:00:00 2001 From: dwilliams Date: Thu, 30 Apr 2026 12:52:18 -0400 Subject: [PATCH 23/30] 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 --- flake.lock | 62 +++++++++++++++---------------- hosts/zaneyos-24-vm/variables.nix | 2 +- modules/core/packages.nix | 2 - modules/home/default.nix | 2 +- 4 files changed, 33 insertions(+), 35 deletions(-) diff --git a/flake.lock b/flake.lock index c15ba0e..a258161 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1775937104, - "narHash": "sha256-JpU/iDNArShDxtRMse2ZVG4lDsjOHuDRrqt5OsTGXw8=", + "lastModified": 1777149230, + "narHash": "sha256-pu6dVB6NrIj90rrqCgJ5pPlBzS76pW4WA6rE1rD1Gp8=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "6d808e1c36b430b1e4762085912db3ccf5b2efdf", + "rev": "8c4a4a572bee519b04e9bb9207e7d993f55ecb4f", "type": "github" }, "original": { @@ -52,11 +52,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1776083220, - "narHash": "sha256-78QngptaPiKhlDuhUMrN/GDSHhXtEgMqnRSe3sjhjhM=", + "lastModified": 1777136912, + "narHash": "sha256-owyQdC2vi0kYC119fzyVQp0J4G0t1n4xXUwryhlBbqA=", "ref": "refs/heads/main", - "rev": "27d68a7b8b81b3b9afced39b32e06639d470c040", - "revCount": 1353, + "rev": "f66e12a76dbc4c669b2f1375f78bce49f5b19d66", + "revCount": 1363, "type": "git", "url": "https://codeberg.org/LGFae/awww" }, @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1777086106, - "narHash": "sha256-hlNpIN18pw3xo34Lsrp6vAMUPn0aB/zFBqL0QXI1Pmk=", + "lastModified": 1777518431, + "narHash": "sha256-SwgiG2T5pbyo33Vz7/vUCAhEMgwCK8Pa2nDSx5a6/WE=", "owner": "nix-community", "repo": "home-manager", - "rev": "5826802354a74af18540aef0b01bc1320f82cc17", + "rev": "2e54a938cdd4c8e414b2518edc3d82308027c670", "type": "github" }, "original": { @@ -430,11 +430,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776877367, - "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1777080231, - "narHash": "sha256-gpx+FmYpBAO4toBmQzcmdR6gVvVxT969UlB7Xz2jbFA=", + "lastModified": 1777236345, + "narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=", "owner": "nix-community", "repo": "nixvim", - "rev": "f6fd130ad3b95c3c039fd7f882825c49f7e70bde", + "rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4", "type": "github" }, "original": { @@ -506,11 +506,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1777079905, - "narHash": "sha256-TvYEXwkZnRFQRuFyyqTNSfPnU2tMdhtiBOXSk2AWLJA=", + "lastModified": 1777427472, + "narHash": "sha256-kqcfLdxb+CqTroMErCScvx6YQcZYJcf6X+z5I8kBJK8=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "a50c92167c8d438000270f7eca36f6eea74f388e", + "rev": "9f8dd48c8df5ab1f7f87ddf9842627e1e5682186", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1776585574, - "narHash": "sha256-j35EWhKoGhKrfcXcAOpoRVgXEPQt41Eukji/h59cnjk=", + "lastModified": 1777380063, + "narHash": "sha256-q5mWOEICcZzr+KnjIwDHV9EXiBxOC9cnBpxZbDAViU8=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "75d180c28a9ab4470e980f3d6f706ad6c5213add", + "rev": "8742a7a748c43bf44eb6862a8ebd3591ed71502d", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1777062815, - "narHash": "sha256-RWwgP/R2nIcyOTPYJdApqvj/dVc4+n/4kOCNlRnfb7U=", + "lastModified": 1777478067, + "narHash": "sha256-2vZnUuv8fg2sIE6pXgGxZQQ3ZhQW1XE7Sxieg8gK2p4=", "owner": "notashelf", "repo": "nvf", - "rev": "41394699260ffc533a688d0ca5b8888bd5e64233", + "rev": "13c4ad4b4bb926c22945e2fb8862769fe51f27f1", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1776893932, - "narHash": "sha256-AFD5cf9eNqXq1brHS63xeZy2xKZMgG9J86XJ9I2eLn8=", + "lastModified": 1777501441, + "narHash": "sha256-+QWZ2/LvtEfbI4a5OiJmfv8aypBdm0u4Ui9t6LNHkRc=", "owner": "danth", "repo": "stylix", - "rev": "84971726c7ef0bb3669a5443e151cc226e65c518", + "rev": "0bd266569c03b74234b8a2ae73d05055fb02a35f", "type": "github" }, "original": { @@ -844,11 +844,11 @@ ] }, "locked": { - "lastModified": 1777058936, - "narHash": "sha256-H7XdcjRBA4UROm6KNi+mR+E22LW8vb0jRfoz1GHpPCo=", + "lastModified": 1777564084, + "narHash": "sha256-O9VRkxg+2j+sh+c73wi4VeIBECoqW2PlnCR9Qe1nQKA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9027d5218172c3aa2060d43e599d3304c9c13bc0", + "rev": "d93443c0f6fdb3b179bed68856f322dba4842612", "type": "github" }, "original": { diff --git a/hosts/zaneyos-24-vm/variables.nix b/hosts/zaneyos-24-vm/variables.nix index 05dfff9..ab6507d 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 = true; + pythonEnable = false; # Hyprland Settings # Examples: diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 513b2aa..bff7dbd 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -54,8 +54,6 @@ 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 diff --git a/modules/home/default.nix b/modules/home/default.nix index f6b29e7..4b1a69f 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 ] From affa1f0ce61c347ba8335f4f94e7b6f915c24d76 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Thu, 30 Apr 2026 12:58:25 -0400 Subject: [PATCH 24/30] Updated CHANGELOG --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28bb55d..269eda2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,13 @@ # 🚀 **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 From 60b97fe42cb9b7a111ab8b1f6e25a86b42971dfe Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 1 May 2026 11:22:23 -0400 Subject: [PATCH 25/30] 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 --- modules/core/packages.nix | 1 + modules/home/editors/vscode.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/core/packages.nix b/modules/core/packages.nix index bff7dbd..5c7a7a9 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -39,6 +39,7 @@ in { }; nixpkgs.config.allowUnfree = true; + nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ]; environment.systemPackages = with pkgs; [ diff --git a/modules/home/editors/vscode.nix b/modules/home/editors/vscode.nix index 8b2d3dc..4f3ce02 100644 --- a/modules/home/editors/vscode.nix +++ b/modules/home/editors/vscode.nix @@ -90,4 +90,5 @@ in { }; }; nixpkgs.config.allowUnfree = true; + nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ]; } From 145d98da1d39681d73ada63a2e210968342f9a5e Mon Sep 17 00:00:00 2001 From: dwilliams Date: Fri, 1 May 2026 11:28:53 -0400 Subject: [PATCH 26/30] Updated FLAKE --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index a258161..68969f2 100644 --- a/flake.lock +++ b/flake.lock @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1777518431, - "narHash": "sha256-SwgiG2T5pbyo33Vz7/vUCAhEMgwCK8Pa2nDSx5a6/WE=", + "lastModified": 1777647296, + "narHash": "sha256-B2dllLZyocJ9fN4io22eadYPWynvAdRq/zC2NSjw52k=", "owner": "nix-community", "repo": "home-manager", - "rev": "2e54a938cdd4c8e414b2518edc3d82308027c670", + "rev": "d181e6ac2ad01e50c914220d7478fed50b1dbf68", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1777501441, - "narHash": "sha256-+QWZ2/LvtEfbI4a5OiJmfv8aypBdm0u4Ui9t6LNHkRc=", + "lastModified": 1777580129, + "narHash": "sha256-6buSTzDtHYCJP1JNAIZCmgNcOs76oN03j+21CxdijVo=", "owner": "danth", "repo": "stylix", - "rev": "0bd266569c03b74234b8a2ae73d05055fb02a35f", + "rev": "20ff51f523e2dd67e5f31a321719d30708c1b771", "type": "github" }, "original": { From b2165ec35eff758a8bcea50a61eb2b7b639e8834 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Tue, 5 May 2026 15:43:09 -0400 Subject: [PATCH 27/30] 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 --- flake.lock | 96 +++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/flake.lock b/flake.lock index 68969f2..2d2d44c 100644 --- a/flake.lock +++ b/flake.lock @@ -103,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": { @@ -158,11 +158,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1775176642, - "narHash": "sha256-2veEED0Fg7Fsh81tvVDNYR6SzjqQxa7hbi18Jv4LWpM=", + "lastModified": 1776136500, + "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "179704030c5286c729b5b0522037d1d51341022c", + "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7", "type": "github" }, "original": { @@ -211,11 +211,11 @@ ] }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1777932387, + "narHash": "sha256-nUYVPiqrzr36ThiQOAr5MKeGHDBSDM3OFWkz0uDjOvc=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "71a3a77326609675e9f8b51084cf23d5d1945899", "type": "github" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1777647296, - "narHash": "sha256-B2dllLZyocJ9fN4io22eadYPWynvAdRq/zC2NSjw52k=", + "lastModified": 1778009629, + "narHash": "sha256-nUoQtf4Zq7DRYJrfv904hjrxjAlWVP6a1pNNFKx3FCg=", "owner": "nix-community", "repo": "home-manager", - "rev": "d181e6ac2ad01e50c914220d7478fed50b1dbf68", + "rev": "00ed86e58bb6979a7921859fd1615d19382eac5c", "type": "github" }, "original": { @@ -377,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": { @@ -430,11 +430,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1777268161, - "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -462,11 +462,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1775036866, - "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6201e203d09599479a3b3450ed24fa81537ebc4e", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1777236345, - "narHash": "sha256-ALOqlq7bE30lsX4rA76hXeQ2aLLEpb44hS+D1+jWS88=", + "lastModified": 1777991353, + "narHash": "sha256-DFwjggMV+nzCZpwK6Obxj9F+P59rbLVowGqHETfctBk=", "owner": "nix-community", "repo": "nixvim", - "rev": "a67d9cd6ff725a763afe88727aac73208ded3bf4", + "rev": "7986a276960b4dfaed9bb2c3c438b5ba71ae08f1", "type": "github" }, "original": { @@ -506,11 +506,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1777427472, - "narHash": "sha256-kqcfLdxb+CqTroMErCScvx6YQcZYJcf6X+z5I8kBJK8=", + "lastModified": 1777859147, + "narHash": "sha256-0vCgxdwrxBkHmqNgJtUMGCFwSV5a6AgYdKAgBCtFFPM=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "9f8dd48c8df5ab1f7f87ddf9842627e1e5682186", + "rev": "6b48834dd6c3913d211476ab2f964f3fb100675e", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1777380063, - "narHash": "sha256-q5mWOEICcZzr+KnjIwDHV9EXiBxOC9cnBpxZbDAViU8=", + "lastModified": 1777773024, + "narHash": "sha256-pLU+KB84A0Jei/vTD6pOS4Ovkmq3QDfPQHg1MlKsRqM=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "8742a7a748c43bf44eb6862a8ebd3591ed71502d", + "rev": "d3e26ccd9eecde9139be00caf5dc2d4260fb31ee", "type": "github" }, "original": { @@ -554,11 +554,11 @@ ] }, "locked": { - "lastModified": 1775228139, - "narHash": "sha256-ebbeHmg+V7w8050bwQOuhmQHoLOEOfqKzM1KgCTexK4=", + "lastModified": 1777598946, + "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=", "owner": "nix-community", "repo": "NUR", - "rev": "601971b9c89e0304561977f2c28fa25e73aa7132", + "rev": "5d55af01c0f86be583931fe99207fc56c14134b3", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1777478067, - "narHash": "sha256-2vZnUuv8fg2sIE6pXgGxZQQ3ZhQW1XE7Sxieg8gK2p4=", + "lastModified": 1777963724, + "narHash": "sha256-DM3sF8ikMrqPGapSOpYYtwqfYMU/xDaP/UzmmdC0lgI=", "owner": "notashelf", "repo": "nvf", - "rev": "13c4ad4b4bb926c22945e2fb8862769fe51f27f1", + "rev": "5dc8f3a34cf46d98f6a0073368adc2746b854cf6", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1777580129, - "narHash": "sha256-6buSTzDtHYCJP1JNAIZCmgNcOs76oN03j+21CxdijVo=", + "lastModified": 1777835090, + "narHash": "sha256-VLH8zPweblCOvpnQXp4fVs7f6Q79YhXF5XFKlOrvIFk=", "owner": "danth", "repo": "stylix", - "rev": "20ff51f523e2dd67e5f31a321719d30708c1b771", + "rev": "7989a1054b01153212dede6005abfd1576b8328c", "type": "github" }, "original": { @@ -769,11 +769,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1772661346, - "narHash": "sha256-4eu3LqB9tPqe0Vaqxd4wkZiBbthLbpb7llcoE/p5HT0=", + "lastModified": 1777041405, + "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=", "owner": "tinted-theming", "repo": "schemes", - "rev": "13b5b0c299982bb361039601e2d72587d6846294", + "rev": "5f868b3a338b6904c47f3833b9c411be641983a8", "type": "github" }, "original": { @@ -785,11 +785,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1772934010, - "narHash": "sha256-x+6+4UvaG+RBRQ6UaX+o6DjEg28u4eqhVRM9kpgJGjQ=", + "lastModified": 1777169200, + "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "c3529673a5ab6e1b6830f618c45d9ce1bcdd829d", + "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac", "type": "github" }, "original": { @@ -801,11 +801,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1772909925, - "narHash": "sha256-jx/5+pgYR0noHa3hk2esin18VMbnPSvWPL5bBjfTIAU=", + "lastModified": 1777463218, + "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "b4d3a1b3bcbd090937ef609a0a3b37237af974df", + "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae", "type": "github" }, "original": { From 927e38e5dc49e1f8d7d0b303f8475f56d0088337 Mon Sep 17 00:00:00 2001 From: dwilliams Date: Fri, 8 May 2026 10:59:48 -0400 Subject: [PATCH 28/30] Updated flake --- flake.lock | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 2d2d44c..9533a50 100644 --- a/flake.lock +++ b/flake.lock @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1778009629, - "narHash": "sha256-nUoQtf4Zq7DRYJrfv904hjrxjAlWVP6a1pNNFKx3FCg=", + "lastModified": 1778248595, + "narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=", "owner": "nix-community", "repo": "home-manager", - "rev": "00ed86e58bb6979a7921859fd1615d19382eac5c", + "rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d", "type": "github" }, "original": { @@ -506,11 +506,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1777859147, - "narHash": "sha256-0vCgxdwrxBkHmqNgJtUMGCFwSV5a6AgYdKAgBCtFFPM=", + "lastModified": 1778104114, + "narHash": "sha256-+tbqLv7IW5Aem8kGF6cp4n3MtNBcwqmuGlMt6S1kQjs=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "6b48834dd6c3913d211476ab2f964f3fb100675e", + "rev": "eb2b53ddaa7564f5c93031cbe65cd5b6ef3c12a9", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1777963724, - "narHash": "sha256-DM3sF8ikMrqPGapSOpYYtwqfYMU/xDaP/UzmmdC0lgI=", + "lastModified": 1778049651, + "narHash": "sha256-EC5pBiLcP/EVmYWldJRNfkChCqF9rkeTnTs8t9Cs+ZY=", "owner": "notashelf", "repo": "nvf", - "rev": "5dc8f3a34cf46d98f6a0073368adc2746b854cf6", + "rev": "88dbbad1f44efe3d2c18903e2c7542452f7bdfd6", "type": "github" }, "original": { @@ -661,11 +661,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1777835090, - "narHash": "sha256-VLH8zPweblCOvpnQXp4fVs7f6Q79YhXF5XFKlOrvIFk=", + "lastModified": 1778104276, + "narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=", "owner": "danth", "repo": "stylix", - "rev": "7989a1054b01153212dede6005abfd1576b8328c", + "rev": "18ed8d270231e067fe2739998479ed5d7c659c2c", "type": "github" }, "original": { From 93c05ad88e2548c8b691dd06c82f77e4f91973d2 Mon Sep 17 00:00:00 2001 From: Don Williams Date: Sat, 9 May 2026 14:48:57 -0400 Subject: [PATCH 29/30] 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 --- hosts/default/host-packages.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/hosts/default/host-packages.nix b/hosts/default/host-packages.nix index 0febf63..8f9f927 100644 --- a/hosts/default/host-packages.nix +++ b/hosts/default/host-packages.nix @@ -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"; + }; + }; + + } From fb12d82468c482119d09d36340025b6d2ef67f1c Mon Sep 17 00:00:00 2001 From: dwilliams Date: Mon, 11 May 2026 14:36:06 -0400 Subject: [PATCH 30/30] Updated flake --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 9533a50..e53589f 100644 --- a/flake.lock +++ b/flake.lock @@ -211,11 +211,11 @@ ] }, "locked": { - "lastModified": 1777932387, - "narHash": "sha256-nUYVPiqrzr36ThiQOAr5MKeGHDBSDM3OFWkz0uDjOvc=", + "lastModified": 1777988971, + "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "71a3a77326609675e9f8b51084cf23d5d1945899", + "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", "type": "github" }, "original": { @@ -340,11 +340,11 @@ ] }, "locked": { - "lastModified": 1778248595, - "narHash": "sha256-dhFgEjoeJMYN/7OY6xfxS799YB4IjbbYXTjyGIJyLpc=", + "lastModified": 1778503501, + "narHash": "sha256-08L/X4/do7nET4rzidJ76eV/1r+mB7DchVpdPypsghc=", "owner": "nix-community", "repo": "home-manager", - "rev": "fdb2ccba9d5e1238d32e0c4a3ec1a277efa80c1d", + "rev": "85ba629c79449badf4338117c27f0ee92b4b9f1a", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1776184304, - "narHash": "sha256-No6QGBmIv5ChiwKCcbkxjdEQ/RO2ZS1gD7SFy6EZ7rc=", + "lastModified": 1777594677, + "narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=", "owner": "nix-community", "repo": "home-manager", - "rev": "3c7524c68348ef79ce48308e0978611a050089b2", + "rev": "899c08a15beae5da51a5cecd6b2b994777a948da", "type": "github" }, "original": { @@ -485,11 +485,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1777991353, - "narHash": "sha256-DFwjggMV+nzCZpwK6Obxj9F+P59rbLVowGqHETfctBk=", + "lastModified": 1778510615, + "narHash": "sha256-cMNCx8mQTJnVkA6kt3B3ArGpCOOniYn644hH0mJHSsw=", "owner": "nix-community", "repo": "nixvim", - "rev": "7986a276960b4dfaed9bb2c3c438b5ba71ae08f1", + "rev": "fa8cd368d27cf9541f086485884928315abdcc8c", "type": "github" }, "original": { @@ -506,11 +506,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1778104114, - "narHash": "sha256-+tbqLv7IW5Aem8kGF6cp4n3MtNBcwqmuGlMt6S1kQjs=", + "lastModified": 1778464608, + "narHash": "sha256-tZRvyaKVP0DJ9DSFrr6K/l3X74Orfirk3Jjo7+br4Qs=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "eb2b53ddaa7564f5c93031cbe65cd5b6ef3c12a9", + "rev": "761869a561548874fe7e293b157fd7841576b367", "type": "github" }, "original": { @@ -529,11 +529,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1777773024, - "narHash": "sha256-pLU+KB84A0Jei/vTD6pOS4Ovkmq3QDfPQHg1MlKsRqM=", + "lastModified": 1778377995, + "narHash": "sha256-uUzHDHqQF1rdVNiTa05L0mML3/d7fpbAShjCRWxbrBQ=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "d3e26ccd9eecde9139be00caf5dc2d4260fb31ee", + "rev": "d8327a723eed6dd9aebe8e0b162126f390e827df", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1778049651, - "narHash": "sha256-EC5pBiLcP/EVmYWldJRNfkChCqF9rkeTnTs8t9Cs+ZY=", + "lastModified": 1778408907, + "narHash": "sha256-QXjdRz5fssxAWDrtfBYxvjMtTqJzQAbnAmX3u22xCck=", "owner": "notashelf", "repo": "nvf", - "rev": "88dbbad1f44efe3d2c18903e2c7542452f7bdfd6", + "rev": "e86a92e4b29b499e5f1285b737b7612115103da9", "type": "github" }, "original": { @@ -844,11 +844,11 @@ ] }, "locked": { - "lastModified": 1777564084, - "narHash": "sha256-O9VRkxg+2j+sh+c73wi4VeIBECoqW2PlnCR9Qe1nQKA=", + "lastModified": 1778377655, + "narHash": "sha256-wHsd+tesB3FtwUZbGjU/sWMZhw0m0yYBSXufMDVyQmc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d93443c0f6fdb3b179bed68856f322dba4842612", + "rev": "101d6731d7b163ef4f6fab8c6eea7da4ddb52ec3", "type": "github" }, "original": {