From 0fce9844f7e7b548ea267f81cd0e203e3b9d4d89 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 25 May 2023 13:08:01 -0400 Subject: [PATCH] nix: Formatting --- desktop/dunst/default.nix | 1 + desktop/rofi/default.nix | 4 ++++ desktop/waybar/default.nix | 17 ++++++++++++++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/desktop/dunst/default.nix b/desktop/dunst/default.nix index 360249c..6a66644 100644 --- a/desktop/dunst/default.nix +++ b/desktop/dunst/default.nix @@ -6,6 +6,7 @@ home-manager.sharedModules = [{ services.dunst = { enable = true; + settings = { global = { geometry = "1870x5-25+45"; diff --git a/desktop/rofi/default.nix b/desktop/rofi/default.nix index 5983123..e0a70e7 100644 --- a/desktop/rofi/default.nix +++ b/desktop/rofi/default.nix @@ -4,10 +4,13 @@ home-manager.sharedModules = [{ programs.rofi = { enable = true; + package = (pkgs.callPackage ./package/wrapper.nix { rofi-unwrapped = (pkgs.callPackage ./package/wayland.nix { }); }); + cycle = false; + extraConfig = { modi = "drun,filebrowser"; font = "Noto Sans CJK JP 12"; @@ -23,6 +26,7 @@ me-select-entry = ""; me-accept-entry = "MousePrimary"; }; + theme = lib.mkForce ./launchpad.rasi; }; }]; diff --git a/desktop/waybar/default.nix b/desktop/waybar/default.nix index 24edccb..fe55329 100644 --- a/desktop/waybar/default.nix +++ b/desktop/waybar/default.nix @@ -5,23 +5,28 @@ programs.waybar = { enable = true; package = hyprland.packages."x86_64-linux".waybar-hyprland; + settings = { mainBar = { layer = "top"; position = "right"; width = 45; spacing = 8; + modules-left = [ "wlr/workspaces" "custom/new-workspace" ]; modules-center = [ "hyprland/window" ]; modules-right = [ "tray" "wireplumber" "backlight" "battery" "clock" ]; - "tray" = { - "icon-size" = 24; + + tray = { + icon-size = 24; spacing = 8; }; + "hyprland/window" = { - "rotate" = 90; + rotate = 90; }; + "wlr/workspaces" = { on-click = "activate"; sort-by-number = true; @@ -39,25 +44,30 @@ "10" = "十"; }; }; + wireplumber = { format = "{icon}"; tooltip-format = "{volume}% {node_name}"; format-muted = ""; format-icons = ["" ""]; }; + battery = { "format" = "{icon}"; "tooltip-format" = "{capacity}% {timeTo}"; "format-icons" = ["" "" "" "" ""]; }; + clock = { "format" = "{:%H\n%M}"; "tooltip-format" = "{calendar}"; }; + backlight = { "format" = "{icon}"; "format-icons" = ["" ""]; }; + "custom/new-workspace" = { "format" = "+"; "on-click" = "hyprctl dispatch workspace empty && rofi -show drun"; @@ -66,6 +76,7 @@ }; }; }; + style = lib.mkForce '' @define-color base00 #272822; @define-color base01 #383830;