From e0c39306da280154af96e274f3f3d08dfc996e21 Mon Sep 17 00:00:00 2001 From: Liam Malone Date: Thu, 31 Jul 2025 16:23:47 +0100 Subject: [PATCH] changes --- configs/hypr/hyprland.conf | 30 ++-- flake.lock | 324 ++++------------------------------ flake.nix | 9 +- hosts/darp8/configuration.nix | 24 +-- hosts/darp8/home.nix | 2 +- 5 files changed, 60 insertions(+), 329 deletions(-) diff --git a/configs/hypr/hyprland.conf b/configs/hypr/hyprland.conf index 79cd6b3..29c1af9 100644 --- a/configs/hypr/hyprland.conf +++ b/configs/hypr/hyprland.conf @@ -23,7 +23,7 @@ env=XDG_CURRENT_DESKTOP,Hyprland env=XDG_SESSION_TYPE,wayland env=XDG_SESSION_DESKTOP,Hyprland env=GTK_THEME,Materia-dark -env=QT_QPA_PLATFORM,xcb;Hyprland +env=QT_QPA_PLATFORM,wayland env=XCURSOR_THEME,Bibata-Modern-Ice env=XCURSOR_SIZE,24 @@ -44,7 +44,7 @@ $crimson=rgba(471520FF) # USED COLORS $active_border=$lightgreen $inactive_border=$gray -$expo_bg=$active_border +# $expo_bg=$active_border animations { @@ -137,19 +137,19 @@ misc { # Plugin Config -plugin { - hyprexpo { - columns = 3 - gap_size = 3 - bg_col = $expo_bg - workspace_method = center current # [center/first] [workspace] e.g. first 1 or center m+1 - - enable_gesture = true # laptop touchpad - gesture_fingers = 3 # 3 or 4 - gesture_distance = 300 # how far is the "max" - gesture_positive = false # true = swipe down, false = swipe up. - } -} +# plugin { +# hyprexpo { +# columns = 3 +# gap_size = 3 +# bg_col = $expo_bg +# workspace_method = center current # [center/first] [workspace] e.g. first 1 or center m+1 +# +# enable_gesture = true # laptop touchpad +# gesture_fingers = 3 # 3 or 4 +# gesture_distance = 300 # how far is the "max" +# gesture_positive = false # true = swipe down, false = swipe up. +# } +# } # Window Rules diff --git a/flake.lock b/flake.lock index 43787c1..646eeba 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1751740947, - "narHash": "sha256-35040CHH7P3JGmhGVfEb2oJHL/A5mI2IXumhkxrBnao=", + "lastModified": 1752743471, + "narHash": "sha256-4izhj1j7J4mE8LgljCXSIUDculqOsxxhdoC81VhqizM=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "dfc1db15a08c4cd234288f66e1199c653495301f", + "rev": "e31b575d19e7cf8a8f4398e2f9cffe27a1332506", "type": "github" }, "original": { @@ -78,11 +78,11 @@ ] }, "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "lastModified": 1753943136, + "narHash": "sha256-eiEE5SabVcIlGSTRcRyBjmJMaYAV95SJnjy8YSsVeW4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "bd82507edd860c453471c46957cbbe3c9fd01b5c", "type": "github" }, "original": { @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1751808145, - "narHash": "sha256-OXgL0XaKMmfX2rRQkt9SkJw+QNfv0jExlySt1D6O72g=", + "lastModified": 1752149140, + "narHash": "sha256-gbh1HL98Fdqu0jJIWN4OJQN7Kkth7+rbkFpSZLm/62A=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "b841473a0bd4a1a74a0b64f1ec2ab199035c349f", + "rev": "340494a38b5ec453dfc542c6226481f736cc8a9a", "type": "github" }, "original": { @@ -165,11 +165,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1752682974, - "narHash": "sha256-qjfHaJGfTfBHUTwibfYyeSthiSn246fZvNGiJ9stEAc=", + "lastModified": 1752873617, + "narHash": "sha256-OyYkFTgk5WuiwCPMhO9nwgplr+qh8Hva/VPON7wK2+0=", "owner": "hyprwm", - "repo": "Hyprland", - "rev": "148718b3bcffaa90cd684df90860fd5bda37907f", + "repo": "hyprland", + "rev": "ae3cc48f223386b057137400354ed0ca1f7a8b1a", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1752254688, - "narHash": "sha256-XJJ+frO4NOxVkoSGc1Mag8ESumzx2FmVRspOgFlMqF8=", + "lastModified": 1753894287, + "narHash": "sha256-yPeP6mY5Mdozji7xZBWYy6K166RcCuJgnOXxQt7vl3s=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "d723e5b153b7990d36e62a425bda3768c41dd9eb", + "rev": "bf310cda4a09b79725c2919688881959ebf3229e", "type": "github" }, "original": { @@ -233,31 +233,6 @@ "type": "github" } }, - "hyprland-protocols_2": { - "inputs": { - "nixpkgs": [ - "hyprsunset", - "nixpkgs" - ], - "systems": [ - "hyprsunset", - "systems" - ] - }, - "locked": { - "lastModified": 1749046714, - "narHash": "sha256-kymV5FMnddYGI+UjwIw8ceDjdeg7ToDVjbHCvUlhn14=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "613878cb6f459c5e323aaafe1e6f388ac8a36330", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "hyprland-qt-support": { "inputs": { "hyprlang": [ @@ -290,32 +265,6 @@ "type": "github" } }, - "hyprland-qt-support_2": { - "inputs": { - "hyprlang": "hyprlang_2", - "nixpkgs": [ - "hyprsysteminfo", - "nixpkgs" - ], - "systems": [ - "hyprsysteminfo", - "systems" - ] - }, - "locked": { - "lastModified": 1737634706, - "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "8810df502cdee755993cb803eba7b23f189db795", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, "hyprland-qtutils": { "inputs": { "hyprland-qt-support": "hyprland-qt-support", @@ -381,81 +330,6 @@ "type": "github" } }, - "hyprlang_2": { - "inputs": { - "hyprutils": "hyprutils_3", - "nixpkgs": [ - "hyprsysteminfo", - "hyprland-qt-support", - "nixpkgs" - ], - "systems": [ - "hyprsysteminfo", - "hyprland-qt-support", - "systems" - ] - }, - "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprsunset": { - "inputs": { - "hyprland-protocols": "hyprland-protocols_2", - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": [ - "hyprland" - ], - "systems": "systems_2" - }, - "locked": { - "lastModified": 1751567624, - "narHash": "sha256-tUVODSZhvafXmuN+5SwZpNWV+2cvhSd+5IJ5TXu3YgI=", - "owner": "hyprwm", - "repo": "hyprsunset", - "rev": "4b2f0f9f46a6552930eecb979d18ac48d7079312", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprsunset", - "type": "github" - } - }, - "hyprsysteminfo": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support_2", - "hyprutils": "hyprutils_4", - "nixpkgs": [ - "hyprland" - ], - "systems": "systems_3" - }, - "locked": { - "lastModified": 1750372066, - "narHash": "sha256-nvpJ1XX2cWIuMd7I/07C2NXYbWEuieHVrYTaNJqo44A=", - "owner": "hyprwm", - "repo": "hyprsysteminfo", - "rev": "b8ee10565d1643bb49eea5a155e1a415b3904d44", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprsysteminfo", - "type": "github" - } - }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -468,90 +342,11 @@ ] }, "locked": { - "lastModified": 1751888065, - "narHash": "sha256-F2SV9WGqgtRsXIdUrl3sRe0wXlQD+kRRZcSfbepjPJY=", + "lastModified": 1752252310, + "narHash": "sha256-06i1pIh6wb+sDeDmWlzuPwIdaFMxLlj1J9I5B9XqSeo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "a8229739cf36d159001cfc203871917b83fdf917", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprsunset", - "nixpkgs" - ], - "systems": [ - "hyprsunset", - "systems" - ] - }, - "locked": { - "lastModified": 1749135356, - "narHash": "sha256-Q8mAKMDsFbCEuq7zoSlcTuxgbIBVhfIYpX0RjE32PS0=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "e36db00dfb3a3d3fdcc4069cb292ff60d2699ccb", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_3": { - "inputs": { - "nixpkgs": [ - "hyprsysteminfo", - "hyprland-qt-support", - "hyprlang", - "nixpkgs" - ], - "systems": [ - "hyprsysteminfo", - "hyprland-qt-support", - "hyprlang", - "systems" - ] - }, - "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_4": { - "inputs": { - "nixpkgs": [ - "hyprsysteminfo", - "nixpkgs" - ], - "systems": [ - "hyprsysteminfo", - "systems" - ] - }, - "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "rev": "bcabcbada90ed2aacb435dc09b91001819a6dc82", "type": "github" }, "original": { @@ -572,36 +367,11 @@ ] }, "locked": { - "lastModified": 1751881472, - "narHash": "sha256-meB0SnXbwIe2trD041MLKEv6R7NZ759QwBcVIhlSBfE=", + "lastModified": 1751897909, + "narHash": "sha256-FnhBENxihITZldThvbO7883PdXC/2dzW4eiNvtoV5Ao=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "8fb426b3e5452fd9169453fd6c10f8c14ca37120", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, - "hyprwayland-scanner_2": { - "inputs": { - "nixpkgs": [ - "hyprsunset", - "nixpkgs" - ], - "systems": [ - "hyprsunset", - "systems" - ] - }, - "locked": { - "lastModified": 1749145760, - "narHash": "sha256-IHaGWpGrv7seFWdw/1A+wHtTsPlOGIKMrk1TUIYJEFI=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "817918315ea016cc2d94004bfb3223b5fd9dfcc6", + "rev": "fcca0c61f988a9d092cbb33e906775014c61579d", "type": "github" }, "original": { @@ -612,11 +382,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1751792365, - "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=", + "lastModified": 1752687322, + "narHash": "sha256-RKwfXA4OZROjBTQAl9WOZQFm7L8Bo93FQwSJpAiSRvo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb", + "rev": "6e987485eb2c77e5dcc5af4e3c70843711ef9251", "type": "github" }, "original": { @@ -628,11 +398,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1752480373, - "narHash": "sha256-JHQbm+OcGp32wAsXTE/FLYGNpb+4GLi5oTvCxwSoBOA=", + "lastModified": 1753694789, + "narHash": "sha256-cKgvtz6fKuK1Xr5LQW/zOUiAC0oSQoA9nOISB0pJZqM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62e0f05ede1da0d54515d4ea8ce9c733f12d9f08", + "rev": "dc9637876d0dcc8c9e5e22986b857632effeb727", "type": "github" }, "original": { @@ -672,11 +442,11 @@ ] }, "locked": { - "lastModified": 1752631407, - "narHash": "sha256-dLDtKxh1VabwLxv5xbjI+oRkDyqWEKGITU+0dEaaW28=", + "lastModified": 1753595452, + "narHash": "sha256-vqkSDvh7hWhPvNjMjEDV4KbSCv2jyl2Arh73ZXe274k=", "owner": "quickshell-mirror", "repo": "quickshell", - "rev": "4d8055f1cd9924bcace59405894b8879633eb83d", + "rev": "a5431dd02dc23d9ef1680e67777fed00fe5f7cda", "type": "github" }, "original": { @@ -690,8 +460,6 @@ "home-manager": "home-manager", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", - "hyprsunset": "hyprsunset", - "hyprsysteminfo": "hyprsysteminfo", "nixpkgs": "nixpkgs_2", "quickshell": "quickshell" } @@ -711,36 +479,6 @@ "type": "github" } }, - "systems_2": { - "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_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" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index 73ee221..3ea5bb2 100644 --- a/flake.nix +++ b/flake.nix @@ -19,14 +19,6 @@ url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; - hyprsunset = { - url = "github:hyprwm/hyprsunset"; - inputs.nixpkgs.follows = "hyprland"; - }; - hyprsysteminfo = { - url = "github:hyprwm/hyprsysteminfo"; - inputs.nixpkgs.follows = "hyprland"; - }; }; outputs = { self, nixpkgs, hyprland, ... }@inputs: @@ -40,6 +32,7 @@ (final: prev: { hyprlandPlugins = prev.hyprlandPlugins // { hyprexpo = inputs.hyprland-plugins.packages.${prev.system}.hyprexpo; + hyprbars = inputs.hyprland-plugins.packages.${prev.system}.hyprbars; }; }) (final: prev: { diff --git a/hosts/darp8/configuration.nix b/hosts/darp8/configuration.nix index 243f4fa..c225d8a 100644 --- a/hosts/darp8/configuration.nix +++ b/hosts/darp8/configuration.nix @@ -2,7 +2,7 @@ let hyprplugins = { - hyprexpo_dir = "${pkgs.hyprlandPlugins.hyprexpo}"; + # hyprexpo_dir = "${pkgs.hyprlandPlugins.hyprexpo}"; }; in { @@ -106,12 +106,12 @@ in "greetd/environments".text = '' Hyprland ''; - "hyprland/plugins.conf" = { - mode = "0444"; - text = '' - plugin = ${pkgs.hyprlandPlugins.hyprexpo} - ''; - }; + # "hyprland/plugins.conf" = { + # mode = "0444"; + # text = '' + # plugin = ${pkgs.hyprlandPlugins.hyprexpo} + # ''; + # }; }; }; @@ -186,8 +186,7 @@ in xwayland.enable = true; withUWSM = true; plugins = [ - pkgs.hyprlandPlugins.hyprbars - pkgs.hyprlandPlugins.hyprexpo + # pkgs.hyprlandPlugins.hyprexpo ]; }; gnupg.agent = { @@ -215,15 +214,16 @@ in environment.systemPackages = with pkgs; [ bat discord + fd + file ghostty glib gnome-keyring - fd - file - libnotify libdrm + libnotify mesa neovim + quickshell ripgrep spotify unzip diff --git a/hosts/darp8/home.nix b/hosts/darp8/home.nix index af6dbe0..077cc9b 100644 --- a/hosts/darp8/home.nix +++ b/hosts/darp8/home.nix @@ -32,7 +32,7 @@ GIT_EDITOR = "nvim"; NIX_SHELL_PRESERVE_PROMPT = 1; NIX_CONFIG_DIR = "${cfg.homeDirectory}/personal/nixos"; - HYPR_EXPO_LIB = "${hyprplugins.hyprexpo_dir}/lib/libhyprexpo.so"; + # HYPR_EXPO_LIB = "${hyprplugins.hyprexpo_dir}/lib/libhyprexpo.so"; }; nix.settings.extra-trusted-substituters = [