From fc52810de8091d2a3aed42c1be2cc98333222db1 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Fri, 27 Sep 2024 12:41:30 +0200 Subject: [PATCH] chore: remove old waybar stuffs --- modules/home/waybar/old/default.nix | 6 -- modules/home/waybar/old/settings.nix | 118 --------------------------- modules/home/waybar/old/style.nix | 99 ---------------------- modules/home/waybar/old/waybar.nix | 9 -- 4 files changed, 232 deletions(-) delete mode 100644 modules/home/waybar/old/default.nix delete mode 100644 modules/home/waybar/old/settings.nix delete mode 100644 modules/home/waybar/old/style.nix delete mode 100644 modules/home/waybar/old/waybar.nix diff --git a/modules/home/waybar/old/default.nix b/modules/home/waybar/old/default.nix deleted file mode 100644 index 9b8b240..0000000 --- a/modules/home/waybar/old/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: -{ - imports = [ (import ./waybar.nix) ] - ++ [ (import ./settings.nix) ] - ++ [ (import ./style.nix) ]; -} diff --git a/modules/home/waybar/old/settings.nix b/modules/home/waybar/old/settings.nix deleted file mode 100644 index 256017e..0000000 --- a/modules/home/waybar/old/settings.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ ... }: -{ - programs.waybar.settings.mainBar = { - position= "top"; - layer= "top"; - height= 5; - margin-top= 0; - margin-bottom= 0; - margin-left= 0; - margin-right= 0; - modules-left= [ - # "custom/launcher" - "hyprland/workspaces" - ]; - modules-center= [ - "clock" - ]; - modules-right= [ - # "cpu" - # "memory" - # "disk" - "pulseaudio" - "battery" - #"network" - "tray" - ]; - clock= { - calendar = { - format = { today = "{}"; }; - }; - format = " {:%H:%M}"; - tooltip= "true"; - tooltip-format= "{:%Y %B}\n{calendar}"; - format-alt= " {:%d/%m}"; - }; - "hyprland/workspaces"= { - active-only= false; - disable-scroll= true; - format = "{icon}"; - on-click= "activate"; - format-icons= { - "1"= "1"; - "2"= "2"; - "3"= "3"; - "4"= "4"; - "5"= "5"; - "6"= "6"; - "7"= "7"; - "8"= "8"; - "9"= "9"; - "10"= "10"; - urgent= ""; - default = ""; - sort-by-number= true; - }; - # persistent-workspaces = { - # "1"= []; - # "2"= []; - # "3"= []; - # }; - }; - memory= { - format= "󰟜 {}%"; - format-alt= "󰟜 {used} GiB"; #  - interval= 2; - }; - cpu= { - format= " {usage}%"; - format-alt= " {avg_frequency} GHz"; - interval= 2; - }; - disk = { - # path = "/"; - format = "󰋊 {percentage_used}%"; - interval= 60; - }; - network = { - format-wifi = " {signalStrength}%"; - format-ethernet = "󰀂 "; - tooltip-format = "Connected to {essid} {ifname} via {gwaddr}"; - format-linked = "{ifname} (No IP)"; - format-disconnected = "󰖪 "; - }; - tray= { - icon-size= 20; - spacing = 2; # was 8 originally - }; - pulseaudio= { - format= "{icon} {volume}%"; - format-muted= "󰖁 {volume}%"; - format-icons= { - default= [" "]; - }; - scroll-step= 5; - on-click= "pamixer -t"; - }; - battery = { - format = "{icon} {capacity}%"; - format-icons = [" " " " " " " " " "]; - format-charging = " {capacity}%"; - format-full = " {capacity}%"; - format-warning = " {capacity}%"; - interval = 5; - states = { - warning = 20; - }; - format-time = "{H}h{M}m"; - tooltip = true; - tooltip-format = "{time}"; - }; - "custom/launcher"= { - format= ""; - on-click= "pkill wofi || wofi --show drun"; - on-click-right= "pkill wofi || wallpaper-picker"; - tooltip= "false"; - }; - }; -} diff --git a/modules/home/waybar/old/style.nix b/modules/home/waybar/old/style.nix deleted file mode 100644 index 9e36dea..0000000 --- a/modules/home/waybar/old/style.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ ... }: -let custom = { - font = "JetBrainsMono Nerd Font"; - font_size = "10px"; - font_weight = "bold"; - text_color = "#cdd6f4"; - secondary_accent= "89b4fa"; - tertiary_accent = "f5f5f5"; - background = "11111B"; - opacity = "0.98"; -}; -in -{ - programs.waybar.style = '' - - * { - border: none; - border-radius: 0px; - padding: 0; - margin: 0; - min-height: 0px; - font-family: ${custom.font}; - font-weight: ${custom.font_weight}; - opacity: ${custom.opacity}; - } - - window#waybar { - background: none; - } - - #workspaces { - font-size: 10px; - padding-left: 15px; - - } - #workspaces button { - color: ${custom.text_color}; - padding-left: 6px; - padding-right: 6px; - } - #workspaces button.empty { - color: #6c7086; - } - #workspaces button.active { - color: #b4befe; - } - - #tray, #pulseaudio, #network, #cpu, #memory, #disk, #clock, #battery { - font-size: ${custom.font_size}; - color: ${custom.text_color}; - } - - #cpu { - padding-left: 15px; - padding-right: 9px; - margin-left: 7px; - } - #memory { - padding-left: 9px; - padding-right: 9px; - } - #disk { - padding-left: 9px; - padding-right: 15px; - } - - #tray { - padding: 0 20px; - margin-left: 7px; - } - - #pulseaudio { - padding-left: 15px; - padding-right: 9px; - margin-left: 7px; - } - #battery { - padding-left: 9px; - padding-right: 9px; - } - #network { - padding-left: 9px; - padding-right: 15px; - } - - #clock { - padding-left: 9px; - padding-right: 15px; - } - - #custom-launcher { - font-size: 20px; - color: #b4befe; - font-weight: ${custom.font_weight}; - padding-left: 10px; - padding-right: 15px; - } - ''; -} diff --git a/modules/home/waybar/old/waybar.nix b/modules/home/waybar/old/waybar.nix deleted file mode 100644 index c50e873..0000000 --- a/modules/home/waybar/old/waybar.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ pkgs, ... }: -{ - programs.waybar = { - enable = true; - }; - programs.waybar.package = pkgs.waybar.overrideAttrs (oa: { - mesonFlags = (oa.mesonFlags or [ ]) ++ [ "-Dexperimental=true" ]; - }); -}