Skip to content

Commit

Permalink
Fix: change icons to nerd v3
Browse files Browse the repository at this point in the history
  • Loading branch information
swmh committed Nov 5, 2023
1 parent f4b3ce2 commit f30b939
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 42 deletions.
10 changes: 5 additions & 5 deletions assets/idea.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@

# whithout flags
```
╭─ CPU ───────────────── 19:47:27 ──────────────── E5-2660 ─╮
╭─ 󰍛 CPU ───────────────── 19:47:27 ──────────────── E5-2660 ─╮
│ ╭─────────────╮ │
│ │  load 99% │ ▁▂▃▄▅▆▇████████████ │
│ │ 龍fr 3.3ghz │ ▁▂▃▄▅▆▇████████████████████ │
│ │ 󰓅 fr 3.3ghz │ ▁▂▃▄▅▆▇████████████████████ │
│ │  temp 63°C │ ▁▂▃▄▅▆▇████████████████████████████ │
│ ╰─────────────╯ ▁▂▃▄▅▆▇████████████████████████████████████ │
│ ▁▂▃▄▅▆▇████████████████████████████████████████████ │
│ ▁▂▃▄▅▆▇████████████████████████████████████████████████████ │
╰─────────────────────────────────────────────────────────────╯
╭─  MEM ───────── 15.55 GiB ─╮ ╭─ SWAP ────────── 4.0 GiB ─╮
╭─  MEM ───────── 15.55 GiB ─╮ ╭─ 󰋊 SWAP ────────── 4.0 GiB ─╮
│ Used 4.46 GiB │ │ Free 1.23 GiB │
│ │ │ │
│ ▁▂▃▄▅▆▇████ │ │ ▁▂▃▄▅▆▇████ │
Expand All @@ -45,8 +45,8 @@
├─────────────────────────────┤ ╭─  BAT ────────────── 3:45 ─╮
│ Free 4.10 GiB │ │ ■■■■■■■■■■■■■■■■■■■■■■■ 51% │
│ │ ╰─────────────────────────────╯
│ ▁▂▃▄▅▆▇████ │ ╭─ INFO ────────────────────╮
│ ▁▂▃▄▅▆▇████████████ │ │ Distro Arch Linux │
│ ▁▂▃▄▅▆▇████ │ ╭─ 󰋼 INFO ────────────────────╮
│ ▁▂▃▄▅▆▇████████████ │ │ 󰏖 Distro Arch Linux │
│ ▁▂▃▄▅▆▇████████████████████ │ │  Hostname sfome │
╰─────────────────────────────╯ ╰─────────────────────────────╯
Q - quit | R - refresh
Expand Down
10 changes: 5 additions & 5 deletions assets/main.dat
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

╭─ CPU ───────────────── 19:47:27 ──────────────── E5-2660 ─╮
╭─ 󰍛 CPU ───────────────── 19:47:27 ──────────────── E5-2660 ─╮
│ ╭─────────────╮ │
│ │  load 99% │ ▁▂▃▄▅▆▇████████████ │
│ │ 龍fr 3.3ghz │ ▁▂▃▄▅▆▇████████████████████ │
│ │ 󰓅 fr 3.3ghz │ ▁▂▃▄▅▆▇████████████████████ │
│ │  temp 63°C │ ▁▂▃▄▅▆▇████████████████████████████ │
│ ╰─────────────╯ ▁▂▃▄▅▆▇████████████████████████████████████ │
│ ▁▂▃▄▅▆▇████████████████████████████████████████████ │
│ ▁▂▃▄▅▆▇████████████████████████████████████████████████████ │
╰─────────────────────────────────────────────────────────────╯
╭─  MEM ───────── 15.55 GiB ─╮ ╭─ SWAP ────────── 4.0 GiB ─╮
╭─  MEM ───────── 15.55 GiB ─╮ ╭─ 󰋊 SWAP ────────── 4.0 GiB ─╮
│ Used 4.46 GiB │ │ Free 1.23 GiB │
│ │ │ │
│ ▁▂▃▄▅▆▇████ │ │ ▁▂▃▄▅▆▇████ │
Expand All @@ -23,8 +23,8 @@
├─────────────────────────────┤ ╭─  BAT ────────────── 3:45 ─╮
│ Free 4.10 GiB │ │ ■■■■■■■■■■■■■■■■■■■■■■■ 51% │
│ │ ╰─────────────────────────────╯
│ ▁▂▃▄▅▆▇████ │ ╭─ INFO ────────────────────╮
│ ▁▂▃▄▅▆▇████████████ │ │ Distro Arch Linux │
│ ▁▂▃▄▅▆▇████ │ ╭─ 󰋼 INFO ────────────────────╮
│ ▁▂▃▄▅▆▇████████████ │ │ 󰏖 Distro Arch Linux │
│ ▁▂▃▄▅▆▇████████████████████ │ │  Hostname sfome │
╰─────────────────────────────╯ ╰─────────────────────────────╯
Q - quit | R - redraw
Expand Down
10 changes: 5 additions & 5 deletions examples/colorsTest.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@ var (

func main() {
fmt.Println()
fmt.Println(" " + colorFaint + "╭─" + colorReset + " " + colorMid + "" + colorReset + " CPU " + colorFaint + "─────────────────" + colorReset + " 19:47:27 " + colorFaint + "────────────────" + colorReset + " E5-2660 " + colorFaint + "─╮" + colorReset)
fmt.Println(" " + colorFaint + "╭─" + colorReset + " " + colorMid + "󰍛" + colorReset + " CPU " + colorFaint + "─────────────────" + colorReset + " 19:47:27 " + colorFaint + "────────────────" + colorReset + " E5-2660 " + colorFaint + "─╮" + colorReset)
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "╭─────────────╮" + colorFaint + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + "")
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + " " + colorList[2] + "" + colorReset + " load " + colorTempr[4] + "99" + colorMid + "% " + colorFaint + "│" + colorFaint + colorReset + " " + colorLoad[5] + "▁▂▃▄▅▆▇████████████" + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + "")
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + " " + colorList[1] + "龍" + colorReset + "fr " + colorTempr[1] + "3.3" + colorMid + "ghz " + colorFaint + "│" + colorFaint + colorReset + " " + colorLoad[4] + "▁▂▃▄▅▆▇████████████████████" + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + "")
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + " " + colorList[1] + "󰓅 " + colorReset + "fr " + colorTempr[1] + "3.3" + colorMid + "ghz " + colorFaint + "│" + colorFaint + colorReset + " " + colorLoad[4] + "▁▂▃▄▅▆▇████████████████████" + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + "")
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + " " + colorList[0] + " " + colorReset + "temp " + colorTempr[2] + "63" + colorMid + "°C " + colorFaint + "│" + colorFaint + colorReset + " " + colorLoad[3] + "▁▂▃▄▅▆▇████████████████████████████" + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + "")
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "╰─────────────╯" + colorFaint + colorReset + " " + colorLoad[2] + "▁▂▃▄▅▆▇████████████████████████████████████" + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + "")
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorLoad[1] + "▁▂▃▄▅▆▇████████████████████████████████████████████" + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + "")
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorLoad[0] + "▁▂▃▄▅▆▇████████████████████████████████████████████████████" + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + "")
fmt.Println(" " + colorFaint + "╰─────────────────────────────────────────────────────────────╯" + colorReset)
fmt.Println(" " + colorFaint + "╭─" + colorReset + " " + colorMid + "" + colorReset + " MEM " + colorFaint + "─────────" + colorReset + " 15.55 " + colorMid + "GiB " + colorFaint + "─╮" + colorReset + " " + colorFaint + "╭─" + colorReset + " " + colorMid + "" + colorReset + " SWAP " + colorFaint + "──────────" + colorReset + " 4.0 " + colorMid + "GiB " + colorFaint + "─╮" + colorReset)
fmt.Println(" " + colorFaint + "╭─" + colorReset + " " + colorMid + "" + colorReset + " MEM " + colorFaint + "─────────" + colorReset + " 15.55 " + colorMid + "GiB " + colorFaint + "─╮" + colorReset + " " + colorFaint + "╭─" + colorReset + " " + colorMid + "󰋊" + colorReset + " SWAP " + colorFaint + "──────────" + colorReset + " 4.0 " + colorMid + "GiB " + colorFaint + "─╮" + colorReset)
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " Used 4.46 " + colorMid + "GiB " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + " Free 1.23 " + colorMid + "GiB " + colorFaint + "│" + colorFaint + colorReset + "")
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + "")
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorLoad[5] + "▁▂▃▄▅▆▇████ " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + " " + colorLoad[5] + "▁▂▃▄▅▆▇████ " + colorFaint + "│" + colorFaint + colorReset + "")
Expand All @@ -59,8 +59,8 @@ func main() {
fmt.Println(" " + colorFaint + "├─────────────────────────────┤" + colorFaint + colorReset + " " + colorFaint + "╭─" + colorReset + "  BAT " + colorFaint + "──────────────" + colorReset + " 3:45 " + colorFaint + "─╮" + colorReset)
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " Free 4.10 " + colorMid + "GiB " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + " " + colorTempr[0] + "■■■■" + colorTempr[1] + "■■■■" + colorTempr[2] + "■■■■" + colorTempr[3] + "■■■■" + colorTempr[4] + "■■■■" + colorTempr[5] + "■■■" + colorReset + " 51% " + colorFaint + "│" + colorFaint + colorReset + "")
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "╰─────────────────────────────╯" + colorReset)
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorLoad[5] + "▁▂▃▄▅▆▇████ " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "╭─" + colorReset + " " + colorMid + "" + colorReset + " INFO " + colorFaint + "────────────────────╮" + colorReset)
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorLoad[2] + "▁▂▃▄▅▆▇████████████ " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + " " + colorList[2] + "" + colorReset + " Distro Arch Linux " + colorFaint + "│" + colorFaint + colorReset + "")
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorLoad[5] + "▁▂▃▄▅▆▇████ " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "╭─" + colorReset + " " + colorMid + "󰋼" + colorReset + " INFO " + colorFaint + "────────────────────╮" + colorReset)
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorLoad[2] + "▁▂▃▄▅▆▇████████████ " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + " " + colorList[2] + "󰏖" + colorReset + " Distro Arch Linux " + colorFaint + "│" + colorFaint + colorReset + "")
fmt.Println(" " + colorFaint + "│" + colorFaint + colorReset + " " + colorLoad[0] + "▁▂▃▄▅▆▇████████████████████ " + colorFaint + "│" + colorFaint + colorReset + " " + colorFaint + "│" + colorFaint + colorReset + " " + colorList[1] + "" + colorReset + " Hostname sfome " + colorFaint + "│" + colorFaint + colorReset + "")
fmt.Println(colorFaint + " ╰─────────────────────────────╯ ╰─────────────────────────────╯" + colorReset)
fmt.Println(" " + colorMid + "Q" + colorFaint + " - quit | " + colorMid + "R" + colorFaint + " - redraw" + colorReset)
Expand Down
12 changes: 6 additions & 6 deletions internal/data/depent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,15 +282,15 @@ func getCpuTemp(ch chan int, errch chan error) {
if err != nil {
errch <- err
ch <- 0
return
return
}
for _, e := range hwms {
hwmn := "/sys/class/hwmon/" + e.Name() + "/"
nameFilePath := hwmn + "name"
if _, err := os.Stat(nameFilePath); os.IsNotExist(err) {
continue
}
f, err := os.ReadFile(nameFilePath)
nameFilePath := hwmn + "name"
if _, err := os.Stat(nameFilePath); os.IsNotExist(err) {
continue
}
f, err := os.ReadFile(nameFilePath)
if err != nil {
errch <- err
continue
Expand Down
18 changes: 2 additions & 16 deletions internal/draw/cpu.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func (s *Info) cpuStatic() {
func (s *Info) cpuDynamic() {
var (
load = iconed{s.colorList[2], "", "load"}
freq = iconed{s.colorList[1], "龍", "fr"}
freq = iconed{s.colorList[1], "󰓅", "fr"}
temp = iconed{s.colorList[0], "", "temp"}
)

Expand All @@ -34,21 +34,7 @@ func (s *Info) cpuDynamic() {
s.tui.WriteString(buf)

s.writeIconed(s.x+5, s.y+3, &load)

// nerd fonts FUCK YOU
// s.writeIconed(8, s.y+5, &freq)
// '龍' icon weight is bigger than normal char

s.tui.WriteString(sterm.CursorTo(s.x+5, s.y+4))
if s.icons {
s.tui.WriteString(freq[0])
s.tui.WriteString(freq[1])
}
s.reset()
s.tui.WriteString(freq[2])

// -------------------------------------------

s.writeIconed(s.x+5, s.y+4, &freq)
s.writeIconed(s.x+5, s.y+5, &temp)

s.tui.WriteString(sterm.CursorTo(s.x+15, s.y+3))
Expand Down
2 changes: 1 addition & 1 deletion internal/draw/info.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
// draw static info for info block
func (s *Info) infoStatic() {
var (
distroName = iconed{s.colorList[2], "", "Distro"}
distroName = iconed{s.colorList[2], "󰏖", "Distro"}
hostName = iconed{s.colorList[1], "", "Hostname"}
)

Expand Down
6 changes: 3 additions & 3 deletions internal/draw/titles.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ func (s *Info) writeTitle(x, y int, d *iconed) {

func (s *Info) titles() {
var (
cpuTitle = iconed{s.colorMid, "", "CPU"}
cpuTitle = iconed{s.colorMid, "󰍛", "CPU"}
memTitle = iconed{s.colorMid, "", "MEM"}
swapTitle = iconed{s.colorMid, "", "SWAP"}
swapTitle = iconed{s.colorMid, "󰋊", "SWAP"}
diskTitle = iconed{s.colorMid, "", "DISK"}
batTitle = iconed{s.colorMid, "", "BAT"}
infoTitle = iconed{s.colorMid, "", "INFO"}
infoTitle = iconed{s.colorMid, "󰋼", "INFO"}
)

s.writeTitle(s.x+3, s.y+1, &cpuTitle)
Expand Down
2 changes: 1 addition & 1 deletion internal/self/commit.dat
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
70ab6aa
f4b3ce2

0 comments on commit f30b939

Please sign in to comment.