From fd6c05145ac8dcde071e981ee9fefa4ddcf31969 Mon Sep 17 00:00:00 2001 From: Kosta Date: Sun, 26 Jan 2025 17:40:04 +0100 Subject: [PATCH] feat: new work config --- Brewfile | 62 +++++++------------ Brewfile.pers-plain | 21 +++++++ Brewfile.work | 5 ++ create_dot_zshenv | 3 + defaults.yaml | 7 +++ dot_zshrc.tmpl | 2 +- encrypted_dot_zshenv.asc | 22 ------- private_dot_gnupg/private_common.conf.tmpl | 3 - ...ce_after_apps-configuration-darwin.sh.tmpl | 1 - ...nce_before_install-packages-darwin.sh.tmpl | 5 ++ 10 files changed, 63 insertions(+), 68 deletions(-) create mode 100644 Brewfile.pers-plain create mode 100644 Brewfile.work create mode 100644 create_dot_zshenv delete mode 100644 encrypted_dot_zshenv.asc delete mode 100644 private_dot_gnupg/private_common.conf.tmpl diff --git a/Brewfile b/Brewfile index 3db94e7..8c2c0b4 100644 --- a/Brewfile +++ b/Brewfile @@ -1,8 +1,11 @@ tap "homebrew/bundle" -tap "homebrew/cask-fonts" -tap "homebrew/cask-versions" tap "homebrew/services" tap "senz/homebrew-tap" +tap "nikitabobko/tap" +tap "zero-sh/tap" +tap "koekeishiya/formulae" + +# This file contains common part shared between setup profiles # Clone of cat(1) with syntax highlighting and Git integration brew "bat" @@ -12,8 +15,6 @@ brew "bat-extras" brew "chezmoi" # Tool for exploring each layer in a docker image brew "dive" -# Lightweight DNS forwarder and DHCP server -brew "dnsmasq", restart_service: true # Simple, fast and user-friendly alternative to find brew "fd" # Command-line fuzzy finder written in Go @@ -23,7 +24,6 @@ brew "git" # Git extension for versioning large files brew "git-lfs" # Lightweight and flexible command-line JSON processor -brew "jq" brew "yq" brew "pre-commit" # Kubernetes CLI To Manage Your Clusters In Style! @@ -42,8 +42,6 @@ brew "pipx" brew "poetry" # Python version management brew "pyenv" -# Unofficial Bitwarden CLI client -brew "rbw" # Search tool like grep and The Silver Searcher brew "ripgrep" # Wrapper around ripgrep that adds multiple rich file types @@ -54,26 +52,10 @@ brew "topgrade" brew "unar" # Internet file retriever brew "wget" -# GPU-accelerated terminal emulator -cask "alacritty" -# Automatic tiling window manager similar to xmonad -cask "amethyst" -# Tool to flash OS images to SD cards & USB drives -cask "balenaetcher" # Web browser focusing on privacy cask "brave-browser" -# E-books management software -cask "calibre" # Free and open-source web browser cask "chromium" -# Photography workflow application and raw developer -cask "darktable" -# App to build and share containerised applications and microservices -cask "docker" -# Elgato FACECAM configuration tool -cask "elgato-camera-hub" -# Assign keys, and then decorate and label them -cask "elgato-stream-deck" # Free monospaced font with programming ligatures cask "font-fira-code" cask "font-noto-emoji" @@ -85,8 +67,6 @@ cask "git-credential-manager" cask "gpg-suite" # Graphically shows disk usage within a file system cask "grandperspective" -# Preview and audit Kindle eBooks -cask "kindle-previewer" # Free and open-source painting and sketching program cask "krita" # Tool to control external monitor brightness & volume @@ -97,29 +77,29 @@ cask "mutedeck" cask "obs" # Android file transfer cask "openmtp" -# System monitor for the menu bar -cask "stats" -# Media player based on MPlayer and mplayer2 -cask "stolendata-mpv" # Real time file synchronisation software cask "syncthing" # Unpacks archive files cask "the-unarchiver" -# Open-source BitTorrent client -cask "transmission" # Virtual machines UI using QEMU cask "utm" -# OpenVPN client with AppleScript support -cask "viscosity" # Open-source code editor cask "visual-studio-code" # Multimedia player cask "vlc" -# Resources for Wacom tablets -cask "wacom-tablet" -# Compatibility layer to run Windows applications -cask "wine-devel" -# Discord and SpaceBar client implemented without Discord API -cask "webcord" - -mas "Brother P-touch Editor", id: 1453365242 +# lets you hide menu bar items to give your Mac a cleaner look +cask "hiddenbar" +# Obsidian is a powerful knowledge base that works on top of a local folder of plain text Markdown files +cask "obsidian" +# yabai is a window management utility that is designed to work as an extension to the built-in window manager of macOS +brew "yabai" +# python-argcomplete provides easy, extensible command line tab completion of arguments for your Python script +brew "python-argcomplete" +# Container runtimes on macOS (and Linux) with minimal setup +brew "colima" +# lazydocker is a simple terminal UI for both docker and docker-compose +brew "lazydocker" +# bitwarden is the easiest and safest way to store all of your logins and passwords while conveniently keeping them synced between all of your devices. +cask "bitwarden" +# apply-user-defaults is a tool to apply mac user defaults from a file +brew "apply-user-defaults" diff --git a/Brewfile.pers-plain b/Brewfile.pers-plain new file mode 100644 index 0000000..752fc54 --- /dev/null +++ b/Brewfile.pers-plain @@ -0,0 +1,21 @@ +# Unofficial Bitwarden CLI client +brew "rbw" +# Tool to flash OS images to SD cards & USB drives +cask "balenaetcher" +# OpenVPN client with AppleScript support +cask "viscosity" +# Open-source BitTorrent client +cask "transmission" +# Discord and SpaceBar client implemented without Discord API +cask "legcord" +# Preview and audit Kindle eBooks +cask "kindle-previewer" +# Elgato prompter configuration tool +cask "elgato-camera-hub" +# Photography workflow application and raw developer +cask "darktable" +# E-books management software +cask "calibre" + +# Brother P-touch Editor +mas "Brother P-touch Editor", id: 1453365242 diff --git a/Brewfile.work b/Brewfile.work new file mode 100644 index 0000000..8dcc077 --- /dev/null +++ b/Brewfile.work @@ -0,0 +1,5 @@ +# Work (SQ) +cask "keepassxc" +cask "lens" +cask "google-cloud-sdk" +cask "karabiner-elements" diff --git a/create_dot_zshenv b/create_dot_zshenv new file mode 100644 index 0000000..44fa590 --- /dev/null +++ b/create_dot_zshenv @@ -0,0 +1,3 @@ +#export OPENAI_API_KEY="" +#export ANTHROPIC_API_KEY="" +#export GITHUB_TOKEN="" diff --git a/defaults.yaml b/defaults.yaml index 981457b..ff55236 100644 --- a/defaults.yaml +++ b/defaults.yaml @@ -20,6 +20,13 @@ NSGlobalDomain: NSAutomaticPeriodSubstitutionEnabled: false WebAutomaticSpellingCorrectionEnabled: false + # Now, you can move windows by holding ctrl+cmd and dragging any part of the window (not necessarily the window title) + NSWindowShouldDragOnGesture: true + + # Set the initial key repeat delay + InitialKeyRepeat: 15 + KeyRepeat: 2 + com.apple.desktopservices: # Disable .DS_Store files on network drives. DSDontWriteNetworkStores: true diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl index ce71832..5272a57 100644 --- a/dot_zshrc.tmpl +++ b/dot_zshrc.tmpl @@ -117,7 +117,7 @@ setopt HIST_IGNORE_SPACE # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" -{{ if (eq .chezmoi.osRelease.variantID "kinoite") -}} +{{ if (and (index .chezmoi.osRelease "variantID") (eq .chezmoi.osRelease.variantID "kinoite")) -}} alias zhistory_paste='echo : `expr $(date +%s) + 1`:0\;`printf "$(wl-paste -pn)\n"` >> ~/.zsh_history && fc -R' {{ end -}} diff --git a/encrypted_dot_zshenv.asc b/encrypted_dot_zshenv.asc deleted file mode 100644 index b2d3cfb..0000000 --- a/encrypted_dot_zshenv.asc +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN PGP MESSAGE----- - -hQGMAyppQEk05odWAQwA6cYM+aNRKBhKfOkkpPG+d6t6DSyUoppElTK0bgIbcanD -iTcmn0gcDkPypbFJRysJgEzcxqlmstrS6utLvDdzGNvEyG6aSPVbCQmJDODQNDW2 -+9tXGIA/l2nDCYnCk9xbTUUTDVETRzmzqAknIn8ul19Bw9hW0/4mRtCffMgCVo1k -90wEuz1CqSDdkZB2TbU/4GCRw2OWHIKDeCWqDDslNrAe6RW18YjGgbsvyEhWHnC4 -LuVK6HmPizt3zVIXtyNSsCy5aMIH4+/3b4E64RbvGssfDtDHwfcO7ETy3hGOlLXz -LNcpBIhF6E73D00kC+5KLuAeqy2367jbs9TXM/+g7xU7kSJiLC3QEaof/QYV9/68 -5TMdDAQgHyCzHDMVpaKZymrNG/OgMXC0QlC380g7g47f9d4PhKoQ8pr5rgJ474Yy -/4acdCwYY71AWHMAJ8+HN1zJuD8pk3BUpQaMnRZBQ9UXzvEwMdRtZPmwWC7SFNkl -VtWeSdtbK4RRBU/j6JOMhF4DFCSz6Dy/Uq0SAQdA04RtH/RoFG+sPva9h+962ipn -Rsh3DwTA6ochOX91a3gwWkHpgHiUi6Je3yqRgNPH1TxFW1O/6xzbpAoY+/xL6RFO -Kv6WUvzEmA4Cc5YhpOm50sCFAbjY8NxV3ZNksm4vWxB9nP4pr9x5eSDmvaHv7Ebk -fA47hcxgWKbkweySftKAUNAtLeHEMVDbFABSZCz5vNWhnnePlkeUcDAXVOlR0Rdy -v0HY+b+WuBh1yZKgTv51itjclrX+l3hOKsh2i3YuloJwrRJw7fEEg/cujDAv6Rr2 -tl5kPOisTGM15gWxa6vrUzMEk83H7V1UGArXImpXMAXlTO0OgpU4yKEqoTQ/d+KH -HcNmM9kkeEbLpIARB9nk/EIgOj8fGkmHsaRVFICBCrIbvK1jEAO7cNAVaIKWzp8b -z/IMo+/RvQQ7HXf0TtEgZtgNrOHg/+DIZs+ubstzCLDO8DPUd/XBFmKz2cfjsJk2 -wXnk7qv3SAq4Ivdyp/QEtgYK0OTZdvDoIDmTEy5pjvYcG/tQDi7vhwGjgichzxo7 -s83iEseIjw== -=nx6h ------END PGP MESSAGE----- diff --git a/private_dot_gnupg/private_common.conf.tmpl b/private_dot_gnupg/private_common.conf.tmpl deleted file mode 100644 index 083ce36..0000000 --- a/private_dot_gnupg/private_common.conf.tmpl +++ /dev/null @@ -1,3 +0,0 @@ -{{ if (eq .chezmoi.os "darwin") -}} -use_keyboxd -{{ end -}} diff --git a/run_once_after_apps-configuration-darwin.sh.tmpl b/run_once_after_apps-configuration-darwin.sh.tmpl index 4cbc850..ea83db2 100644 --- a/run_once_after_apps-configuration-darwin.sh.tmpl +++ b/run_once_after_apps-configuration-darwin.sh.tmpl @@ -8,7 +8,6 @@ killall Docker defaults write com.docker.docker SUAutomaticallyUpdate -bool false defaults write com.docker.docker SUEnableAutomaticChecks -bool false -open -a Docker # --------------------------------------------------------------------------------------------------------------------- # GPG settings diff --git a/run_once_before_install-packages-darwin.sh.tmpl b/run_once_before_install-packages-darwin.sh.tmpl index 63db171..1f4befc 100644 --- a/run_once_before_install-packages-darwin.sh.tmpl +++ b/run_once_before_install-packages-darwin.sh.tmpl @@ -20,7 +20,12 @@ export HOMEBREW_CASK_OPTS=--no-quarantine # rendering directly in template, so chezmoi could detect a change of content brew bundle install -v --no-lock --file=/dev/stdin <