dotfiles
My PC Dotfiles & Websitegit clone https://github.com/maydayv7/dotfiles
commit e679db873ae543390e4f80cad1e0e9d7a9f1cce6 parent 2d43ec1b547d7faf33ce2d6f2bdd6d29c7aee404 Author: maydayv7 <maydayv7@gmail.com> Date: Sun, 2 Jun 2024 20:17:13 +0530 feat: Update Hyprland to v0.40
Diffstat:
| M | flake.lock | | | 115 | ++++++++++++++++++++++++++++++++++++++++++++----------------------------------- |
| M | flake.nix | | | 7 | +++++-- |
| M | modules/gui/default.nix | | | 1 | + |
| M | modules/gui/desktop/hyprland/settings/default.nix | | | 8 | ++++---- |
| M | scripts/hyprutils.nix | | | 2 | +- |
5 files changed, 75 insertions(+), 58 deletions(-)
diff --git a/flake.lock b/flake.lock @@ -455,11 +455,11 @@ ] }, "locked": { - "lastModified": 1713936041, - "narHash": "sha256-T/tp+edWXTQ5LUG/uy2a+o4MUOPkGL69TWvRMyxSwJk=", + "lastModified": 1714910346, + "narHash": "sha256-Up5ZFLfAu7BtASVc/Pr7Ay+5QehQ/L9vwF2Q26DRunk=", "owner": "DreamMaoMao", "repo": "hycov", - "rev": "d4216ca70e4b651f5fc95caafc4a0f03c0ae3b34", + "rev": "115cba558d439cc25d62ce38b7c62cde83f50ef5", "type": "github" }, "original": { @@ -484,11 +484,11 @@ ] }, "locked": { - "lastModified": 1712434681, - "narHash": "sha256-qwmR2p1oc48Bj7gUDvb1oGL19Rjs2PmEmk4ChV01A5o=", + "lastModified": 1713612213, + "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "818d8c4b69e0997483d60b75f701fe14b561a7a3", + "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", "type": "github" }, "original": { @@ -502,14 +502,16 @@ "hyprland": [ "hyprland" ], - "nix-filter": "nix-filter" + "nix-filter": [ + "filters" + ] }, "locked": { - "lastModified": 1713251571, - "narHash": "sha256-8sVbc/1VIw3K2I5XD7YwbjZ813UPNE1A+LNxu5pAWBc=", + "lastModified": 1715637820, + "narHash": "sha256-Ayan/E1jm9kObFatBtZ0m73dGy0HLWi7229D/9rIe2I=", "owner": "micha4w", "repo": "Hypr-DarkWindow", - "rev": "e847f179adf4eab3517623e3d5209f531435a61a", + "rev": "9d27b9d6829bc822287c39b66a5abfe61fdf17d6", "type": "github" }, "original": { @@ -523,6 +525,7 @@ "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_2", "systems": [ "systems" @@ -531,16 +534,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1713283263, - "narHash": "sha256-Urb/njWiHYUudXpmK8EKl9Z58esTIG0PxXw5LuM2r5g=", + "lastModified": 1714837352, + "narHash": "sha256-QzzJTb+0CBqgAT0wKZsOt1rky5+u2zMUlNxbZcGj2VM=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "fe7b748eb668136dd0558b7c8279bfcd7ab4d759", + "rev": "cba1ade848feac44b2eda677503900639581c3f4", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.39.1", + "ref": "v0.40.0", "repo": "Hyprland", "type": "github" } @@ -557,11 +560,11 @@ ] }, "locked": { - "lastModified": 1712836056, - "narHash": "sha256-qf6yev9OlJuQv557ApLQ/5V8pQj0YOO9tyh5j3It1mY=", + "lastModified": 1714916173, + "narHash": "sha256-XP9v42PdSBkP/JlllfZR/0FDD1PMAVqw+LhOi79g0MA=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "e9457e08ca3ff16dc5a815be62baf9e18b539197", + "rev": "d716d1221348b5bef9d13161876caa91a3e33705", "type": "github" }, "original": { @@ -607,11 +610,11 @@ ] }, "locked": { - "lastModified": 1711671891, - "narHash": "sha256-C/Wwsy/RLxHP1axFFl+AnwJRWfd8gxDKKoa8nt8Qk3c=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "c1402612146ba06606ebf64963a02bc1efe11e74", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -627,11 +630,11 @@ ] }, "locked": { - "lastModified": 1713989021, - "narHash": "sha256-oIpcibtKHP8e7yhYilK9+TaiOTApS4TqXQbdKqJpyWQ=", + "lastModified": 1715376791, + "narHash": "sha256-QKecFhWAB7sagSE+FXztINDqYqLro2nYp94f+ZtE/f4=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "a44d834af279f233a269d065d2e14fe4101d6f41", + "rev": "8049b2794ca19d49320093426677d8c2911e7327", "type": "github" }, "original": { @@ -647,11 +650,11 @@ ] }, "locked": { - "lastModified": 1713372897, - "narHash": "sha256-N2qPGMo55DPLqvGPgdvkE9zb0Zq/xYzqH28ZtNhGYsk=", + "lastModified": 1716577972, + "narHash": "sha256-JVrpVeJxLjat/oq+psajTUKCa/ExvU/dc8WRj5bNWpM=", "owner": "shezdy", "repo": "hyprsplit", - "rev": "6bbad6f19a918f951d243c81083b961c131fa36b", + "rev": "8e6bff8650dea85a5b16022a8ba28ff5ba173526", "type": "github" }, "original": { @@ -660,6 +663,31 @@ "type": "github" } }, + "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1714755542, + "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "impermanence": { "locked": { "lastModified": 1708968331, @@ -695,21 +723,6 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1705332318, - "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "3449dc925982ad46246cfc36469baf66e1b64f17", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1716619601, @@ -744,11 +757,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { @@ -1129,17 +1142,17 @@ "wlroots": { "flake": false, "locked": { - "lastModified": 1713124002, - "narHash": "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI=", + "lastModified": 1713731601, + "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", "owner": "hyprwm", "repo": "wlroots-hyprland", - "rev": "611a4f24cd2384378f6e500253983107c6656c64", + "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", "type": "github" }, "original": { "owner": "hyprwm", "repo": "wlroots-hyprland", - "rev": "611a4f24cd2384378f6e500253983107c6656c64", + "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", "type": "github" } }, @@ -1163,11 +1176,11 @@ ] }, "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "lastModified": 1714060055, + "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix @@ -143,7 +143,7 @@ # Hyprland hyprland = { - url = "github:hyprwm/Hyprland?ref=v0.39.1"; + url = "github:hyprwm/Hyprland?ref=v0.40.0"; inputs.systems.follows = "systems"; }; @@ -159,7 +159,10 @@ hyprdark = { url = "github:micha4w/Hypr-DarkWindow"; - inputs.hyprland.follows = "hyprland"; + inputs = { + hyprland.follows = "hyprland"; + nix-filter.follows = "filters"; + }; }; hyprspace = { diff --git a/modules/gui/default.nix b/modules/gui/default.nix @@ -20,6 +20,7 @@ in { default = "eDP-1"; example = "HDMI-A-1"; }; + desktop = mkOption { description = "GUI Desktop Choice"; type = types.enum ((name ./desktop) ++ map (x: x + "-iso") (import ./desktop/iso.nix) ++ [""]); diff --git a/modules/gui/desktop/hyprland/settings/default.nix b/modules/gui/desktop/hyprland/settings/default.nix @@ -5,7 +5,7 @@ ... }: let inherit (lib) mkForce mkIf; - inherit (sys.gui) fancy; + inherit (sys.gui) display fancy; inherit (sys.lib.stylix.colors) base03 base0A base0D; in { ## Hyprland Settings @@ -65,10 +65,9 @@ in { }; misc = { - disable_autoreload = false; - - # Window Swallowing enable_swallow = true; + disable_autoreload = false; + initial_workspace_tracking = 2; # Interfere with wallpaper daemons force_default_wallpaper = 0; @@ -84,6 +83,7 @@ in { { resize_on_border = true; allow_tearing = !fancy; + default_cursor_monitor = display; } // # Visuals diff --git a/scripts/hyprutils.nix b/scripts/hyprutils.nix @@ -207,7 +207,7 @@ in ;; "") info "Monitoring workspace 'special:minimized' activation..." - socat -u UNIX-CONNECT:/tmp/hypr/"$HYPRLAND_INSTANCE_SIGNATURE"/.socket2.sock \ + socat -u UNIX-CONNECT:"$XDG_RUNTIME_DIR"/hypr/"$HYPRLAND_INSTANCE_SIGNATURE"/.socket2.sock \ EXEC:"shellevents ${minimize}",nofork ;; *) error "Unexpected Option 'minimize $2'" "Try 'hyprutils help' for more information" ;;