diff --git a/ansible/tasks/servers/services/cloudreve/cloudreve.yml b/ansible/tasks/servers/services/cloudreve/cloudreve.yml index c8b401e..a201048 100644 --- a/ansible/tasks/servers/services/cloudreve/cloudreve.yml +++ b/ansible/tasks/servers/services/cloudreve/cloudreve.yml @@ -19,14 +19,14 @@ src: docker-compose.yml.j2 dest: "{{ cloudreve_service_dir }}/docker-compose.yml" mode: "0644" - notify: restart_cloudreve + register: cloudreve_compose -- name: Stop Cloudreve service - ansible.builtin.command: docker compose -f "{{ cloudreve_service_dir }}/docker-compose.yml" down --remove-orphans - changed_when: false - listen: restart_cloudreve + - name: Stop Cloudreve service + ansible.builtin.command: docker compose -f "{{ cloudreve_service_dir }}/docker-compose.yml" down --remove-orphans + changed_when: false + when: cloudreve_compose.changed -- name: Start Cloudreve service - ansible.builtin.command: docker compose -f "{{ cloudreve_service_dir }}/docker-compose.yml" up -d - changed_when: false - listen: restart_cloudreve + - name: Start Cloudreve service + ansible.builtin.command: docker compose -f "{{ cloudreve_service_dir }}/docker-compose.yml" up -d + changed_when: false + when: cloudreve_compose.changed diff --git a/ansible/tasks/servers/services/dashy/conf.yml.j2 b/ansible/tasks/servers/services/dashy/conf.yml.j2 index ca29b68..8257c58 100644 --- a/ansible/tasks/servers/services/dashy/conf.yml.j2 +++ b/ansible/tasks/servers/services/dashy/conf.yml.j2 @@ -259,12 +259,6 @@ sections: - do - discount - work - displayData: - sortBy: default - rows: 1 - cols: 1 - collapsed: true - hideForGuests: true appConfig: layout: auto iconSize: large diff --git a/config/bash.nix b/config/bash.nix index d13a96b..9829313 100644 --- a/config/bash.nix +++ b/config/bash.nix @@ -62,6 +62,13 @@ eval "$(pyenv init - bash)" fi + # NVM (if installed) + if [ -d "$HOME/.nvm" ]; then + export NVM_DIR="$HOME/.nvm" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion + fi + # Detect distribution and set CGO_CFLAGS for Pop!_OS if [ -f /etc/os-release ]; then distro=$(awk -F= '/^NAME/{print $2}' /etc/os-release | tr -d '"') @@ -234,6 +241,11 @@ if [ -d "${config.home.homeDirectory}/Projects/Work" ]; then export TRADAWARE_DEVOPS=true fi + + # Japanese input + export GTK_IM_MODULE=fcitx5 + export QT_IM_MODULE=fcitx5 + export XMODIFIERS="@im=fcitx5" ''; # Interactive shell specific configuration