From 1fa3dea1b9e59665d028c28262b6f3cbeda9488b Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Fri, 27 Dec 2024 19:07:22 +0100 Subject: [PATCH] fix: add missing packages --- config.toml | 93 ++++++++++++++++++++++------------------------ dotfiles.go | 1 + model.go | 1 + specialSoftware.go | 4 +- 4 files changed, 50 insertions(+), 49 deletions(-) diff --git a/config.toml b/config.toml index c20fe14..1fe67ba 100644 --- a/config.toml +++ b/config.toml @@ -32,65 +32,61 @@ headless = [ "pipx", "golang", "rustup", + "latexmk", + "luarocks", + "cliphist", + "neovim", ] non_headless = [ - "discord", - "flameshot", - "fuzzel", - "google-chrome", - "hyprcursor", - "hypridle", - "hyprland", - "hyprland-qtutils", - "hyprlock", - "hyprpaper", - "hyprutils", - "kitty", - "mako", - "mpv", - "neovide", - "pidgin", - "remmina", - "spotify", - "thunderbird", - "thunderbird-i18n-de", - "virt-manager", - "vlc", - "waybar", - "xdg-desktop-portal-hyprland", - "zathura", - "zathura-mu-pdf", - "zoom", - "zotero", - "android-studio" + "discord", + "flameshot", + "fuzzel", + "google-chrome", + "hyprcursor", + "hypridle", + "hyprland", + "hyprland-qtutils", + "hyprlock", + "hyprpaper", + "hyprutils", + "kitty", + "mako", + "mpv", + "neovide", + "pidgin", + "remmina", + "spotify", + "thunderbird", + "thunderbird-i18n-de", + "virt-manager", + "vlc", + "waybar", + "xdg-desktop-portal-hyprland", + "zathura", + "zathura-pdf-mupdf", + "zoom", + "zotero", + "android-studio", ] [special_packages] go = [ - "github.com/jesseduffield/lazygit", - "github.com/stefanlogue/meteor", - "golang.org/x/tools/gopls", - "github.com/go-delve/delve/cmd/dlv", - "github.com/air-verse/air" + "github.com/jesseduffield/lazygit", + "github.com/stefanlogue/meteor", + "golang.org/x/tools/gopls", + "github.com/go-delve/delve/cmd/dlv", + "github.com/air-verse/air", ] -cargo = [ - "git-cliff", - "bottom", - "typst-cli", -] +cargo = ["git-cliff", "bottom", "typst-cli"] -pipx = [ - # "harlequin", - # "posting", - # "euporie", -] +pipx = ["harlequin", "posting", "euporie"] [flatpak] -enable = false +enable = true remotes = [ - { name = "flathub", url = "https://flathub.org/repo/flathub.flatpakrepo" } + { name = "flathub", url = "https://flathub.org/repo/flathub.flatpakrepo" }, ] packages = [ "com.spotify.Client", @@ -99,8 +95,9 @@ packages = [ "com.google.AndroidStudio", "io.freetubeapp.FreeTube", "com.discordapp.Discord", + "com.nextcloud.desktopclient.nextcloud", ] [dotfiles] -enable = false -git_repo = "https://github.com/username/dotfiles.git" +enable = true +git_repo = "https://codeberg.org/Pata1704/dotfiles.git" diff --git a/dotfiles.go b/dotfiles.go index e493afc..8341057 100644 --- a/dotfiles.go +++ b/dotfiles.go @@ -25,6 +25,7 @@ func setupDotfiles(config DotfilesConfig) error { dotfilesDir := filepath.Join(os.Getenv("HOME"), "dotfiles") cmd := exec.Command("git", "clone", config.GitRepo) + // cmd := exec.Command("git", "clone", config.GitRepo, dotfilesDir) if err := cmd.Run(); err != nil { return fmt.Errorf("Fehler beim Klonen der Dotfiles: %v", err) } diff --git a/model.go b/model.go index 532537f..3b73847 100644 --- a/model.go +++ b/model.go @@ -90,6 +90,7 @@ func (m model) Init() tea.Cmd { } func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { + tea.EnterAltScreen() switch msg := msg.(type) { case tea.WindowSizeMsg: m.width, m.height = msg.Width, msg.Height diff --git a/specialSoftware.go b/specialSoftware.go index 4c1c7f3..fa35696 100644 --- a/specialSoftware.go +++ b/specialSoftware.go @@ -110,7 +110,9 @@ func (m specialSoftwareModel) installItemCmd(item string) tea.Cmd { } case "rust": if _, err := exec.LookPath("rustc"); err == nil { - return installedItemMsg(item) + if _, err := exec.LookPath("cargo"); err == nil { + return installedItemMsg(item) + } } rustupCommand := "curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -q -y" if err := installPackage(rustupCommand, "", ""); err != nil {