diff --git a/.gitignore b/.gitignore index 2664ab5..5369217 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea .vscode /darktile +/erm *.swp diff --git a/.goreleaser.yml b/.goreleaser.yml deleted file mode 100644 index c69d8ff..0000000 --- a/.goreleaser.yml +++ /dev/null @@ -1,41 +0,0 @@ -before: - hooks: - - sudo apt install xorg-dev libgl1-mesa-dev - - go mod vendor -builds: - - - id: darktile - main: ./cmd/darktile - binary: darktile - ldflags: - - "-X github.com/liamg/darktile/internal/app/darktile/version.Version={{.Version}}" - env: - - GOFLAGS=-mod=vendor - goos: - - linux - goarch: - - amd64 - -checksum: - name_template: '{{ .ProjectName }}_checksums.txt' - -snapshot: - name_template: "{{ .Tag }}-next" - -changelog: - sort: asc - filters: - exclude: - - '^docs:' - - '^test:' - -archives: - - - format: binary - name_template: "{{ .Binary}}-{{ .Os }}-{{ .Arch }}" - -release: - prerelease: auto - github: - owner: liamg - name: darktile diff --git a/Makefile b/Makefile index 4c58c69..78b4882 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ -darktile: cmd/**/* internal/**/* - go build -o darktile ./cmd/darktile +erm: cmd/**/* app/**/* + go build -o erm ./cmd/erm clean: rm darktile diff --git a/README.md b/README.md index 2273106..21b1b9b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,12 @@ +# erm + +a fork of Darktile + +https://github.com/liamg/darktile + # Darktile -Darktile is a GPU rendered terminal emulator designed for tiling window managers. +Darktile is a GPU rendered terminal emulator designed for tiling window managers. ![Demo](demo.gif) @@ -39,7 +45,7 @@ curl -s "https://raw.githubusercontent.com/liamg/darktile/main/scripts/install.s ## Configuration -Configuration files should be created in `$XDG_CONFIG_HOME/darktile/` if the variable is defined, otherwise in `$HOME/.config/darktile/`. +Configuration files should be created in `$XDG_CONFIG_HOME/darktile/` if the variable is defined, otherwise in `$HOME/.config/darktile/`. If you wish, you can create an example config file as a starting point using `darktile --rewrite-config`. diff --git a/app/darktile/config/theme.go b/app/darktile/config/theme.go index 367f4f2..c31078f 100644 --- a/app/darktile/config/theme.go +++ b/app/darktile/config/theme.go @@ -5,6 +5,8 @@ import ( "io/ioutil" "os" "path" + + "sigs.k8s.io/yaml" ) type Theme struct { diff --git a/app/darktile/gui/draw.go b/app/darktile/gui/draw.go index 515881e..c124ee3 100644 --- a/app/darktile/gui/draw.go +++ b/app/darktile/gui/draw.go @@ -1,6 +1,7 @@ package gui import ( + "github.com/hajimehoshi/ebiten/v2" "tuxpa.in/t/erm/app/darktile/gui/render" ) diff --git a/app/darktile/gui/gui.go b/app/darktile/gui/gui.go index 6b2d9e8..15afaa5 100644 --- a/app/darktile/gui/gui.go +++ b/app/darktile/gui/gui.go @@ -7,6 +7,8 @@ import ( "os" "strings" "time" + + "github.com/hajimehoshi/ebiten/v2" "tuxpa.in/t/erm/app/darktile/font" "tuxpa.in/t/erm/app/darktile/gui/popup" "tuxpa.in/t/erm/app/darktile/hinters" diff --git a/app/darktile/gui/input.go b/app/darktile/gui/input.go index 9d7a1dc..a974a88 100644 --- a/app/darktile/gui/input.go +++ b/app/darktile/gui/input.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/d-tsuji/clipboard" + "github.com/hajimehoshi/ebiten/v2" ) var modifiableKeys = map[ebiten.Key]uint8{ diff --git a/app/darktile/gui/key_states.go b/app/darktile/gui/key_states.go index ec57c2b..6ea4163 100644 --- a/app/darktile/gui/key_states.go +++ b/app/darktile/gui/key_states.go @@ -3,6 +3,8 @@ package gui import ( "sync" "time" + + "github.com/hajimehoshi/ebiten/v2" ) var ( diff --git a/app/darktile/gui/manipulator.go b/app/darktile/gui/manipulator.go index 2ab4c05..1da8980 100644 --- a/app/darktile/gui/manipulator.go +++ b/app/darktile/gui/manipulator.go @@ -1,6 +1,7 @@ package gui import ( + "github.com/hajimehoshi/ebiten/v2" "tuxpa.in/t/erm/app/darktile/termutil" ) diff --git a/app/darktile/gui/mouse.go b/app/darktile/gui/mouse.go index c37e013..e247488 100644 --- a/app/darktile/gui/mouse.go +++ b/app/darktile/gui/mouse.go @@ -3,6 +3,8 @@ package gui import ( "fmt" "time" + + "github.com/hajimehoshi/ebiten/v2" "tuxpa.in/t/erm/app/darktile/hinters" termutil2 "tuxpa.in/t/erm/app/darktile/termutil" ) diff --git a/app/darktile/gui/options.go b/app/darktile/gui/options.go index 4bacb5c..2f26f93 100644 --- a/app/darktile/gui/options.go +++ b/app/darktile/gui/options.go @@ -2,6 +2,8 @@ package gui import ( "image" + + "github.com/hajimehoshi/ebiten/v2" ) type Option func(g *GUI) error diff --git a/app/darktile/gui/render/annotation.go b/app/darktile/gui/render/annotation.go index 0657d06..2a461b8 100644 --- a/app/darktile/gui/render/annotation.go +++ b/app/darktile/gui/render/annotation.go @@ -3,6 +3,7 @@ package render import ( "image/color" + "github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2/ebitenutil" "github.com/hajimehoshi/ebiten/v2/text" ) diff --git a/app/darktile/gui/render/cursor.go b/app/darktile/gui/render/cursor.go index 4328222..aef0ff6 100644 --- a/app/darktile/gui/render/cursor.go +++ b/app/darktile/gui/render/cursor.go @@ -1,6 +1,7 @@ package render import ( + "github.com/hajimehoshi/ebiten/v2" "github.com/hajimehoshi/ebiten/v2/ebitenutil" "github.com/hajimehoshi/ebiten/v2/text" "tuxpa.in/t/erm/app/darktile/termutil" diff --git a/app/darktile/gui/render/render.go b/app/darktile/gui/render/render.go index 2037416..7d5534f 100644 --- a/app/darktile/gui/render/render.go +++ b/app/darktile/gui/render/render.go @@ -2,6 +2,8 @@ package render import ( "image" + + "github.com/hajimehoshi/ebiten/v2" "tuxpa.in/t/erm/app/darktile/font" "tuxpa.in/t/erm/app/darktile/gui/popup" termutil2 "tuxpa.in/t/erm/app/darktile/termutil" diff --git a/app/darktile/gui/render/sixels.go b/app/darktile/gui/render/sixels.go index 763cb4e..18c75d5 100644 --- a/app/darktile/gui/render/sixels.go +++ b/app/darktile/gui/render/sixels.go @@ -1,5 +1,7 @@ package render +import "github.com/hajimehoshi/ebiten/v2" + func (r *Render) drawSixels() { for _, sixel := range r.buffer.GetVisibleSixels() { op := &ebiten.DrawImageOptions{} diff --git a/app/darktile/gui/update.go b/app/darktile/gui/update.go index 79a73fe..8dabec8 100644 --- a/app/darktile/gui/update.go +++ b/app/darktile/gui/update.go @@ -2,6 +2,8 @@ package gui import ( "time" + + "github.com/hajimehoshi/ebiten/v2" "tuxpa.in/t/erm/app/darktile/gui/popup" ) diff --git a/app/darktile/termutil/sixel.go b/app/darktile/termutil/sixel.go index 5b23567..93dc012 100644 --- a/app/darktile/termutil/sixel.go +++ b/app/darktile/termutil/sixel.go @@ -4,6 +4,7 @@ import ( "image" "math" "strings" + "tuxpa.in/t/erm/app/darktile/sixel" ) diff --git a/cmd/darktile/main.go b/cmd/erm/main.go similarity index 100% rename from cmd/darktile/main.go rename to cmd/erm/main.go diff --git a/cursor.gif b/cursor.gif deleted file mode 100644 index ec66f63..0000000 Binary files a/cursor.gif and /dev/null differ diff --git a/demo.gif b/demo.gif deleted file mode 100644 index ca44c5f..0000000 Binary files a/demo.gif and /dev/null differ