diff --git a/modules/home/cli/neovim.nix b/modules/home/cli/neovim.nix index 6d70f46..a195172 100644 --- a/modules/home/cli/neovim.nix +++ b/modules/home/cli/neovim.nix @@ -297,7 +297,6 @@ } ''; } - luasnip mason-lspconfig-nvim { plugin = mason-nvim; diff --git a/modules/home/desktop/sway/waybar.nix b/modules/home/desktop/sway/waybar.nix index 9d39b6d..6fbcf69 100644 --- a/modules/home/desktop/sway/waybar.nix +++ b/modules/home/desktop/sway/waybar.nix @@ -1,5 +1,4 @@ -{hostConfig, ...}: -{ +_: { programs.waybar = { enable = true; systemd = { @@ -16,13 +15,8 @@ "sway/workspaces" "sway/mode" ]; - modules-right = [ "network" ] - ++ (if hostConfig.laptop then - [ "custom/sep" - "backlight" - "battery"] - else null - ) ++ [ + modules-right = [ + "network" "custom/sep" "memory" "cpu" @@ -102,41 +96,6 @@ "format" = "{temperatureC}°C  "; "thermal-zone" = "6"; }; - "backlight" = { - "format" = "{percent}% {icon}"; - "format-icons" = [ - "󰌶" - "󱩏" - "󱩐" - "󱩐" - "󱩑" - "󱩒" - "󱩓" - "󱩔" - "󱩕" - "󱩖" - "󰛨" - ]; - }; - "battery" = { - "tooltip" = false; - "states" = { - "full" = 100; - "warning" = 30; - "critical" = 15; - }; - "format" = "{capacity}% {icon}"; - "format-charging" = "{capacity}% 󰓦"; - "format-plugged" = "{capacity}% "; - "format-alt" = "{time} {icon}"; - "format-icons" = [ - " " - " " - " " - " " - " " - ]; - }; }; }; style = ''