diff --git a/files/vscode-settings.json b/files/vscode-settings.json index d13b06a..1774469 100644 --- a/files/vscode-settings.json +++ b/files/vscode-settings.json @@ -33,15 +33,6 @@ "[cpp]": { "editor.defaultFormatter": "ms-vscode.cpptools" }, - "[dockercompose]": { - "editor.insertSpaces": true, - "editor.tabSize": 2, - "editor.autoIndent": "advanced", - "editor.defaultFormatter": "redhat.vscode-yaml" - }, - "[github-actions-workflow]": { - "editor.defaultFormatter": "redhat.vscode-yaml" - }, "[html]": { "editor.formatOnSave": false }, @@ -184,7 +175,5 @@ "python.analysis.aiHoverSummaries": false, "rust-analyzer.hover.memoryLayout.size": "both", "rust-analyzer.imports.granularity.enforce": true, - "rust-analyzer.rustfmt.overrideCommand": null, - "yaml.format.printWidth": 110, - "xml.server.preferBinary": true + "yaml.format.printWidth": 110 } \ No newline at end of file diff --git a/tasks/devel-Darwin.yml b/tasks/devel-Darwin.yml index 31c0a61..a315680 100644 --- a/tasks/devel-Darwin.yml +++ b/tasks/devel-Darwin.yml @@ -3,12 +3,8 @@ - name: Devel - Fonts community.general.homebrew: - name: "{{ item }}" + name: font-hack state: present - loop: - - font-hack - - font-overpass - - font-news-cycle # Install Visual Studio Code and Set Basic Configuration - name: VSCode - Basics @@ -57,16 +53,7 @@ vars: packages: - clang-format - - llvm - - cmake - - ninja - - meson diff: false - - name: Devel - C/C++ - Symlink clang-tidy - ansible.builtin.file: - state: link - path: /usr/local/bin/clang-tidy - src: /opt/homebrew/opt/llvm/bin/clang-tidy # Dev Env - Python Development Tools # all done in vscode.yml @@ -94,6 +81,6 @@ state: present vars: packages: - - basictex # needs sudo + - basictex # neeeds sudo - tex-live-utility diff: false diff --git a/tasks/devel.yml b/tasks/devel.yml index 75faadb..a6fc5e3 100644 --- a/tasks/devel.yml +++ b/tasks/devel.yml @@ -54,16 +54,9 @@ code --install-extension ms-vscode.cmake-tools # VS Code - Python Development Tools -- name: Devel - Python - Install python dev packages (macOS) +- name: Devel - Python - Install python dev packages tags: lang_python - when: user_lang_python and (override_os_family is defined) | ternary(override_os_family,ansible_facts['os_family']) == "Darwin" - ansible.builtin.homebrew: - name: - - autopep8 - - pylint -- name: Devel - Python - Install python dev packages (non macOS) - tags: lang_python - when: user_lang_python and not (override_os_family is defined) | ternary(override_os_family,ansible_facts['os_family']) == "Darwin" + when: user_lang_python ansible.builtin.pip: name: - autopep8 diff --git a/templates/_zshrc.j2 b/templates/_zshrc.j2 index f4d0802..60aa775 100644 --- a/templates/_zshrc.j2 +++ b/templates/_zshrc.j2 @@ -1,15 +1,4 @@ # Unified zshrc of Jannik Beyerstedt -typeset -aU path -{% if (override_os_family is defined) | ternary(override_os_family,ansible_facts['os_family']) == "Darwin" %} -path=('/opt/homebrew/bin' $path) -export PATH -{% else %} -# If you come from bash you might have to change your $PATH. -# path=('$HOME/bin' $path) -# path=('/usr/local/bin' $path) -# export PATH -{% endif %} - export TERM=xterm-256color {% if usersetup_virtualenvwrapper|default(false)|bool %} VIRTUALENVWRAPPER_PYTHON=$(which python3) @@ -18,6 +7,9 @@ VIRTUALENVWRAPPER_PYTHON=$(which python3) DEFAULT_USER="jannik" DISABLE_UPDATE_PROMPT=true +# If you come from bash you might have to change your $PATH. +# export PATH=$HOME/bin:/usr/local/bin:$PATH + # Path to your oh-my-zsh installation. export ZSH=$HOME/.oh-my-zsh