From fe6b13fbf8e60952c94f273ef0805695aeddf3da Mon Sep 17 00:00:00 2001 From: Adithya Nair Date: Fri, 7 Apr 2023 21:01:48 +0530 Subject: [PATCH] fmt --- home/wm/addon/rofi/default.nix | 21 ++-- home/wm/addon/waybar/default.nix | 171 +++++++++++++++---------------- 2 files changed, 98 insertions(+), 94 deletions(-) diff --git a/home/wm/addon/rofi/default.nix b/home/wm/addon/rofi/default.nix index a6b1587..6899975 100644 --- a/home/wm/addon/rofi/default.nix +++ b/home/wm/addon/rofi/default.nix @@ -1,12 +1,4 @@ { pkgs, ... }: { - xdg.desktopEntries."rofi".name = "Rofi"; - xdg.desktopEntries."rofi".exec = "rofi -show"; - xdg.desktopEntries."rofi".noDisplay = true; - - xdg.desktopEntries."rofi-theme-selector".name = "Rofi Theme Selector"; - xdg.desktopEntries."rofi-theme-selector".exec = "rofi-theme-selector"; - xdg.desktopEntries."rofi-theme-selector".noDisplay = true; - programs.rofi = { enable = true; cycle = false; @@ -17,4 +9,17 @@ }; theme = ./theme.rasi; }; + xdg.desktopEntries = { + "rofi" = { + name = "Rofi"; + exec = "rofi -show"; + noDisplay = true; + }; + "rofi-theme-selector" = { + name = "Rofi Theme Selector"; + exec = "rofi-theme-selector"; + noDisplay = true; + }; + }; + } diff --git a/home/wm/addon/waybar/default.nix b/home/wm/addon/waybar/default.nix index 3b3f6d0..2796f57 100644 --- a/home/wm/addon/waybar/default.nix +++ b/home/wm/addon/waybar/default.nix @@ -1,93 +1,92 @@ -{ config -, pkgs -, ... -}: { - programs.waybar.enable = true; - programs.waybar.systemd.enable = true; - programs.waybar.style = ./style.css; +{ config, pkgs, ... }: { xdg.configFile."waybar/colors.css".source = ./colors.css; - programs.waybar.settings = { - mainBar = { - layer = "top"; - position = "top"; - height = 28; - modules-left = [ "sway/workspaces" "wlr/workspaces" "sway/window" "hyprland/window" "sway/mode" "hyprland/submap" ]; - modules-center = [ ]; - modules-right = [ "tray" "idle_inhibitor" "network" "bluetooth" "pulseaudio" "backlight" "battery" "clock" ]; - "sway/mode" = { - "format" = "{}"; - }; - "sway/window" = { - "tooltip" = false; - }; - "idle_inhibitor" = { - "format" = "{icon}"; - "format-icons" = { - "activated" = ""; - "deactivated" = ""; + programs.waybar = { + enable = true; + systemd.enable = true; + style = ./style.css; + settings = { + mainBar = { + layer = "top"; + position = "top"; + height = 28; + modules-left = [ "sway/workspaces" "wlr/workspaces" "sway/window" "hyprland/window" "sway/mode" "hyprland/submap" ]; + modules-center = [ ]; + modules-right = [ "tray" "idle_inhibitor" "network" "bluetooth" "pulseaudio" "backlight" "battery" "clock" ]; + "sway/mode" = { + "format" = "{}"; }; - "tooltip" = false; - }; - "clock" = { - "tooltip" = false; - "interval" = 1; - "format" = "{:%I:%M}"; - "format-alt" = "{:%d %B %Y, %A}"; - }; - "backlight" = { - "format" = "{icon}"; - "format-icons" = [ "" "" "" "" ]; - }; - "battery" = { - "states" = { - "good" = 90; - "warning" = 20; - "critical" = 10; + "sway/window" = { + "tooltip" = false; }; - "format" = "{icon}"; - "format-alt" = "{icon} {capacity}% ({time})"; - "format-charging" = " {capacity}%"; - "format-plugged" = "‭ﮣ {capacity}%"; - "format-icons" = [ "" "" "" "" "" "" "" "" "" "" "" ]; - "tooltip" = false; - }; - "network" = { - "format-wifi" = "直"; - "format-ethernet" = ""; - "format-linked" = ""; - "format-disconnected" = "睊"; - "format-alt" = "{ifname}: {ipaddr}/{cidr}"; - "tooltip" = false; - }; - "pulseaudio" = { - "tooltip" = false; - "format" = "{icon} {format_source}"; - "format-muted" = "‭ﱝ {format_source}"; - "format-bluetooth" = " {icon} {format_source}"; - "format-bluetooth-muted" = " ‭ﱝ {format_source}"; - "format-source" = ""; - "format-source-muted" = ""; - "format-icons" = { - "headphones" = ""; - "handsfree" = ""; - "headset" = ""; - "phone" = ""; - "portable" = ""; - "car" = ""; - "default" = [ "奄" "奔" "墳" ]; + "idle_inhibitor" = { + "format" = "{icon}"; + "format-icons" = { + "activated" = ""; + "deactivated" = ""; + }; + "tooltip" = false; + }; + "clock" = { + "tooltip" = false; + "interval" = 1; + "format" = "{:%I:%M}"; + "format-alt" = "{:%d %B %Y, %A}"; + }; + "backlight" = { + "format" = "{icon}"; + "format-icons" = [ "" "" "" "" ]; + }; + "battery" = { + "states" = { + "good" = 90; + "warning" = 20; + "critical" = 10; + }; + "format" = "{icon}"; + "format-alt" = "{icon} {capacity}% ({time})"; + "format-charging" = " {capacity}%"; + "format-plugged" = "‭ﮣ {capacity}%"; + "format-icons" = [ "" "" "" "" "" "" "" "" "" "" "" ]; + "tooltip" = false; + }; + "network" = { + "format-wifi" = "直"; + "format-ethernet" = ""; + "format-linked" = ""; + "format-disconnected" = "睊"; + "format-alt" = "{ifname}: {ipaddr}/{cidr}"; + "tooltip" = false; + }; + "pulseaudio" = { + "tooltip" = false; + "format" = "{icon} {format_source}"; + "format-muted" = "‭ﱝ {format_source}"; + "format-bluetooth" = " {icon} {format_source}"; + "format-bluetooth-muted" = " ‭ﱝ {format_source}"; + "format-source" = ""; + "format-source-muted" = ""; + "format-icons" = { + "headphones" = ""; + "handsfree" = ""; + "headset" = ""; + "phone" = ""; + "portable" = ""; + "car" = ""; + "default" = [ "奄" "奔" "墳" ]; + }; + "on-click" = "${pkgs.pavucontrol}/bin/pavucontrol"; + }; + "bluetooth" = { + "format" = ""; + "format-connected" = ""; + "format-disabled" = ""; + "format-off" = ""; + "format-connected-battery" = " {device_battery_percentage}%"; + "on-click" = "${pkgs.blueman}/bin/blueman-manager"; + }; + "tray" = { + "spacing" = 4; }; - "on-click" = "${pkgs.pavucontrol}/bin/pavucontrol"; - }; - "bluetooth" = { - "format" = ""; - "format-connected" = ""; - "format-disabled" = ""; - "format-off" = ""; - "format-connected-battery" = " {device_battery_percentage}%"; - "on-click" = "${pkgs.blueman}/bin/blueman-manager"; - }; - "tray" = { - "spacing" = 4; }; }; };