From bbd631c5b9a9a435a0f6f617d604a47f5ddd8746 Mon Sep 17 00:00:00 2001 From: Emmet Date: Wed, 12 Jun 2024 19:48:23 -0500 Subject: [PATCH] Updated system + hyprland, pinned nwg-dock --- flake.lock | 125 ++++++++++++++-------------------- flake.nix | 17 +++-- user/wm/hyprland/hyprland.nix | 61 +++++++++-------- 3 files changed, 98 insertions(+), 105 deletions(-) diff --git a/flake.lock b/flake.lock index 53cfb8e..d459076 100644 --- a/flake.lock +++ b/flake.lock @@ -511,17 +511,17 @@ ] }, "locked": { - "lastModified": 1714910346, - "narHash": "sha256-Up5ZFLfAu7BtASVc/Pr7Ay+5QehQ/L9vwF2Q26DRunk=", + "lastModified": 1718188849, + "narHash": "sha256-bNlu9Iv/BDMbuqtDSHbS082XBA2kKW9jCMLXeprmkxI=", "owner": "DreamMaoMao", "repo": "hycov", - "rev": "115cba558d439cc25d62ce38b7c62cde83f50ef5", + "rev": "3d144a79f8b5468656de88a005be55f3317d295b", "type": "github" }, "original": { "owner": "DreamMaoMao", "repo": "hycov", - "rev": "115cba558d439cc25d62ce38b7c62cde83f50ef5", + "rev": "3d144a79f8b5468656de88a005be55f3317d295b", "type": "github" } }, @@ -541,11 +541,11 @@ ] }, "locked": { - "lastModified": 1713612213, - "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=", + "lastModified": 1717181720, + "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1", + "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", "type": "github" }, "original": { @@ -554,51 +554,28 @@ "type": "github" } }, - "hyprgrass": { - "inputs": { - "hyprland": [ - "hyprland" - ] - }, - "locked": { - "lastModified": 1715969899, - "narHash": "sha256-NDURZAbLIihUHNt5a8PGrgmzFkcBsG5e4MgwJE/InbM=", - "owner": "horriblename", - "repo": "hyprgrass", - "rev": "6d8dbbcfb14ebdb2a2a2551b7d495d01d8ef6917", - "type": "github" - }, - "original": { - "owner": "horriblename", - "repo": "hyprgrass", - "rev": "6d8dbbcfb14ebdb2a2a2551b7d495d01d8ef6917", - "type": "github" - } - }, "hyprland": { "inputs": { "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "nixpkgs" ], "systems": "systems", - "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1714837352, - "narHash": "sha256-UxpPPS5uiyE4FDO3trfJObOm6sE7jnkVguHH6IdkQqs=", - "rev": "cba1ade848feac44b2eda677503900639581c3f4", - "revCount": 4606, + "lastModified": 1718029386, + "narHash": "sha256-iX/l3UT8iXu8psu2UirFX11Yg2zYwpgzoXB32oM3N3U=", + "rev": "ea2501d4556f84d3de86a4ae2f4b22a474555b9f", + "revCount": 4794, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" }, "original": { - "rev": "cba1ade848feac44b2eda677503900639581c3f4", + "rev": "ea2501d4556f84d3de86a4ae2f4b22a474555b9f", "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -609,6 +586,11 @@ "hyprland": [ "hyprland" ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "nixpkgs" + ], "systems": [ "hyprland-plugins", "hyprland", @@ -616,17 +598,17 @@ ] }, "locked": { - "lastModified": 1714862850, - "narHash": "sha256-j1DPSl7FMy3JeWpmzXxcmZhxXbIOfteTozSfqtZ7KBQ=", + "lastModified": 1718111105, + "narHash": "sha256-sLGohaz+8pCce4+wehXSlwOu7c7+We4Zc1ToXGCJYfs=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "fd133914bf1921db2a26627698f914478f6a9471", + "rev": "151102b7d7c4f61ff42f275e72008d28318dac96", "type": "github" }, "original": { "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "fd133914bf1921db2a26627698f914478f6a9471", + "rev": "151102b7d7c4f61ff42f275e72008d28318dac96", "type": "github" } }, @@ -634,10 +616,12 @@ "inputs": { "nixpkgs": [ "hyprland", + "xdph", "nixpkgs" ], "systems": [ "hyprland", + "xdph", "systems" ] }, @@ -667,11 +651,11 @@ ] }, "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", + "lastModified": 1716473782, + "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", + "rev": "87d5d984109c839482b88b4795db073eb9ed446f", "type": "github" }, "original": { @@ -692,11 +676,11 @@ ] }, "locked": { - "lastModified": 1714755542, - "narHash": "sha256-D0pg+ZRwrt4lavZ97Ca8clsgbPA3duLj8iEM7riaIFY=", + "lastModified": 1717784906, + "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "1270ebaa539e56d61b708c24b072b09cbbd3a828", + "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d", "type": "github" }, "original": { @@ -801,11 +785,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717974879, - "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", + "lastModified": 1718160348, + "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", + "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", "type": "github" }, "original": { @@ -877,6 +861,21 @@ "type": "github" } }, + "nwg-dock-hyprland-pin-nixpkgs": { + "locked": { + "lastModified": 1716385560, + "narHash": "sha256-xuFXyvvrDXx5A56uo8D+YmHqsmPscsjBh279P44Z5bE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2098d845d76f8a21ae4fe12ed7c7df49098d3f15", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "rev": "2098d845d76f8a21ae4fe12ed7c7df49098d3f15", + "type": "indirect" + } + }, "ob-racket": { "flake": false, "locked": { @@ -1110,7 +1109,6 @@ "home-manager-stable": "home-manager-stable", "home-manager-unstable": "home-manager-unstable", "hycov": "hycov", - "hyprgrass": "hyprgrass", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "kdenlive-pin-nixpkgs": "kdenlive-pin-nixpkgs", @@ -1119,6 +1117,7 @@ "nix-straight": "nix-straight", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", + "nwg-dock-hyprland-pin-nixpkgs": "nwg-dock-hyprland-pin-nixpkgs", "org-krita": "org-krita", "org-nursery": "org-nursery", "org-side-tree": "org-side-tree", @@ -1271,23 +1270,6 @@ "type": "github" } }, - "wlroots": { - "flake": false, - "locked": { - "lastModified": 1713731601, - "narHash": "sha256-bdcKdtLkusvv85DNuJsajZLFeq7bXp+x5AGP1Sd4wD8=", - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "wlroots-hyprland", - "rev": "5c1d51c5a2793480f5b6c4341ad0797052aec2ea", - "type": "github" - } - }, "ws-butler": { "flake": false, "locked": { @@ -1306,10 +1288,7 @@ }, "xdph": { "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], + "hyprland-protocols": "hyprland-protocols", "hyprlang": [ "hyprland", "hyprlang" @@ -1324,11 +1303,11 @@ ] }, "locked": { - "lastModified": 1714060055, - "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=", + "lastModified": 1716290197, + "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a", + "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index de2de6d..3af225a 100644 --- a/flake.nix +++ b/flake.nix @@ -86,6 +86,10 @@ system = systemSettings.system; }; + pkgs-nwg-dock-hyprland = import inputs.nwg-dock-hyprland-pin-nixpkgs { + system = systemSettings.system; + }; + # configure lib # use nixpkgs if running a server (homelab or worklab profile) # otherwise use patched nixos-unstable nixpkgs @@ -125,6 +129,7 @@ inherit pkgs-stable; inherit pkgs-emacs; inherit pkgs-kdenlive; + inherit pkgs-nwg-dock-hyprland; inherit systemSettings; inherit userSettings; inherit inputs; @@ -175,6 +180,7 @@ nixpkgs-stable.url = "nixpkgs/nixos-23.11"; emacs-pin-nixpkgs.url = "nixpkgs/f72123158996b8d4449de481897d855bc47c7bf6"; kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94"; + nwg-dock-hyprland-pin-nixpkgs.url = "nixpkgs/2098d845d76f8a21ae4fe12ed7c7df49098d3f15"; home-manager-unstable.url = "github:nix-community/home-manager/master"; home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs"; @@ -186,15 +192,16 @@ type = "git"; url = "https://github.com/hyprwm/Hyprland"; submodules = true; - rev = "cba1ade848feac44b2eda677503900639581c3f4"; + rev = "ea2501d4556f84d3de86a4ae2f4b22a474555b9f"; }; hyprland.inputs.nixpkgs.follows = "nixpkgs"; - hyprland-plugins.url = "github:hyprwm/hyprland-plugins/fd133914bf1921db2a26627698f914478f6a9471"; + hyprland-plugins.url = "github:hyprwm/hyprland-plugins/151102b7d7c4f61ff42f275e72008d28318dac96"; hyprland-plugins.inputs.hyprland.follows = "hyprland"; - hycov.url = "github:DreamMaoMao/hycov/115cba558d439cc25d62ce38b7c62cde83f50ef5"; + hycov.url = "github:DreamMaoMao/hycov/3d144a79f8b5468656de88a005be55f3317d295b"; hycov.inputs.hyprland.follows = "hyprland"; - hyprgrass.url = "github:horriblename/hyprgrass/6d8dbbcfb14ebdb2a2a2551b7d495d01d8ef6917"; - hyprgrass.inputs.hyprland.follows = "hyprland"; + # FIXME hyprgrass broken on 0.41.0 + #hyprgrass.url = "github:horriblename/hyprgrass/6d8dbbcfb14ebdb2a2a2551b7d495d01d8ef6917"; + #hyprgrass.inputs.hyprland.follows = "hyprland"; nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; nix-doom-emacs.inputs.nixpkgs.follows = "emacs-pin-nixpkgs"; diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index d4fdaae..cce0113 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -1,4 +1,4 @@ -{ inputs, config, lib, pkgs, userSettings, systemSettings, ... }: let +{ inputs, config, lib, pkgs, userSettings, systemSettings, pkgs-nwg-dock-hyprland, ... }: let pkgs-hyprland = inputs.hyprland.inputs.nixpkgs.legacyPackages.${pkgs.stdenv.hostPlatform.system}; in { @@ -29,7 +29,8 @@ in plugins = [ inputs.hyprland-plugins.packages.${pkgs.system}.hyprtrails inputs.hycov.packages.${pkgs.system}.hycov - inputs.hyprgrass.packages.${pkgs.system}.default + # FIXME hypgrass currently broken on 0.41.0 + #inputs.hyprgrass.packages.${pkgs.system}.default ]; settings = { }; extraConfig = '' @@ -86,9 +87,7 @@ in general { layout = master - cursor_inactive_timeout = 30 border_size = 5 - no_cursor_warps = false col.active_border = 0xff'' + config.lib.stylix.colors.base08 + " " + ''0xff'' + config.lib.stylix.colors.base09 + " " + ''0xff'' + config.lib.stylix.colors.base0A + " " + ''0xff'' + config.lib.stylix.colors.base0B + " " + ''0xff'' + config.lib.stylix.colors.base0C + " " + ''0xff'' + config.lib.stylix.colors.base0D + " " + ''0xff'' + config.lib.stylix.colors.base0E + " " + ''0xff'' + config.lib.stylix.colors.base0F + " " + ''270deg col.inactive_border = 0xaa'' + config.lib.stylix.colors.base02 + '' @@ -98,6 +97,11 @@ in gaps_out = 7 } + cursor { + no_warps = false + inactive_timeout = 30 + } + plugin { hyprtrails { color = rgba(''+config.lib.stylix.colors.base08+''55) @@ -125,32 +129,33 @@ in show_special = 0 # show windwos in special workspace in overview. } - touch_gestures { - sensitivity = 4.0 - long_press_delay = 260 - hyprgrass-bind = , edge:r:l, exec, hyprnome - hyprgrass-bind = , edge:l:r, exec, hyprnome --previous - hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper + # FIXME hypgrass currently broken on 0.41.0 :( + #touch_gestures { + # sensitivity = 4.0 + # long_press_delay = 260 + # hyprgrass-bind = , edge:r:l, exec, hyprnome + # hyprgrass-bind = , edge:l:r, exec, hyprnome --previous + # hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper - hyprgrass-bind = , swipe:3:u, hycov:toggleoverview - hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper + # hyprgrass-bind = , swipe:3:u, hycov:toggleoverview + # hyprgrass-bind = , swipe:3:d, exec, nwggrid-wrapper - hyprgrass-bind = , swipe:3:l, exec, hyprnome --previous - hyprgrass-bind = , swipe:3:r, exec, hyprnome + # hyprgrass-bind = , swipe:3:l, exec, hyprnome --previous + # hyprgrass-bind = , swipe:3:r, exec, hyprnome - hyprgrass-bind = , swipe:4:u, movewindow,u - hyprgrass-bind = , swipe:4:d, movewindow,d - hyprgrass-bind = , swipe:4:l, movewindow,l - hyprgrass-bind = , swipe:4:r, movewindow,r + # hyprgrass-bind = , swipe:4:u, movewindow,u + # hyprgrass-bind = , swipe:4:d, movewindow,d + # hyprgrass-bind = , swipe:4:l, movewindow,l + # hyprgrass-bind = , swipe:4:r, movewindow,r - hyprgrass-bind = , tap:3, fullscreen,1 - hyprgrass-bind = , tap:4, fullscreen,0 + # hyprgrass-bind = , tap:3, fullscreen,1 + # hyprgrass-bind = , tap:4, fullscreen,0 - hyprgrass-bindm = , longpress:2, movewindow - hyprgrass-bindm = , longpress:3, resizewindow + # hyprgrass-bindm = , longpress:2, movewindow + # hyprgrass-bindm = , longpress:3, resizewindow - } + #} } bind=SUPER,SUPER_L,exec,nwggrid-wrapper @@ -389,9 +394,6 @@ in feh killall polkit_gnome - (nwg-dock-hyprland.overrideAttrs (oldAttrs: { - patches = ./patches/noactiveclients.patch; - })) nwg-launchers papirus-icon-theme (pkgs.writeScriptBin "nwggrid-wrapper" '' @@ -538,7 +540,12 @@ in type = "Application"; })]) ++ - (with pkgs-hyprland; [ hyprlock ]); + (with pkgs-hyprland; [ hyprlock ]) + ++ (with pkgs-nwg-dock-hyprland; [ + (nwg-dock-hyprland.overrideAttrs (oldAttrs: { + patches = ./patches/noactiveclients.patch; + })) + ]); home.file.".local/share/pixmaps/hyprland-logo-stylix.svg".source = config.lib.stylix.colors { template = builtins.readFile ../../pkgs/hyprland-logo-stylix.svg.mustache;