diff --git a/activity_watch/dotfile_manager.yaml b/activity_watch/dotfile_manager.yaml index 27ca970e..fe282f35 100644 --- a/activity_watch/dotfile_manager.yaml +++ b/activity_watch/dotfile_manager.yaml @@ -1,4 +1,5 @@ -install_ubuntu: - - install_ubuntu.sh -install_macos: - - install_macos.sh +install: + ubuntu: + - install_ubuntu.sh + macos: + - install_macos.sh diff --git a/alacritty/dotfile_manager.yaml b/alacritty/dotfile_manager.yaml index da98b277..f7329fa0 100644 --- a/alacritty/dotfile_manager.yaml +++ b/alacritty/dotfile_manager.yaml @@ -1,7 +1,8 @@ -install_ubuntu: - - install_ubuntu.sh -install_macos: - - install_macos.sh +install: + ubuntu: + - install_ubuntu.sh + macos: + - install_macos.sh symlinks: alacritty.toml: ~/.config/alacritty/alacritty.toml requires: diff --git a/atuin/dotfile_manager.yaml b/atuin/dotfile_manager.yaml index ae752886..a8a944e7 100644 --- a/atuin/dotfile_manager.yaml +++ b/atuin/dotfile_manager.yaml @@ -1,6 +1,4 @@ -install_ubuntu: - - install.sh -install_macos: +install: - install.sh symlink: config.toml: ~/.config/atuin/config.toml diff --git a/bazel/dotfile_manager.yaml b/bazel/dotfile_manager.yaml index 5e18be95..a55d5b64 100644 --- a/bazel/dotfile_manager.yaml +++ b/bazel/dotfile_manager.yaml @@ -1,5 +1,6 @@ -install_ubuntu: - - install_ubuntu.sh +install: + ubuntu: + - install_ubuntu.sh source: - helpers.sh bin: diff --git a/brew/dotfile_manager.sh b/brew/dotfile_manager.sh deleted file mode 100644 index df4c4356..00000000 --- a/brew/dotfile_manager.sh +++ /dev/null @@ -1,4 +0,0 @@ -install_ubuntu: - - install.sh -install_macos: - - install.sh diff --git a/brew/dotfile_manager.yaml b/brew/dotfile_manager.yaml new file mode 100644 index 00000000..007086b2 --- /dev/null +++ b/brew/dotfile_manager.yaml @@ -0,0 +1,2 @@ +install: + - install.sh \ No newline at end of file diff --git a/git/dotfile_manager.yaml b/git/dotfile_manager.yaml index 5639e27d..8e9398c6 100644 --- a/git/dotfile_manager.yaml +++ b/git/dotfile_manager.yaml @@ -1,7 +1,8 @@ -install_ubuntu: - - install_ubuntu.sh -install_macos: - - install_macos.sh +install: + ubuntu: + - install_ubuntu.sh + macos: + - install_macos.sh symlinks: gitconfig: ~/.gitconfig source: diff --git a/i3/dotfile_manager.yaml b/i3/dotfile_manager.yaml index d991b0b7..d63d8c3b 100644 --- a/i3/dotfile_manager.yaml +++ b/i3/dotfile_manager.yaml @@ -1,4 +1,5 @@ -install_ubuntu: - - install_ubuntu.sh +install: + ubuntu: + - install_ubuntu.sh symlinks: config: ~/.config/i3/config diff --git a/linters/dotfile_manager.yaml b/linters/dotfile_manager.yaml index 5e6b2d58..60ae4c6e 100644 --- a/linters/dotfile_manager.yaml +++ b/linters/dotfile_manager.yaml @@ -1,7 +1,8 @@ -install_macos: - - install_macos.sh -install_ubuntu: - - install_ubuntu.sh +install: + ubuntu: + - install_ubuntu.sh + macos: + - install_macos.sh symlinks: config/yapf.style: ~/.yapf.style config/pylintrc: ~/.pylintrc diff --git a/one_password/dotfile_manager.yaml b/one_password/dotfile_manager.yaml index e2e10fc0..2fd649ad 100644 --- a/one_password/dotfile_manager.yaml +++ b/one_password/dotfile_manager.yaml @@ -1,7 +1,8 @@ -install_ubuntu: - - install_ubuntu.sh -install_macos: - - install_macos.sh +install: + ubuntu: + - install_ubuntu.sh + macos: + - install_macos.sh source: - helpers.sh requires: diff --git a/skhd/dotfile_manager.yaml b/skhd/dotfile_manager.yaml index 650e5fe8..32ff8171 100644 --- a/skhd/dotfile_manager.yaml +++ b/skhd/dotfile_manager.yaml @@ -1,5 +1,6 @@ -install_macos: - - install_macos.sh +install: + macos: + - install_macos.sh symlinks: skhdrc: ~/.config/skhd/skhdrc bin: diff --git a/system_installation/dotfile_manager.yaml b/system_installation/dotfile_manager.yaml index 392f4626..d6cbffc2 100644 --- a/system_installation/dotfile_manager.yaml +++ b/system_installation/dotfile_manager.yaml @@ -1,6 +1,7 @@ -install_macos: - - macos/install_utils.sh -install_ubuntu: - - ubuntu/install_utils.sh - - ubuntu/install_brave_browser.sh - - ubuntu/install_spotify.sh +install: + macos: + - macos/install_utils.sh + ubuntu: + - ubuntu/install_utils.sh + - ubuntu/install_brave_browser.sh + - ubuntu/install_spotify.sh diff --git a/tmux/dotfile_manager.yaml b/tmux/dotfile_manager.yaml index 2b3d3a29..8d3b9568 100644 --- a/tmux/dotfile_manager.yaml +++ b/tmux/dotfile_manager.yaml @@ -1,6 +1,7 @@ -install_ubuntu: - - install_ubuntu.sh -install_macos: - - install_macos.sh +install: + ubuntu: + - install_ubuntu.sh + macos: + - install_macos.sh symlinks: tmux.conf: ~/.tmux.conf diff --git a/vim/dotfile_manager.yaml b/vim/dotfile_manager.yaml index 626c427a..fcb9ab35 100644 --- a/vim/dotfile_manager.yaml +++ b/vim/dotfile_manager.yaml @@ -1,9 +1,10 @@ -install_ubuntu: - - install/install_neovim_ubuntu.sh - - install/install_plugins.sh -install_macos: - - install/install_neovim_macos.sh - - install/install_plugins.sh +install: + ubuntu: + - install/install_neovim_ubuntu.sh + - install/install_plugins.sh + macos: + - install/install_neovim_macos.sh + - install/install_plugins.sh symlinks: init.vim: ~/.vimrc init.lua: ~/.config/nvim/init.lua diff --git a/vscode/dotfile_manager.yaml b/vscode/dotfile_manager.yaml index 4e9ec422..362fcda2 100644 --- a/vscode/dotfile_manager.yaml +++ b/vscode/dotfile_manager.yaml @@ -1,9 +1,26 @@ -install_ubuntu: - - install_ubuntu.sh -install_macos: - - install_macos.sh +install: + ubuntu: + - install_ubuntu.sh + macos: + - install_macos.sh symlinks: - keybindings.json: ~/.config/Code/User/keybindings.json - settings.json: ~/.config/Code/User/settings.json + macos: + keybindings.json: + - '~/Library/Application Support/Code/User/keybindings.json' + - '~/Library/Application Support/Windsurf/User/keybindings.json' + - '~/Library/Application Support/Cursor/User/keybindings.json' + settings.json: + - '~/Library/Application Support/Code/User/settings.json' + - '~/Library/Application Support/Windsurf/User/settings.json' + - '~/Library/Application Support/Cursor/User/settings.json' + ubuntu: + keybindings.json: + - ~/.config/Code/User/keybindings.json + - ~/.config/Cursor/User/keybindings.json + - ~/.config/Windsurf/User/keybindings.json + settings.json: + ~/.config/Code/User/settings.json + ~/.config/Windsurf/User/settings.json + ~/.config/Cursor/User/settings.json requires: - brew diff --git a/vscode/settings.json b/vscode/settings.json index c8640e21..c3710c3a 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -1,72 +1,56 @@ { - "python.pythonPath": "/Users/lionelgulich/anaconda3", - "python.defaultInterpreterPath": "/Users/lionelgulich/anaconda3", - "editor.fontSize": 16, - "explorer.confirmDragAndDrop": false, - "vim.insertModeKeyBindings": [ - { - "before": [ - "j", - "k" - ], - "after": [ - "" - ] - } - ], - "vim.normalModeKeyBindings": [ - { - "before": [ - "B" - ], - "after": [ - "^" - ] - }, - { - "before": [ - "E" - ], - "after": [ - "$" - ] - } - ], - "git.autofetch": true, - "bazel.buildifierFixOnFormat": true, - "editor.wordWrapColumn": 100, - "pylint.args": [ - "--rcfile=bzl/pylintrc" - ], - "[python]": { - "editor.formatOnType": true + "[cpp]": { + "editor.defaultFormatter": "xaver.clang-format" + }, + "[python]": { + "editor.formatOnType": true + }, + "bazel.buildifierFixOnFormat": true, + "diffEditor.ignoreTrimWhitespace": false, + "editor.fontSize": 16, + "editor.wordWrapColumn": 100, + "explorer.confirmDragAndDrop": false, + "files.autoSave": "afterDelay", + "git.autofetch": true, + "git.confirmSync": false, + "git.detectSubmodulesLimit": 30, + "git.repositoryScanMaxDepth": -1, + "grammarly.files.include": [ + "**/*.txt", + "**/*.rst", + "**/*.md" + ], + "scm.showIncomingChanges": "always", + "scm.showOutgoingChanges": "always", + "search.followSymlinks": false, + "security.workspace.trust.untrustedFiles": "open", + "vim.insertModeKeyBindings": [ + { + "after": [ + "" + ], + "before": [ + "j", + "k" + ] + } + ], + "vim.normalModeKeyBindings": [ + { + "after": [ + "^" + ], + "before": [ + "B" + ] }, - "diffEditor.ignoreTrimWhitespace": false, - "[cpp]": { - "editor.defaultFormatter": "xaver.clang-format" - }, - "llm.configTemplate": "Custom", - "llm.modelIdOrEndpoint": "http://0.0.0.0:8000/api/generate", - "llm.tlsSkipVerifyInsecure": true, - "llm.documentFilter": {}, - "git.confirmSync": false, - "files.autoSave": "afterDelay", - "security.workspace.trust.untrustedFiles": "open", - "grammarly.files.include": [ - "**/readme.md", - "**/README.md", - "**/*.txt", - "**/*.rst", - "**/*.md" - ], - "scm.showIncomingChanges": "always", - "scm.showOutgoingChanges": "always", - "git.detectSubmodulesLimit": 30, - "git.repositoryScanMaxDepth": -1, - "search.followSymlinks": false, - "cmake.showOptionsMovedNotification": false, - "cmake.pinnedCommands": [ - "workbench.action.tasks.configureTaskRunner", - "workbench.action.tasks.runTask" - ] + { + "after": [ + "$" + ], + "before": [ + "E" + ] + } + ] } diff --git a/yabai/dotfile_manager.yaml b/yabai/dotfile_manager.yaml index 8c726dfd..bbce5cc7 100644 --- a/yabai/dotfile_manager.yaml +++ b/yabai/dotfile_manager.yaml @@ -1,4 +1,5 @@ -install_macos: - - install_macos.sh +install: + macos: + - install_macos.sh symlinks: yabairc: ~/.config/yabai/yabairc diff --git a/yabai/yabairc b/yabai/yabairc index 5a8fb0bc..09ca9c7c 100755 --- a/yabai/yabairc +++ b/yabai/yabairc @@ -88,6 +88,11 @@ yabai -m rule --add app=Code space=code yabai -m rule --add app=Cursor space=code yabai -m rule --add app=Windsurf space=code yabai -m rule --add app=NoMachine space=varia1 +yabai -m rule --add app=Calendar space=calendar +yabai -m rule --add app=Teams space=calendar +yabai -m rule --add app=Reminders space=organisation +yabai -m rule --add app=Notes space=organisation +yabai -m rule --add app=Outlook space=mail yabai -m rule --add app=Mail space=mail yabai -m rule --add app=Spark space=mail yabai -m rule --add app=Franz space=chat @@ -96,10 +101,7 @@ yabai -m rule --add app=WhatsApp space=chat yabai -m rule --add app=Signal space=chat yabai -m rule --add app=Spotify space=chat yabai -m rule --add app=Slack space=chat -yabai -m rule --add app=Teams space=calendar -yabai -m rule --add app=Calendar space=calendar -yabai -m rule --add app=Reminders space=organisation -yabai -m rule --add app=Notes space=organisation +yabai -m rule --apply yabai -m space --focus chat yabai -m space --focus term diff --git a/zsh/dotfile_manager.yaml b/zsh/dotfile_manager.yaml index f1293cd7..b4aab5bc 100644 --- a/zsh/dotfile_manager.yaml +++ b/zsh/dotfile_manager.yaml @@ -1,13 +1,14 @@ -install_ubuntu: - - install/install_ubuntu.sh - - install/change_default_shell.bash - - install/install_fonts.sh - - install/install_oh_my_zsh.sh -install_macos: - - install/install_macos.sh - - install/change_default_shell.bash - - install/install_fonts.sh - - install/install_oh_my_zsh.sh +install: + ubuntu: + - install/install_ubuntu.sh + - install/change_default_shell.bash + - install/install_fonts.sh + - install/install_oh_my_zsh.sh + macos: + - install/install_macos.sh + - install/change_default_shell.bash + - install/install_fonts.sh + - install/install_oh_my_zsh.sh symlinks: zshrc.zsh: ~/.zshrc source: