From f6f3a19d18b0ecb9309a11b394a0d47fcb685dbf Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Sat, 8 Mar 2025 14:21:59 +0100 Subject: [PATCH] better applet handling --- flake.lock | 60 +------------------ flake.nix | 14 +---- .../hypr/hyprland-customization.nix | 18 +++--- modules/home-manager/hypr/waybar.nix | 11 ++-- modules/home-manager/kitty.nix | 3 +- 5 files changed, 19 insertions(+), 87 deletions(-) diff --git a/flake.lock b/flake.lock index 85caeb9..477352b 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "Hyprspace": { - "inputs": { - "hyprland": [ - "hyprland" - ], - "systems": "systems" - }, - "locked": { - "lastModified": 1740777046, - "narHash": "sha256-hPp+DnTYjE6M9Mdau7inbqMeLR1SpSPVyuxd+nabwaA=", - "owner": "KZDKM", - "repo": "Hyprspace", - "rev": "b5c8adb16f4729572c67883da1bcb46e11f195d6", - "type": "github" - }, - "original": { - "owner": "KZDKM", - "repo": "Hyprspace", - "type": "github" - } - }, "aquamarine": { "inputs": { "hyprutils": [ @@ -171,26 +150,6 @@ "type": "github" } }, - "hyprgrass": { - "inputs": { - "hyprland": [ - "hyprland" - ] - }, - "locked": { - "lastModified": 1736771168, - "narHash": "sha256-8TaiwQorn5etYxUtyUYPJBkWuzfoULHSwGDEf+cOhh4=", - "owner": "horriblename", - "repo": "hyprgrass", - "rev": "d324904d70e8c9710bcf772227f364262baf3820", - "type": "github" - }, - "original": { - "owner": "horriblename", - "repo": "hyprgrass", - "type": "github" - } - }, "hyprland": { "inputs": { "aquamarine": "aquamarine", @@ -203,7 +162,7 @@ "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems", "xdph": "xdph" }, "locked": { @@ -442,9 +401,7 @@ }, "root": { "inputs": { - "Hyprspace": "Hyprspace", "home-manager": "home-manager", - "hyprgrass": "hyprgrass", "hyprland": "hyprland", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", @@ -466,21 +423,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" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index 0eac1db..8989b21 100644 --- a/flake.nix +++ b/flake.nix @@ -11,26 +11,14 @@ nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.4.1"; # hyprland, plugins and related utils hyprland.url = "github:hyprwm/Hyprland"; - hyprgrass = { - url = "github:horriblename/hyprgrass"; - inputs.hyprland.follows = "hyprland"; # IMPORTANT - }; - Hyprspace = { - url = "github:KZDKM/Hyprspace"; - - # Hyprspace uses latest Hyprland. We declare this to keep them in sync. - inputs.hyprland.follows = "hyprland"; - }; - }; outputs = { self, nixpkgs, home-manager, - hyprgrass, ... - } @ inputs: + } @ inputs: let in { diff --git a/modules/home-manager/hypr/hyprland-customization.nix b/modules/home-manager/hypr/hyprland-customization.nix index b7a6356..0868f97 100644 --- a/modules/home-manager/hypr/hyprland-customization.nix +++ b/modules/home-manager/hypr/hyprland-customization.nix @@ -1,4 +1,4 @@ -{inputs, pkgs, ...}: +{inputs, pkgs, ...}: { home.packages = [ @@ -28,8 +28,8 @@ "$mod, s, exec, $ide" "$mod, e, exec, nautilus" # Overview - # "$mod, , overview:toggle" - + "$mod, , overview:toggle" + # Lock screen "$mod+Shift, l, exec, hyprlock" @@ -172,12 +172,12 @@ }; # TODO - plugins are broken for now - # plugins = [ - # # Global overview - # inputs.Hyprspace.packages.${pkgs.system}.Hyprspace - # # Touch gestures: https://github.com/horriblename/hyprgrass - # inputs.hyprgrass.packages.${pkgs.system}.default - # ]; + plugins = [ + # Global overview + pkgs.hyprlandPlugins.hyprspace + # Touch gestures + pkgs.hyprlandPlugins.hyprgrass + ]; # plugin = { # touch_gestures = { diff --git a/modules/home-manager/hypr/waybar.nix b/modules/home-manager/hypr/waybar.nix index aef8fa3..105b1e2 100644 --- a/modules/home-manager/hypr/waybar.nix +++ b/modules/home-manager/hypr/waybar.nix @@ -1,4 +1,4 @@ -{inputs, pkgs, ...}: +{inputs, pkgs, ...}: { # required to autoload fonts from packages installed via Home Manager fonts.fontconfig.enable = true; @@ -67,7 +67,7 @@ }; "clock" = { format = "{:%H:%M}"; - interval = 1; + interval = 1; tooltip-format = "{calendar}"; calendar = { "format" = { @@ -95,7 +95,7 @@ tooltip-format-enumerate-connected = "{device_alias}\n{device_address}"; tooltip-format-enumerate-connected-battery = "{device_alias}\n{device_address}\n{device_battery_percentage}%"; on-click-right = "blueman-manager"; - }; + }; "battery" = { interval = 60; states = { @@ -109,7 +109,7 @@ format-icons = [ "󰁻" "󰁼" "󰁾" "󰂀" "󰂂" "󰁹" ]; }; "backlight" = { - "format" = "{percent}% {icon}",; + "format" = "{percent}% {icon}"; "format-icons" = ["" "" "" "" "" "" "" "" ""]; }; "wireplumber" = { @@ -132,7 +132,7 @@ "" ]; }; - on-click = "sleep 0.1 && pavucontrol"; + on-click = "XDG_CURRENT_DESKTOP=GNOME gnome-control-center sound"; }; "tray" = { spacing = 5; @@ -166,6 +166,7 @@ tooltip-format-wifi = "SSID: {essid}({signalStrength}%), {frequency} MHz\nInterface: {ifname}\nIP: {ipaddr}\nGW: {gwaddr}\n\n{bandwidthUpBits}\t{bandwidthDownBits}\t󰹹{bandwidthTotalBits}"; tooltip-format-ethernet = "{ifname} "; tooltip-format-disconnected = "Disconnected"; + on-click = "XDG_CURRENT_DESKTOP=GNOME gnome-control-center wifi"; }; }; }; diff --git a/modules/home-manager/kitty.nix b/modules/home-manager/kitty.nix index ebd1d43..d496800 100644 --- a/modules/home-manager/kitty.nix +++ b/modules/home-manager/kitty.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: +{pkgs, ...}: { programs.kitty = { enable = true; @@ -6,6 +6,7 @@ settings = { background_opacity = 0.8; confirm_os_window_close = 0; + enable_audio_bell = false; cursor_trail = 3; cursor_trail_decay = "0.1 0.4"; url_style = "curly";