From 2942104cf3e48fb27883d617948a900ca6074f72 Mon Sep 17 00:00:00 2001 From: elyth Date: Tue, 19 Nov 2024 19:12:34 +0100 Subject: [PATCH] :wrench: (hyprland): add hyprbar i might delete soon, it's useless, but pretty --- flake.lock | 466 ++---------------- flake.nix | 2 +- .../opt/wayland/hyprland/config/options.nix | 17 + modules/home/opt/wayland/hyprland/default.nix | 3 +- 4 files changed, 58 insertions(+), 430 deletions(-) diff --git a/flake.lock b/flake.lock index 588b9bd1..485a2d37 100644 --- a/flake.lock +++ b/flake.lock @@ -42,43 +42,6 @@ "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprspace", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprspace", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1729527199, - "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "astal": { "inputs": { "nixpkgs": [ @@ -189,22 +152,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1673956053, @@ -220,7 +167,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -234,7 +181,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_4": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1696426674, @@ -250,7 +197,7 @@ "type": "github" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -266,7 +213,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1696426674, @@ -282,7 +229,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1673956053, @@ -298,7 +245,7 @@ "type": "github" } }, - "flake-compat_8": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1696426674, @@ -395,7 +342,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -413,7 +360,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -473,7 +420,7 @@ "nixvim", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "nixvim", "nixvim", @@ -500,29 +447,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "hyprspace", - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -545,7 +469,7 @@ "type": "github" } }, - "gitignore_3": { + "gitignore_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -567,7 +491,7 @@ "type": "github" } }, - "gitignore_4": { + "gitignore_3": { "inputs": { "nixpkgs": [ "pre-commit-hooks", @@ -688,95 +612,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprspace", - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_3", - "pre-commit-hooks": "pre-commit-hooks", - "systems": [ - "hyprspace", - "systems" - ], - "xdph": "xdph" - }, - "locked": { - "lastModified": 1729989895, - "narHash": "sha256-IFctdjt+v7zRDe24Y8+BdVDaKy0pmn60FWDzpYg4CT0=", - "owner": "hyprwm", - "repo": "Hyprland", - "rev": "a3d3b4fd64a51a8c1663b450bd2a408f1f0fa9b3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "Hyprland", - "type": "github" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -806,38 +641,6 @@ "type": "github" } }, - "hyprlang_2": { - "inputs": { - "hyprutils": [ - "hyprspace", - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, "hyprpaper": { "inputs": { "hyprlang": "hyprlang", @@ -860,25 +663,6 @@ "type": "github" } }, - "hyprspace": { - "inputs": { - "hyprland": "hyprland", - "systems": "systems_3" - }, - "locked": { - "lastModified": 1730569007, - "narHash": "sha256-cwbcYg+rPmvHFFtAEie7nw5IaBidrTYe5XsTlhOyoyQ=", - "owner": "KZDKM", - "repo": "Hyprspace", - "rev": "260f386075c7f6818033b05466a368d8821cde2d", - "type": "github" - }, - "original": { - "owner": "KZDKM", - "repo": "Hyprspace", - "type": "github" - } - }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -904,33 +688,6 @@ "type": "github" } }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728941256, - "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -956,33 +713,6 @@ "type": "github" } }, - "hyprwayland-scanner_2": { - "inputs": { - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -1057,9 +787,9 @@ }, "nix-minecraft": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1731116504, @@ -1132,22 +862,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -1163,7 +877,7 @@ "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs-stable_2": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -1179,7 +893,7 @@ "type": "github" } }, - "nixpkgs-stable_4": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1730602179, "narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=", @@ -1212,22 +926,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1715266358, "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", @@ -1243,7 +941,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1730785428, "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", @@ -1259,7 +957,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1731676054, "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", @@ -1275,7 +973,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1730785428, "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", @@ -1294,9 +992,9 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim_2", - "pre-commit-hooks": "pre-commit-hooks_2" + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { "lastModified": 1732036999, @@ -1316,7 +1014,7 @@ "nixvim_2": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_4", "git-hooks": "git-hooks", "home-manager": "home-manager", @@ -1383,38 +1081,13 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1729104314, - "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "pre-commit-hooks_2": { - "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore_3", + "flake-compat": "flake-compat_3", + "gitignore": "gitignore_2", "nixpkgs": [ "nixvim", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1731363552, @@ -1430,14 +1103,14 @@ "type": "github" } }, - "pre-commit-hooks_3": { + "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_5", - "gitignore": "gitignore_4", + "flake-compat": "flake-compat_4", + "gitignore": "gitignore_3", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_3" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1730814269, @@ -1461,14 +1134,13 @@ "grub2-themes": "grub2-themes", "hm": "hm", "hyprpaper": "hyprpaper", - "hyprspace": "hyprspace", "nh": "nh", "nix-minecraft": "nix-minecraft", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixvim": "nixvim", "nur": "nur", - "pre-commit-hooks": "pre-commit-hooks_3", + "pre-commit-hooks": "pre-commit-hooks_2", "sops-nix": "sops-nix", "spicetify": "spicetify", "stylix": "stylix", @@ -1481,7 +1153,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_4" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1731047660, @@ -1499,7 +1171,7 @@ }, "spicetify": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_5", "nixpkgs": [ "nixpkgs" ] @@ -1524,14 +1196,14 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_6", "flake-utils": "flake-utils_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" @@ -1581,21 +1253,6 @@ } }, "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1610,7 +1267,7 @@ "type": "github" } }, - "systems_5": { + "systems_4": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1625,7 +1282,7 @@ "type": "github" } }, - "systems_6": { + "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1714,7 +1371,7 @@ }, "waybar": { "inputs": { - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_7", "nixpkgs": [ "nixpkgs" ] @@ -1733,56 +1390,9 @@ "type": "github" } }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprspace", - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprspace", - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprspace", - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprspace", - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprspace", - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprspace", - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728166987, - "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1731201824, diff --git a/flake.nix b/flake.nix index 911d0523..6468c3e2 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ # hyprland.inputs.nixpkgs.follows = "nixpkgs"; # Hyprspacem workspace overview plugin - hyprspace.url = "github:KZDKM/Hyprspace"; + # hyprspace.url = "github:KZDKM/Hyprspace"; # hyprspace.inputs.hyprland.follows = "hyprland"; # Hyprpaper, wallpaper manager for hyprland diff --git a/modules/home/opt/wayland/hyprland/config/options.nix b/modules/home/opt/wayland/hyprland/config/options.nix index 66fad139..dd62218f 100644 --- a/modules/home/opt/wayland/hyprland/config/options.nix +++ b/modules/home/opt/wayland/hyprland/config/options.nix @@ -1,5 +1,22 @@ +{ config, ... }: { wayland.windowManager.hyprland.settings = { + + "plugin:hyprbars" = with config.lib.stylix.colors; { + bar_color = "rgb(${base01})"; + bar_height = 32; + "col.text" = "rgb(${base05})"; + bar_precedence_over_border = false; + bar_part_of_window = true; + bar_padding = 12; + bar_text_size = 11; + bar_text_font = "Iosevka Nerd Font Propo"; + bar_text_align = "left"; + hyprbars-button = [ + "rgb(${base08}), 10, , hyprctl dispatch killactive" + "rgb(${base0B}), 10, , hyprctl dispatch fullscreen 1" + ]; + }; exec-once = [ "ags" "clipse -listen" diff --git a/modules/home/opt/wayland/hyprland/default.nix b/modules/home/opt/wayland/hyprland/default.nix index 63ef3d76..10407d9a 100644 --- a/modules/home/opt/wayland/hyprland/default.nix +++ b/modules/home/opt/wayland/hyprland/default.nix @@ -146,10 +146,11 @@ in }; wayland.windowManager.hyprland = { - plugins = [ + plugins = with pkgs; [ #inputs.hyprspace.packages.${pkgs.system}.Hyprspace #inputs.hyprsplit.packages.${pkgs.system}.hyprsplit #inputs.split-monitor-workspaces.packages.${pkgs.system}.split-monitor-workspaces + hyprlandPlugins.hyprbars ]; xwayland.enable = true; enable = true;