diff --git a/CHANGELOG.md b/CHANGELOG.md index 269eda2..a2f0b6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,79 +5,8 @@ --- -# 🚀 **Current Release - ZaneyOS v2.6.1** - -- Removed `discord` and `discord-canary` - - They use an outdated `electron` - - That build uses and `openssl v1.1.1w` - - That ius OEL and marked insecure in NIXOS - - Users can use an alternativve client until discord is updated -- Disabled `zen browser` in `zaneyos/modules/home/default.nix` - - Needs to be migrated to being enabled via host variable -- Changed from `zen` to `latest` kernel - - Linux kernel v7.0 is much better than 6.19_zen -- Disabled `vfr = true;` in hyprland config - - It's not supportorted after `v54.3` - - Disabling now to avoid error on next update -- Added `awww` as flake input for installs < 25.11 -- Fixed eval warnings: - - `gtk.gtk4.theme` set to `null` - - `git.signing.format` set to `null` -- `nixvim` lualine theme set to `auto` -- Changed to NixOS unstable branch -- Ported `DropTerminal` from `KoolDots` to ZaneyOS - - Replaces pyprland and some python dependencies -- Hyprland updated to v0.54 - - Added support for scrolling and monocle layouts - - Fixed hyprland float-all bindings - - Updated Window Rules for new Hyprland format -- Disabled steam by default -- Removed `adb.enable` no longer supported and not needed for ZaneyOS -- Changed `nixfmt-rfc-style` package for updated `nitfmt` - - `nixfmt-rfc-style` no longer supported -- Fixed other evaluation warnings with `Xorg` package changes - # 🚀 **Current Release - ZaneyOS v2.6.0** -#### 📅 **Updated: April 3rd, 2026** - -- Swapped `awww` for `swww` - - `swww` is no longer maintained - - removed `--format xrgb` flag also no needed - -#### 📅 **Updated: February 19th, 2026** - -- Fixed `zcli` GPU detection for newer AMD GPUs - - Fixed the fix to properly detect VMs -- `nixvim.nix` changes - - Disabled Zig language server - - Disabled marksman language server - - Caused dotnet lib to be compiled (takes hours) - -#### 📅 **Updated: February 16th, 2026** - -- Removed `hyprpanel` - - No longer maintained - - Vendor created `wayle` to replace it - - Replaced in ZaneyOS with 'noctalia-shell' - -- `webkitgtk` being built from source - - Removed audacity is called `wxwidgets` - - Created overlay for `tumbler` to disable `libepub` - - These caused the build from source issue - - Building `webkitgtk` takes hours every rebuild/update - -#### 📅 **Updated: January 31st, 2026** - -- Changed default login manager to `TUI` - - Issues recently (again) with SDDM and some GPUs - - Often related to SDDM wayland support option - - Some GPUs need it enabled, others disabled - -#### 📅 **Updated: January 28th, 2026** - -- Disabled gnome in stylix. Caused install failure - #### 📅 **Updated: January 26th, 2026** - `noctalia-shell` regression: diff --git a/FAQ.es.md b/FAQ.es.md index 5a08953..7b9bcbc 100644 --- a/FAQ.es.md +++ b/FAQ.es.md @@ -825,7 +825,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; ** ¿Cómo puedo establecer un temporizador para cambiar el wallpaper automáticamente? ** 1. Edita el archivo `~/zaneyos/modules/home/hyprland/config.nix` file. -2. Comenta la línea `sleep 1.5 && awww img ...` +2. Comenta la línea `sleep 1.5 && swww img ...` 3. Agrega nueva línea después de eso con `sleep 1 && wallsetter` ```json @@ -833,13 +833,13 @@ settings = { exec-once = [ "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "killall -q awww;sleep .5 && awww init" + "killall -q swww;sleep .5 && swww init" "killall -q waybar;sleep .5 && waybar" "killall -q swaync;sleep .5 && swaync" "nm-applet --indicator" "lxqt-policykit-agent" "pypr &" - #"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" + #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" "sleep 1 && wallsetter" ]; ``` diff --git a/FAQ.md b/FAQ.md index 32c6708..1c1b2ab 100644 --- a/FAQ.md +++ b/FAQ.md @@ -811,7 +811,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; ** How can I set a timer to change the wallpaper automatically? ** 1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file. -2. Comment out the line `sleep 1.5 && awww img ...` +2. Comment out the line `sleep 1.5 && swww img ...` 3. Add new line after that with `sleep 1 && wallsetter` ```json @@ -819,13 +819,13 @@ settings = { exec-once = [ "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "killall -q awww;sleep .5 && awww init" + "killall -q swww;sleep .5 && swww init" "killall -q waybar;sleep .5 && waybar" "killall -q swaync;sleep .5 && swaync" "nm-applet --indicator" "lxqt-policykit-agent" "pypr &" - #"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" + #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" "sleep 1 && wallsetter" ]; ``` @@ -2002,7 +2002,7 @@ stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; ** How can I set a timer to change the wallpaper automatically? ** 1. Edit the `~/zaneyos/modules/home/hyprland/config.nix` file. -2. Comment out the line `sleep 1.5 && awww img ...` +2. Comment out the line `sleep 1.5 && swww img ...` 3. Add new line after that with `sleep 1 && wallsetter` ```json @@ -2010,13 +2010,13 @@ settings = { exec-once = [ "dbus-update-activation-environment --all --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" - "killall -q awww;sleep .5 && awww init" + "killall -q swww;sleep .5 && swww init" "killall -q waybar;sleep .5 && waybar" "killall -q swaync;sleep .5 && swaync" "nm-applet --indicator" "lxqt-policykit-agent" "pypr &" - #"sleep 1.5 && awww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" + #"sleep 1.5 && swww img /home/${username}/Pictures/Wallpapers/zaney-wallpaper.jpg" "sleep 1 && wallsetter" ]; ``` diff --git a/README.es.md b/README.es.md index 1e83376..5153115 100644 --- a/README.es.md +++ b/README.es.md @@ -295,9 +295,8 @@ Ahora, cuando quieras reconstruir, tienes el alias `fr` que reconstruye el flake Gracias por toda su ayuda -- KoolDots https://github.com/LinuxBeginnings - Jakookit https://github.com/jakookit -- Justaguylinux https://codeberg.org/Justaguylinux +- Justaguylinux https://github.com/drewgrif - Jerry Starke https://github.com/JerrySM64 ## ¡Disfruta! diff --git a/README.md b/README.md index 375ced2..b11d779 100644 --- a/README.md +++ b/README.md @@ -291,8 +291,8 @@ cp -r hosts/default hosts/ git add . ``` -4. Edit `hosts//variables.nix` - ```nixos-generate-config --show-hardware-config > hosts//hardware.nix``` +4. Edit `hosts//variab + nixos-generate-config --show-hardware-config > hosts//hardware.nix ``` @@ -310,13 +310,14 @@ Now when you want to rebuild the configuration you have access to an alias called `fr` that will rebuild the flake and you do not have to be in the `zaneyos` folder for it to work. + + ### Special Recognitions: Thank you for all your assistance -- KoolDots https://github.com/LinuxBeginnings -- JakKoolit https://github.com/Jakoolit -- Justaguylinux https://codeberg.org/Justaguylinux +- Jakookit https://github.com/jakookit +- Justaguylinux https://github.com/drewgrif - Jerry Starke https://github.com/JerrySM64 ## Hope you enjoy! diff --git a/cheatsheets/add-gnome.md b/cheatsheets/add-gnome.md deleted file mode 100644 index b36cdc5..0000000 --- a/cheatsheets/add-gnome.md +++ /dev/null @@ -1,58 +0,0 @@ -# Add GNOME Desktop (overview) - -This guide gives **basic steps** and **which files to edit** to add GNOME to ZaneyOS. - -In NixOS, you enable it through NixOS options in a module (a `.nix` file), then pick a display manager (login screen). -This repo already has **SDDM** (graphical) and **LY** (text) login support. You can keep using either — both can start GNOME sessions. - -## Files to edit (minimal list) - -1. `modules/core/default.nix` - - Import your new GNOME module so it becomes part of the system config. - -2. `modules/core/xserver.nix` - - GNOME needs `services.xserver.enable = true;` (this file currently disables X11). - -3. `modules/core/gnome.nix` (new file you create) - - Turn on GNOME’s desktop manager. - -4. `hosts//variables.nix` - - Make sure your `displayManager` is set to either `"sddm"` or `"tui"` (for LY), since those are already supported here. - -## Suggested minimal GNOME module (example) - -```nix path=null start=null -{ ... }: -{ - services.xserver = { - enable = true; - desktopManager.gnome.enable = true; - }; -} -``` - -## Where to import the GNOME module - -In `modules/core/default.nix`, add your GNOME file to the imports list: - -```nix path=null start=null -imports = [ - # ... - ./gnome.nix - # ... -]; -``` - -## Flatpak: GNOME Extensions Manager - -To add the Flatpak app **Extension Manager** (for GNOME extensions), edit `modules/core/flatpak.nix` and add its ID: - -```nix path=null start=null -services.flatpak.packages = [ - "com.mattjakeman.ExtensionManager" -]; -``` - -## `git add .` and rebuild - -Once you have the file created. In the ZaneyOS directory run `git add . ` then `zcli rebuild` diff --git a/flake.lock b/flake.lock index e53589f..81c54dc 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1777149230, - "narHash": "sha256-pu6dVB6NrIj90rrqCgJ5pPlBzS76pW4WA6rE1rD1Gp8=", + "lastModified": 1768155355, + "narHash": "sha256-s0TBsxvGjl3Z4O3McFlKKq5CKCjFLYd/WGaROb3VkX0=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "8c4a4a572bee519b04e9bb9207e7d993f55ecb4f", + "rev": "8f47c5e82ee8e6e8adcc1748be0056a1e349f7e8", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1776411505, - "narHash": "sha256-7HILfdTOvWzAMmfS3lQV3MDmVrr2Epj8x4c9F3mzOSE=", + "lastModified": 1769418838, + "narHash": "sha256-wW6L4fSUi8+JWl5K+tTfF3isZDe3DZKpLsempa2rO0k=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "9f31d28882185d30c0e3082fbc52dab1cd4e879f", + "rev": "246eaf0563d632e5f0e25034b8e8aac76969cdbc", "type": "github" }, "original": { @@ -43,28 +43,6 @@ "type": "github" } }, - "awww": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs": [ - "nixpkgs" - ], - "rust-overlay": "rust-overlay" - }, - "locked": { - "lastModified": 1777136912, - "narHash": "sha256-owyQdC2vi0kYC119fzyVQp0J4G0t1n4xXUwryhlBbqA=", - "ref": "refs/heads/main", - "rev": "f66e12a76dbc4c669b2f1375f78bce49f5b19d66", - "revCount": 1363, - "type": "git", - "url": "https://codeberg.org/LGFae/awww" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/LGFae/awww" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -103,11 +81,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1776754714, - "narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -158,11 +136,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1776136500, - "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=", + "lastModified": 1764873433, + "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7", + "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92", "type": "github" }, "original": { @@ -172,22 +150,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1751685974, @@ -211,11 +173,11 @@ ] }, "locked": { - "lastModified": 1777988971, - "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -232,11 +194,11 @@ ] }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -253,11 +215,11 @@ ] }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1767609335, + "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "250481aafeb741edfe23d29195671c19b36b6dca", "type": "github" }, "original": { @@ -284,6 +246,24 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flakeCompat": { "flake": false, "locked": { @@ -319,18 +299,20 @@ "gnome-shell": { "flake": false, "locked": { + "host": "gitlab.gnome.org", "lastModified": 1767737596, "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=", "owner": "GNOME", "repo": "gnome-shell", "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "type": "gitlab" }, "original": { + "host": "gitlab.gnome.org", "owner": "GNOME", + "ref": "gnome-49", "repo": "gnome-shell", - "rev": "ef02db02bf0ff342734d525b5767814770d85b49", - "type": "github" + "type": "gitlab" } }, "home-manager": { @@ -340,16 +322,16 @@ ] }, "locked": { - "lastModified": 1778503501, - "narHash": "sha256-08L/X4/do7nET4rzidJ76eV/1r+mB7DchVpdPypsghc=", + "lastModified": 1768949235, + "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=", "owner": "nix-community", "repo": "home-manager", - "rev": "85ba629c79449badf4338117c27f0ee92b4b9f1a", + "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "master", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -362,11 +344,11 @@ ] }, "locked": { - "lastModified": 1777594677, - "narHash": "sha256-h90sHwoRJLRvaTpZroTvU2JRHDFj0czUafM8eqLe1RI=", + "lastModified": 1768434960, + "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=", "owner": "nix-community", "repo": "home-manager", - "rev": "899c08a15beae5da51a5cecd6b2b994777a948da", + "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b", "type": "github" }, "original": { @@ -375,13 +357,41 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "nixvim", + "nuschtosSearch", + "flake-utils" + ], + "nixpkgs": [ + "nixvim", + "nuschtosSearch", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754860581, + "narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.1.1", + "repo": "ixx", + "type": "github" + } + }, "mnw": { "locked": { - "lastModified": 1777828893, - "narHash": "sha256-gVWVnmyNr74BVKfhMMZDWkhx2699dhmZ2g0W8TTHtkk=", + "lastModified": 1768701608, + "narHash": "sha256-kSvWF3Xt2HW9hmV5V7i8PqeWJIBUKmuKoHhOgj3Znzs=", "owner": "Gerg-L", "repo": "mnw", - "rev": "c1c0b544bfabe6669b5a6a0383ccb475fe60258b", + "rev": "20d63a8a1ae400557c770052a46a9840e768926b", "type": "github" }, "original": { @@ -398,11 +408,11 @@ ] }, "locked": { - "lastModified": 1776882296, - "narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=", + "lastModified": 1768214250, + "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=", "owner": "feel-co", "repo": "ndg", - "rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e", + "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8", "type": "github" }, "original": { @@ -430,48 +440,48 @@ }, "nixpkgs": { "locked": { - "lastModified": 1777954456, - "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", + "lastModified": 1769474886, + "narHash": "sha256-Idv5b+XMWjvUTsvJNZU75sMqcb3HA9cUk23XMgmKTso=", "owner": "nixos", "repo": "nixpkgs", - "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", + "rev": "99abc7b4b7dcb382fd12bb115b7dd65c7bf24c83", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "release-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1774386573, - "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "lastModified": 1768875095, + "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { "locked": { - "lastModified": 1777268161, - "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", + "lastModified": 1767799921, + "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", + "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -482,18 +492,20 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "nuschtosSearch": "nuschtosSearch", + "systems": "systems_3" }, "locked": { - "lastModified": 1778510615, - "narHash": "sha256-cMNCx8mQTJnVkA6kt3B3ArGpCOOniYn644hH0mJHSsw=", + "lastModified": 1769049374, + "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=", "owner": "nix-community", "repo": "nixvim", - "rev": "fa8cd368d27cf9541f086485884928315abdcc8c", + "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95", "type": "github" }, "original": { "owner": "nix-community", + "ref": "nixos-25.11", "repo": "nixvim", "type": "github" } @@ -502,15 +514,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "noctalia-qs": "noctalia-qs" + ] }, "locked": { - "lastModified": 1778464608, - "narHash": "sha256-tZRvyaKVP0DJ9DSFrr6K/l3X74Orfirk3Jjo7+br4Qs=", + "lastModified": 1769471305, + "narHash": "sha256-Vw+6B2tVU3U8QEw+cVL4IngOirGFaCMddfbdbyNK4ac=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "761869a561548874fe7e293b157fd7841576b367", + "rev": "36ed643e77047df0d024ea9740d20b754c2f9632", "type": "github" }, "original": { @@ -519,29 +530,6 @@ "type": "github" } }, - "noctalia-qs": { - "inputs": { - "nixpkgs": [ - "noctalia", - "nixpkgs" - ], - "systems": "systems_3", - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1778377995, - "narHash": "sha256-uUzHDHqQF1rdVNiTa05L0mML3/d7fpbAShjCRWxbrBQ=", - "owner": "noctalia-dev", - "repo": "noctalia-qs", - "rev": "d8327a723eed6dd9aebe8e0b162126f390e827df", - "type": "github" - }, - "original": { - "owner": "noctalia-dev", - "repo": "noctalia-qs", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": [ @@ -554,11 +542,11 @@ ] }, "locked": { - "lastModified": 1777598946, - "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=", + "lastModified": 1767886815, + "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=", "owner": "nix-community", "repo": "NUR", - "rev": "5d55af01c0f86be583931fe99207fc56c14134b3", + "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef", "type": "github" }, "original": { @@ -567,9 +555,32 @@ "type": "github" } }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils_2", + "ixx": "ixx", + "nixpkgs": [ + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768249818, + "narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=", + "owner": "NuschtOS", + "repo": "search", + "rev": "b6f77b88e9009bfde28e2130e218e5123dc66796", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "nvf": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", "mnw": "mnw", "ndg": "ndg", @@ -577,11 +588,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1778408907, - "narHash": "sha256-QXjdRz5fssxAWDrtfBYxvjMtTqJzQAbnAmX3u22xCck=", + "lastModified": 1769403795, + "narHash": "sha256-Gk1MedUqTOMt9Hnn4WEGK/lpC/6UJ8O+e1Rm3LRnLgI=", "owner": "notashelf", "repo": "nvf", - "rev": "e86a92e4b29b499e5f1285b737b7612115103da9", + "rev": "45aaf1cccff9981456821105b4d2b5918f00cab0", "type": "github" }, "original": { @@ -594,7 +605,6 @@ "inputs": { "alejandra": "alejandra", "antigravity-nix": "antigravity-nix", - "awww": "awww", "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", @@ -622,27 +632,6 @@ "type": "github" } }, - "rust-overlay": { - "inputs": { - "nixpkgs": [ - "awww", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764038373, - "narHash": "sha256-M6w2wNBRelcavoDAyFL2iO4NeWknD40ASkH1S3C0YGM=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ab3536fe850211a96673c6ffb2cb88aab8071cc9", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, "stylix": { "inputs": { "base16": "base16", @@ -655,22 +644,23 @@ "nixpkgs": "nixpkgs_3", "nur": "nur", "systems": "systems_5", + "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1778104276, - "narHash": "sha256-/DSSnU0LLmOTG/OCgGwYpxP6+5YvxRx2g/GhI4x6aCU=", + "lastModified": 1769472288, + "narHash": "sha256-RdnbroWsujYh1MaMhDpP5QM+bRIGG6smz987v1fli+U=", "owner": "danth", "repo": "stylix", - "rev": "18ed8d270231e067fe2739998479ed5d7c659c2c", + "rev": "c2c4a3ad52c096db1c8dde97d3d21451613f000c", "type": "github" }, "original": { "owner": "danth", - "ref": "master", + "ref": "release-25.11", "repo": "stylix", "type": "github" } @@ -707,16 +697,16 @@ }, "systems_3": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -750,6 +740,23 @@ "type": "github" } }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, "tinted-kitty": { "flake": false, "locked": { @@ -769,11 +776,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1777041405, - "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=", + "lastModified": 1767817087, + "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5f868b3a338b6904c47f3833b9c411be641983a8", + "rev": "bd99656235aab343e3d597bf196df9bc67429507", "type": "github" }, "original": { @@ -785,11 +792,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1777169200, - "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=", + "lastModified": 1767489635, + "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac", + "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184", "type": "github" }, "original": { @@ -801,11 +808,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1777463218, - "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=", + "lastModified": 1767488740, + "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae", + "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40", "type": "github" }, "original": { @@ -814,28 +821,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "noctalia", - "noctalia-qs", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1775636079, - "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", @@ -844,11 +829,11 @@ ] }, "locked": { - "lastModified": 1778377655, - "narHash": "sha256-wHsd+tesB3FtwUZbGjU/sWMZhw0m0yYBSXufMDVyQmc=", + "lastModified": 1769296843, + "narHash": "sha256-J2ZqG5LFZkthn/UGn6nGHNW2xFZ0Sn9WhZVBoBIxIiI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "101d6731d7b163ef4f6fab8c6eea7da4ddb52ec3", + "rev": "4bee50bdfd104301973e404d7602b1510d549f52", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 9ca5d5b..7af3aa5 100644 --- a/flake.nix +++ b/flake.nix @@ -3,12 +3,12 @@ inputs = { home-manager = { - url = "github:nix-community/home-manager/master"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/release-25.11"; nvf.url = "github:notashelf/nvf"; - stylix.url = "github:danth/stylix/master"; + stylix.url = "github:danth/stylix/release-25.11"; nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest"; noctalia = { @@ -18,7 +18,7 @@ # Checking nixvim to see if it's better nixvim = { - url = "github:nix-community/nixvim"; + url = "github:nix-community/nixvim/nixos-25.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -36,10 +36,6 @@ url = "github:kamadorueda/alejandra"; inputs.nixpkgs.follows = "nixpkgs"; }; - awww = { - url = "git+https://codeberg.org/LGFae/awww"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { diff --git a/hosts/default/host-packages.nix b/hosts/default/host-packages.nix index 8f9f927..f44b200 100644 --- a/hosts/default/host-packages.nix +++ b/hosts/default/host-packages.nix @@ -1,28 +1,7 @@ -{configs, pkgs, ...}: { - +{pkgs, ...}: { environment.systemPackages = with pkgs; [ - # Add local pacakaged here + audacity + discord + nodejs ]; - # Add host specific flatpaks here - services = { - flatpak = { - packages = [ - ]; - }; - }; - - - services.auto-cpufreq.enable = false; - services.auto-cpufreq.settings = { - battery = { - governor = "powersave"; - turbo = "never"; - }; - charger = { - governor = "performance"; - turbo = "auto"; - }; - }; - - } diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index 8badf01..c44ab35 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -1,13 +1,13 @@ { # Git Configuration ( For Pulling Software Repos ) - gitUsername = "Don Williams"; - gitEmail = "don.e.williams@gmail.com"; + gitUsername = "Tyler Kelley"; + gitEmail = "tylerzanekelley@gmail.com"; # Set Displau Manager # `tui` for Text login # `sddm` for graphical GUI (default) # SDDM background is set with stylixImage - displayManager = "tui"; + displayManager = "sddm"; # Emable/disable bundled applications tmuxEnable = false; @@ -30,7 +30,7 @@ # You can configure multiple monitors. # Inside the quotes, create a new line for each monitor. extraMonitorSettings = " - monitor = Virtual-1,1920x1080@60,auto,1 + "; # Bar/Shell Settings @@ -84,8 +84,8 @@ printEnable = false; # Enable Thunar GUI File Manager - # Yazi is alternate File Manager - thunarEnable = true; + # Yazi is default File Manager + thunarEnable = false; # Themes, waybar and animation. # Only uncomment your selection @@ -95,17 +95,17 @@ # This will set your color palette # Default background # Add new images to ~/zaneyos/wallpapers - #stylixImage = ../../wallpapers/mountainscapedark.jpg; + stylixImage = ../../wallpapers/mountainscapedark.jpg; #stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; #stylixImage = ../../wallpapers/Anime-Purple-eyes.png; - stylixImage = ../../wallpapers/Rainnight.jpg; + #stylixImage = ../../wallpapers/Rainnight.jpg; #stylixImage = ../../wallpapers/zaney-wallpaper.jpg; #stylixImage = ../../wallpapers/nix-wallpaper-stripes-logo.png; #stylixImage = ../../wallpapers/beautifulmountainscape.jpg; # Set Waybar # Available Options: - #waybarChoice = ../../modules/home/waybar/waybar-curved.nix; + waybarChoice = ../../modules/home/waybar/waybar-curved.nix; #waybarChoice = ../../modules/home/waybar/waybar-ddubs.nix; #waybarChoice = ../../modules/home/waybar/waybar-ddubs-2.nix; #waybarChoice = ../../modules/home/waybar/waybar-simple.nix; @@ -124,12 +124,12 @@ #waybarChoice = ../../modules/home/waybar/waybar-jwt-transparent.nix; #waybarChoice = ../../modules/home/waybar/waybar-jwt-ultradark.nix; #waybarChoice = ../../modules/home/waybar/waybar-pctrade-catppuccin.nix; - waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix; + #waybarChoice = ../../modules/home/waybar/waybar-mangowc-jak-catppuccin.nix; #waybarChoice = ../../modules/home/waybar/waybar-old-ddubsos.nix; # Set Animation style # Available options are: - #animChoice = ../../modules/home/hyprland/animations-def.nix; + animChoice = ../../modules/home/hyprland/animations-def.nix; #animChoice = ../../modules/home/hyprland/animations-end4.nix; #animChoice = ../../modules/home/hyprland/animations-end4-slide.nix; #animChoice = ../../modules/home/hyprland/animations-end-slide.nix; @@ -138,7 +138,7 @@ #animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix; #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix; #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix; - animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix; + #animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix; #animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix; #animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix; diff --git a/hosts/zaneyos-24-vm/host-packages.nix b/hosts/zaneyos-24-vm/host-packages.nix index 33b6047..f44b200 100644 --- a/hosts/zaneyos-24-vm/host-packages.nix +++ b/hosts/zaneyos-24-vm/host-packages.nix @@ -1,4 +1,7 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ + audacity + discord + nodejs ]; } diff --git a/hosts/zaneyos-24-vm/variables.nix b/hosts/zaneyos-24-vm/variables.nix index ab6507d..d0a1a7b 100644 --- a/hosts/zaneyos-24-vm/variables.nix +++ b/hosts/zaneyos-24-vm/variables.nix @@ -22,7 +22,7 @@ doomEmacsEnable = true; # Python development tools - pythonEnable = false; + pythonEnable = true; # Hyprland Settings # Examples: @@ -99,8 +99,8 @@ #stylixImage = ../../wallpapers/mountainscapedark.jpg; #stylixImage = ../../wallpapers/AnimeGirlNightSky.jpg; #stylixImage = ../../wallpapers/Anime-Purple-eyes.png; - stylixImage = ../../wallpapers/Rainnight.jpg; - #stylixImage = ../../wallpapers/zaney-wallpaper.jpg; + #stylixImage = ../../wallpapers/Rainnight.jpg; + stylixImage = ../../wallpapers/zaney-wallpaper.jpg; #stylixImage = ../../wallpapers/nix-wallpapers-strips-logo.jpg; #stylixImage = ../../wallpapers/beautifulmountainscape.jpg; @@ -131,7 +131,7 @@ # Set Animation style # Available options are: #animChoice = ../../modules/home/hyprland/animations-def.nix; - #animChoice = ../../modules/home/hyprland/animations-end4.nix; + animChoice = ../../modules/home/hyprland/animations-end4.nix; #animChoice = ../../modules/home/hyprland/animations-end4-slide.nix; #animChoice = ../../modules/home/hyprland/animations-end-slide.nix; #animChoice = ../../modules/home/hyprland/animations-dynamic.nix; @@ -139,7 +139,7 @@ #animChoice = ../../modules/home/hyprland/animations-hyde-optimized.nix; #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-1.nix; #animChoice = ../../modules/home/hyprland/animations-mahaveer-me-2.nix; - animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix; + #animChoice = ../../modules/home/hyprland/animations-ml4w-classic.nix; #animChoice = ../../modules/home/hyprland/animations-ml4w-fast.nix; #animChoice = ../../modules/home/hyprland/animations-ml4w-high.nix; diff --git a/hosts/zaneyos-oem/host-packages.nix b/hosts/zaneyos-oem/host-packages.nix index d1a5eb3..37a6b3b 100644 --- a/hosts/zaneyos-oem/host-packages.nix +++ b/hosts/zaneyos-oem/host-packages.nix @@ -1,10 +1,12 @@ {pkgs, ...}: { environment.systemPackages = with pkgs; [ + nodejs atop bottom dua fd gping + lunarvim luarocks mission-center resources diff --git a/install-zaneyos.sh b/install-zaneyos.sh index 657492d..eb90f5d 100755 --- a/install-zaneyos.sh +++ b/install-zaneyos.sh @@ -138,44 +138,19 @@ has_nvidia=false has_intel=false has_amd=false has_vm=false -detect_vm() { - if command -v systemd-detect-virt &>/dev/null; then - if systemd-detect-virt --quiet; then - return 0 - fi - fi - for f in /sys/class/dmi/id/product_name /sys/class/dmi/id/sys_vendor; do - if [ -r "$f" ] && grep -Eqi 'qemu|kvm|vmware|virtualbox|hyper-v|microsoft corporation|xen|parallels' "$f"; then - return 0 - fi - done - return 1 -} -if detect_vm; then - has_vm=true -fi - -if lspci | grep -qi 'vga\|3d\|display'; then +if lspci | grep -qi 'vga\|3d'; then while read -r line; do - if echo "$line" | grep -Eq '\[10de:'; then + if echo "$line" | grep -qi 'nvidia'; then has_nvidia=true - elif echo "$line" | grep -Eq '\[1002:'; then - has_amd=true - elif echo "$line" | grep -Eq '\[8086:'; then - has_intel=true - elif echo "$line" | grep -Eq '\[(1af4|15ad|80ee|1b36|1414|1234|1013):'; then - has_vm=true - elif echo "$line" | grep -qi 'nvidia'; then - has_nvidia=true - elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then + elif echo "$line" | grep -qi 'amd'; then has_amd=true elif echo "$line" | grep -qi 'intel'; then has_intel=true - elif echo "$line" | grep -Eqi 'virtio|vmware|virtualbox|qxl|hyper-v|microsoft corporation|parallels|qemu|bochs|cirrus|svga|virtual'; then + elif echo "$line" | grep -qi 'virtio\|vmware'; then has_vm=true fi - done < <(lspci -nn | grep -i 'vga\|3d\|display') + done < <(lspci | grep -i 'vga\|3d') if $has_vm; then DETECTED_PROFILE="vm" diff --git a/modules/core/boot.nix b/modules/core/boot.nix index 51a5da5..47011ff 100644 --- a/modules/core/boot.nix +++ b/modules/core/boot.nix @@ -4,7 +4,7 @@ ... }: { boot = { - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_zen; kernelModules = ["v4l2loopback"]; extraModulePackages = [config.boot.kernelPackages.v4l2loopback]; kernel.sysctl = {"vm.max_map_count" = 2147483642;}; diff --git a/modules/core/flatpak.nix b/modules/core/flatpak.nix index 2862127..e513739 100644 --- a/modules/core/flatpak.nix +++ b/modules/core/flatpak.nix @@ -15,7 +15,7 @@ #"com.github.tchx84.Flatseal" #Manage flatpak permissions - should always have this #"com.rtosta.zapzap" # WhatsApp client #"io.github.flattool.Warehouse" # Manage flatpaks, clean data, remove flatpaks and deps - #"it.mijorus.gearlever" # Manage and support AppImages + #"it.mijorus.gearlever" # Manage and support AppImages #"io.github.freedoom.Phase1" # Classic Doom FPS 1 #"io.github.freedoom.Phase2" # Classic Doom FPS 2 #"io.github.dvlv.boxbuddyrs" # Manage distroboxes diff --git a/modules/core/overlays.nix b/modules/core/overlays.nix index 1f473aa..c7de92a 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -2,13 +2,5 @@ nixpkgs.overlays = [ # Provide pkgs.google-antigravity via antigravity-nix overlay inputs.antigravity-nix.overlays.default - # Build tumbler without EPUB thumbnailer (libgepub) to avoid webkitgtk - (_final: prev: { - xfce = prev.xfce // { - tumbler = prev.xfce.tumbler.overrideAttrs (old: { - buildInputs = prev.lib.remove prev.libgepub old.buildInputs; - }); - }; - }) ]; } diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 5c7a7a9..9bea5c2 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -1,5 +1,4 @@ { - inputs, pkgs, host, ... @@ -31,6 +30,7 @@ in { seahorse.enable = true; fuse.userAllowOther = true; mtr.enable = true; + adb.enable = true; hyprlock.enable = true; gnupg.agent = { enable = true; @@ -39,13 +39,9 @@ in { }; nixpkgs.config.allowUnfree = true; - nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ]; environment.systemPackages = with pkgs; - [ - inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww - ] - ++ noctaliaPkgs + noctaliaPkgs ++ [ alejandra # nix formatter amfora # Fancy Terminal Browser For Gemini Protocol @@ -55,14 +51,14 @@ in { cliphist # Clipboard manager using rofi menu cmatrix # Matrix Movie Effect In Terminal cowsay # Great Fun Terminal Program + discord # Stable client + discord-canary # beta client docker-compose # Allows Controlling Docker From A Single File duf # Utility For Viewing Disk Usage In Terminal dysk # Disk space util nice formattting eza # Beautiful ls Replacement ffmpeg # Terminal Video / Audio Editing file-roller # Archive Manager - gearlever # Manage / run Appimages - icu # dep for gearlever gimp # Great Photo Editor gpu-screen-recorder # needed for nnoctalia-shell power-profiles-daemon # needed for noctalia-shell power cycle @@ -79,7 +75,7 @@ in { mdcat # CLI markdown parser mpv # Incredible Video Player ncdu # Disk Usage Analyzer With Ncurses Interface - nixfmt # Nix Formatter + nixfmt-rfc-style # Nix Formatter nwg-displays # configure monitor configs via GUI nwg-drawer # Application launcher for wayland nwg-dock-hyprland # Dock for hyprland diff --git a/modules/core/steam.nix b/modules/core/steam.nix index 84829ec..6fafcf7 100644 --- a/modules/core/steam.nix +++ b/modules/core/steam.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { programs = { steam = { - enable = false; + enable = true; remotePlay.openFirewall = true; dedicatedServer.openFirewall = false; gamescopeSession.enable = true; diff --git a/modules/core/system.nix b/modules/core/system.nix index d728615..850198b 100644 --- a/modules/core/system.nix +++ b/modules/core/system.nix @@ -29,7 +29,7 @@ in { }; environment.variables = { NIXOS_OZONE_WL = "1"; - ZANEYOS_VERSION = "2.6.1"; + ZANEYOS_VERSION = "2.6.0"; ZANEYOS = "true"; }; console.keyMap = "${consoleKeyMap}"; diff --git a/modules/core/thunar.nix b/modules/core/thunar.nix index 9c82ac5..c7419e0 100644 --- a/modules/core/thunar.nix +++ b/modules/core/thunar.nix @@ -8,9 +8,9 @@ in { programs = { thunar = { enable = thunarEnable; - plugins = [ - pkgs.thunar-archive-plugin - pkgs.thunar-volman + plugins = with pkgs.xfce; [ + thunar-archive-plugin + thunar-volman ]; }; }; diff --git a/modules/home/cli/git.nix b/modules/home/cli/git.nix index 996b394..5a509ad 100644 --- a/modules/home/cli/git.nix +++ b/modules/home/cli/git.nix @@ -3,7 +3,6 @@ in { programs.git = { enable = true; - signing.format = null; settings = { user = { diff --git a/modules/home/default.nix b/modules/home/default.nix index 4b1a69f..f6b29e7 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -58,7 +58,7 @@ in { ./wlogout ./xdg.nix ./yazi - #./zen-browser.nix + ./zen-browser.nix ./zoxide.nix ./zsh ] diff --git a/modules/home/editors/nixvim.nix b/modules/home/editors/nixvim.nix index af1676d..94ca7e1 100644 --- a/modules/home/editors/nixvim.nix +++ b/modules/home/editors/nixvim.nix @@ -44,9 +44,6 @@ settings = { flavour = "mocha"; transparent_background = false; - integrations = { - lualine = true; - }; }; }; @@ -56,7 +53,7 @@ lualine = { enable = true; settings = { - options = {theme = "auto";}; + options = {theme = "catppuccin";}; }; }; bufferline.enable = true; @@ -77,16 +74,11 @@ treesitter-context.enable = false; # Project management - project-nvim = { - enable = true; - settings = { - history.save_dir = "${config.home.homeDirectory}/.local/share/nvim/project_nvim"; - }; - }; + project-nvim.enable = true; # Notifications and UI polish notify.enable = true; - noice.enable = false; + noice.enable = true; # Startup dashboard alpha = { @@ -182,8 +174,8 @@ html.enable = true; cssls.enable = true; clangd.enable = true; - zls.enable = false; - marksman.enable = false; + zls.enable = true; + marksman.enable = true; hyprls.enable = true; # hyprls is optional; keep tools available via extraPackages }; @@ -334,13 +326,13 @@ lazygit nil hyprls - typescript-language-server - typescript + nodePackages.typescript-language-server + nodePackages.typescript vscode-langservers-extracted pyright lua-language-server zls - marksman + #marksman multimarkdown clang-tools prettierd @@ -349,8 +341,6 @@ nixpkgs-fmt figlet toilet - bash-language-server - tailwindcss-language-server ]; # Diagnostic UI and notify background tweaks @@ -460,9 +450,4 @@ end ''; }; - - home.activation.projectNvimHistory = '' - mkdir -p "$HOME/.local/share/nvim/project_nvim" - find "$HOME/.local/share/nvim/project_nvim" -type f -size 0 -delete 2>/dev/null || true - ''; } diff --git a/modules/home/editors/vscode.nix b/modules/home/editors/vscode.nix index 4f3ce02..8b2d3dc 100644 --- a/modules/home/editors/vscode.nix +++ b/modules/home/editors/vscode.nix @@ -90,5 +90,4 @@ in { }; }; nixpkgs.config.allowUnfree = true; - nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ]; } diff --git a/modules/home/gtk.nix b/modules/home/gtk.nix index 12fe645..cec72b3 100644 --- a/modules/home/gtk.nix +++ b/modules/home/gtk.nix @@ -1,6 +1,5 @@ -{config, pkgs, ...}: { +{pkgs, ...}: { gtk = { - gtk4.theme = null; iconTheme = { name = "Papirus-Dark"; package = pkgs.papirus-icon-theme; diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 5d8491f..145ba5d 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -16,12 +16,11 @@ "$modifier,V, Noctalia Clipboard, exec, noctalia-shell ipc call launcher clipboard" "$modifier ALT,P, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" "$modifier SHIFT,comma, Noctalia Settings, exec, noctalia-shell ipc call settings toggle" - "$modifier CTRL,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockscreen lock" + "$modifier ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend" "$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle" "$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle" "$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle" "$modifier CTRL,R, Noctalia Screen Recorder, exec, noctalia-shell ipc call screenRecorder toggle" - "$modifier SHIFT,R, Restart Noctalia shell, exec, restart.noctalia" ] else []; # Rofi launcher bindings (only included when barChoice != "noctalia") @@ -54,7 +53,7 @@ in { # ============= APPLICATION LAUNCHERS ============= "$modifier,K, Keybinds Search Tool, exec, qs-keybinds" "$modifier CTRL,C, Cheatsheets Viewer, exec, qs-cheatsheets" - "$modifier SHIFT,K, Keybinds Search Tool, exec, qs-keybinds" + "$modifier SHIFT,K, Legacy Keybinds Menu, exec, list-keybinds" "$modifier SHIFT,D, Discord, exec, discord" "$modifier ALT,W, Web Search, exec, web-search" "$modifier SHIFT,W, QS Wallpaper Setter, exec, qs-wallpapers-apply" @@ -70,22 +69,16 @@ in { "$modifier,O, OBS Studio, exec, obs" "$modifier ALT,C, Color Picker, exec, hyprpicker -a" "$modifier,G, GIMP, exec, gimp" - "$modifier SHIFT,T, Dropdown Terminal, exec, sh -lc 'DropTerminal'" + "$modifier shift,T, Dropdown Terminal, exec, pypr toggle term" "$modifier,T, Thunar, exec, thunar" "$modifier ALT,M, Audio Control, exec, pavucontrol" # ============= WINDOW MANAGEMENT ============= "$modifier,Q, Kill Active Window, killactive," "$modifier,P, Pseudo Tile, pseudo," - "$modifier SHIFT,I, Toggle Split, layoutmsg, togglesplit" + "$modifier SHIFT,I, Toggle Split, togglesplit," "$modifier,F, Maximize, fullscreen," "$modifier SHIFT,F, Toggle Floating, togglefloating," - "$modifier ALT,F, Float All Windows, exec, hyprland-float-all" - # ============= LAYOUTS ============= - "$modifier ALT,L, Toggle Layouts, exec, hyprland-change-layout toggle" - "$modifier ALT,1, Layout Dwindle, exec, hyprland-change-layout dwindle" - "$modifier ALT,2, Layout Master, exec, hyprland-change-layout master" - "$modifier ALT,3, Layout Scrolling, exec, hyprland-change-layout scrolling" - "$modifier ALT,4, Layout Monocle, exec, hyprland-change-layout monocle" + "$modifier ALT,F, Float All Windows, workspaceopt, allfloat" "$modifier SHIFT,C, Exit/Logout of Hyprland, exit," # ============= WINDOW MOVEMENT (ARROW KEYS) ============= "$modifier SHIFT,left, Move Left, movewindow, l" diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index 0e41181..ab286ca 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -9,6 +9,7 @@ in { ./hypridle.nix ./hyprland.nix ./hyprlock.nix + ./pyprland.nix ./windowrules.nix ]; } diff --git a/modules/home/hyprland/exec-once.nix b/modules/home/hyprland/exec-once.nix index edb5f50..adec6b2 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -20,12 +20,12 @@ waybarExec = if barChoice != "noctalia" then [ - "killall -q awww;sleep .5 && awww-daemon" + "killall -q swww;sleep .5 && swww-daemon" "killall -q waybar;sleep .5 && waybar" "killall -q swaync;sleep .5 && swaync" "nm-applet --indicator" # Delayed-only restore so Stylix finishes first, then user's wallpaper wins with a single change - "sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend awww) >/dev/null 2>&1 || true'" + "sh -lc 'sleep 2 && (qs-wallpapers-restore || waypaper --wallpaper ${stylixImage} --backend swww) >/dev/null 2>&1 || true'" ] else []; in { @@ -38,7 +38,6 @@ in { "systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "systemctl --user start hyprpolkitagent" "qs -c overview" # Start quickshell-overview daemon - "hyprland-change-layout init" ] ++ noctaliaExec ++ waybarExec; }; diff --git a/modules/home/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix index 635c6c7..79dab33 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -44,6 +44,7 @@ hyprKbVariant = variantFinal; in { home.packages = with pkgs; [ + swww grim slurp wl-clipboard @@ -51,7 +52,6 @@ in { ydotool hyprpolkitagent hyprshot - hyprshutdown hyprpicker #hyprland-qtutils # needed for banners and ANR messages ]; @@ -108,18 +108,9 @@ in { workspace_swipe_create_new = true; workspace_swipe_forever = true; }; - "$modifier" = "SUPER"; - - scrolling = { - column_width = 0.80; - fullscreen_on_one_column = true; - direction = "right"; - follow_focus = true; - }; - - monocle = {}; general = { + "$modifier" = "SUPER"; layout = "dwindle"; gaps_in = 6; gaps_out = 8; @@ -137,7 +128,7 @@ in { disable_hyprland_logo = true; disable_splash_rendering = true; enable_swallow = false; - # vfr = true; # Variable Frame Rate Not supported post v0.54.3 + vfr = true; # Variable Frame Rate vrr = 2; # Variable Refresh Rate Might need to set to 0 for NVIDIA/AQ_DRM_DEVICES # Screen flashing to black momentarily or going black when app is fullscreen # Try setting vrr to 0 @@ -148,15 +139,9 @@ in { }; dwindle = { - pseudotile = false; + pseudotile = true; preserve_split = true; - smart_resizing = true; - use_active_for_splits = true; - smart_split = false; - default_split_ratio = 1.0; - split_bias = 0; - precise_mouse_move = false; - special_scale_factor = 0.8; + force_split = 2; }; decoration = { @@ -197,16 +182,9 @@ in { }; master = { - new_status = "slave"; - new_on_top = false; - new_on_active = "none"; - orientation = "left"; - mfact = 0.55; - slave_count_for_center_master = 2; - center_master_fallback = "left"; - smart_resizing = true; - drop_at_cursor = true; - always_keep_position = false; + new_status = "master"; + new_on_top = 1; + mfact = 0.5; }; # Ensure Xwayland windows render at integer scale; compositor scales them diff --git a/modules/home/hyprland/pyprland.nix b/modules/home/hyprland/pyprland.nix new file mode 100644 index 0000000..0bffe11 --- /dev/null +++ b/modules/home/hyprland/pyprland.nix @@ -0,0 +1,18 @@ +{pkgs, ...}: { + home.packages = with pkgs; [pyprland]; + + home.file.".config/hypr/pyprland.toml".text = '' + [pyprland] + plugins = [ + "scratchpads", + ] + + [scratchpads.term] + animation = "fromTop" + command = "kitty --class kitty-dropterm" + class = "kitty-dropterm" + size = "70% 70%" + max_size = "1920px 100%" + position = "150px 150px" + ''; +} diff --git a/modules/home/hyprland/windowrules.nix b/modules/home/hyprland/windowrules.nix index be4fc9a..87cd9aa 100644 --- a/modules/home/hyprland/windowrules.nix +++ b/modules/home/hyprland/windowrules.nix @@ -1,436 +1,130 @@ -_: { +{host, ...}: let + inherit + (import ../../../hosts/${host}/variables.nix) + extraMonitorSettings + ; +in { wayland.windowManager.hyprland = { - extraConfig = '' - # Set float and centering for dialog boxes - rule = float(true), match:modal:1 - rule = center(true), match:modal:1 + settings = { + windowrule = [ + #"noblur, xwayland:1" # Helps prevent odd borders/shadows for xwayland apps + # downside it can impact other xwayland apps + # This rule is a template for a more targeted approach + "noblur, class:^(\bresolve\b)$, xwayland:1" # Window rule for just resolve + "tag +file-manager, class:^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$" + "tag +terminal, class:^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm)$" + "tag +browser, class:^(Brave-browser(-beta|-dev|-unstable)?)$" + "tag +browser, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$" + "tag +browser, class:^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$" + "tag +browser, class:^([Tt]horium-browser|[Cc]achy-browser)$" + "tag +projects, class:^(codium|codium-url-handler|VSCodium)$" + "tag +projects, class:^(VSCode|code-url-handler)$" + "tag +im, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$" + "tag +im, class:^([Ff]erdium)$" + "tag +im, class:^([Ww]hatsapp-for-linux)$" + "tag +im, class:^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$" + "tag +im, class:^(teams-for-linux)$" + "tag +games, class:^(gamescope)$" + "tag +games, class:^(steam_app_\d+)$" + "tag +gamestore, class:^([Ss]team)$" + "tag +gamestore, title:^([Ll]utris)$" + "tag +gamestore, class:^(com.heroicgameslauncher.hgl)$" + "tag +settings, class:^(gnome-disks|wihotspot(-gui)?)$" + "tag +settings, class:^([Rr]ofi)$" + "tag +settings, class:^(file-roller|org.gnome.FileRoller)$" + "tag +settings, class:^(nm-applet|nm-connection-editor|blueman-manager)$" + "tag +settings, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$" + "tag +settings, class:^(nwg-look|qt5ct|qt6ct|[Yy]ad)$" + "tag +settings, class:(xdg-desktop-portal-gtk)" + "tag +settings, class:(.blueman-manager-wrapped)" + "tag +settings, class:(nwg-displays)" + "move 72% 7%,title:^(Picture-in-Picture)$" + # qs-keybinds floating viewer + "float, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$" + "center, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$" + "size 55% 66%, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$" + # qs-cheatsheets floating viewer + "float, title:^(Cheatsheets Viewer)$" + "center, title:^(Cheatsheets Viewer)$" + "size 65% 60%, title:^(Cheatsheets Viewer)$" + "center, class:^([Ff]erdium)$" + "float, class:^([Ww]aypaper)$" + "float, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" + "float, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" + "center, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" + "float, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" + "center, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" + "float, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" + "center, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" + "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" + "noblur, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" + "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" + # qs-keybinds, qs-docs, qs-chevron floating viewer + "float, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$" + "center, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$" + "size 55% 66%, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$" + "center, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$" + "center, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)" + "center, title:^(Authentication Required)$" + "idleinhibit fullscreen, class:^(*)$" + "idleinhibit fullscreen, title:^(*)$" + "idleinhibit fullscreen, fullscreen:1" + "float, tag:settings*" + "float, class:^([Ff]erdium)$" + "float, title:^(Picture-in-Picture)$" + "float, class:^(mpv|com.github.rafostar.Clapper)$" + "float, title:^(Authentication Required)$" + "float, class:(codium|codium-url-handler|VSCodium), title:negative:(.*codium.*|.*VSCodium.*)" + "float, class:^(com.heroicgameslauncher.hgl)$, title:negative:(Heroic Games Launcher)" + "float, class:^([Ss]team)$, title:negative:^([Ss]team)$" + "float, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)" + "float, initialTitle:(Add Folder to Workspace)" + "float, initialTitle:(Open Files)" + "float, initialTitle:(wants to save)" + "size 70% 60%, initialTitle:(Open Files)" + "size 70% 60%, initialTitle:(Add Folder to Workspace)" + "size 70% 70%, tag:settings*" + "size 60% 70%, class:^([Ff]erdium)$" + "opacity 1.0 1.0, tag:browser*" + "opacity 0.9 0.8, tag:projects*" + "opacity 0.94 0.86, tag:im*" + "opacity 0.9 0.8, tag:file-manager*" + "opacity 0.8 0.7, tag:terminal*" + "opacity 0.8 0.7, tag:settings*" + "opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor|mousepad)$" + "opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui" + "opacity 0.95 0.75, title:^(Picture-in-Picture)$" + "pin, title:^(Picture-in-Picture)$" + "keepaspectratio, title:^(Picture-in-Picture)$" + "noblur, tag:games*" + "fullscreen, tag:games*" + ]; + windowrulev2 = [ + # qs-wallpapers styling via compositor + "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" + "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" + "noblur, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" + "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" - windowrule { - name = Resolve - match:class = ^(\bresolve\b)$ - match:xwayland = 1 - no_blur = on - } + # qs-vid-wallpapers styling via compositor + "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" + "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" + "noblur, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" + "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - windowrule { - name = Thunar - match:class = ^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$ - tag = +file-manager - } + # qs-wlogout styling via compositor - power menu overlay + "noborder, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" + "rounding 20, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" + "opacity 1.0 1.0, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" - windowrule { - name = Terminals - match:class = ^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm|dropterminal)$ - tag = +terminal - } - - windowrule { - name = Brave-browser - match:class = ^(Brave-browser(-beta|-dev|-unstable)?)$ - tag = +browser - } - - windowrule { - name = Firefox - match:class = ^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$ - tag = +browser - } - - windowrule { - name = Google-chrome - match:class = ^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$ - tag = +browser - } - - windowrule { - name = Thorium-browser - match:class = ^([Tt]horium-browser|[Cc]achy-browser)$ - tag = +browser - } - - windowrule { - name = vscodium - match:class = ^(codium|codium-url-handler|VSCodium)$ - tag = +projects - } - - windowrule { - name = vscode - match:class = ^(VSCode|code-url-handler)$ - tag = +projects - } - - windowrule { - name = Discord - match:class = ^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$ - tag = +im - } - - windowrule { - name = Ferdium - match:class = ^([Ff]erdium)$ - center = on - float = on - size = 60% = 70% - tag = +im - } - - windowrule { - name = Whatsapp - match:class = ^([Ww]hatsapp-for-linux)$ - tag = +im - } - - windowrule { - name = Telegram-desktop - match:class = ^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$ - tag = +im - } - - windowrule { - name = teams-for-linux - match:class = ^(teams-for-linux)$ - tag = +im - } - - windowrule { - name = gamescope - match:class = ^(gamescope)$ - tag = +games - } - - windowrule { - name = steam-app - match:class = ^(steam_app\d+)$ - tag = +games - } - - windowrule { - name = Steam - match:class = ^([Ss]team)$ - tag = +gamestore - } - - windowrule { - name = Lutris - match:title = ^([Ll]utris)$ - tag = +gamestore - } - - windowrule { - name = heroicgameslauncher - match:class = ^(com.heroicgameslauncher.hgl)$ - tag = +gamestore - } - - windowrule { - name = gnome-disks - match:class = ^(gnome-disks|wihotspot(-gui)?)$ - tag = +settings - } - - windowrule { - name = rofi - match:class = ^([Rr]ofi)$ - tag = +settings - no_blur = off - } - - windowrule { - name = FileRoller - match:class = ^(file-roller|org.gnome.FileRoller)$ - tag = +settings - } - - windowrule { - name = NetworkManger - match:class = ^(nm-applet|nm-connection-editor|blueman-manager)$ - tag = +settings - } - - windowrule { - name = PlusAudio - match:class = ^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$ - center = on - tag = +settings - no_blur = off - } - - windowrule { - name = nwg-look - match:class = ^(nwg-look|qt5ct|qt6ct|[Yy]ad)$ - tag = +settings - } - - windowrule { - name = xdg-desktop-portal-gtk - match:class = (xdg-desktop-portal-gtk) - tag = +settings - } - - windowrule { - name = blueman - match:class = (.blueman-manager-wrapped) - tag = +settings - } - - windowrule { - name = nwg-displays - match:class = (nwg-displays) - tag = +settings - } - - windowrule { - name = Picture-in-Picture - match:title = ^(Picture-in-Picture)$ - float = on - move = 72% = 7% - opacity = 0.95 = 0.75 - pin = 0 - keep_aspect_ratio = on - } - - windowrule { - name = ThunarFileMgr - match:class = ([Tt]hunar) - match:title = negative:(.*[Tt]hunar.*) - center = on - float = on - } - - windowrule { - name = Authentication-Required - match:title = ^(Authentication Required)$ - center = on - float = on - } - - windowrule { - name = IdleInhibit-fullscreen-1 - match:class = ^(*)$ - idle_inhibit = fullscreen - } - - windowrule { - name = IdleInhibit-fullscreen-2 - match:title = ^(*)$ - idle_inhibit = fullscreen - } - - windowrule { - name = IdleInhibit-fullscreen-3 - match:fullscreen = 1 - idle_inhibit = fullscreen - } - - windowrule { - name = Settings-Tag - match:tag = settings* - float = on - opacity = 0.8 = 0.7 - size = 70% = 70% - no_blur = off - } - - windowrule { - name = WayPaper - match:class = ^([Ww]aypaper)$ - float = on - no_blur = off - } - - windowrule { - name = mpv-or-clapper - match:class = ^(mpv|com.github.rafostar.Clapper)$ - float = on - } - - windowrule { - name = codium-url-handler - match:class = (codium|codium-url-handler|VSCodium) - match:title = negative:(.*codium.*|.*VSCodium.*) - float = on - } - - windowrule { - name = heroicgameslauncher-1 - match:class = ^(com.heroicgameslauncher.hgl)$ - match:title = negative:(Heroic Games Launcher) - float = on - } - - windowrule { - name = Steam - match:class = ^([Ss]team)$ - match:title = negative:^([Ss]team)$ - float = on - } - - windowrule { - name = Add-Folder - match:initial_title = (Add Folder to Workspace) - float = on - size = 70% = 60% - } - - windowrule { - name = Open-File - match:initial_title = (Open Files) - float = on - size = 70% = 60% - } - - windowrule { - name = Wants-to-Save - match:initial_title = (wants to save) - float = on - } - - windowrule { - name = Browsers - match:tag = browser* - opacity = 1.0 = 1.0 - } - - windowrule { - name = Projects - match:tag = projects* - opacity = 0.9 = 0.8 - } - - windowrule { - name = Instant-Messaging - match:tag = im* - opacity = 0.94 = 0.86 - } - - windowrule { - name = File-Managers - match:tag = file-manager* - opacity = 0.9 = 0.8 - } - - windowrule { - name = Terminals-opacity - match:tag = terminal* - opacity = 0.8 = 0.7 - no_blur = off - } - - windowrule { - name = windowrule-77 - match:class = ^(gedit|org.gnome.TextEditor|mousepad)$ - opacity = 0.8 = 0.7 - } - - windowrule { - name = windowrule-78 - match:class = ^(seahorse)$ - opacity = 0.9 = 0.8 - } - - windowrule { - name = windowrule-79 - match:tag = games* - no_blur = on - } - - windowrule { - name = windowrule-80 - match:tag = games* - fullscreen = on - } - - windowrule { - name = qs-keybinds - match:title = ^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$ - float = on - center = on - size = 55% = 66% - } - - windowrule { - name = qs-cheatsheets - match:title = ^(Cheatsheets Viewer)$ - float = on - center = on - size = 65% = 60% - } - - windowrule { - name = qs-extended-viewers - match:title = ^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$ - float = on - center = on - size = 55% = 66% - } - - windowrule { - name = QS-Wallpapers - match:class = ^(org\.qt-project\.qml)$ - match:title = ^(Wallpapers)$ - border_size = 0 - float = on - no_blur = on - no_shadow = on - rounding = 12 - } - - windowrule { - name = QA-Video-Wallpapers - match:class = ^(org\.qt-project\.qml)$ - match:title = ^(Video Wallpapers)$ - border_size = 0 - center = on - float = on - no_blur = on - no_shadow = on - rounding = 12 - } - - windowrule { - name = QS-wlogout - match:class = ^(org\.qt-project\.qml)$ - match:title = ^(qs-wlogout)$ - border_size = 0 - center = on - float = on - opacity = 1.0 = 1.0 - rounding = 20 - } - - windowrule { - name = QA-Panels - match:class = ^(org\.qt-project\.qml)$ - match:title = ^(Panels)$ - center = on - float = on - no_blur = on - no_shadow = on - rounding = 12 - } - - windowrule { - name = QS-Cheatsheets - match:class = ^(org\.qt-project\.qml)$ - match:title = ^(Cheatsheets Viewer)$ - border_size = 0 - center = on - float = on - no_shadow = on - rounding = 12 - } - - windowrule { - name = QS-Documentation-Viewer - match:class = ^(org\.qt-project\.qml)$ - match:title = ^(Documentation Viewer)$ - border_size = 0 - center = on - float = on - no_shadow = on - rounding = 12 - } - ''; + # qs-docs / qs-cheatsheets overlay windows + "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$" + "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$" + "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$" + "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$" + "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$" + "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$" + ]; + }; }; } diff --git a/modules/home/install-zaneyos.sh b/modules/home/install-zaneyos.sh index cf88a04..a3fdc50 100755 --- a/modules/home/install-zaneyos.sh +++ b/modules/home/install-zaneyos.sh @@ -102,18 +102,18 @@ has_intel=false has_amd=false has_vm=false -if lspci | grep -qi 'vga\|3d\|display'; then +if lspci | grep -qi 'vga\|3d'; then while read -r line; do if echo "$line" | grep -qi 'nvidia'; then has_nvidia=true - elif echo "$line" | grep -qi 'amd\|ati\|advanced micro devices'; then + elif echo "$line" | grep -qi 'amd'; then has_amd=true elif echo "$line" | grep -qi 'intel'; then has_intel=true elif echo "$line" | grep -qi 'virtio\|vmware'; then has_vm=true fi - done < <(lspci | grep -i 'vga\|3d\|display') + done < <(lspci | grep -i 'vga\|3d') if $has_vm; then DETECTED_PROFILE="vm" diff --git a/modules/home/scripts/DropTerminal.nix b/modules/home/scripts/DropTerminal.nix deleted file mode 100644 index cbc14d1..0000000 --- a/modules/home/scripts/DropTerminal.nix +++ /dev/null @@ -1,446 +0,0 @@ -{pkgs}: -pkgs.writeShellScriptBin "DropTerminal" '' - #!/usr/bin/env bash - # Dropdown Terminal for Hyprland (Nix-managed) - # Source: adapted from Dropterminal.sh by Kiran George (SherLock707) - # Usage: - # DropTerminal [-d] [] - # Behavior: - # - If is omitted, uses $TERM, with fallback to kitty when $TERM is unset/empty - - set -euo pipefail - - DEBUG=false - # Use a dedicated special workspace so preload never flashes on screen - SPECIAL_WS="special:dropterminal" - ADDR_FILE="/tmp/dropdown_terminal_addr" - SPAWN_ONLY=false # if true, just create hidden in scratchpad and exit - - # Sanitize Hyprland JSON to strict JSON (work around NaN/Inf issues) - hyprjson() { - # Usage: hyprjson - # Emits strict JSON, replacing invalid numeric literals with null - hyprctl "$@" -j 2>/dev/null | sed -E 's/: *nan([,}])/ : null\1/gi; s/: *-nan([,}])/ : null\1/gi; s/: *inf([,}])/ : null\1/gi; s/: *-inf([,}])/ : null\1/gi' - } - - # Dropdown size and position configuration (percentages) - WIDTH_PERCENT=65 # Width as percentage of screen width - HEIGHT_PERCENT=65 # Height as percentage of screen height - Y_PERCENT=10 # Y position as percentage from top (X is auto-centered) - - # Animation settings - ANIMATION_DURATION=100 # milliseconds - SLIDE_STEPS=5 - SLIDE_DELAY=5 # milliseconds between steps - - # Parse arguments - if [ "''${1-}" = "-d" ] || [ "''${1-}" = "--debug" ]; then - DEBUG=true - shift || true - fi - if [ "''${1-}" = "-S" ] || [ "''${1-}" = "--spawn-only" ]; then - SPAWN_ONLY=true - shift || true - fi - # Env override for startup usage - if [ "''${DROPTERM_SPAWN_ONLY-}" = "1" ]; then - SPAWN_ONLY=true - fi - - # Terminal command: prefer explicit arg; otherwise always use kitty - TERMINAL_CMD="''${1-}" - if [ -z "''${TERMINAL_CMD}" ]; then - TERMINAL_CMD="kitty" - fi - - # Debug echo function - debug_echo() { - if [ "$DEBUG" = true ]; then - echo "$@" >&2 - fi - } - - # Wait until Hyprland returns sane JSON (monitors/workspace ready) - wait_for_hypr() { - for i in $(seq 1 60); do - if hyprjson monitors | ${pkgs.jq}/bin/jq -e 'length > 0' >/dev/null 2>&1 \ - && hyprjson activeworkspace | ${pkgs.jq}/bin/jq -e '.id | numbers' >/dev/null 2>&1; then - return 0 - fi - sleep 0.05 - done - return 0 - } - - # Function to get window geometry - get_window_geometry() { - local addr="$1" - hyprjson clients | ${pkgs.jq}/bin/jq -r --arg ADDR "$addr" '.[] | select(.address == $ADDR) | "\(.at[0]) \(.at[1]) \(.size[0]) \(.size[1])"' - } - - # Ensure a window is floating - ensure_floating() { - local addr="$1" - local is_float=$(hyprjson clients | ${pkgs.jq}/bin/jq -r --arg ADDR "$addr" '.[] | select(.address == $ADDR) | .floating // false') - if [ "$is_float" != "true" ]; then - hyprctl dispatch togglefloating "address:$addr" >/dev/null 2>&1 || true - sleep 0.02 - fi - } - - # Function to animate window slide down (show) - animate_slide_down() { - local addr="$1" - local target_x="$2" - local target_y="$3" - local width="$4" - local height="$5" - if ! [[ "$target_x" =~ ^-?[0-9]+$ ]] || ! [[ "$target_y" =~ ^-?[0-9]+$ ]] || \ - ! [[ "$width" =~ ^[0-9]+$ ]] || ! [[ "$height" =~ ^[0-9]+$ ]]; then - debug_echo "Invalid geometry for slide down; skipping animation" - return 1 - fi - - debug_echo "Animating slide down for window $addr to position $target_x,$target_y" - - # Start position (above screen) - local start_y=$((target_y - height - 50)) - - # Calculate step size - local step_y=$(((target_y - start_y) / SLIDE_STEPS)) - - # Move window to start position instantly (off-screen) - hyprctl dispatch movewindowpixel "exact $target_x $start_y,address:$addr" >/dev/null 2>&1 - sleep 0.05 - - # Animate slide down - for i in $(seq 1 $SLIDE_STEPS); do - local current_y=$((start_y + (step_y * i))) - hyprctl dispatch movewindowpixel "exact $target_x $current_y,address:$addr" >/dev/null 2>&1 - sleep 0.03 - done - - # Ensure final position is exact - hyprctl dispatch movewindowpixel "exact $target_x $target_y,address:$addr" >/dev/null 2>&1 - } - - # Function to animate window slide up (hide) - animate_slide_up() { - local addr="$1" - local start_x="$2" - local start_y="$3" - local width="$4" - local height="$5" - if ! [[ "$start_x" =~ ^-?[0-9]+$ ]] || ! [[ "$start_y" =~ ^-?[0-9]+$ ]] || \ - ! [[ "$width" =~ ^[0-9]+$ ]] || ! [[ "$height" =~ ^[0-9]+$ ]]; then - debug_echo "Invalid geometry for slide up; skipping animation" - return 1 - fi - - debug_echo "Animating slide up for window $addr from position $start_x,$start_y" - - # End position (above screen) - local end_y=$((start_y - height - 50)) - - # Calculate step size - local step_y=$(((start_y - end_y) / SLIDE_STEPS)) - - # Animate slide up - for i in $(seq 1 $SLIDE_STEPS); do - local current_y=$((start_y - (step_y * i))) - hyprctl dispatch movewindowpixel "exact $start_x $current_y,address:$addr" >/dev/null 2>&1 - sleep 0.03 - done - - debug_echo "Slide up animation completed" - } - - # Function to get monitor info including scale and name of focused monitor - get_monitor_info() { - local monitor_data=$(hyprjson monitors | ${pkgs.jq}/bin/jq -r '.[] | select(.focused == true) | "\(.x) \(.y) \(.width) \(.height) \(.scale // 1) \(.name)"') - if [ -z "$monitor_data" ] || [[ "$monitor_data" =~ ^null ]]; then - debug_echo "Error: Could not get focused monitor information" - return 1 - fi - echo "$monitor_data" - } - - # Function to calculate dropdown position with proper scaling and centering - calculate_dropdown_position() { - local monitor_info=$(get_monitor_info) - - if [ $? -ne 0 ] || [ -z "$monitor_info" ]; then - debug_echo "Error: Failed to get monitor info, using fallback values" - echo "100 100 800 600 fallback-monitor" - return 1 - fi - - local mon_x=$(echo $monitor_info | cut -d' ' -f1) - local mon_y=$(echo $monitor_info | cut -d' ' -f2) - local mon_width=$(echo $monitor_info | cut -d' ' -f3) - local mon_height=$(echo $monitor_info | cut -d' ' -f4) - local mon_scale=$(echo $monitor_info | cut -d' ' -f5) - local mon_name=$(echo $monitor_info | cut -d' ' -f6) - # Ensure geometry values are numeric; Hyprland can emit non-JSON status lines during startup - if ! [[ "$mon_x" =~ ^-?[0-9]+$ ]] || ! [[ "$mon_y" =~ ^-?[0-9]+$ ]] || \ - ! [[ "$mon_width" =~ ^[0-9]+$ ]] || ! [[ "$mon_height" =~ ^[0-9]+$ ]]; then - debug_echo "Error: Non-numeric monitor geometry; using fallback values" - echo "100 100 800 600 fallback-monitor" - return 1 - fi - - debug_echo "Monitor info: x=$mon_x, y=$mon_y, width=$mon_width, height=$mon_height, scale=$mon_scale" - - # Validate scale value and provide fallback - if [ -z "$mon_scale" ] || [ "$mon_scale" = "null" ] || [ "$mon_scale" = "0" ]; then - debug_echo "Invalid scale value, using 1.0 as fallback" - mon_scale="1.0" - fi - - # Calculate logical dimensions by dividing physical dimensions by scale - local logical_width logical_height - if [ -x "${pkgs.bc}/bin/bc" ]; then - logical_width=$(echo "scale=0; $mon_width / $mon_scale" | ${pkgs.bc}/bin/bc | cut -d'.' -f1) - logical_height=$(echo "scale=0; $mon_height / $mon_scale" | ${pkgs.bc}/bin/bc | cut -d'.' -f1) - else - # Fallback to integer math (multiply by 100 for precision, then divide) - local scale_int=$(echo "$mon_scale" | sed 's/\.///' | sed 's/^0*//') - if [ -z "$scale_int" ]; then scale_int=100; fi - - logical_width=$(((mon_width * 100) / scale_int)) - logical_height=$(((mon_height * 100) / scale_int)) - fi - - # Ensure we have valid integer values - if ! [[ "$logical_width" =~ ^-?[0-9]+$ ]]; then logical_width=$mon_width; fi - if ! [[ "$logical_height" =~ ^-?[0-9]+$ ]]; then logical_height=$mon_height; fi - - debug_echo "Physical resolution: ''${mon_width}x''${mon_height}" - debug_echo "Logical resolution: ''${logical_width}x''${logical_height} (physical ÷ scale)" - - # Calculate window dimensions based on LOGICAL space percentages - local width=$((logical_width * WIDTH_PERCENT / 100)) - local height=$((logical_height * HEIGHT_PERCENT / 100)) - - # Calculate Y position from top based on percentage of LOGICAL height - local y_offset=$((logical_height * Y_PERCENT / 100)) - - # Calculate centered X position in LOGICAL space - local x_offset=$(((logical_width - width) / 2)) - - # Apply monitor offset to get final positions in logical coordinates - local final_x=$((mon_x + x_offset)) - local final_y=$((mon_y + y_offset)) - - debug_echo "Window size: ''${width}x''${height} (logical pixels)" - debug_echo "Final position: x=$final_x, y=$final_y (logical coordinates)" - debug_echo "Hyprland will scale these to physical coordinates automatically" - - echo "$final_x $final_y $width $height $mon_name" - } - - # Ensure Hyprland is ready and get the current workspace - wait_for_hypr - CURRENT_WS=$(hyprjson activeworkspace | ${pkgs.jq}/bin/jq -r '.id // empty') - if [ -z "''${CURRENT_WS}" ]; then - # Try once more after a short wait - sleep 0.1 - CURRENT_WS=$(hyprjson activeworkspace | ${pkgs.jq}/bin/jq -r '.id // empty') - fi - if [ -z "''${CURRENT_WS}" ]; then - debug_echo "Warning: unable to read active workspace; using workspace 1" - CURRENT_WS="1" - fi - - # Function to get stored terminal address - get_terminal_address() { - if [ -f "$ADDR_FILE" ] && [ -s "$ADDR_FILE" ]; then - cut -d' ' -f1 "$ADDR_FILE" - fi - } - - # Function to get stored monitor name - get_terminal_monitor() { - if [ -f "$ADDR_FILE" ] && [ -s "$ADDR_FILE" ]; then - cut -d' ' -f2- "$ADDR_FILE" - fi - } - - # Function to check if terminal exists - terminal_exists() { - local addr=$(get_terminal_address) - if [ -n "$addr" ]; then - hyprjson clients | ${pkgs.jq}/bin/jq -e --arg ADDR "$addr" 'map(select(.address == $ADDR)) | any' >/dev/null 2>&1 - else - return 1 - fi - } - - # Function to check if terminal is in special workspace - terminal_in_special() { - local addr=$(get_terminal_address) - if [ -n "$addr" ]; then - hyprjson clients | ${pkgs.jq}/bin/jq -e --arg ADDR "$addr" --arg WS "$SPECIAL_WS" 'map(select(.address == $ADDR and .workspace.name == $WS)) | any' >/dev/null 2>&1 - else - return 1 - fi - } - - # Function to spawn terminal and capture its address - spawn_terminal() { - debug_echo "Creating new dropdown terminal with command: $TERMINAL_CMD" - - # Calculate dropdown position for later use - local pos_info=$(calculate_dropdown_position) - if [ $? -ne 0 ]; then - debug_echo "Warning: Using fallback positioning" - fi - local target_x target_y width height monitor_name - read -r target_x target_y width height monitor_name <<<"$pos_info" - if ! [[ "$target_x" =~ ^-?[0-9]+$ ]] || ! [[ "$target_y" =~ ^-?[0-9]+$ ]] || \ - ! [[ "$width" =~ ^[0-9]+$ ]] || ! [[ "$height" =~ ^[0-9]+$ ]]; then - debug_echo "Invalid position parsed; using fallback values" - target_x=100 - target_y=100 - width=800 - height=600 - monitor_name="fallback-monitor" - fi - - debug_echo "Target position: ''${target_x},''${target_y}, size: ''${width}x''${height}" - - # Create a unique title so we can robustly identify the new window - local token=$(date +%s%N) - local title="dropterm-$token" - local spawn_cmd="$TERMINAL_CMD --class dropterminal --instance-group dropterminal --title $title" - - # Launch in scratchpad to avoid visible spawn; size will be enforced after detection - hyprctl dispatch exec "[float; workspace $SPECIAL_WS silent] $spawn_cmd" >/dev/null 2>&1 || true - - # Wait for the new window with our unique class/title (up to ~3s) - local new_addr="" - for i in $(seq 1 60); do - new_addr=$(hyprjson clients | ${pkgs.jq}/bin/jq -r --arg CLS "dropterminal" --arg TITLE "$title" \ - '.[] | select(.class == $CLS and .title == $TITLE) | .address' | head -1) - if [ -n "$new_addr" ]; then break; fi - sleep 0.05 - done - - if [ -n "$new_addr" ] && [ "$new_addr" != "null" ]; then - # Store the address and monitor name - echo "$new_addr $monitor_name" >"$ADDR_FILE" - debug_echo "Terminal created with address: $new_addr in special workspace on monitor $monitor_name" - - # Ensure scratchpad placement (in case exec flags were ignored) - hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$new_addr" >/dev/null 2>&1 || true - ensure_floating "$new_addr" - hyprctl dispatch resizewindowpixel "exact $width $height,address:$new_addr" >/dev/null 2>&1 || true - - if [ "$SPAWN_ONLY" = true ]; then - # Keep it hidden for startup preload - debug_echo "Spawn-only: leaving terminal hidden in scratchpad" - return 0 - fi - - # Bring to current workspace and set up geometry/animation - hyprctl dispatch movetoworkspacesilent "$CURRENT_WS,address:$new_addr" - ensure_floating "$new_addr" - hyprctl dispatch pin "address:$new_addr" - hyprctl dispatch resizewindowpixel "exact $width $height,address:$new_addr" - animate_slide_down "$new_addr" "$target_x" "$target_y" "$width" "$height" - - return 0 - fi - - debug_echo "Failed to detect new kitty window; aborting spawn" - return 1 - } - - # Main logic - if terminal_exists; then - TERMINAL_ADDR=$(get_terminal_address) - debug_echo "Found existing terminal: $TERMINAL_ADDR" - focused_monitor=$(get_monitor_info | awk '{print $6}') - dropdown_monitor=$(get_terminal_monitor) - if [ "$focused_monitor" != "$dropdown_monitor" ]; then - debug_echo "Monitor focus changed: moving dropdown to $focused_monitor" - # Calculate new position for focused monitor - pos_info=$(calculate_dropdown_position) - read -r target_x target_y width height monitor_name <<<"$pos_info" - if ! [[ "$target_x" =~ ^-?[0-9]+$ ]] || ! [[ "$target_y" =~ ^-?[0-9]+$ ]] || \ - ! [[ "$width" =~ ^[0-9]+$ ]] || ! [[ "$height" =~ ^[0-9]+$ ]]; then - debug_echo "Invalid position parsed; using fallback values" - target_x=100 - target_y=100 - width=800 - height=600 - monitor_name="fallback-monitor" - fi - # Move and resize window - hyprctl dispatch movewindowpixel "exact $target_x $target_y,address:$TERMINAL_ADDR" - hyprctl dispatch resizewindowpixel "exact $width $height,address:$TERMINAL_ADDR" - # Update ADDR_FILE - echo "$TERMINAL_ADDR $monitor_name" >"$ADDR_FILE" - fi - - if terminal_in_special; then - debug_echo "Bringing terminal from scratchpad with slide down animation" - - # Calculate target position - pos_info=$(calculate_dropdown_position) - read -r target_x target_y width height monitor_name <<<"$pos_info" - if ! [[ "$target_x" =~ ^-?[0-9]+$ ]] || ! [[ "$target_y" =~ ^-?[0-9]+$ ]] || \ - ! [[ "$width" =~ ^[0-9]+$ ]] || ! [[ "$height" =~ ^[0-9]+$ ]]; then - debug_echo "Invalid position parsed; using fallback values" - target_x=100 - target_y=100 - width=800 - height=600 - fi - - # Use movetoworkspacesilent to avoid affecting workspace history - hyprctl dispatch movetoworkspacesilent "$CURRENT_WS,address:$TERMINAL_ADDR" - ensure_floating "$TERMINAL_ADDR" - hyprctl dispatch pin "address:$TERMINAL_ADDR" - - # Set size and animate slide down - hyprctl dispatch resizewindowpixel "exact $width $height,address:$TERMINAL_ADDR" - animate_slide_down "$TERMINAL_ADDR" "$target_x" "$target_y" "$width" "$height" - - hyprctl dispatch focuswindow "address:$TERMINAL_ADDR" - else - debug_echo "Hiding terminal to scratchpad with slide up animation" - - # Get current geometry for animation - geometry=$(get_window_geometry "$TERMINAL_ADDR") - if [ -n "$geometry" ]; then - curr_x=$(echo $geometry | cut -d' ' -f1) - curr_y=$(echo $geometry | cut -d' ' -f2) - curr_width=$(echo $geometry | cut -d' ' -f3) - curr_height=$(echo $geometry | cut -d' ' -f4) - - debug_echo "Current geometry: ''${curr_x},''${curr_y} ''${curr_width}x''${curr_height}" - - # Animate slide up first - animate_slide_up "$TERMINAL_ADDR" "$curr_x" "$curr_y" "$curr_width" "$curr_height" - - # Small delay then move to special workspace and unpin - sleep 0.1 - hyprctl dispatch pin "address:$TERMINAL_ADDR" # Unpin (toggle) - hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$TERMINAL_ADDR" - else - debug_echo "Could not get window geometry, moving to scratchpad without animation" - hyprctl dispatch pin "address:$TERMINAL_ADDR" - hyprctl dispatch movetoworkspacesilent "$SPECIAL_WS,address:$TERMINAL_ADDR" - fi - fi - else - debug_echo "No existing terminal found, creating new one" - if spawn_terminal; then - TERMINAL_ADDR=$(get_terminal_address) - if [ "$SPAWN_ONLY" = false ] && [ -n "$TERMINAL_ADDR" ]; then - hyprctl dispatch focuswindow "address:$TERMINAL_ADDR" - fi - fi - fi -'' diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix index 4874006..69c0598 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -1,7 +1,6 @@ { config, pkgs, - inputs, username, profile, ... @@ -18,9 +17,8 @@ (import ./screenshootin.nix {inherit pkgs;}) (import ./squirtle.nix {inherit pkgs;}) (import ./task-waybar.nix {inherit pkgs;}) - (import ./DropTerminal.nix {inherit pkgs;}) (import ./wallsetter.nix { - inherit pkgs inputs; + inherit pkgs; inherit username; }) (import ./web-search.nix {inherit pkgs;}) @@ -33,16 +31,13 @@ (import ./qs-vid-wallpapers-apply.nix {inherit pkgs;}) (import ./qs-vid-wallpapers-watchdog.nix {inherit pkgs;}) (import ./qs-wallpapers.nix {inherit pkgs;}) - (import ./qs-wallpapers-apply.nix {inherit pkgs inputs;}) - (import ./qs-wallpapers-restore.nix {inherit pkgs inputs;}) + (import ./qs-wallpapers-apply.nix {inherit pkgs;}) + (import ./qs-wallpapers-restore.nix {inherit pkgs;}) (import ./qs-wlogout.nix {inherit pkgs;}) (import ./qs-docs.nix {inherit pkgs;}) (import ./docs-parser.nix {inherit pkgs;}) - (import ./hyprland-float-all.nix {inherit pkgs;}) - (import ./hyprland-change-layout.nix {inherit pkgs;}) (import ./launch-nwg-menu.nix {inherit pkgs;}) (import ./hyprland-dock.nix {inherit pkgs;}) - (import ./restart.noctalia.nix {inherit pkgs;}) (import ./zcli.nix { inherit pkgs profile; backupFiles = [ @@ -50,15 +45,4 @@ ]; }) ]; - - xdg.desktopEntries.dropterminal = { - name = "Drop Terminal"; - comment = "Dropdown terminal (Hyprland)"; - exec = "DropTerminal"; - terminal = false; - type = "Application"; - icon = "kitty"; - settings.StartupWMClass = "dropterminal"; - categories = ["System" "Utility" "TerminalEmulator"]; - }; } diff --git a/modules/home/scripts/docs-parser.nix b/modules/home/scripts/docs-parser.nix index 1276bea..884f9e7 100644 --- a/modules/home/scripts/docs-parser.nix +++ b/modules/home/scripts/docs-parser.nix @@ -16,7 +16,7 @@ pkgs.writeShellScriptBin "docs-parser" '' Usage: docs-parser [MODE] [CATEGORY] [LANGUAGE] MODE: files|content - CATEGORY: AI|Zed|ddubsos|etc. + CATEGORY: AI|Hyprpanel|Zed|ddubsos|etc. LANGUAGE: en|es Examples: diff --git a/modules/home/scripts/hyprland-change-layout.nix b/modules/home/scripts/hyprland-change-layout.nix deleted file mode 100644 index 0ce0e65..0000000 --- a/modules/home/scripts/hyprland-change-layout.nix +++ /dev/null @@ -1,85 +0,0 @@ -{pkgs}: -pkgs.writeShellScriptBin "hyprland-change-layout" '' - #!/usr/bin/env bash - set -euo pipefail - - notif="''${XDG_CONFIG_HOME:-$HOME/.config}/swaync/images/catppuccin-macchiato.png" - layouts=(dwindle master scrolling monocle) - - get_layout() { - ${pkgs.hyprland}/bin/hyprctl -j getoption general:layout | ${pkgs.jq}/bin/jq -r '.str' - } - - next_layout() { - local current="$1" - local i - for i in "''${!layouts[@]}"; do - if [[ "''${layouts[i]}" == "$current" ]]; then - echo "''${layouts[((i + 1) % ''${#layouts[@]})]}" - return - fi - done - echo "''${layouts[0]}" - } - - set_layout() { - local target="$1" - - ${pkgs.hyprland}/bin/hyprctl keyword general:layout "$target" - ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,J || true - ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,K || true - ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,O || true - ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER_SHIFT,M || true - - case "$target" in - "dwindle") - ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,cyclenext - ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,cyclenext,prev - ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,O,layoutmsg,togglesplit - ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Dwindle Layout" - ;; - "master") - ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,layoutmsg,cyclenext - ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,layoutmsg,cycleprev - ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Master Layout" - ;; - "scrolling") - ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,cyclenext - ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,cyclenext,prev - ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Scrolling Layout" - ;; - "monocle") - ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,layoutmsg,cyclenext - ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,layoutmsg,cycleprev - ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER_SHIFT,M,layoutmsg,swapnext - ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Monocle Layout" - ;; - *) - echo "Unknown layout: $target" >&2 - return 1 - ;; - esac - } - - current="$(get_layout)" - arg="''${1:-toggle}" - - case "$arg" in - init) - set_layout "$current" - ;; - toggle|next) - set_layout "$(next_layout "$current")" - ;; - set) - set_layout "''${2:-}" - ;; - master|dwindle|scrolling|monocle) - set_layout "$arg" - ;; - *) - echo "Usage: $(basename "$0") [toggle|next|init|set |master|dwindle|scrolling|monocle]" >&2 - exit 1 - ;; - esac -'' diff --git a/modules/home/scripts/hyprland-float-all.nix b/modules/home/scripts/hyprland-float-all.nix deleted file mode 100644 index e99c30f..0000000 --- a/modules/home/scripts/hyprland-float-all.nix +++ /dev/null @@ -1,11 +0,0 @@ -{pkgs}: -pkgs.writeShellScriptBin "hyprland-float-all" '' - #!/usr/bin/env bash - set -euo pipefail - - ws="$(${pkgs.hyprland}/bin/hyprctl activeworkspace -j | ${pkgs.jq}/bin/jq -r .id)" - ${pkgs.hyprland}/bin/hyprctl clients -j | ${pkgs.jq}/bin/jq -r --arg ws "$ws" '.[] | select(.workspace.id == ($ws|tonumber)) | .address' \ - | while read -r addr; do - [ -n "''${addr:-}" ] && ${pkgs.hyprland}/bin/hyprctl dispatch togglefloating "address:$addr" - done -'' diff --git a/modules/home/scripts/keybinds-parser.nix b/modules/home/scripts/keybinds-parser.nix index 0d2ef32..5451e94 100644 --- a/modules/home/scripts/keybinds-parser.nix +++ b/modules/home/scripts/keybinds-parser.nix @@ -271,7 +271,7 @@ pkgs.writeShellScriptBin "keybinds-parser" '' else if (low ~ /(emacs|code|vscode|nvim|vim)/) category="editor" else if (low ~ /(rofi|wofi|dmenu|launcher)/) category="launcher" else if (low ~ /(chrome|chromium|firefox|brave|browser)/) category="browser" - else if (low ~ /(awww|wallpaper)/) category="wallpaper" + else if (low ~ /(swww|wallpaper)/) category="wallpaper" else if (low ~ /(playerctl|wpctl|pactl|pamixer|brightnessctl|volume|brightness)/) category="media" else category="app" } else { diff --git a/modules/home/scripts/qs-docs.nix b/modules/home/scripts/qs-docs.nix index b5dfc82..0edeb40 100644 --- a/modules/home/scripts/qs-docs.nix +++ b/modules/home/scripts/qs-docs.nix @@ -12,7 +12,7 @@ pkgs.writeShellScriptBin "qs-docs" '' Usage: qs-docs [options] Options: - -c CATEGORY Category to display (AI|Zed|ddubsos) (default: AI) + -c CATEGORY Category to display (AI|Hyprpanel|Zed|ddubsos) (default: AI) -l LANGUAGE Language (en|es) (default: en) -h Show this help EOF @@ -316,7 +316,7 @@ pkgs.writeShellScriptBin "qs-docs" '' win.availableCategories = result; } catch (e) { console.error("Failed to parse categories JSON:", e); - win.availableCategories = ["AI", "Zed", "ddubsos"]; + win.availableCategories = ["AI", "Hyprpanel", "Zed", "ddubsos"]; } } } diff --git a/modules/home/scripts/qs-panels.nix b/modules/home/scripts/qs-panels.nix index 2f0f97c..500e070 100644 --- a/modules/home/scripts/qs-panels.nix +++ b/modules/home/scripts/qs-panels.nix @@ -5,6 +5,7 @@ pkgs.writeShellScriptBin "qs-panels" '' # Detect current active panel/bar (robust matching, no regex metachar) active="" + if pgrep -x hyprpanel >/dev/null 2>&1; then active="hyprpanel"; fi if pgrep -x waybar >/dev/null 2>&1; then active="waybar"; fi if pgrep -x dms >/dev/null 2>&1 || pgrep -fa dms | grep -q "\bdms\b.*\brun\b"; then active="dms"; fi if pgrep -fa quickshell | grep -q "noctalia-shell"; then active="noctalia"; fi @@ -65,7 +66,8 @@ pkgs.writeShellScriptBin "qs-panels" '' model: [ { key: "noctalia", label: "Noctalia" }, { key: "dms", label: "DMS" }, - { key: "waybar", label: "Waybar" } + { key: "waybar", label: "Waybar" }, + { key: "hyprpanel",label: "Hyprpanel" } ] delegate: Rectangle { width: 180; height: 52 @@ -147,6 +149,7 @@ pkgs.writeShellScriptBin "qs-panels" '' noctalia) run_and_exit noctalia-run ;; dms) run_and_exit dms-run ;; waybar) run_and_exit waybar-run ;; + hyprpanel)run_and_exit hyprpanel-run ;; *) exit 0 ;; esac '' diff --git a/modules/home/scripts/qs-vid-wallpapers-apply.nix b/modules/home/scripts/qs-vid-wallpapers-apply.nix index 61be824..b4197d2 100644 --- a/modules/home/scripts/qs-vid-wallpapers-apply.nix +++ b/modules/home/scripts/qs-vid-wallpapers-apply.nix @@ -67,8 +67,8 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers-apply" '' case "$BACKEND" in mpvpaper) - log "Stopping awww-daemon, hyprpaper, mpvpaper if running" - ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true + log "Stopping swww-daemon, hyprpaper, mpvpaper if running" + ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true log "Sleeping briefly before starting mpvpaper" @@ -88,7 +88,7 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers-apply" '' -o "$opts" \ '*' "$sel" >/dev/null 2>&1 & fi - disown || true + disown log "mpvpaper launched" exit 0 ;; diff --git a/modules/home/scripts/qs-vid-wallpapers.nix b/modules/home/scripts/qs-vid-wallpapers.nix index a3d5e4a..36113b0 100644 --- a/modules/home/scripts/qs-vid-wallpapers.nix +++ b/modules/home/scripts/qs-vid-wallpapers.nix @@ -509,8 +509,6 @@ pkgs.writeShellScriptBin "qs-vid-wallpapers" '' # Prepare QML runtime environment (Qt6) export QT_QPA_PLATFORM="wayland;xcb" export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" - export QT_LOGGING_TO_CONSOLE="1" - export QT_FORCE_STDERR_LOGGING="1" export QT_PLUGIN_PATH="${pkgs.qt6.qtbase}/lib/qt-6/plugins:${pkgs.qt6.qtwayland}/lib/qt-6/plugins" export QML_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml:${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtsvg}/lib/qt-6/qml" export QML2_IMPORT_PATH="$QML_IMPORT_PATH" diff --git a/modules/home/scripts/qs-wallpapers-apply.nix b/modules/home/scripts/qs-wallpapers-apply.nix index 2bc1818..702d8f0 100644 --- a/modules/home/scripts/qs-wallpapers-apply.nix +++ b/modules/home/scripts/qs-wallpapers-apply.nix @@ -1,6 +1,4 @@ -{pkgs, inputs}: let - awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww; -in +{pkgs}: pkgs.writeShellScriptBin "qs-wallpapers-apply" '' #!/usr/bin/env bash set -euo pipefail @@ -30,7 +28,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' # Auto-detect sensible default backend per compositor when not provided via env if [ -z "''${BACKEND:-}" ]; then if [ "''${XDG_SESSION_DESKTOP:-}" = "Niri" ] || [ "''${XDG_CURRENT_DESKTOP:-}" = "Niri" ] || command -v niri >/dev/null 2>&1; then - BACKEND="awww" + BACKEND="swww" else BACKEND="mpvpaper" fi @@ -98,8 +96,8 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' case "$BACKEND" in mpvpaper) # Stop other wallpaper daemons to avoid conflicts - log "Stopping awww-daemon, hyprpaper, mpvpaper if running" - ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true + log "Stopping swww-daemon, hyprpaper, mpvpaper if running" + ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true # Give the compositor a moment to release layers @@ -117,21 +115,21 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' -o "$MPV_OPTS" \ '*' "$sel" >/dev/null 2>&1 & fi - disown || true + disown log "mpvpaper launched" exit 0 ;; - awww) + swww) ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true - # Start awww-daemon if needed (newer awww has no 'init' subcommand) - if ! ${awwwPkg}/bin/awww query >/dev/null 2>&1; then - log "Starting awww-daemon" - ${awwwPkg}/bin/awww-daemon >/dev/null 2>&1 & disown || true + # Start swww-daemon if needed (newer swww has no 'init' subcommand) + if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then + log "Starting swww-daemon" + ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown # wait briefly for the daemon to be ready for i in $(${pkgs.coreutils}/bin/seq 1 50); do - if ${awwwPkg}/bin/awww query >/dev/null 2>&1; then - log "awww-daemon ready" + if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then + log "swww-daemon ready" break fi ${pkgs.coreutils}/bin/sleep 0.1 @@ -141,26 +139,26 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true # Robust resize: if WALLPAPER_RESIZE is set, use it; otherwise try fill -> fit -> crop - run_awww_img() { + run_swww_img() { if [ -n "''${WALLPAPER_RESIZE:-}" ]; then - log "awww img --resize ''${WALLPAPER_RESIZE} $sel" - ${awwwPkg}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$sel" + log "swww img --resize ''${WALLPAPER_RESIZE} $sel" + ${pkgs.swww}/bin/swww img --resize "''${WALLPAPER_RESIZE}" "$sel" return $? fi - log "Trying awww resize modes: fill -> fit -> crop" - ${awwwPkg}/bin/awww img --resize fill "$sel" || \ - ${awwwPkg}/bin/awww img --resize fit "$sel" || \ - ${awwwPkg}/bin/awww img --resize crop "$sel" + log "Trying swww resize modes: fill -> fit -> crop" + ${pkgs.swww}/bin/swww img --resize fill "$sel" || \ + ${pkgs.swww}/bin/swww img --resize fit "$sel" || \ + ${pkgs.swww}/bin/swww img --resize crop "$sel" } # Niri: generic apply has proven to work more reliably than per-output here - run_awww_img + run_swww_img exit $? ;; hyprpaper) ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true - ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true + ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true # Generate a minimal hyprpaper config and start it _TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d) _CFG="$_TMPDIR/hyprpaper.conf" @@ -179,7 +177,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-apply" '' else ${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 & fi - disown || true + disown exit 0 ;; diff --git a/modules/home/scripts/qs-wallpapers-restore.nix b/modules/home/scripts/qs-wallpapers-restore.nix index 81a3554..9616939 100644 --- a/modules/home/scripts/qs-wallpapers-restore.nix +++ b/modules/home/scripts/qs-wallpapers-restore.nix @@ -1,6 +1,4 @@ -{pkgs, inputs}: let - awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww; -in +{pkgs}: pkgs.writeShellScriptBin "qs-wallpapers-restore" '' #!/usr/bin/env bash set -euo pipefail @@ -32,8 +30,8 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' hyprlock-update-wallpaper-link >/dev/null 2>&1 || true fi - # Order: recorded backend first, then awww -> hyprpaper -> mpvpaper -> waypaper - ORDER_DEFAULT="awww,hyprpaper,mpvpaper,waypaper" + # Order: recorded backend first, then swww -> hyprpaper -> mpvpaper -> waypaper + ORDER_DEFAULT="swww,hyprpaper,mpvpaper,waypaper" ORDER_COMBINED="$BACKEND_J,$ORDER_DEFAULT" # De-duplicate while preserving order (awk trick) ORDER=$({ echo "$ORDER_COMBINED" | ${pkgs.coreutils}/bin/tr ',' '\n' | ${pkgs.gawk}/bin/awk 'NF{ if (!seen[$0]++) print $0 }' | ${pkgs.coreutils}/bin/tr '\n' ','; echo; } | ${pkgs.coreutils}/bin/tr -s ',' | ${pkgs.gnused}/bin/sed 's/^,\|,$//g') @@ -52,35 +50,48 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' return 1 } - start_awww() { + start_swww() { + # Honor Hyprpanel requirement: do not start swww-daemon before Hyprpanel + local wait_sec="''${QS_RESTORE_WAIT_HYPRPANEL_SECONDS:-15}" + if ${pkgs.procps}/bin/pgrep -x hyprpanel >/dev/null 2>&1; then + log "hyprpanel detected; proceeding" + else + # If waybar is already running, it's fine to proceed immediately + if ${pkgs.procps}/bin/pgrep -x waybar >/dev/null 2>&1; then + log "waybar detected; proceeding without waiting for hyprpanel" + else + log "Waiting up to ''${wait_sec}s for hyprpanel before starting swww-daemon" + wait_for_proc hyprpanel "$wait_sec" || log "hyprpanel not detected after ''${wait_sec}s; proceeding" + fi + fi - # Stop conflicting daemons if we intend to use awww + # Stop conflicting daemons if we intend to use swww ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true - if ! ${awwwPkg}/bin/awww query >/dev/null 2>&1; then - log "Starting awww-daemon" - ${awwwPkg}/bin/awww-daemon >/dev/null 2>&1 & disown || true + if ! ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then + log "Starting swww-daemon" + ${pkgs.swww}/bin/swww-daemon >/dev/null 2>&1 & disown for i in $(${pkgs.coreutils}/bin/seq 1 50); do - if ${awwwPkg}/bin/awww query >/dev/null 2>&1; then break; fi + if ${pkgs.swww}/bin/swww query >/dev/null 2>&1; then break; fi ${pkgs.coreutils}/bin/sleep 0.1 done fi # Robust resize: use explicit WALLPAPER_RESIZE if provided; otherwise try fill -> fit -> crop if [ -n "''${WALLPAPER_RESIZE:-}" ]; then - log "awww img --resize ''${WALLPAPER_RESIZE} $PATH_J" - ${awwwPkg}/bin/awww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J" + log "swww img --resize ''${WALLPAPER_RESIZE} $PATH_J" + ${pkgs.swww}/bin/swww img --resize "''${WALLPAPER_RESIZE}" "$PATH_J" else - log "Trying awww resize modes: fill -> fit -> crop" - ${awwwPkg}/bin/awww img --resize fill "$PATH_J" || \ - ${awwwPkg}/bin/awww img --resize fit "$PATH_J" || \ - ${awwwPkg}/bin/awww img --resize crop "$PATH_J" + log "Trying swww resize modes: fill -> fit -> crop" + ${pkgs.swww}/bin/swww img --resize fill "$PATH_J" || \ + ${pkgs.swww}/bin/swww img --resize fit "$PATH_J" || \ + ${pkgs.swww}/bin/swww img --resize crop "$PATH_J" fi } start_hyprpaper() { ${pkgs.procps}/bin/pkill -x mpvpaper >/dev/null 2>&1 || true - ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true + ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true _TMPDIR=$(${pkgs.coreutils}/bin/mktemp -d) _CFG="$_TMPDIR/hyprpaper.conf" { @@ -92,21 +103,21 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' echo "wallpaper = $mon,$PATH_J" >> "$_CFG" done log "Starting hyprpaper" - ${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 & disown || true + ${pkgs.hyprpaper}/bin/hyprpaper -c "$_CFG" >/dev/null 2>&1 & disown } start_mpvpaper() { - ${pkgs.procps}/bin/pkill -x awww-daemon >/dev/null 2>&1 || true + ${pkgs.procps}/bin/pkill -x swww-daemon >/dev/null 2>&1 || true ${pkgs.procps}/bin/pkill -x hyprpaper >/dev/null 2>&1 || true local MPV_OPTS="--no-audio --loop-file=inf --image-display-duration=inf --no-osc --no-osd-bar --keep-open=yes --keepaspect=yes --panscan=1.0" log "Starting mpvpaper" - ${pkgs.mpvpaper}/bin/mpvpaper -o "$MPV_OPTS" '*' "$PATH_J" >/dev/null 2>&1 & disown || true + ${pkgs.mpvpaper}/bin/mpvpaper -o "$MPV_OPTS" '*' "$PATH_J" >/dev/null 2>&1 & disown } start_waypaper() { if command -v waypaper >/dev/null 2>&1; then log "Trying waypaper" - waypaper --backend awww --wallpaper "$PATH_J" >/dev/null 2>&1 || return 1 + waypaper --backend swww --wallpaper "$PATH_J" >/dev/null 2>&1 || return 1 else return 1 fi @@ -115,7 +126,7 @@ pkgs.writeShellScriptBin "qs-wallpapers-restore" '' IFS=',' read -r -a tools <<<"$ORDER" for t in "''${tools[@]}"; do case "$t" in - awww) start_awww && exit 0 || log "awww failed; falling back" ;; + swww) start_swww && exit 0 || log "swww failed; falling back" ;; hyprpaper) start_hyprpaper && exit 0 || log "hyprpaper failed; falling back" ;; mpvpaper) start_mpvpaper && exit 0 || log "mpvpaper failed; falling back" ;; waypaper) start_waypaper && exit 0 || log "waypaper failed; falling back" ;; diff --git a/modules/home/scripts/qs-wallpapers.nix b/modules/home/scripts/qs-wallpapers.nix index ce03e7b..2a25f51 100644 --- a/modules/home/scripts/qs-wallpapers.nix +++ b/modules/home/scripts/qs-wallpapers.nix @@ -361,8 +361,6 @@ pkgs.writeShellScriptBin "qs-wallpapers" '' # Prepare QML runtime environment (Qt6) export QT_QPA_PLATFORM="wayland;xcb" export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" - export QT_LOGGING_TO_CONSOLE="1" - export QT_FORCE_STDERR_LOGGING="1" export QT_PLUGIN_PATH="${pkgs.qt6.qtbase}/lib/qt-6/plugins:${pkgs.qt6.qtwayland}/lib/qt-6/plugins" export QML_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml:${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtsvg}/lib/qt-6/qml" export QML2_IMPORT_PATH="$QML_IMPORT_PATH" diff --git a/modules/home/scripts/qs-wlogout.nix b/modules/home/scripts/qs-wlogout.nix index 4c24cac..a21e4a3 100644 --- a/modules/home/scripts/qs-wlogout.nix +++ b/modules/home/scripts/qs-wlogout.nix @@ -232,8 +232,6 @@ in # Setup Qt6 environment with proper app identification export QT_QPA_PLATFORM="wayland;xcb" export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" - export QT_LOGGING_TO_CONSOLE="1" - export QT_FORCE_STDERR_LOGGING="1" export QT_PLUGIN_PATH="${pkgs.qt6.qtbase}/lib/qt-6/plugins:${pkgs.qt6.qtwayland}/lib/qt-6/plugins" export QML_IMPORT_PATH="${pkgs.qt6.qtbase}/lib/qt-6/qml:${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.qt6.qt5compat}/lib/qt-6/qml:${pkgs.qt6.qtsvg}/lib/qt-6/qml" export QML2_IMPORT_PATH="$QML_IMPORT_PATH" diff --git a/modules/home/scripts/restart.noctalia b/modules/home/scripts/restart.noctalia deleted file mode 100644 index 747c18a..0000000 --- a/modules/home/scripts/restart.noctalia +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -# Restart the Noctalia QuickShell session by terminating only the noctalia-shell -# processes, avoiding any signals to unrelated process groups (e.g. Hyprland). - -log() { printf "[restart.noctalia] %s\n" "$*"; } - -list_target_pids() { - # Collect only PIDs whose command explicitly runs noctalia-shell - # - direct wrapper: ".../noctalia-shell" - # - quickshell/qs with "-c noctalia-shell" - ps -eo pid=,cmd= \ - | ${GREP:-grep} -E "(^|/)(noctalia-shell)( |$)|(^| )((qs|quickshell))( | ).*-c( |=)?noctalia-shell( |$)" \ - | awk '{print $1}' -} - -terminate_targets() { - local pids left tries - mapfile -t pids < <(list_target_pids || true) - - if ((${#pids[@]} > 0)); then - kill -TERM "${pids[@]}" 2>/dev/null || true - fi - - # Wait up to ~3s for clean exit - for tries in {1..15}; do - mapfile -t left < <(list_target_pids || true) - ((${#left[@]} == 0)) && break - sleep 0.2 - done - - # Force kill leftovers only (do not touch anything else) - if ((${#left[@]} > 0)); then - kill -KILL "${left[@]}" 2>/dev/null || true - fi -} - -start_noctalia() { - # Prefer the noctalia-shell wrapper to ensure proper env and runtime flags - if command -v noctalia-shell >/dev/null 2>&1; then - nohup setsid noctalia-shell >/dev/null 2>&1 & - elif command -v quickshell >/dev/null 2>&1; then - nohup setsid quickshell -c noctalia-shell >/dev/null 2>&1 & - elif command -v qs >/dev/null 2>&1; then - nohup setsid qs -c noctalia-shell >/dev/null 2>&1 & - else - echo "Error: noctalia-shell/quickshell/qs not found in PATH" >&2 - exit 1 - fi -} - -terminate_targets -start_noctalia diff --git a/modules/home/scripts/restart.noctalia.nix b/modules/home/scripts/restart.noctalia.nix deleted file mode 100644 index d229149..0000000 --- a/modules/home/scripts/restart.noctalia.nix +++ /dev/null @@ -1,24 +0,0 @@ -{pkgs, ...}: let - binPath = pkgs.lib.makeBinPath [ - pkgs.coreutils - pkgs.procps - pkgs.psmisc - pkgs.gnugrep - pkgs.findutils - pkgs.util-linux - pkgs.bash - ]; - script = builtins.readFile ./restart.noctalia; -in - pkgs.writeShellScriptBin "restart.noctalia" '' - set -euo pipefail - export PATH=${binPath}:$PATH - - tmp_script=$(mktemp) - trap 'rm -f "$tmp_script"' EXIT - cat > "$tmp_script" <<'BASH_EOF' - ${script} - BASH_EOF - chmod +x "$tmp_script" - exec ${pkgs.bash}/bin/bash "$tmp_script" "$@" - '' diff --git a/modules/home/scripts/wallsetter.nix b/modules/home/scripts/wallsetter.nix index 59c5226..a2ae7d5 100644 --- a/modules/home/scripts/wallsetter.nix +++ b/modules/home/scripts/wallsetter.nix @@ -1,6 +1,4 @@ -{pkgs, inputs, ...}: let - awwwPkg = inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww; -in +{pkgs, ...}: pkgs.writeShellScriptBin "wallsetter" '' TIMEOUT=720 @@ -19,7 +17,7 @@ pkgs.writeShellScriptBin "wallsetter" '' PREVIOUS=$WALLPAPER - ${awwwPkg}/bin/awww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60 + ${pkgs.swww}/bin/swww img "$WALLPAPER" --transition-type random --transition-step 1 --transition-fps 60 sleep $TIMEOUT done '' diff --git a/modules/home/scripts/zcli.nix b/modules/home/scripts/zcli.nix index 05eae32..d905fb6 100644 --- a/modules/home/scripts/zcli.nix +++ b/modules/home/scripts/zcli.nix @@ -130,7 +130,7 @@ in # --- Configuration --- PROJECT="zaneyos" #ddubos or zaneyos - PROFILE_DEFAULT="${profile}" + PROFILE="${profile}" BACKUP_FILES_STR="${backupFilesString}" VERSION="1.0.2" FLAKE_NIX_PATH="$HOME/$PROJECT/flake.nix" @@ -138,13 +138,6 @@ in read -r -a BACKUP_FILES <<< "$BACKUP_FILES_STR" # --- Helper Functions --- - get_flake_profile() { - local flake_profile="" - if [ -f "$FLAKE_NIX_PATH" ]; then - flake_profile=$(${pkgs.gnugrep}/bin/grep -E '^[[:space:]]*profile[[:space:]]*=' "$FLAKE_NIX_PATH" | ${pkgs.gnused}/bin/sed 's/.*=[[:space:]]*"\([^"]*\)".*/\1/') - fi - echo "$flake_profile" - } verify_hostname() { local current_hostname local flake_hostname @@ -237,45 +230,32 @@ in local has_intel=false local has_amd=false local has_vm=false - # Prefer hypervisor detection first to avoid misclassifying VMs as AMD - if ${pkgs.systemd}/bin/systemd-detect-virt -q; then - echo "vm" - return - fi if ${pkgs.pciutils}/bin/lspci &> /dev/null; then # Check if lspci is available - if ${pkgs.pciutils}/bin/lspci -nn | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d\|display'; then + if ${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -qi 'vga\|3d'; then while read -r line; do - if echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[10de:'; then + if echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'nvidia'; then has_nvidia=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[1002:'; then - has_amd=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[8086:'; then - has_intel=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -Eq '\[(1af4|15ad|80ee|1b36|1414|1234|1013):'; then - has_vm=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'nvidia'; then - has_nvidia=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'amd\|ati\|advanced micro devices'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'amd'; then has_amd=true elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'intel'; then has_intel=true - elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware\|virtualbox\|qxl\|hyper-v\|microsoft corporation\|parallels\|qemu\|bochs\|cirrus\|svga\|virtual'; then + elif echo "$line" | ${pkgs.gnugrep}/bin/grep -qi 'virtio\|vmware'; then has_vm=true fi - done < <(${pkgs.pciutils}/bin/lspci -nn | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d\|display') + done < <(${pkgs.pciutils}/bin/lspci | ${pkgs.gnugrep}/bin/grep -i 'vga\|3d') - if $has_vm; then + if "$has_vm"; then detected_profile="vm" - elif $has_nvidia && $has_intel; then + elif "$has_nvidia" && "$has_intel"; then detected_profile="nvidia-laptop" - elif $has_nvidia && $has_amd; then + elif "$has_nvidia" && "$has_amd"; then detected_profile="amd-hybrid" - elif $has_nvidia; then + elif "$has_nvidia"; then detected_profile="nvidia" - elif $has_amd; then + elif "$has_amd"; then detected_profile="amd" - elif $has_intel; then + elif "$has_intel"; then detected_profile="intel" fi fi @@ -356,10 +336,6 @@ in } # --- Main Logic --- - PROFILE="$(get_flake_profile)" - if [ -z "$PROFILE" ]; then - PROFILE="$PROFILE_DEFAULT" - fi if [ "$#" -eq 0 ]; then echo "Error: No command provided." >&2 print_help diff --git a/modules/home/stylix.nix b/modules/home/stylix.nix index 1624de0..4448304 100644 --- a/modules/home/stylix.nix +++ b/modules/home/stylix.nix @@ -1,7 +1,5 @@ _: { stylix.targets = { - # Avoid fetching GNOME Shell sources on non-GNOME systems (breaks on some remotes) - gnome.enable = false; waybar.enable = false; rofi.enable = false; hyprland.enable = false; diff --git a/modules/home/swaync.nix b/modules/home/swaync.nix index a29959b..07e6261 100644 --- a/modules/home/swaync.nix +++ b/modules/home/swaync.nix @@ -1,6 +1,4 @@ {config, ...}: { - home.file."${config.xdg.configHome}/swaync/images/catppuccin-macchiato.png".source = - ./swaync/images/catppuccin-macchiato.png; services.swaync = { enable = true; settings = { diff --git a/modules/home/swaync/images/catppuccin-macchiato.png b/modules/home/swaync/images/catppuccin-macchiato.png deleted file mode 100644 index ddb8cd6..0000000 Binary files a/modules/home/swaync/images/catppuccin-macchiato.png and /dev/null differ diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix index 5df8b59..9f1bcbb 100644 --- a/modules/home/zsh/default.nix +++ b/modules/home/zsh/default.nix @@ -2,7 +2,6 @@ profile, pkgs, lib, - config, ... }: { imports = [ @@ -11,7 +10,6 @@ programs.zsh = { enable = true; - dotDir = config.home.homeDirectory; autosuggestion.enable = true; syntaxHighlighting = { enable = true;