diff --git a/etc/httpd/extra/httpd-manual.conf.default b/etc/httpd/extra/httpd-manual.conf.default index 3e261224..a65cd490 100644 --- a/etc/httpd/extra/httpd-manual.conf.default +++ b/etc/httpd/extra/httpd-manual.conf.default @@ -8,9 +8,9 @@ # mod_setenvif, mod_negotiation # -AliasMatch ^/manual(?:/(?:da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn))?(/.*)?$ "/opt/homebrew/Cellar/httpd/2.4.58/share/httpd/manual$1" +AliasMatch ^/manual(?:/(?:da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn))?(/.*)?$ "/opt/homebrew/Cellar/httpd/2.4.59/share/httpd/manual$1" - + Options Indexes AllowOverride None Require all granted diff --git a/etc/httpd/mime.types.default b/etc/httpd/mime.types.default index 2957b67d..1b92ee1c 100644 --- a/etc/httpd/mime.types.default +++ b/etc/httpd/mime.types.default @@ -1,6 +1,6 @@ # This file maps Internet media types to unique file extension(s). # Although created for httpd, this file is used by many software systems -# and has been placed in the public domain for unlimited redisribution. +# and has been placed in the public domain for unlimited redistribution. # # The table below contains both registered and (common) unregistered types. # A type that has no unique extension can be ignored -- they are listed diff --git a/etc/httpd/original/extra/httpd-manual.conf.default b/etc/httpd/original/extra/httpd-manual.conf.default index 3e261224..a65cd490 100644 --- a/etc/httpd/original/extra/httpd-manual.conf.default +++ b/etc/httpd/original/extra/httpd-manual.conf.default @@ -8,9 +8,9 @@ # mod_setenvif, mod_negotiation # -AliasMatch ^/manual(?:/(?:da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn))?(/.*)?$ "/opt/homebrew/Cellar/httpd/2.4.58/share/httpd/manual$1" +AliasMatch ^/manual(?:/(?:da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn))?(/.*)?$ "/opt/homebrew/Cellar/httpd/2.4.59/share/httpd/manual$1" - + Options Indexes AllowOverride None Require all granted diff --git a/etc/php/8.3/pear.conf.default b/etc/php/8.3/pear.conf.default index 983f2a14..5dc8e311 100644 --- a/etc/php/8.3/pear.conf.default +++ b/etc/php/8.3/pear.conf.default @@ -1,2 +1,2 @@ #PEAR_Config 0.9 -a:33:{s:9:"cache_dir";s:23:"/private/tmp/pear/cache";s:15:"default_channel";s:12:"pear.php.net";s:16:"preferred_mirror";s:12:"pear.php.net";s:13:"remote_config";s:0:"";s:13:"auto_discover";i:0;s:13:"master_server";s:12:"pear.php.net";s:10:"http_proxy";s:0:"";s:7:"php_dir";s:45:"/opt/homebrew/Cellar/php/8.3.2/share/php/pear";s:7:"ext_dir";s:47:"/opt/homebrew/Cellar/php/8.3.2/lib/php/20230831";s:7:"doc_dir";s:49:"/opt/homebrew/Cellar/php/8.3.2/share/php/pear/doc";s:7:"bin_dir";s:34:"/opt/homebrew/Cellar/php/8.3.2/bin";s:8:"data_dir";s:50:"/opt/homebrew/Cellar/php/8.3.2/share/php/pear/data";s:7:"cfg_dir";s:49:"/opt/homebrew/Cellar/php/8.3.2/share/php/pear/cfg";s:7:"www_dir";s:52:"/opt/homebrew/Cellar/php/8.3.2/share/php/pear/htdocs";s:7:"man_dir";s:55:"/opt/homebrew/Cellar/php/8.3.2/share/php/pear/local/man";s:8:"test_dir";s:50:"/opt/homebrew/Cellar/php/8.3.2/share/php/pear/test";s:8:"temp_dir";s:22:"/private/tmp/pear/temp";s:12:"download_dir";s:26:"/private/tmp/pear/download";s:7:"php_bin";s:38:"/opt/homebrew/Cellar/php/8.3.2/bin/php";s:10:"php_prefix";s:0:"";s:10:"php_suffix";s:0:"";s:7:"php_ini";s:0:"";s:12:"metadata_dir";s:0:"";s:8:"username";s:0:"";s:8:"password";s:0:"";s:7:"verbose";i:1;s:15:"preferred_state";s:6:"stable";s:5:"umask";i:18;s:9:"cache_ttl";i:3600;s:8:"sig_type";s:3:"gpg";s:7:"sig_bin";s:18:"/usr/local/bin/gpg";s:9:"sig_keyid";s:0:"";s:10:"sig_keydir";s:34:"/opt/homebrew/etc/php/8.3/pearkeys";} \ No newline at end of file +a:33:{s:9:"cache_dir";s:23:"/private/tmp/pear/cache";s:15:"default_channel";s:12:"pear.php.net";s:16:"preferred_mirror";s:12:"pear.php.net";s:13:"remote_config";s:0:"";s:13:"auto_discover";i:0;s:13:"master_server";s:12:"pear.php.net";s:10:"http_proxy";s:0:"";s:7:"php_dir";s:45:"/opt/homebrew/Cellar/php/8.3.4/share/php/pear";s:7:"ext_dir";s:47:"/opt/homebrew/Cellar/php/8.3.4/lib/php/20230831";s:7:"doc_dir";s:49:"/opt/homebrew/Cellar/php/8.3.4/share/php/pear/doc";s:7:"bin_dir";s:34:"/opt/homebrew/Cellar/php/8.3.4/bin";s:8:"data_dir";s:50:"/opt/homebrew/Cellar/php/8.3.4/share/php/pear/data";s:7:"cfg_dir";s:49:"/opt/homebrew/Cellar/php/8.3.4/share/php/pear/cfg";s:7:"www_dir";s:52:"/opt/homebrew/Cellar/php/8.3.4/share/php/pear/htdocs";s:7:"man_dir";s:55:"/opt/homebrew/Cellar/php/8.3.4/share/php/pear/local/man";s:8:"test_dir";s:50:"/opt/homebrew/Cellar/php/8.3.4/share/php/pear/test";s:8:"temp_dir";s:22:"/private/tmp/pear/temp";s:12:"download_dir";s:26:"/private/tmp/pear/download";s:7:"php_bin";s:38:"/opt/homebrew/Cellar/php/8.3.4/bin/php";s:10:"php_prefix";s:0:"";s:10:"php_suffix";s:0:"";s:7:"php_ini";s:0:"";s:12:"metadata_dir";s:0:"";s:8:"username";s:0:"";s:8:"password";s:0:"";s:7:"verbose";i:1;s:15:"preferred_state";s:6:"stable";s:5:"umask";i:18;s:9:"cache_ttl";i:3600;s:8:"sig_type";s:3:"gpg";s:7:"sig_bin";s:18:"/usr/local/bin/gpg";s:9:"sig_keyid";s:0:"";s:10:"sig_keydir";s:34:"/opt/homebrew/etc/php/8.3/pearkeys";} \ No newline at end of file diff --git a/etc/php/8.3/php-fpm.conf.default b/etc/php/8.3/php-fpm.conf.default index 82e65ad1..8b0f1506 100644 --- a/etc/php/8.3/php-fpm.conf.default +++ b/etc/php/8.3/php-fpm.conf.default @@ -3,7 +3,7 @@ ;;;;;;;;;;;;;;;;;;;;; ; All relative paths in this configuration file are relative to PHP's install -; prefix (/opt/homebrew/Cellar/php/8.3.2). This prefix can be dynamically changed by using the +; prefix (/opt/homebrew/Cellar/php/8.3.4). This prefix can be dynamically changed by using the ; '-p' argument from the command line. ;;;;;;;;;;;;;;;;;; @@ -139,5 +139,5 @@ daemonize = no ; file. ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p argument) -; - /opt/homebrew/Cellar/php/8.3.2 otherwise +; - /opt/homebrew/Cellar/php/8.3.4 otherwise include=/opt/homebrew/etc/php/8.3/php-fpm.d/*.conf diff --git a/etc/php/8.3/php-fpm.d/www.conf.default b/etc/php/8.3/php-fpm.d/www.conf.default index 1a1e1d0d..6c3de20b 100644 --- a/etc/php/8.3/php-fpm.d/www.conf.default +++ b/etc/php/8.3/php-fpm.d/www.conf.default @@ -12,7 +12,7 @@ ; - 'chdir' ; - 'php_values' ; - 'php_admin_values' -; When not set, the global prefix (or /opt/homebrew/Cellar/php/8.3.2) applies instead. +; When not set, the global prefix (or /opt/homebrew/Cellar/php/8.3.4) applies instead. ; Note: This directive can also be relative to the global prefix. ; Default Value: none ;prefix = /path/to/pools/$pool @@ -249,7 +249,7 @@ pm.max_spare_servers = 3 ; last request memory: 0 ; ; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /opt/homebrew/Cellar/php/8.3.2/share/php/fpm/status.html +; It's available in: /opt/homebrew/Cellar/php/8.3.4/share/php/fpm/status.html ; ; Note: The value must start with a leading slash (/). The value can be ; anything, but it may not be a good idea to use the .php extension or it @@ -479,7 +479,7 @@ pm.max_spare_servers = 3 ; instead. ; Note: path INI options can be relative and will be expanded with the prefix -; (pool, global or /opt/homebrew/Cellar/php/8.3.2) +; (pool, global or /opt/homebrew/Cellar/php/8.3.4) ; Default Value: nothing is defined by default except the values in php.ini and ; specified at startup with the -d argument diff --git a/gitconfig b/gitconfig index a0c3979b..db91ca38 100644 --- a/gitconfig +++ b/gitconfig @@ -85,3 +85,5 @@ syntax-theme = gruvbox-dark width = "-4" +[init] + defaultBranch = main diff --git a/hammerspoon/init.lua b/hammerspoon/init.lua index cc9f93c4..50e4033a 100644 --- a/hammerspoon/init.lua +++ b/hammerspoon/init.lua @@ -71,7 +71,6 @@ local appsToLaunch = { "Messages", "Microsoft Teams (work or school)", "Signal", - "Streaks", "Strongbox", "WezTerm", } diff --git a/install/1_languages.sh b/install/1_languages.sh index dfc32aa9..49915437 100755 --- a/install/1_languages.sh +++ b/install/1_languages.sh @@ -2,14 +2,15 @@ # ruby brew install rbenv # restart terminal, then: -rbenv install 3.2.3 -rbenv global 3.2.3 +rbenv install 3.3.0 +rbenv global 3.3.0 # node curl -L https://git.io/n-install | bash n v8 n v14 n v16 +n v18 n lts npm install -g npm@latest npm update -g @@ -18,6 +19,7 @@ npm update -g # first: find out the current python3 version in homebrew # then install this version with pyenv and link it brew install pyenv # restart terminal, then: -pyenv install 3.12.1 -pyenv global 3.12.1 +pyenv install 3.12.2 +pyenv global 3.12.2 pip install --upgrade pip +pip install setuptools diff --git a/install/2_cli-tools.sh b/install/2_cli-tools.sh index c5a24f1c..f0242bde 100755 --- a/install/2_cli-tools.sh +++ b/install/2_cli-tools.sh @@ -4,21 +4,18 @@ brew tap homebrew/cask-drivers brew tap homebrew/services # install additional brew packages -- see _install.sh too -brew install bat brew install blackhole-2ch brew install fd brew install ffmpeg brew install fzf +brew install glow brew install imagemagick brew install jump brew install lazygit brew install ocrmypdf brew install ripgrep -brew install spotifyd brew install switchaudio-osx brew install topgrade -brew install tree -brew install viu ln -s ~/dotfiles/lazygit ~/.config/lazygit ln -s ~/dotfiles/starship.toml ~/.config/starship.toml diff --git a/install/6_software.sh b/install/6_software.sh index 833d07eb..a525c329 100755 --- a/install/6_software.sh +++ b/install/6_software.sh @@ -9,7 +9,6 @@ brew install --cask font-monaspace-nerd-font # default software brew install --cask affinity-designer brew install --cask affinity-photo -brew install --cask alfred brew install --cask carbon-copy-cloner brew install --cask firefox brew install --cask forklift @@ -17,18 +16,22 @@ brew install --cask google-chrome brew install --cask hammerspoon brew install --cask karabiner-elements brew install --cask microsoft-teams +brew install --cask raycast brew install --cask signal brew install --cask syntax-highlight -brew install --cask telegram +brew install --cask tidal brew install --cask vlc brew install --cask wezterm + # on demand, when needed # brew install --cask citrix-workspace # brew install --cask kap # brew install --cask rapidapi # brew install --cask reaper +# brew install --cask telegram # brew install --cask visual-studio-code +# brew install --cask whatsapp ln -s ~/dotfiles/hammerspoon ~/.hammerspoon ln -s ~/dotfiles/karabiner ~/.config/karabiner @@ -42,4 +45,4 @@ ln -s ~/dotfiles/karabiner ~/.config/karabiner # other software that can't be installed via brew: # bill: https://billtheapp.com/ -# Apps from the app-store: strongbox, xcode, unifi +# Apps from the app-store: strongbox, xcode, unifi, streaks diff --git a/nvim/init.lua b/nvim/init.lua index 01b9429e..e79bc770 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -70,8 +70,15 @@ require('lazy').setup({ { 'epwalsh/obsidian.nvim', version = '*', lazy = true, ft = 'markdown', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { dir = '~/Notes' }, }, + + -- Copilot and other AI tools { 'zbirenbaum/copilot.lua', event = 'InsertEnter', config = get_config('copilot') }, { 'zbirenbaum/copilot-cmp', config = true }, + { 'Exafunction/codeium.nvim', event = 'BufEnter', config = true, dependencies = { + 'nvim-lua/plenary.nvim', + 'hrsh7th/nvim-cmp', + }, + }, }) -- general sane vim options diff --git a/nvim/lua/plugins/cmp.lua b/nvim/lua/plugins/cmp.lua index 08b6dbda..afbaa1b3 100644 --- a/nvim/lua/plugins/cmp.lua +++ b/nvim/lua/plugins/cmp.lua @@ -11,6 +11,7 @@ cmp.setup({ }), sources = cmp.config.sources({ { name = 'copilot' }, + { name = 'codeium' }, { name = 'nvim_lsp' }, { name = 'buffer', @@ -28,6 +29,7 @@ cmp.setup({ format = function(entry, vim_item) vim_item.menu = ({ copilot = '[Copilot]', + codeium = '[Codeium]', nvim_lsp = '[LSP]', buffer = '[Buffer]', path = '[Path]', diff --git a/nvim/lua/plugins/zen-mode.lua b/nvim/lua/plugins/zen-mode.lua index fb3fe703..568bf3d4 100644 --- a/nvim/lua/plugins/zen-mode.lua +++ b/nvim/lua/plugins/zen-mode.lua @@ -3,8 +3,17 @@ require('zen-mode').setup({ backdrop = 0.95, width = 120, height = 0.85, + options = { + signcolumn = "no", -- disable signcolumn + number = false, -- disable number column + relativenumber = false, -- disable relative numbers + }, }, plugins = { gitsigns = { enabled = true }, + wezterm = { + enabled = true, + font = "+2", + }, }, }) diff --git a/other/out/index.js b/other/out/index.js index 90888cab..c5364105 100755 --- a/other/out/index.js +++ b/other/out/index.js @@ -21,9 +21,6 @@ async function changeDevice(device) { await asyncExec(`SwitchAudioSource -i ${id}`); console.log(`❯ Selected »${device}« as new audio output device`); - console.log('❯ Restarting Spotify Daemon'); - - await asyncExec('brew services restart spotifyd'); console.log('❯ Done 🤘'); } diff --git a/wezterm.lua b/wezterm.lua index a455cc05..bf73afac 100644 --- a/wezterm.lua +++ b/wezterm.lua @@ -87,7 +87,6 @@ config.leader = { key = 'a', mods = 'CTRL', timeout_milliseconds = 1000 } config.scrollback_lines = 5000 config.send_composed_key_when_left_alt_is_pressed = true config.show_new_tab_button_in_tab_bar = false -config.show_tab_index_in_tab_bar = true config.tab_bar_at_bottom = true config.use_dead_keys = false config.use_fancy_tab_bar = false @@ -187,6 +186,30 @@ wezterm.on('format-tab-title', function(tab) return string.format(' %s %s ', num, cwd) end) +-- Vim ZenMode fontsize-sync +wezterm.on('user-var-changed', function(window, pane, name, value) + local overrides = window:get_config_overrides() or {} + if name == "ZEN_MODE" then + local incremental = value:find("+") + local number_value = tonumber(value) + if incremental ~= nil then + while (number_value > 0) do + window:perform_action(wezterm.action.IncreaseFontSize, pane) + number_value = number_value - 1 + end + overrides.enable_tab_bar = false + elseif number_value < 0 then + window:perform_action(wezterm.action.ResetFontSize, pane) + overrides.font_size = nil + overrides.enable_tab_bar = true + else + overrides.font_size = number_value + overrides.enable_tab_bar = false + end + end + window:set_config_overrides(overrides) +end) + -- show workspace on the left side of tabbar wezterm.on('update-status', function(window) local workspace = mux.get_active_workspace()