Update #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

lgulich merged 2 commits into master from lgulich/bump-dotfile-manager

May 27, 2025

activity_watch/dotfile_manager.yaml

-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
-    install_ubuntu:
-      - install_ubuntu.sh
-    install_macos:
-      - install_macos.sh
+    install:
+      ubuntu:
+        - install_ubuntu.sh
+      macos:
+        - install_macos.sh

alacritty/dotfile_manager.yaml

-Original file line number
+Diff line change
@@ -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:
@@ Expand Down @@

atuin/dotfile_manager.yaml

-Original file line number
+Diff line change
@@ -1,6 +1,4 @@
-    install_ubuntu:
-      - install.sh
-    install_macos:
+    install:
       - install.sh
     symlink:
       config.toml: ~/.config/atuin/config.toml

bazel/dotfile_manager.yaml

-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
-    install_ubuntu:
-      - install_ubuntu.sh
+    install:
+      ubuntu:
+        - install_ubuntu.sh
     source:
       - helpers.sh
     bin:
@@ Expand Down @@

brew/dotfile_manager.sh

This file was deleted.

brew/dotfile_manager.yaml

Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		install:
		- install.sh

git/dotfile_manager.yaml

-Original file line number
+Diff line change
@@ -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:
@@ Expand Down @@

i3/dotfile_manager.yaml

-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
-    install_ubuntu:
-      - install_ubuntu.sh
+    install:
+      ubuntu:
+        - install_ubuntu.sh
     symlinks:
       config: ~/.config/i3/config

linters/dotfile_manager.yaml

-Original file line number
+Diff line change
@@ -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
@@ Expand Down @@

one_password/dotfile_manager.yaml

-Original file line number
+Diff line change
@@ -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:
@@ Expand Down @@

skhd/dotfile_manager.yaml

-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
-    install_macos:
-      - install_macos.sh
+    install:
+      macos:
+        - install_macos.sh
     symlinks:
       skhdrc: ~/.config/skhd/skhdrc
     bin:
@@ Expand Down @@

system_installation/dotfile_manager.yaml

-Original file line number
+Diff line change
@@ -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

tmux/dotfile_manager.yaml

-Original file line number
+Diff line change
@@ -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

vim/dotfile_manager.yaml

-Original file line number
+Diff line change
@@ -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

vscode/dotfile_manager.yaml

-Original file line number
+Diff line change
@@ -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

vscode/settings.json

-Original file line number
+Diff line change
@@ -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": [
-                    "<Esc>"
-                ]
-            }
-        ],
-        "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": [
+            "<Esc>"
+          ],
+          "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"
+          ]
+        }
+      ]
     }

yabai/dotfile_manager.yaml

-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
-    install_macos:
-      - install_macos.sh
+    install:
+      macos:
+        - install_macos.sh
     symlinks:
       yabairc: ~/.config/yabai/yabairc

yabai/yabairc

-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand All / @@ -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
@@ Expand Down @@

zsh/dotfile_manager.yaml

-Original file line number
+Diff line change
@@ -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:
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update #10

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!