Merge pull request #9 from nomutin/fix-ci#8

[ci] fix ci workflow

.github/workflows/lint.yaml

@@ -0,0 +1,44 @@
+name: ci
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  linting:
+    name: Lint Shell Scripts and Workflows
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup shfmt
+        uses: mfinelli/setup-shfmt@v2
+
+      - name: Run shfmt
+        run: |
+          # shellcheck disable=SC2046
+          shfmt -i 2 -ci -d $(shfmt -f . | grep -v '\.zsh$')
+
+      - name: Run ShellCheck
+        uses: ludeeus/action-shellcheck@master
+
+      - name: Download actionlint
+        id: get_actionlint
+        run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
+        shell: bash
+
+      - name: Check workflow files
+        run: ${{ steps.get_actionlint.outputs.executable }} -color
+        shell: bash
+
+      # - uses: JohnnyMorganz/stylua-action@v4
+      #   with:
+      #     token: ${{ secrets.GITHUB_TOKEN }}
+      #     version: latest
+      #     args: --check .
+
+      - uses: ludvighz/vint-action@v1
+        with:
+          path: config/vim/.vimrc

Brewfile

@@ -12,6 +12,9 @@ cask "discord"
 cask "docker"
 cask "font-hack-nerd-font"
 cask "iterm2"
+cask "microsoft-excel"
+cask "microsoft-word"
+cask "microsost-powerpoint"
 cask "raycast"
 cask "visual-studio-code"
 cask "zoom"

Makefile

@@ -1,10 +1,7 @@
-deploy-macos:
-	bash scripts/deploy-macos.sh
-
-deploy-linux:
-	bash scripts/deploy-linux.sh
+deploy:
+	bash scripts/deploy.sh
 
 init-macos:
 	bash scripts/init-macos.sh
 
-.PHONY: deploy-macos deploy-linux init-macos
+.PHONY: deploy-macos deploy

README.md

@@ -1,24 +1,27 @@
-# Nomutin's dotfiles
+<div align="center">
 
-![platform](https://img.shields.io/badge/platform-linux%20|%20macos-blue)
-[![shellcheck](https://github.com/nomutin/dotfiles/actions/workflows/shellcheck.yaml/badge.svg)](https://github.com/nomutin/dotfiles/actions/workflows/shellcheck.yaml)
-[![actionlint](https://github.com/nomutin/dotfiles/actions/workflows/actionlint.yaml/badge.svg)](https://github.com/nomutin/dotfiles/actions/workflows/actionlint.yaml)
-[![shfmt](https://github.com/nomutin/dotfiles/actions/workflows/shfmt.yaml/badge.svg)](https://github.com/nomutin/dotfiles/actions/workflows/shfmt.yaml)
+# .dotfiles
 
-```shell
-bash -c "$(curl https://raw.githubusercontent.com/nomutin/dotfiles/master/scripts/install.sh)"
-```
-
-## Other Applications
-
-### MS Office applications
+Dotfiles for my own `macOS` and non-root `Linux`.
 
-Only users with access privilege can open from the link.
+![platform](https://img.shields.io/badge/platform-macOS%20|%20Linux-blue)
+[![Lint](https://github.com/nomutin/dotfiles/actions/workflows/lint.yaml/badge.svg)](https://github.com/nomutin/dotfiles/actions/workflows/lint.yaml)
 
-[google drive](https://drive.google.com/file/d/1soT3UK_pYMM_M9VxWZdm-dVIBGhS8xBi/view?usp=sharing)
+</div>
 
-### ssh keys&configs
-
-Only users with access privilege can open from the link.
+```shell
+bash -c "$(curl https://raw.githubusercontent.com/nomutin/dotfiles/master/scripts/install.sh)"
+```
 
-[notion](https://www.notion.so/SSH-config-b7d08f8f06bc40e88325763da68557fb)
+## Contents
+
+| App Group | App | Platform | Config |
+| --- | --- | --- | :---: |
+| Shell | [zsh](https://www.zsh.org) | ![platform](https://img.shields.io/badge/platform-macOS-blue) | [🔍](./config/shell/.zshrc) |
+|  | [bash](https://www.gnu.org/software/bash/) | ![platform](https://img.shields.io/badge/platform-Linux-blue) | |
+| Package Manager | [Homebrew](https://brew.sh) | ![platform](https://img.shields.io/badge/platform-macOS%20%7C%20Linux-blue) | [🔍](./Brewfile) |
+|  | [mise](https://mise.jdx.dev/) | ![platform](https://img.shields.io/badge/platform-macOS%20%7C%20Linux-blue) | [🔍](./config/mise/config.toml) |
+| Terminal Emulator | [iterm2](https://iterm2.com) | ![platform](https://img.shields.io/badge/platform-macOS-blue) | |
+| Terminal Multiplexer | [zellij](https://zellij.dev) | ![platform](https://img.shields.io/badge/platform-macOS%20%7C%20Linux-blue) | [🔍](./config/zellij/config.kdl) |
+| Text Editor | [neovim](https://neovim.io) | ![platform](https://img.shields.io/badge/platform-macOS%20%7C%20Linux-blue) | [🔍](./config/neovim/README.md) |
+| | [vim](https://www.vim.org) | ![platform](https://img.shields.io/badge/platform-macOS%20%7C%20Linux-blue) | [🔍](./config/vim/.vimrc) |

config/neovim/init.lua

@@ -151,6 +151,7 @@ require("lazy").setup {
           "hadolint",     -- dockerfile
           "stylua",       -- lua
           "markdownlint", -- markdown
+          "shellcheck",   -- sh
           "shfmt",        -- sh
           "actionlint",   -- yaml
           "prettier",     -- javascript etc.

config/shell/.zshrc

@@ -31,3 +31,7 @@ alias ls='ls --color=auto'
 export MANPAGER="less -R --use-color -Dd+r -Du+b"
 export CLICOLOR=1
 export LSCOLORS=GxGxBxDxCxEgEdxbxgxcxd
+
+eval "$(~/.local/bin/mise activate zsh)"
+# shellcheck disable=SC1091
+source "$HOME/.rye/env"

scripts/deploy-macos.sh → scripts/deploy.sh

@@ -14,8 +14,14 @@ ln -sf "${HOME}"/.dotfiles/config/neovim/init.lua "${HOME}"/.config/nvim/init.lu
 mkdir -p "${HOME}"/.config/mise
 ln -sf "${HOME}"/.dotfiles/config/mise/config.toml "${HOME}"/.config/mise/config.toml
 
-ln -sf "${HOME}"/.dotfiles/config/shell/.profile "${HOME}"/.zprofile
-ln -sf "${HOME}"/.dotfiles/config/shell/.zshrc "${HOME}"/.zshrc
+if [ "$(uname)" = "Darwin" ]; then
+  ln -sf "${HOME}"/.dotfiles/config/shell/.zshrc "${HOME}"/.zshrc
+  # shellcheck disable=SC1090
+  source ~/.zshrc
 
-# shellcheck disable=SC1090
-source ~/.zshrc
+elif [ "$(uname)" = "Linux" ]; then
+  echo "eval '$(~/.local/bin/mise activate bash)'" >>~/.bashrc
+  echo "source '$HOME/.rye/env'" >>~/.bashrc
+  # shellcheck disable=SC1090
+  source ~/.bashrc
+fi

scripts/install.sh

@@ -16,12 +16,8 @@ fi
 
 cd .dotfiles
 
-# Deploy dotfiles
-if [ "$(uname)" = "Darwin" ]; then
-  make deploy-macos
-else
-  make deploy-linux
-fi
+# Deploy
+make deploy
 
 mise install -y