2
0
mirror of https://github.com/webgefrickel/dotfiles synced 2024-11-11 07:10:40 +00:00

Compare commits

..

2 Commits

Author SHA1 Message Date
Steffen Rademacker
8a02e13f87 tidal 2024-04-10 14:40:26 +02:00
Steffen Rademacker
083aa37c38 zenmode, software and fonts 2024-04-10 11:44:43 +02:00
16 changed files with 71 additions and 27 deletions

View File

@ -8,9 +8,9 @@
# mod_setenvif, mod_negotiation # 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"
<Directory "/opt/homebrew/Cellar/httpd/2.4.58/share/httpd/manual"> <Directory "/opt/homebrew/Cellar/httpd/2.4.59/share/httpd/manual">
Options Indexes Options Indexes
AllowOverride None AllowOverride None
Require all granted Require all granted

View File

@ -1,6 +1,6 @@
# This file maps Internet media types to unique file extension(s). # This file maps Internet media types to unique file extension(s).
# Although created for httpd, this file is used by many software systems # 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. # The table below contains both registered and (common) unregistered types.
# A type that has no unique extension can be ignored -- they are listed # A type that has no unique extension can be ignored -- they are listed

View File

@ -8,9 +8,9 @@
# mod_setenvif, mod_negotiation # 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"
<Directory "/opt/homebrew/Cellar/httpd/2.4.58/share/httpd/manual"> <Directory "/opt/homebrew/Cellar/httpd/2.4.59/share/httpd/manual">
Options Indexes Options Indexes
AllowOverride None AllowOverride None
Require all granted Require all granted

View File

@ -1,2 +1,2 @@
#PEAR_Config 0.9 #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";} 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";}

View File

@ -3,7 +3,7 @@
;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;
; All relative paths in this configuration file are relative to PHP's install ; 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. ; '-p' argument from the command line.
;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;
@ -139,5 +139,5 @@ daemonize = no
; file. ; file.
; Relative path can also be used. They will be prefixed by: ; Relative path can also be used. They will be prefixed by:
; - the global prefix if it's been set (-p argument) ; - 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 include=/opt/homebrew/etc/php/8.3/php-fpm.d/*.conf

View File

@ -12,7 +12,7 @@
; - 'chdir' ; - 'chdir'
; - 'php_values' ; - 'php_values'
; - 'php_admin_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. ; Note: This directive can also be relative to the global prefix.
; Default Value: none ; Default Value: none
;prefix = /path/to/pools/$pool ;prefix = /path/to/pools/$pool
@ -249,7 +249,7 @@ pm.max_spare_servers = 3
; last request memory: 0 ; last request memory: 0
; ;
; Note: There is a real-time FPM status monitoring sample web page available ; 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 ; 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 ; 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. ; instead.
; Note: path INI options can be relative and will be expanded with the prefix ; 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 ; Default Value: nothing is defined by default except the values in php.ini and
; specified at startup with the -d argument ; specified at startup with the -d argument

View File

@ -85,3 +85,5 @@
syntax-theme = gruvbox-dark syntax-theme = gruvbox-dark
width = "-4" width = "-4"
[init]
defaultBranch = main

View File

@ -45,6 +45,7 @@ local layoutDouble = {
{ "Reminders", nil, laptopMonitor, screenPositions.full, nil, nil }, { "Reminders", nil, laptopMonitor, screenPositions.full, nil, nil },
{ "Signal", nil, mainMonitor, screenPositions.rightBottom, nil, nil }, { "Signal", nil, mainMonitor, screenPositions.rightBottom, nil, nil },
{ "Strongbox", nil, laptopMonitor, screenPositions.full, nil, nil }, { "Strongbox", nil, laptopMonitor, screenPositions.full, nil, nil },
{ "TIDAL", nil, laptopMonitor, screenPositions.full, nil, nil },
{ "Telegram", nil, mainMonitor, screenPositions.rightTop, nil, nil }, { "Telegram", nil, mainMonitor, screenPositions.rightTop, nil, nil },
{ "WezTerm", nil, mainMonitor, screenPositions.right, nil, nil }, { "WezTerm", nil, mainMonitor, screenPositions.right, nil, nil },
} }
@ -59,6 +60,7 @@ local layoutSingle = {
{ "Reminders", nil, laptopMonitor, screenPositions.full, nil, nil }, { "Reminders", nil, laptopMonitor, screenPositions.full, nil, nil },
{ "Signal", nil, laptopMonitor, screenPositions.full, nil, nil }, { "Signal", nil, laptopMonitor, screenPositions.full, nil, nil },
{ "Strongbox", nil, laptopMonitor, screenPositions.full, nil, nil }, { "Strongbox", nil, laptopMonitor, screenPositions.full, nil, nil },
{ "TIDAL", nil, laptopMonitor, screenPositions.full, nil, nil },
{ "Telegram", nil, laptopMonitor, screenPositions.full, nil, nil }, { "Telegram", nil, laptopMonitor, screenPositions.full, nil, nil },
{ "WezTerm", nil, laptopMonitor, screenPositions.full, nil, nil }, { "WezTerm", nil, laptopMonitor, screenPositions.full, nil, nil },
} }
@ -71,8 +73,8 @@ local appsToLaunch = {
"Messages", "Messages",
"Microsoft Teams (work or school)", "Microsoft Teams (work or school)",
"Signal", "Signal",
"Streaks",
"Strongbox", "Strongbox",
"TIDAL",
"WezTerm", "WezTerm",
} }

View File

@ -2,14 +2,15 @@
# ruby # ruby
brew install rbenv # restart terminal, then: brew install rbenv # restart terminal, then:
rbenv install 3.2.3 rbenv install 3.3.0
rbenv global 3.2.3 rbenv global 3.3.0
# node # node
curl -L https://git.io/n-install | bash curl -L https://git.io/n-install | bash
n v8 n v8
n v14 n v14
n v16 n v16
n v18
n lts n lts
npm install -g npm@latest npm install -g npm@latest
npm update -g npm update -g
@ -18,6 +19,7 @@ npm update -g
# first: find out the current python3 version in homebrew # first: find out the current python3 version in homebrew
# then install this version with pyenv and link it # then install this version with pyenv and link it
brew install pyenv # restart terminal, then: brew install pyenv # restart terminal, then:
pyenv install 3.12.1 pyenv install 3.12.2
pyenv global 3.12.1 pyenv global 3.12.2
pip install --upgrade pip pip install --upgrade pip
pip install setuptools

View File

@ -4,21 +4,18 @@ brew tap homebrew/cask-drivers
brew tap homebrew/services brew tap homebrew/services
# install additional brew packages -- see _install.sh too # install additional brew packages -- see _install.sh too
brew install bat
brew install blackhole-2ch brew install blackhole-2ch
brew install fd brew install fd
brew install ffmpeg brew install ffmpeg
brew install fzf brew install fzf
brew install glow
brew install imagemagick brew install imagemagick
brew install jump brew install jump
brew install lazygit brew install lazygit
brew install ocrmypdf brew install ocrmypdf
brew install ripgrep brew install ripgrep
brew install spotifyd
brew install switchaudio-osx brew install switchaudio-osx
brew install topgrade brew install topgrade
brew install tree
brew install viu
ln -s ~/dotfiles/lazygit ~/.config/lazygit ln -s ~/dotfiles/lazygit ~/.config/lazygit
ln -s ~/dotfiles/starship.toml ~/.config/starship.toml ln -s ~/dotfiles/starship.toml ~/.config/starship.toml

View File

@ -9,7 +9,6 @@ brew install --cask font-monaspace-nerd-font
# default software # default software
brew install --cask affinity-designer brew install --cask affinity-designer
brew install --cask affinity-photo brew install --cask affinity-photo
brew install --cask alfred
brew install --cask carbon-copy-cloner brew install --cask carbon-copy-cloner
brew install --cask firefox brew install --cask firefox
brew install --cask forklift brew install --cask forklift
@ -17,18 +16,22 @@ brew install --cask google-chrome
brew install --cask hammerspoon brew install --cask hammerspoon
brew install --cask karabiner-elements brew install --cask karabiner-elements
brew install --cask microsoft-teams brew install --cask microsoft-teams
brew install --cask raycast
brew install --cask signal brew install --cask signal
brew install --cask syntax-highlight brew install --cask syntax-highlight
brew install --cask telegram brew install --cask tidal
brew install --cask vlc brew install --cask vlc
brew install --cask wezterm brew install --cask wezterm
# on demand, when needed # on demand, when needed
# brew install --cask citrix-workspace # brew install --cask citrix-workspace
# brew install --cask kap # brew install --cask kap
# brew install --cask rapidapi # brew install --cask rapidapi
# brew install --cask reaper # brew install --cask reaper
# brew install --cask telegram
# brew install --cask visual-studio-code # brew install --cask visual-studio-code
# brew install --cask whatsapp
ln -s ~/dotfiles/hammerspoon ~/.hammerspoon ln -s ~/dotfiles/hammerspoon ~/.hammerspoon
ln -s ~/dotfiles/karabiner ~/.config/karabiner 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: # other software that can't be installed via brew:
# bill: https://billtheapp.com/ # bill: https://billtheapp.com/
# Apps from the app-store: strongbox, xcode, unifi # Apps from the app-store: strongbox, xcode, unifi, streaks

View File

@ -70,8 +70,15 @@ require('lazy').setup({
{ 'epwalsh/obsidian.nvim', version = '*', lazy = true, ft = 'markdown', { 'epwalsh/obsidian.nvim', version = '*', lazy = true, ft = 'markdown',
dependencies = { 'nvim-lua/plenary.nvim' }, opts = { dir = '~/Notes' }, dependencies = { 'nvim-lua/plenary.nvim' }, opts = { dir = '~/Notes' },
}, },
-- Copilot and other AI tools
{ 'zbirenbaum/copilot.lua', event = 'InsertEnter', config = get_config('copilot') }, { 'zbirenbaum/copilot.lua', event = 'InsertEnter', config = get_config('copilot') },
{ 'zbirenbaum/copilot-cmp', config = true }, { 'zbirenbaum/copilot-cmp', config = true },
{ 'Exafunction/codeium.nvim', event = 'BufEnter', config = true, dependencies = {
'nvim-lua/plenary.nvim',
'hrsh7th/nvim-cmp',
},
},
}) })
-- general sane vim options -- general sane vim options

View File

@ -11,6 +11,7 @@ cmp.setup({
}), }),
sources = cmp.config.sources({ sources = cmp.config.sources({
{ name = 'copilot' }, { name = 'copilot' },
{ name = 'codeium' },
{ name = 'nvim_lsp' }, { name = 'nvim_lsp' },
{ {
name = 'buffer', name = 'buffer',
@ -28,6 +29,7 @@ cmp.setup({
format = function(entry, vim_item) format = function(entry, vim_item)
vim_item.menu = ({ vim_item.menu = ({
copilot = '[Copilot]', copilot = '[Copilot]',
codeium = '[Codeium]',
nvim_lsp = '[LSP]', nvim_lsp = '[LSP]',
buffer = '[Buffer]', buffer = '[Buffer]',
path = '[Path]', path = '[Path]',

View File

@ -3,8 +3,17 @@ require('zen-mode').setup({
backdrop = 0.95, backdrop = 0.95,
width = 120, width = 120,
height = 0.85, height = 0.85,
options = {
signcolumn = "no", -- disable signcolumn
number = false, -- disable number column
relativenumber = false, -- disable relative numbers
},
}, },
plugins = { plugins = {
gitsigns = { enabled = true }, gitsigns = { enabled = true },
wezterm = {
enabled = true,
font = "+2",
},
}, },
}) })

View File

@ -21,9 +21,6 @@ async function changeDevice(device) {
await asyncExec(`SwitchAudioSource -i ${id}`); await asyncExec(`SwitchAudioSource -i ${id}`);
console.log(` Selected »${device}« as new audio output device`); console.log(` Selected »${device}« as new audio output device`);
console.log(' Restarting Spotify Daemon');
await asyncExec('brew services restart spotifyd');
console.log(' Done 🤘'); console.log(' Done 🤘');
} }

View File

@ -87,7 +87,6 @@ config.leader = { key = 'a', mods = 'CTRL', timeout_milliseconds = 1000 }
config.scrollback_lines = 5000 config.scrollback_lines = 5000
config.send_composed_key_when_left_alt_is_pressed = true config.send_composed_key_when_left_alt_is_pressed = true
config.show_new_tab_button_in_tab_bar = false config.show_new_tab_button_in_tab_bar = false
config.show_tab_index_in_tab_bar = true
config.tab_bar_at_bottom = true config.tab_bar_at_bottom = true
config.use_dead_keys = false config.use_dead_keys = false
config.use_fancy_tab_bar = 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) return string.format(' %s %s ', num, cwd)
end) 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 -- show workspace on the left side of tabbar
wezterm.on('update-status', function(window) wezterm.on('update-status', function(window)
local workspace = mux.get_active_workspace() local workspace = mux.get_active_workspace()