From a6dd0f328f49ab9b8378840882bc9fdab2a404cd Mon Sep 17 00:00:00 2001 From: TechDufus Date: Thu, 26 Oct 2023 14:10:08 -0500 Subject: [PATCH] updating mode formatting and nvim filetype detection --- bin/dotfiles | 1 + roles/bash/files/.bashrc | 3 +++ roles/bash/tasks/ubuntu.yml | 14 +++++++------- .../files/lua/techdufus/plugins/filetype.lua | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/bin/dotfiles b/bin/dotfiles index d1c2afd7..244fc91a 100755 --- a/bin/dotfiles +++ b/bin/dotfiles @@ -113,3 +113,4 @@ if ! [[ -f "$IS_FIRST_RUN" ]]; then touch "$IS_FIRST_RUN" fi +# vi:ft=sh: diff --git a/roles/bash/files/.bashrc b/roles/bash/files/.bashrc index c1eaefa3..04e2def3 100644 --- a/roles/bash/files/.bashrc +++ b/roles/bash/files/.bashrc @@ -61,6 +61,9 @@ COMPLETION_WAITING_DOTS="true" # Would you like to use another custom folder than $OSH/custom? # OSH_CUSTOM=/path/to/new-custom-folder +# don't put duplicate lines in the history. See bash(1) for more options +export HISTCONTROL=ignoredups + # To disable the uses of "sudo" by oh-my-bash, please set "false" to # this variable. The default behavior for the empty value is "true". OMB_USE_SUDO=true diff --git a/roles/bash/tasks/ubuntu.yml b/roles/bash/tasks/ubuntu.yml index 122884be..79793078 100644 --- a/roles/bash/tasks/ubuntu.yml +++ b/roles/bash/tasks/ubuntu.yml @@ -13,37 +13,37 @@ var: ohmybash_is_installed - name: "Bash | Install oh-my-bash" + when: not ohmybash_is_installed block: - name: "Bash | Download oh-my-bash Install Script" ansible.builtin.get_url: url: https://raw.githubusercontent.com/ohmybash/oh-my-bash/master/tools/install.sh dest: /tmp/oh-my-bash.install.sh force: true - mode: 0755 + mode: 755 - name: "Bash | Run the install script" ansible.builtin.script: cmd: /tmp/oh-my-bash.install.sh - when: not ohmybash_is_installed - name: "Bash | Copy .bashrc" ansible.builtin.copy: src: ".bashrc" dest: "{{ ansible_user_dir }}/.bashrc" - mode: 0644 + mode: "0644" - name: "Bash | Copy .profile" ansible.builtin.copy: src: ".profile" dest: "{{ ansible_user_dir }}/.profile" - mode: 0644 + mode: "0644" - name: "Bash | Copy custom bash config" ansible.builtin.copy: dest: "{{ ansible_user_dir }}/.config/" src: "bash" - mode: 0644 + mode: "0644" directory_mode: 0755 force: true @@ -52,7 +52,7 @@ dest: "{{ ansible_user_dir }}/.oh-my-bash/custom/" src: "themes" directory_mode: 0755 - mode: 0644 + mode: "0644" force: true - name: "Bash | Set default terminal" @@ -65,7 +65,7 @@ ansible.builtin.template: dest: "{{ ansible_user_dir }}/.config/bash/.bash_private" src: ".bash_private.j2" - mode: 0644 + mode: "0644" no_log: true - name: "Bash | Copy Private Files" diff --git a/roles/neovim/files/lua/techdufus/plugins/filetype.lua b/roles/neovim/files/lua/techdufus/plugins/filetype.lua index 3601dbe7..f34ff94c 100644 --- a/roles/neovim/files/lua/techdufus/plugins/filetype.lua +++ b/roles/neovim/files/lua/techdufus/plugins/filetype.lua @@ -8,7 +8,7 @@ return { tfstate = "json", tfstate_backup = "json", tfplan = "json", - sh = "bash", + sh = "sh", }, }, },