diff --git a/home/user/config/waybar-style.nix b/home/user/config/waybar-style.nix index 0c7318f..ded9b5c 100644 --- a/home/user/config/waybar-style.nix +++ b/home/user/config/waybar-style.nix @@ -1,7 +1,6 @@ '' * { border: none; - border-radius: 10; font-family: "nerdfonts" ; font-size: 12px; min-height: 10px; @@ -16,7 +15,7 @@ window#waybar.hidden { } #window { - margin-top: 6px; + margin-top: 2px; padding-left: 10px; padding-right: 10px; border-radius: 10px; @@ -26,7 +25,7 @@ window#waybar.hidden { } #workspaces { - margin-top: 6px; + margin-top: 2px; margin-left: 12px; font-size: 4px; margin-bottom: 0px; @@ -70,7 +69,7 @@ window#waybar.hidden { } #network { - margin-top: 6px; + margin-top: 2px; margin-left: 8px; padding-left: 10px; padding-right: 10px; @@ -82,7 +81,7 @@ window#waybar.hidden { } #wireplumber { - margin-top: 6px; + margin-top: 2px; margin-left: 8px; padding-left: 10px; padding-right: 10px; @@ -94,7 +93,7 @@ window#waybar.hidden { } #battery { - margin-top: 6px; + margin-top: 2px; margin-left: 8px; padding-left: 10px; padding-right: 10px; @@ -128,7 +127,7 @@ window#waybar.hidden { } #backlight { - margin-top: 6px; + margin-top: 2px; margin-left: 8px; padding-left: 10px; padding-right: 10px; @@ -140,7 +139,7 @@ window#waybar.hidden { } #clock { - margin-top: 6px; + margin-top: 2px; margin-left: 8px; padding-left: 10px; padding-right: 10px; @@ -153,7 +152,7 @@ window#waybar.hidden { } #memory { - margin-top: 6px; + margin-top: 2px; margin-left: 8px; padding-left: 10px; margin-bottom: 0px; @@ -165,7 +164,7 @@ window#waybar.hidden { } #cpu { - margin-top: 6px; + margin-top: 2px; margin-left: 8px; padding-left: 10px; margin-bottom: 0px; @@ -177,7 +176,7 @@ window#waybar.hidden { } #tray { - margin-top: 6px; + margin-top: 2px; margin-left: 8px; padding-left: 10px; margin-bottom: 0px; @@ -190,7 +189,7 @@ window#waybar.hidden { #custom-launcher { font-size: 24px; - margin-top: 6px; + margin-top: 2px; margin-left: 8px; padding-left: 10px; padding-right: 5px; @@ -202,7 +201,7 @@ window#waybar.hidden { #custom-power { font-size: 20px; - margin-top: 6px; + margin-top: 2px; margin-left: 8px; margin-right: 8px; padding-left: 10px; diff --git a/home/user/config/waybar.nix b/home/user/config/waybar.nix index 19efd7b..1301f0c 100644 --- a/home/user/config/waybar.nix +++ b/home/user/config/waybar.nix @@ -5,9 +5,10 @@ modules-left = [ "custom/launcher" + "wlr/workspaces" "hyprland/window" ]; - modules-center = [ "wlr/workspaces" ]; + modules-center = [ ]; modules-right = [ "backlight" "wireplumber" @@ -71,8 +72,8 @@ critical = 20; }; format = "{icon} {capacity}%"; - format-charging = " {capacity}%"; - format-plugged = " {capacity}%"; + format-charging = " {capacity}%"; + format-plugged = " {capacity}%"; format-alt = "{time} {icon}"; format-icons = ["" "" "" "" ""]; }; @@ -116,7 +117,7 @@ }; "custom/power" = { - format = "󰐥 "; + format = "󰐥"; on-click = "nwgbar"; }; } diff --git a/home/user/default.nix b/home/user/default.nix index e3ec139..aaec529 100644 --- a/home/user/default.nix +++ b/home/user/default.nix @@ -13,5 +13,6 @@ i18n.inputMethod.fcitx5.addons = with pkgs; [ fcitx5-configtool fcitx5-gtk + fcitx5-chinese-addons ]; } \ No newline at end of file diff --git a/home/user/files/hyprland.conf b/home/user/files/hyprland.conf index eb1c8c7..fe105d2 100644 --- a/home/user/files/hyprland.conf +++ b/home/user/files/hyprland.conf @@ -15,6 +15,9 @@ monitor=,preferred,auto,1,transform,3 # Execute your favorite apps at launch # exec-once = waybar & hyprpaper & firefox +exec-once = waybar +exec-once = systemctl --user start dunst +exec-once = systemctl --user start fcitx5-daemon # Source a file (multi-file configs) # source = ~/.config/hypr/myColors.conf diff --git a/home/user/programs.nix b/home/user/programs.nix index 3fb5b67..ac0f125 100644 --- a/home/user/programs.nix +++ b/home/user/programs.nix @@ -27,6 +27,7 @@ waybar = { enable = true; systemd.enable = true; + systemd.target = "default.target"; # see https://github.com/theCode-Breaker/riverwm/blob/main/waybar/river/config-river # https://blog.cascade.moe/posts/hyprland-configure/ settings = {