From ae21713f260fc1599c36c0e4cf572d24b0379ef4 Mon Sep 17 00:00:00 2001 From: Arpit Chakladar Date: Sun, 26 Jul 2026 18:21:26 +0530 Subject: feat: hyprland keybindings, neomutt refactoring - Fixed the keybinding to resize the windows to 50% and 100% (Super + =) - Left Click + Drag on mouse to move windows - Right Click + Drag on mouse to resize --- modules/desktop/waybar/bar/main.nix | 3 +- modules/desktop/waybar/module/default.nix | 41 +++++++++++++--------------- modules/desktop/waybar/module/workspaces.nix | 3 +- 3 files changed, 21 insertions(+), 26 deletions(-) (limited to 'modules/desktop/waybar') diff --git a/modules/desktop/waybar/bar/main.nix b/modules/desktop/waybar/bar/main.nix index ce8ec52..4bbbc8b 100644 --- a/modules/desktop/waybar/bar/main.nix +++ b/modules/desktop/waybar/bar/main.nix @@ -1,5 +1,4 @@ -{ config }: -with config.scheme.withHashtag; +{ ... }: { layer = "top"; position = "top"; diff --git a/modules/desktop/waybar/module/default.nix b/modules/desktop/waybar/module/default.nix index 2f9f83c..99b8420 100644 --- a/modules/desktop/waybar/module/default.nix +++ b/modules/desktop/waybar/module/default.nix @@ -1,30 +1,27 @@ { - config, lib, - pkgs, ... -}: +}@input: let inherit (import ../lib.nix { inherit lib; }) mkIcon; + + args = input // { + inherit mkIcon; + }; + + modules = { + "battery" = ./battery.nix; + "cpu" = ./cpu.nix; + "clock#date" = ./date.nix; + "memory" = ./memory.nix; + "network" = ./network.nix; + "clock#time" = ./time.nix; + "pulseaudio" = ./volume.nix; + "custom/vpn" = ./vpn.nix; + "hyprland/window" = ./window.nix; + "hyprland/workspaces" = ./workspaces.nix; + }; in { - mainBar = { - "battery" = import ./battery.nix { inherit config mkIcon; }; - "cpu" = import ./cpu.nix { inherit config mkIcon; }; - "clock#date" = import ./date.nix { inherit config mkIcon; }; - "memory" = import ./memory.nix { inherit config mkIcon; }; - "network" = import ./network.nix { inherit config mkIcon; }; - "clock#time" = import ./time.nix { inherit config mkIcon; }; - "pulseaudio" = import ./volume.nix { inherit config mkIcon; }; - "custom/vpn" = import ./vpn.nix { - inherit - config - lib - pkgs - mkIcon - ; - }; - "hyprland/window" = import ./window.nix { inherit config; }; - "hyprland/workspaces" = import ./workspaces.nix { inherit config lib mkIcon; }; - }; + mainBar = lib.mapAttrs (_name: path: import path args) modules; } diff --git a/modules/desktop/waybar/module/workspaces.nix b/modules/desktop/waybar/module/workspaces.nix index 9f9e3be..ccfeaa6 100644 --- a/modules/desktop/waybar/module/workspaces.nix +++ b/modules/desktop/waybar/module/workspaces.nix @@ -2,8 +2,8 @@ config, lib, mkIcon, + ... }: -with config.scheme.withHashtag; let mkWindowRewrite = enable: color: icon: @@ -39,7 +39,6 @@ in "class<.virt-manager-wrapped>" = mkWindowRewrite config.development.qemu.enable "#AD8AFF" "󰟀"; "class" = mkWindowRewrite config.development.opencode.enable "#98C379" "󰘦"; "class" = mkWindowRewrite config.security.enteauth.enable "#E5C07B" "󰍀"; - "class" = mkWindowRewrite config.file-management.yazi.enable "#56B6C2" "󰉋"; "class" = mkWindowRewrite config.file-management.yazi.enable "#56B6C2" "󰉋"; "class" = mkWindowRewrite config.web.w3m.enable "#8BE9FD" "󰖟"; "class" = mkWindowRewrite config.networking.bluetui.enable "#BD93F9" ""; -- cgit v1.2.3