From 33476ce5624cb92cbff51997e76ba3d086edccfe Mon Sep 17 00:00:00 2001 From: Don Williams Date: Fri, 20 Mar 2026 22:13:58 -0400 Subject: [PATCH] Porting ZOS-NEXT updates back to ZOS --- CHANGELOG.md | 18 +- flake.lock | 275 ++------- flake.nix | 10 +- hosts/default/variables.nix | 22 +- hosts/zaneyos-24-vm/variables.nix | 8 +- modules/core/overlays.nix | 12 - modules/core/packages.nix | 3 +- modules/core/steam.nix | 2 +- modules/core/thunar.nix | 6 +- modules/home/hyprland/binds.nix | 14 +- modules/home/hyprland/default.nix | 1 - modules/home/hyprland/exec-once.nix | 1 + modules/home/hyprland/hyprland.nix | 34 +- modules/home/hyprland/pyprland.nix | 18 - modules/home/hyprland/windowrules.nix | 554 ++++++++++++++---- modules/home/scripts/DropTerminal.nix | 446 ++++++++++++++ modules/home/scripts/default.nix | 14 + .../home/scripts/hyprland-change-layout.nix | 85 +++ modules/home/scripts/hyprland-float-all.nix | 11 + modules/home/swaync.nix | 2 + .../swaync/images/catppuccin-macchiato.png | Bin 0 -> 25926 bytes modules/home/zsh/default.nix | 2 + 22 files changed, 1118 insertions(+), 420 deletions(-) delete mode 100644 modules/home/hyprland/pyprland.nix create mode 100644 modules/home/scripts/DropTerminal.nix create mode 100644 modules/home/scripts/hyprland-change-layout.nix create mode 100644 modules/home/scripts/hyprland-float-all.nix create mode 100644 modules/home/swaync/images/catppuccin-macchiato.png diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e6fb06..d474662 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,12 +7,20 @@ # ๐Ÿš€ **Current Release - ZaneyOS v2.6.1** -#### ๐Ÿ“… **Updated: March 16th, 2026** +- 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 -- Fixed issues with `qs-wallpaper,qs-wlogout` - - Forced Qt/QML logs to console in qs-wallpapers, qs-vid-wallpapers, and qs-wlogout - - Soo the wrapper scripts can parse selections/commands when launched from Waybar/Rofi. - - Made disown nonโ€‘fatal in qs-wallpapers-apply, qs-vid-wallpapers-apply, and qs-wallpapers-restore. +# ๐Ÿš€ **Current Release - ZaneyOS v2.6.0** #### ๐Ÿ“… **Updated: February 19th, 2026** diff --git a/flake.lock b/flake.lock index ddcbf05..8628ca4 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1773854383, - "narHash": "sha256-ra8jcAG9WHDsGvqgumqK7Bq6DQqOrbYm18S+TMKaots=", + "lastModified": 1772867847, + "narHash": "sha256-nIXWsnURXPqK4bAwYciu0bLzxHGB9UsmhOmQdeLpegk=", "owner": "jacopone", "repo": "antigravity-nix", - "rev": "54f7caf3dff6ae6131669e91203fb06f2f82db3a", + "rev": "a610db44f5c24da9cbde3bbd22f1dd4690d9553e", "type": "github" }, "original": { @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -246,24 +246,6 @@ "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": { @@ -322,16 +304,16 @@ ] }, "locked": { - "lastModified": 1773963144, - "narHash": "sha256-WzBOBfSay3GYilUfKaUa1Mbf8/jtuAiJIedx7fWuIX4=", + "lastModified": 1772845525, + "narHash": "sha256-Dp5Ir2u4jJDGCgeMRviHvEQDe+U37hMxp6RSNOoMMPc=", "owner": "nix-community", "repo": "home-manager", - "rev": "a91b3ea73a765614d90360580b689c48102d1d33", + "rev": "27b93804fbef1544cb07718d3f0a451f4c4cd6c0", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -344,11 +326,11 @@ ] }, "locked": { - "lastModified": 1773422513, - "narHash": "sha256-MPjR48roW7CUMU6lu0+qQGqj92Kuh3paIulMWFZy+NQ=", + "lastModified": 1772330611, + "narHash": "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=", "owner": "nix-community", "repo": "home-manager", - "rev": "ef12a9a2b0f77c8fa3dda1e7e494fca668909056", + "rev": "58fd7ff0eec2cda43e705c4c0585729ec471d400", "type": "github" }, "original": { @@ -357,34 +339,6 @@ "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": 1770419553, @@ -440,43 +394,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774052792, - "narHash": "sha256-u+vmvWyYhd1Z1QybtNW7LdqiQVr+sTGibW7AkaAW2G8=", + "lastModified": 1772773019, + "narHash": "sha256-E1bxHxNKfDoQUuvriG71+f+s/NT0qWkImXsYZNFFfCs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6202066f0c0f15bf24ac554b1460b83cd7f0802", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-25.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1768649915, - "narHash": "sha256-jc21hKogFnxU7KXSVTRmxC7u5D4RHwm9BAvDf5/Z1Uo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "3e3f3c7f9977dc123c23ee21e8085ed63daf8c37", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "aca4d95fce4914b3892661bcb80b8087293536c6", "type": "github" }, "original": { @@ -487,22 +409,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1771008912, "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=", @@ -518,18 +424,18 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1767799921, - "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=", + "lastModified": 1767767207, + "narHash": "sha256-Mj3d3PfwltLmukFal5i3fFt27L6NiKXdBezC1EBuZs4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d351d0653aeb7877273920cd3e823994e7579b0b", + "rev": "5912c1772a44e31bf1c63c0390b90501e5026886", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -540,20 +446,18 @@ "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_3" + "systems": "systems_2" }, "locked": { - "lastModified": 1769049374, - "narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=", + "lastModified": 1772402258, + "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=", "owner": "nix-community", "repo": "nixvim", - "rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95", + "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10", "type": "github" }, "original": { "owner": "nix-community", - "ref": "nixos-25.11", "repo": "nixvim", "type": "github" } @@ -566,11 +470,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1774053689, - "narHash": "sha256-8tuH2SJvPi4bjMcXUK5WQYJKql+Aw6V5f3D4UiIP9LI=", + "lastModified": 1772925400, + "narHash": "sha256-I0Gb+CO6bXi1U5PYgCqnuvI1B+R9kZtamLwhVvOywSo=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "9285188981c3a6f44c0de45eff881d053a312e75", + "rev": "5f319987a5003c383678f4aae0cf71f78c7ea49e", "type": "github" }, "original": { @@ -584,16 +488,14 @@ "nixpkgs": [ "noctalia", "nixpkgs" - ], - "systems": "systems_4", - "treefmt-nix": "treefmt-nix" + ] }, "locked": { - "lastModified": 1773842483, - "narHash": "sha256-oRqz+5AbNKfUWWwN5c83CsSOsUWVGITh0HZg+wX5Q/8=", + "lastModified": 1772673824, + "narHash": "sha256-TLHXPoELZA6VeuzC1Zpx+MnSsYzrJs+DSieMgfjAOJc=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "3962ff1e0b59ef067c57199d31271ddbf23b29cd", + "rev": "f8531192cd09b9ea2e78d18e9cfc9d3dba498690", "type": "github" }, "original": { @@ -614,11 +516,11 @@ ] }, "locked": { - "lastModified": 1767886815, - "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=", + "lastModified": 1767810917, + "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=", "owner": "nix-community", "repo": "NUR", - "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef", + "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4", "type": "github" }, "original": { @@ -627,44 +529,21 @@ "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", "flake-parts": "flake-parts_2", "mnw": "mnw", "ndg": "ndg", - "nixpkgs": "nixpkgs_3", - "systems": "systems_5" + "nixpkgs": "nixpkgs_2", + "systems": "systems_3" }, "locked": { - "lastModified": 1773970322, - "narHash": "sha256-xyO9ZV+cZk+HVmjS6P5Jzwl6ioRCKgeLQSSbUFtPrZk=", + "lastModified": 1772875143, + "narHash": "sha256-ENBRe7vCCp/SIG2WRKI2pyAxwnrc9CPuwZ4CtMu4KU4=", "owner": "notashelf", "repo": "nvf", - "rev": "8aad181ec9057c56b6fe5d6081a399427e1d1dec", + "rev": "6681e33727409d4ccfa687de981b594110a735d6", "type": "github" }, "original": { @@ -680,8 +559,6 @@ "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "noctalia": "noctalia", "nvf": "nvf", @@ -715,9 +592,9 @@ "firefox-gnome-theme": "firefox-gnome-theme", "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nur": "nur", - "systems": "systems_6", + "systems": "systems_4", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -725,16 +602,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1773790548, - "narHash": "sha256-6lI+ZM1yWL4cNRT39s8AUC+kwq237PZCrWc1ubLOwqc=", + "lastModified": 1772296853, + "narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=", "owner": "danth", "repo": "stylix", - "rev": "e8ffdddd42062ebc90178db9d013aa38c20b7b2f", + "rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf", "type": "github" }, "original": { "owner": "danth", - "ref": "release-25.11", + "ref": "master", "repo": "stylix", "type": "github" } @@ -785,36 +662,6 @@ } }, "systems_4": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_5": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -865,11 +712,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1767817087, - "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=", + "lastModified": 1767710407, + "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=", "owner": "tinted-theming", "repo": "schemes", - "rev": "bd99656235aab343e3d597bf196df9bc67429507", + "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2", "type": "github" }, "original": { @@ -910,24 +757,6 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1772660329, - "narHash": "sha256-IjU1FxYqm+VDe5qIOxoW+pISBlGvVApRjiw/Y/ttJzY=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "3710e0e1218041bbad640352a0440114b1e10428", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", @@ -936,11 +765,11 @@ ] }, "locked": { - "lastModified": 1773661718, - "narHash": "sha256-MYm1EKp/gbBi9wMEf7Lx0agIVnej/P61sg97EruWzrU=", + "lastModified": 1772858378, + "narHash": "sha256-VPRlTud1REOz0GPjq3XQNjk5GpH/xNbeadiul4gkPGA=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "3ac6ea223b32ff63c45e3577712df991a35aaf33", + "rev": "42e1e9a1cb5b507789a51193113d56f8f1bb08d9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ad7cff5..e3a88f6 100644 --- a/flake.nix +++ b/flake.nix @@ -3,14 +3,12 @@ inputs = { home-manager = { - url = "github:nix-community/home-manager/release-25.11"; + url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; - nixpkgs.url = "github:nixos/nixpkgs/release-25.11"; - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/release-25.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nvf.url = "github:notashelf/nvf"; - stylix.url = "github:danth/stylix/release-25.11"; + stylix.url = "github:danth/stylix/master"; nix-flatpak.url = "github:gmodena/nix-flatpak?ref=latest"; noctalia = { @@ -20,7 +18,7 @@ # Checking nixvim to see if it's better nixvim = { - url = "github:nix-community/nixvim/nixos-25.11"; + url = "github:nix-community/nixvim"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index aff6cc0..8badf01 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -1,7 +1,7 @@ { # Git Configuration ( For Pulling Software Repos ) - gitUsername = "Tyler Kelley"; - gitEmail = "tylerzanekelley@gmail.com"; + gitUsername = "Don Williams"; + gitEmail = "don.e.williams@gmail.com"; # Set Displau Manager # `tui` for Text login @@ -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 default File Manager - thunarEnable = false; + # Yazi is alternate File Manager + thunarEnable = true; # 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/variables.nix b/hosts/zaneyos-24-vm/variables.nix index d0a1a7b..05dfff9 100644 --- a/hosts/zaneyos-24-vm/variables.nix +++ b/hosts/zaneyos-24-vm/variables.nix @@ -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/modules/core/overlays.nix b/modules/core/overlays.nix index 137cfe6..1f473aa 100644 --- a/modules/core/overlays.nix +++ b/modules/core/overlays.nix @@ -2,18 +2,6 @@ nixpkgs.overlays = [ # Provide pkgs.google-antigravity via antigravity-nix overlay inputs.antigravity-nix.overlays.default - # pkgs.unstable overlay for bleeding edge applications - (_final: prev: { - unstable = import inputs.nixpkgs-unstable { - inherit (prev.stdenv.hostPlatform) system; - config.allowUnfree = true; - }; - }) - # Prefer stable mpv-with-scripts and yt-dlp to avoid deno source builds - (final: _prev: { - mpv-with-scripts = inputs.nixpkgs-stable.legacyPackages.${final.stdenv.hostPlatform.system}.mpv-with-scripts; - yt-dlp = inputs.nixpkgs-stable.legacyPackages.${final.stdenv.hostPlatform.system}.yt-dlp; - }) # Build tumbler without EPUB thumbnailer (libgepub) to avoid webkitgtk (_final: prev: { xfce = prev.xfce // { diff --git a/modules/core/packages.nix b/modules/core/packages.nix index 9bea5c2..3b7d27d 100644 --- a/modules/core/packages.nix +++ b/modules/core/packages.nix @@ -30,7 +30,6 @@ in { seahorse.enable = true; fuse.userAllowOther = true; mtr.enable = true; - adb.enable = true; hyprlock.enable = true; gnupg.agent = { enable = true; @@ -75,7 +74,7 @@ in { mdcat # CLI markdown parser mpv # Incredible Video Player ncdu # Disk Usage Analyzer With Ncurses Interface - nixfmt-rfc-style # Nix Formatter + nixfmt # Nix Formatter nwg-displays # configure monitor configs via GUI nwg-drawer # Application launcher for wayland nwg-dock-hyprland # Dock for hyprland diff --git a/modules/core/steam.nix b/modules/core/steam.nix index 6fafcf7..84829ec 100644 --- a/modules/core/steam.nix +++ b/modules/core/steam.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { programs = { steam = { - enable = true; + enable = false; remotePlay.openFirewall = true; dedicatedServer.openFirewall = false; gamescopeSession.enable = true; diff --git a/modules/core/thunar.nix b/modules/core/thunar.nix index c7419e0..9c82ac5 100644 --- a/modules/core/thunar.nix +++ b/modules/core/thunar.nix @@ -8,9 +8,9 @@ in { programs = { thunar = { enable = thunarEnable; - plugins = with pkgs.xfce; [ - thunar-archive-plugin - thunar-volman + plugins = [ + pkgs.thunar-archive-plugin + pkgs.thunar-volman ]; }; }; diff --git a/modules/home/hyprland/binds.nix b/modules/home/hyprland/binds.nix index 383b744..5d8491f 100644 --- a/modules/home/hyprland/binds.nix +++ b/modules/home/hyprland/binds.nix @@ -16,7 +16,7 @@ "$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 ALT,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockAndSuspend" + "$modifier CTRL,L, Noctalia Lock Screen, exec, noctalia-shell ipc call sessionMenu lockscreen lock" "$modifier SHIFT,W, Noctalia Wallpaper, exec, noctalia-shell ipc call wallpaper toggle" "$modifier,X, Noctalia Power Menu, exec, noctalia-shell ipc call sessionMenu toggle" "$modifier,C, Noctalia Control Center, exec, noctalia-shell ipc call controlCenter toggle" @@ -70,16 +70,22 @@ in { "$modifier,O, OBS Studio, exec, obs" "$modifier ALT,C, Color Picker, exec, hyprpicker -a" "$modifier,G, GIMP, exec, gimp" - "$modifier shift,T, Dropdown Terminal, exec, pypr toggle term" + "$modifier SHIFT,T, Dropdown Terminal, exec, sh -lc 'DropTerminal'" "$modifier,T, Thunar, exec, thunar" "$modifier ALT,M, Audio Control, exec, pavucontrol" # ============= WINDOW MANAGEMENT ============= "$modifier,Q, Kill Active Window, killactive," "$modifier,P, Pseudo Tile, pseudo," - "$modifier SHIFT,I, Toggle Split, layoutmsg, togglesplit," + "$modifier SHIFT,I, Toggle Split, layoutmsg, togglesplit" "$modifier,F, Maximize, fullscreen," "$modifier SHIFT,F, Toggle Floating, togglefloating," - "$modifier ALT,F, Float All Windows, workspaceopt, allfloat" + "$modifier ALT,F, Float All Windows, exec, hyprland-float-all" + # ============= LAYOUTS ============= + "$modifier ALT,L, Toggle Layouts, exec, hyprland-change-layout toggle" + "$modifier ALT,1, Layout Dwindle, exec, hyprland-change-layout dwindle" + "$modifier ALT,2, Layout Master, exec, hyprland-change-layout master" + "$modifier ALT,3, Layout Scrolling, exec, hyprland-change-layout scrolling" + "$modifier ALT,4, Layout Monocle, exec, hyprland-change-layout monocle" "$modifier SHIFT,C, Exit/Logout of Hyprland, exit," # ============= WINDOW MOVEMENT (ARROW KEYS) ============= "$modifier SHIFT,left, Move Left, movewindow, l" diff --git a/modules/home/hyprland/default.nix b/modules/home/hyprland/default.nix index ab286ca..0e41181 100644 --- a/modules/home/hyprland/default.nix +++ b/modules/home/hyprland/default.nix @@ -9,7 +9,6 @@ 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 adec6b2..130233a 100644 --- a/modules/home/hyprland/exec-once.nix +++ b/modules/home/hyprland/exec-once.nix @@ -38,6 +38,7 @@ 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 79dab33..367e28a 100644 --- a/modules/home/hyprland/hyprland.nix +++ b/modules/home/hyprland/hyprland.nix @@ -108,9 +108,18 @@ in { workspace_swipe_create_new = true; workspace_swipe_forever = true; }; + "$modifier" = "SUPER"; + + scrolling = { + column_width = 0.80; + fullscreen_on_one_column = true; + direction = "right"; + follow_focus = true; + }; + + monocle = {}; general = { - "$modifier" = "SUPER"; layout = "dwindle"; gaps_in = 6; gaps_out = 8; @@ -139,9 +148,15 @@ in { }; dwindle = { - pseudotile = true; + pseudotile = false; preserve_split = true; - force_split = 2; + smart_resizing = true; + use_active_for_splits = true; + smart_split = false; + default_split_ratio = 1.0; + split_bias = 0; + precise_mouse_move = false; + special_scale_factor = 0.8; }; decoration = { @@ -182,9 +197,16 @@ in { }; master = { - new_status = "master"; - new_on_top = 1; - mfact = 0.5; + new_status = "slave"; + new_on_top = false; + new_on_active = "none"; + orientation = "left"; + mfact = 0.55; + slave_count_for_center_master = 2; + center_master_fallback = "left"; + smart_resizing = true; + drop_at_cursor = true; + always_keep_position = false; }; # Ensure Xwayland windows render at integer scale; compositor scales them diff --git a/modules/home/hyprland/pyprland.nix b/modules/home/hyprland/pyprland.nix deleted file mode 100644 index 0bffe11..0000000 --- a/modules/home/hyprland/pyprland.nix +++ /dev/null @@ -1,18 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs; [pyprland]; - - home.file.".config/hypr/pyprland.toml".text = '' - [pyprland] - plugins = [ - "scratchpads", - ] - - [scratchpads.term] - animation = "fromTop" - command = "kitty --class kitty-dropterm" - class = "kitty-dropterm" - size = "70% 70%" - max_size = "1920px 100%" - position = "150px 150px" - ''; -} diff --git a/modules/home/hyprland/windowrules.nix b/modules/home/hyprland/windowrules.nix index 87cd9aa..be4fc9a 100644 --- a/modules/home/hyprland/windowrules.nix +++ b/modules/home/hyprland/windowrules.nix @@ -1,130 +1,436 @@ -{host, ...}: let - inherit - (import ../../../hosts/${host}/variables.nix) - extraMonitorSettings - ; -in { +_: { wayland.windowManager.hyprland = { - settings = { - windowrule = [ - #"noblur, xwayland:1" # Helps prevent odd borders/shadows for xwayland apps - # downside it can impact other xwayland apps - # This rule is a template for a more targeted approach - "noblur, class:^(\bresolve\b)$, xwayland:1" # Window rule for just resolve - "tag +file-manager, class:^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$" - "tag +terminal, class:^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm)$" - "tag +browser, class:^(Brave-browser(-beta|-dev|-unstable)?)$" - "tag +browser, class:^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$" - "tag +browser, class:^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$" - "tag +browser, class:^([Tt]horium-browser|[Cc]achy-browser)$" - "tag +projects, class:^(codium|codium-url-handler|VSCodium)$" - "tag +projects, class:^(VSCode|code-url-handler)$" - "tag +im, class:^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$" - "tag +im, class:^([Ff]erdium)$" - "tag +im, class:^([Ww]hatsapp-for-linux)$" - "tag +im, class:^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$" - "tag +im, class:^(teams-for-linux)$" - "tag +games, class:^(gamescope)$" - "tag +games, class:^(steam_app_\d+)$" - "tag +gamestore, class:^([Ss]team)$" - "tag +gamestore, title:^([Ll]utris)$" - "tag +gamestore, class:^(com.heroicgameslauncher.hgl)$" - "tag +settings, class:^(gnome-disks|wihotspot(-gui)?)$" - "tag +settings, class:^([Rr]ofi)$" - "tag +settings, class:^(file-roller|org.gnome.FileRoller)$" - "tag +settings, class:^(nm-applet|nm-connection-editor|blueman-manager)$" - "tag +settings, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$" - "tag +settings, class:^(nwg-look|qt5ct|qt6ct|[Yy]ad)$" - "tag +settings, class:(xdg-desktop-portal-gtk)" - "tag +settings, class:(.blueman-manager-wrapped)" - "tag +settings, class:(nwg-displays)" - "move 72% 7%,title:^(Picture-in-Picture)$" - # qs-keybinds floating viewer - "float, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$" - "center, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$" - "size 55% 66%, title:^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$" - # qs-cheatsheets floating viewer - "float, title:^(Cheatsheets Viewer)$" - "center, title:^(Cheatsheets Viewer)$" - "size 65% 60%, title:^(Cheatsheets Viewer)$" - "center, class:^([Ff]erdium)$" - "float, class:^([Ww]aypaper)$" - "float, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" - "float, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - "center, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - "float, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" - "center, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" - "float, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" - "center, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" - "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" - "noblur, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" - "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Panels)$" - # qs-keybinds, qs-docs, qs-chevron floating viewer - "float, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$" - "center, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$" - "size 55% 66%, title:^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$" - "center, class:^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$" - "center, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)" - "center, title:^(Authentication Required)$" - "idleinhibit fullscreen, class:^(*)$" - "idleinhibit fullscreen, title:^(*)$" - "idleinhibit fullscreen, fullscreen:1" - "float, tag:settings*" - "float, class:^([Ff]erdium)$" - "float, title:^(Picture-in-Picture)$" - "float, class:^(mpv|com.github.rafostar.Clapper)$" - "float, title:^(Authentication Required)$" - "float, class:(codium|codium-url-handler|VSCodium), title:negative:(.*codium.*|.*VSCodium.*)" - "float, class:^(com.heroicgameslauncher.hgl)$, title:negative:(Heroic Games Launcher)" - "float, class:^([Ss]team)$, title:negative:^([Ss]team)$" - "float, class:([Tt]hunar), title:negative:(.*[Tt]hunar.*)" - "float, initialTitle:(Add Folder to Workspace)" - "float, initialTitle:(Open Files)" - "float, initialTitle:(wants to save)" - "size 70% 60%, initialTitle:(Open Files)" - "size 70% 60%, initialTitle:(Add Folder to Workspace)" - "size 70% 70%, tag:settings*" - "size 60% 70%, class:^([Ff]erdium)$" - "opacity 1.0 1.0, tag:browser*" - "opacity 0.9 0.8, tag:projects*" - "opacity 0.94 0.86, tag:im*" - "opacity 0.9 0.8, tag:file-manager*" - "opacity 0.8 0.7, tag:terminal*" - "opacity 0.8 0.7, tag:settings*" - "opacity 0.8 0.7, class:^(gedit|org.gnome.TextEditor|mousepad)$" - "opacity 0.9 0.8, class:^(seahorse)$ # gnome-keyring gui" - "opacity 0.95 0.75, title:^(Picture-in-Picture)$" - "pin, title:^(Picture-in-Picture)$" - "keepaspectratio, title:^(Picture-in-Picture)$" - "noblur, tag:games*" - "fullscreen, tag:games*" - ]; - windowrulev2 = [ - # qs-wallpapers styling via compositor - "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" - "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" - "noblur, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" - "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Wallpapers)$" + extraConfig = '' + # Set float and centering for dialog boxes + rule = float(true), match:modal:1 + rule = center(true), match:modal:1 - # qs-vid-wallpapers styling via compositor - "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - "noblur, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" - "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Video Wallpapers)$" + windowrule { + name = Resolve + match:class = ^(\bresolve\b)$ + match:xwayland = 1 + no_blur = on + } - # qs-wlogout styling via compositor - power menu overlay - "noborder, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" - "rounding 20, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" - "opacity 1.0 1.0, class:^(org\\.qt-project\\.qml)$, title:^(qs-wlogout)$" + windowrule { + name = Thunar + match:class = ^([Tt]hunar|org.gnome.Nautilus|[Pp]cmanfm-qt)$ + tag = +file-manager + } - # qs-docs / qs-cheatsheets overlay windows - "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$" - "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$" - "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Cheatsheets Viewer)$" - "noborder, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$" - "noshadow, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$" - "rounding 12, class:^(org\\.qt-project\\.qml)$, title:^(Documentation Viewer)$" - ]; - }; + windowrule { + name = Terminals + match:class = ^(com.mitchellh.ghostty|org.wezfurlong.wezterm|Alacritty|kitty|kitty-dropterm|dropterminal)$ + tag = +terminal + } + + windowrule { + name = Brave-browser + match:class = ^(Brave-browser(-beta|-dev|-unstable)?)$ + tag = +browser + } + + windowrule { + name = Firefox + match:class = ^([Ff]irefox|org.mozilla.firefox|[Ff]irefox-esr)$ + tag = +browser + } + + windowrule { + name = Google-chrome + match:class = ^([Gg]oogle-chrome(-beta|-dev|-unstable)?)$ + tag = +browser + } + + windowrule { + name = Thorium-browser + match:class = ^([Tt]horium-browser|[Cc]achy-browser)$ + tag = +browser + } + + windowrule { + name = vscodium + match:class = ^(codium|codium-url-handler|VSCodium)$ + tag = +projects + } + + windowrule { + name = vscode + match:class = ^(VSCode|code-url-handler)$ + tag = +projects + } + + windowrule { + name = Discord + match:class = ^([Dd]iscord|[Ww]ebCord|[Vv]esktop)$ + tag = +im + } + + windowrule { + name = Ferdium + match:class = ^([Ff]erdium)$ + center = on + float = on + size = 60% = 70% + tag = +im + } + + windowrule { + name = Whatsapp + match:class = ^([Ww]hatsapp-for-linux)$ + tag = +im + } + + windowrule { + name = Telegram-desktop + match:class = ^(org.telegram.desktop|io.github.tdesktop_x64.TDesktop)$ + tag = +im + } + + windowrule { + name = teams-for-linux + match:class = ^(teams-for-linux)$ + tag = +im + } + + windowrule { + name = gamescope + match:class = ^(gamescope)$ + tag = +games + } + + windowrule { + name = steam-app + match:class = ^(steam_app\d+)$ + tag = +games + } + + windowrule { + name = Steam + match:class = ^([Ss]team)$ + tag = +gamestore + } + + windowrule { + name = Lutris + match:title = ^([Ll]utris)$ + tag = +gamestore + } + + windowrule { + name = heroicgameslauncher + match:class = ^(com.heroicgameslauncher.hgl)$ + tag = +gamestore + } + + windowrule { + name = gnome-disks + match:class = ^(gnome-disks|wihotspot(-gui)?)$ + tag = +settings + } + + windowrule { + name = rofi + match:class = ^([Rr]ofi)$ + tag = +settings + no_blur = off + } + + windowrule { + name = FileRoller + match:class = ^(file-roller|org.gnome.FileRoller)$ + tag = +settings + } + + windowrule { + name = NetworkManger + match:class = ^(nm-applet|nm-connection-editor|blueman-manager)$ + tag = +settings + } + + windowrule { + name = PlusAudio + match:class = ^(pavucontrol|org.pulseaudio.pavucontrol|com.saivert.pwvucontrol)$ + center = on + tag = +settings + no_blur = off + } + + windowrule { + name = nwg-look + match:class = ^(nwg-look|qt5ct|qt6ct|[Yy]ad)$ + tag = +settings + } + + windowrule { + name = xdg-desktop-portal-gtk + match:class = (xdg-desktop-portal-gtk) + tag = +settings + } + + windowrule { + name = blueman + match:class = (.blueman-manager-wrapped) + tag = +settings + } + + windowrule { + name = nwg-displays + match:class = (nwg-displays) + tag = +settings + } + + windowrule { + name = Picture-in-Picture + match:title = ^(Picture-in-Picture)$ + float = on + move = 72% = 7% + opacity = 0.95 = 0.75 + pin = 0 + keep_aspect_ratio = on + } + + windowrule { + name = ThunarFileMgr + match:class = ([Tt]hunar) + match:title = negative:(.*[Tt]hunar.*) + center = on + float = on + } + + windowrule { + name = Authentication-Required + match:title = ^(Authentication Required)$ + center = on + float = on + } + + windowrule { + name = IdleInhibit-fullscreen-1 + match:class = ^(*)$ + idle_inhibit = fullscreen + } + + windowrule { + name = IdleInhibit-fullscreen-2 + match:title = ^(*)$ + idle_inhibit = fullscreen + } + + windowrule { + name = IdleInhibit-fullscreen-3 + match:fullscreen = 1 + idle_inhibit = fullscreen + } + + windowrule { + name = Settings-Tag + match:tag = settings* + float = on + opacity = 0.8 = 0.7 + size = 70% = 70% + no_blur = off + } + + windowrule { + name = WayPaper + match:class = ^([Ww]aypaper)$ + float = on + no_blur = off + } + + windowrule { + name = mpv-or-clapper + match:class = ^(mpv|com.github.rafostar.Clapper)$ + float = on + } + + windowrule { + name = codium-url-handler + match:class = (codium|codium-url-handler|VSCodium) + match:title = negative:(.*codium.*|.*VSCodium.*) + float = on + } + + windowrule { + name = heroicgameslauncher-1 + match:class = ^(com.heroicgameslauncher.hgl)$ + match:title = negative:(Heroic Games Launcher) + float = on + } + + windowrule { + name = Steam + match:class = ^([Ss]team)$ + match:title = negative:^([Ss]team)$ + float = on + } + + windowrule { + name = Add-Folder + match:initial_title = (Add Folder to Workspace) + float = on + size = 70% = 60% + } + + windowrule { + name = Open-File + match:initial_title = (Open Files) + float = on + size = 70% = 60% + } + + windowrule { + name = Wants-to-Save + match:initial_title = (wants to save) + float = on + } + + windowrule { + name = Browsers + match:tag = browser* + opacity = 1.0 = 1.0 + } + + windowrule { + name = Projects + match:tag = projects* + opacity = 0.9 = 0.8 + } + + windowrule { + name = Instant-Messaging + match:tag = im* + opacity = 0.94 = 0.86 + } + + windowrule { + name = File-Managers + match:tag = file-manager* + opacity = 0.9 = 0.8 + } + + windowrule { + name = Terminals-opacity + match:tag = terminal* + opacity = 0.8 = 0.7 + no_blur = off + } + + windowrule { + name = windowrule-77 + match:class = ^(gedit|org.gnome.TextEditor|mousepad)$ + opacity = 0.8 = 0.7 + } + + windowrule { + name = windowrule-78 + match:class = ^(seahorse)$ + opacity = 0.9 = 0.8 + } + + windowrule { + name = windowrule-79 + match:tag = games* + no_blur = on + } + + windowrule { + name = windowrule-80 + match:tag = games* + fullscreen = on + } + + windowrule { + name = qs-keybinds + match:title = ^(Hyprland Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration)$ + float = on + center = on + size = 55% = 66% + } + + windowrule { + name = qs-cheatsheets + match:title = ^(Cheatsheets Viewer)$ + float = on + center = on + size = 65% = 60% + } + + windowrule { + name = qs-extended-viewers + match:title = ^(Hyprland Keybinds|Niri Keybinds|BSPWM Keybinds|i3 Keybinds|Sway Keybinds|DWM Keybinds|Emacs Leader Keybinds|Kitty Configuration|WezTerm Configuration|Ghostty Configuration|Yazi Configuration|Cheatsheets Viewer|Documentation Viewer)$ + float = on + center = on + size = 55% = 66% + } + + windowrule { + name = QS-Wallpapers + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(Wallpapers)$ + border_size = 0 + float = on + no_blur = on + no_shadow = on + rounding = 12 + } + + windowrule { + name = QA-Video-Wallpapers + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(Video Wallpapers)$ + border_size = 0 + center = on + float = on + no_blur = on + no_shadow = on + rounding = 12 + } + + windowrule { + name = QS-wlogout + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(qs-wlogout)$ + border_size = 0 + center = on + float = on + opacity = 1.0 = 1.0 + rounding = 20 + } + + windowrule { + name = QA-Panels + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(Panels)$ + center = on + float = on + no_blur = on + no_shadow = on + rounding = 12 + } + + windowrule { + name = QS-Cheatsheets + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(Cheatsheets Viewer)$ + border_size = 0 + center = on + float = on + no_shadow = on + rounding = 12 + } + + windowrule { + name = QS-Documentation-Viewer + match:class = ^(org\.qt-project\.qml)$ + match:title = ^(Documentation Viewer)$ + border_size = 0 + center = on + float = on + no_shadow = on + rounding = 12 + } + ''; }; } diff --git a/modules/home/scripts/DropTerminal.nix b/modules/home/scripts/DropTerminal.nix new file mode 100644 index 0000000..cbc14d1 --- /dev/null +++ b/modules/home/scripts/DropTerminal.nix @@ -0,0 +1,446 @@ +{pkgs}: +pkgs.writeShellScriptBin "DropTerminal" '' + #!/usr/bin/env bash + # Dropdown Terminal for Hyprland (Nix-managed) + # Source: adapted from Dropterminal.sh by Kiran George (SherLock707) + # Usage: + # DropTerminal [-d] [] + # 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 94f1355..6e99baa 100644 --- a/modules/home/scripts/default.nix +++ b/modules/home/scripts/default.nix @@ -17,6 +17,7 @@ (import ./screenshootin.nix {inherit pkgs;}) (import ./squirtle.nix {inherit pkgs;}) (import ./task-waybar.nix {inherit pkgs;}) + (import ./DropTerminal.nix {inherit pkgs;}) (import ./wallsetter.nix { inherit pkgs; inherit username; @@ -36,6 +37,8 @@ (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;}) @@ -46,4 +49,15 @@ ]; }) ]; + + xdg.desktopEntries.dropterminal = { + name = "Drop Terminal"; + comment = "Dropdown terminal (Hyprland)"; + exec = "DropTerminal"; + terminal = false; + type = "Application"; + icon = "kitty"; + settings.StartupWMClass = "dropterminal"; + categories = ["System" "Utility" "TerminalEmulator"]; + }; } diff --git a/modules/home/scripts/hyprland-change-layout.nix b/modules/home/scripts/hyprland-change-layout.nix new file mode 100644 index 0000000..0ce0e65 --- /dev/null +++ b/modules/home/scripts/hyprland-change-layout.nix @@ -0,0 +1,85 @@ +{pkgs}: +pkgs.writeShellScriptBin "hyprland-change-layout" '' + #!/usr/bin/env bash + set -euo pipefail + + notif="''${XDG_CONFIG_HOME:-$HOME/.config}/swaync/images/catppuccin-macchiato.png" + layouts=(dwindle master scrolling monocle) + + get_layout() { + ${pkgs.hyprland}/bin/hyprctl -j getoption general:layout | ${pkgs.jq}/bin/jq -r '.str' + } + + next_layout() { + local current="$1" + local i + for i in "''${!layouts[@]}"; do + if [[ "''${layouts[i]}" == "$current" ]]; then + echo "''${layouts[((i + 1) % ''${#layouts[@]})]}" + return + fi + done + echo "''${layouts[0]}" + } + + set_layout() { + local target="$1" + + ${pkgs.hyprland}/bin/hyprctl keyword general:layout "$target" + ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,J || true + ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,K || true + ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER,O || true + ${pkgs.hyprland}/bin/hyprctl keyword unbind SUPER_SHIFT,M || true + + case "$target" in + "dwindle") + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,cyclenext + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,cyclenext,prev + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,O,layoutmsg,togglesplit + ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Dwindle Layout" + ;; + "master") + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,layoutmsg,cyclenext + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,layoutmsg,cycleprev + ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Master Layout" + ;; + "scrolling") + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,cyclenext + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,cyclenext,prev + ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Scrolling Layout" + ;; + "monocle") + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,J,layoutmsg,cyclenext + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER,K,layoutmsg,cycleprev + ${pkgs.hyprland}/bin/hyprctl keyword bind SUPER_SHIFT,M,layoutmsg,swapnext + ${pkgs.libnotify}/bin/notify-send -e -u low -i "$notif" " Monocle Layout" + ;; + *) + echo "Unknown layout: $target" >&2 + return 1 + ;; + esac + } + + current="$(get_layout)" + arg="''${1:-toggle}" + + case "$arg" in + init) + set_layout "$current" + ;; + toggle|next) + set_layout "$(next_layout "$current")" + ;; + set) + set_layout "''${2:-}" + ;; + master|dwindle|scrolling|monocle) + set_layout "$arg" + ;; + *) + echo "Usage: $(basename "$0") [toggle|next|init|set |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 new file mode 100644 index 0000000..e99c30f --- /dev/null +++ b/modules/home/scripts/hyprland-float-all.nix @@ -0,0 +1,11 @@ +{pkgs}: +pkgs.writeShellScriptBin "hyprland-float-all" '' + #!/usr/bin/env bash + set -euo pipefail + + ws="$(${pkgs.hyprland}/bin/hyprctl activeworkspace -j | ${pkgs.jq}/bin/jq -r .id)" + ${pkgs.hyprland}/bin/hyprctl clients -j | ${pkgs.jq}/bin/jq -r --arg ws "$ws" '.[] | select(.workspace.id == ($ws|tonumber)) | .address' \ + | while read -r addr; do + [ -n "''${addr:-}" ] && ${pkgs.hyprland}/bin/hyprctl dispatch togglefloating "address:$addr" + done +'' diff --git a/modules/home/swaync.nix b/modules/home/swaync.nix index 07e6261..a29959b 100644 --- a/modules/home/swaync.nix +++ b/modules/home/swaync.nix @@ -1,4 +1,6 @@ {config, ...}: { + home.file."${config.xdg.configHome}/swaync/images/catppuccin-macchiato.png".source = + ./swaync/images/catppuccin-macchiato.png; services.swaync = { enable = true; settings = { diff --git a/modules/home/swaync/images/catppuccin-macchiato.png b/modules/home/swaync/images/catppuccin-macchiato.png new file mode 100644 index 0000000000000000000000000000000000000000..ddb8cd643c21cc31c53d9dd31e976de2e605f313 GIT binary patch literal 25926 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 TiELwFU|{fc^>bP0l+XkKAW{-T literal 0 HcmV?d00001 diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix index 9f1bcbb..5df8b59 100644 --- a/modules/home/zsh/default.nix +++ b/modules/home/zsh/default.nix @@ -2,6 +2,7 @@ profile, pkgs, lib, + config, ... }: { imports = [ @@ -10,6 +11,7 @@ programs.zsh = { enable = true; + dotDir = config.home.homeDirectory; autosuggestion.enable = true; syntaxHighlighting = { enable = true;