chore: fixed linter findings

Signed-off-by: aserowy <serowy@hotmail.com>
aserowy · Apr 25, 2024 · 45839c8 · 45839c8
1 parent 061fa57
commit 45839c8
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 64 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -10,6 +10,12 @@ jobs:
     name: checks
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: read
+      packages: read
+      # To report GitHub Actions status checks
+      statuses: write
+
     steps:
       - name: checkout
         uses: actions/checkout@v4

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -10,32 +10,38 @@ jobs:
     name: tests
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: read
+      packages: read
+      # To report GitHub Actions status checks
+      statuses: write
+
     steps:
-    - name: checkout
-      uses: actions/checkout@v4
-
-    - name: setup ‘lua’
-      uses: leafo/gh-actions-lua@v10.0.0
-      with:
-        luaVersion: "5.1"
-
-    - name: setup ‘luarocks’
-      uses: leafo/gh-actions-luarocks@v4
-
-    - name: setup dependencies
-      run: |
-        luarocks install busted
-        luarocks install luacov-coveralls
-
-    - name: run
-      run: busted -c -v
-      env:
-        LUA_PATH: "/home/runner/work/tmux.nvim/tmux.nvim/?.lua;/home/runner/work/tmux.nvim/tmux.nvim/lua/?/init.lua;/home/runner/work/tmux.nvim/tmux.nvim/lua/?.lua;/home/runner/work/tmux.nvim/tmux.nvim/spec/?/init.lua;/home/runner/work/tmux.nvim/tmux.nvim/spec/?.lua;"
-
-    - name: report
-      if: success()
-      continue-on-error: true
-      run: luacov-coveralls -i tmux.nvim/lua -e .luarocks
-      env:
-        COVERALLS_REPO_TOKEN: ${{ github.token }}
-        LUA_PATH: "/home/runner/work/tmux.nvim/tmux.nvim/?.lua;/home/runner/work/tmux.nvim/tmux.nvim/lua/?/init.lua;/home/runner/work/tmux.nvim/tmux.nvim/lua/?.lua;/home/runner/work/tmux.nvim/tmux.nvim/spec/?/init.lua;/home/runner/work/tmux.nvim/tmux.nvim/spec/?.lua;"
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: setup ‘lua’
+        uses: leafo/gh-actions-lua@v10.0.0
+        with:
+          luaVersion: "5.1"
+
+      - name: setup ‘luarocks’
+        uses: leafo/gh-actions-luarocks@v4
+
+      - name: setup dependencies
+        run: |
+          luarocks install busted
+          luarocks install luacov-coveralls
+
+      - name: run
+        run: busted -c -v
+        env:
+          LUA_PATH: "/home/runner/work/tmux.nvim/tmux.nvim/?.lua;/home/runner/work/tmux.nvim/tmux.nvim/lua/?/init.lua;/home/runner/work/tmux.nvim/tmux.nvim/lua/?.lua;/home/runner/work/tmux.nvim/tmux.nvim/spec/?/init.lua;/home/runner/work/tmux.nvim/tmux.nvim/spec/?.lua;"
+
+      - name: report
+        if: success()
+        continue-on-error: true
+        run: luacov-coveralls -i tmux.nvim/lua -e .luarocks
+        env:
+          COVERALLS_REPO_TOKEN: ${{ github.token }}
+          LUA_PATH: "/home/runner/work/tmux.nvim/tmux.nvim/?.lua;/home/runner/work/tmux.nvim/tmux.nvim/lua/?/init.lua;/home/runner/work/tmux.nvim/tmux.nvim/lua/?.lua;/home/runner/work/tmux.nvim/tmux.nvim/spec/?/init.lua;/home/runner/work/tmux.nvim/tmux.nvim/spec/?.lua;"
diff --git a/flake.nix b/flake.nix
@@ -26,6 +26,7 @@
               nodePackages.dockerfile-language-server-nodejs
               nodePackages.markdownlint-cli
               nodePackages.prettier
+              shfmt
               stylua
               sumneko-lua-language-server
             ];

diff --git a/tmux.nvim.tmux b/tmux.nvim.tmux
@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 
 get_tmux_option() {
-  local option=$1
-  local default_value=$2
-  local option_value
-  option_value=$(tmux show-option -gqv "$option")
-  if [ -z "$option_value" ]; then
-    echo "$default_value"
-  else
-    echo "$option_value"
-  fi
+	local option=$1
+	local default_value=$2
+	local option_value
+	option_value=$(tmux show-option -gqv "$option")
+	if [ -z "$option_value" ]; then
+		echo "$default_value"
+	else
+		echo "$option_value"
+	fi
 }
 
 is_vim="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?\.?(view|n?vim?x?)(-wrapped)?(diff)?$'"
@@ -25,27 +25,27 @@ navigation_kb_up=$(get_tmux_option "@tmux-nvim-navigation-keybinding-up" 'C-k')
 navigation_kb_right=$(get_tmux_option "@tmux-nvim-navigation-keybinding-right" 'C-l')
 
 if $navigation_enabled; then
-  if $navigation_cycle; then
-    tmux bind-key -n "$navigation_kb_left" if-shell "$is_vim" "send-keys $navigation_kb_left" 'select-pane -L'
-    tmux bind-key -n "$navigation_kb_down" if-shell "$is_vim" "send-keys $navigation_kb_down" 'select-pane -D'
-    tmux bind-key -n "$navigation_kb_up" if-shell "$is_vim" "send-keys $navigation_kb_up" 'select-pane -U'
-    tmux bind-key -n "$navigation_kb_right" if-shell "$is_vim" "send-keys $navigation_kb_right" 'select-pane -R'
+	if $navigation_cycle; then
+		tmux bind-key -n "$navigation_kb_left" if-shell "$is_vim" "send-keys $navigation_kb_left" 'select-pane -L'
+		tmux bind-key -n "$navigation_kb_down" if-shell "$is_vim" "send-keys $navigation_kb_down" 'select-pane -D'
+		tmux bind-key -n "$navigation_kb_up" if-shell "$is_vim" "send-keys $navigation_kb_up" 'select-pane -U'
+		tmux bind-key -n "$navigation_kb_right" if-shell "$is_vim" "send-keys $navigation_kb_right" 'select-pane -R'
 
-    tmux bind-key -T copy-mode-vi "$navigation_kb_left" select-pane -L
-    tmux bind-key -T copy-mode-vi "$navigation_kb_down" select-pane -D
-    tmux bind-key -T copy-mode-vi "$navigation_kb_up" select-pane -U
-    tmux bind-key -T copy-mode-vi "$navigation_kb_right" select-pane -R
-  else
-    tmux bind-key -n "$navigation_kb_left" if-shell "$is_vim" "send-keys $navigation_kb_left" "if -F '#{pane_at_left}' '' 'select-pane -L'"
-    tmux bind-key -n "$navigation_kb_down" if-shell "$is_vim" "send-keys $navigation_kb_down" "if -F '#{pane_at_bottom}' '' 'select-pane -D'"
-    tmux bind-key -n "$navigation_kb_up" if-shell "$is_vim" "send-keys $navigation_kb_up" "if -F '#{pane_at_top}' '' 'select-pane -U'"
-    tmux bind-key -n "$navigation_kb_right" if-shell "$is_vim" "send-keys $navigation_kb_right" "if -F '#{pane_at_right}' '' 'select-pane -R'"
+		tmux bind-key -T copy-mode-vi "$navigation_kb_left" select-pane -L
+		tmux bind-key -T copy-mode-vi "$navigation_kb_down" select-pane -D
+		tmux bind-key -T copy-mode-vi "$navigation_kb_up" select-pane -U
+		tmux bind-key -T copy-mode-vi "$navigation_kb_right" select-pane -R
+	else
+		tmux bind-key -n "$navigation_kb_left" if-shell "$is_vim" "send-keys $navigation_kb_left" "if -F '#{pane_at_left}' '' 'select-pane -L'"
+		tmux bind-key -n "$navigation_kb_down" if-shell "$is_vim" "send-keys $navigation_kb_down" "if -F '#{pane_at_bottom}' '' 'select-pane -D'"
+		tmux bind-key -n "$navigation_kb_up" if-shell "$is_vim" "send-keys $navigation_kb_up" "if -F '#{pane_at_top}' '' 'select-pane -U'"
+		tmux bind-key -n "$navigation_kb_right" if-shell "$is_vim" "send-keys $navigation_kb_right" "if -F '#{pane_at_right}' '' 'select-pane -R'"
 
-    tmux bind-key -T copy-mode-vi "$navigation_kb_left" "if -F '#{pane_at_left}' '' 'select-pane -L'"
-    tmux bind-key -T copy-mode-vi "$navigation_kb_down" "if -F '#{pane_at_bottom}' '' 'select-pane -D'"
-    tmux bind-key -T copy-mode-vi "$navigation_kb_up" "if -F '#{pane_at_top}' '' 'select-pane -U'"
-    tmux bind-key -T copy-mode-vi "$navigation_kb_right" "if -F '#{pane_at_right}' '' 'select-pane -R'"
-  fi
+		tmux bind-key -T copy-mode-vi "$navigation_kb_left" "if -F '#{pane_at_left}' '' 'select-pane -L'"
+		tmux bind-key -T copy-mode-vi "$navigation_kb_down" "if -F '#{pane_at_bottom}' '' 'select-pane -D'"
+		tmux bind-key -T copy-mode-vi "$navigation_kb_up" "if -F '#{pane_at_top}' '' 'select-pane -U'"
+		tmux bind-key -T copy-mode-vi "$navigation_kb_right" "if -F '#{pane_at_right}' '' 'select-pane -R'"
+	fi
 fi
 
 # resize
@@ -60,13 +60,13 @@ resize_kb_up=$(get_tmux_option "@tmux-nvim-resize-keybinding-up" 'M-k')
 resize_kb_right=$(get_tmux_option "@tmux-nvim-resize-keybinding-right" 'M-l')
 
 if $resize_enabled; then
-  tmux bind -n "$resize_kb_left" if-shell "$is_vim" "send-keys $resize_kb_left" "resize-pane -L $resize_step_x"
-  tmux bind -n "$resize_kb_down" if-shell "$is_vim" "send-keys $resize_kb_down" "resize-pane -D $resize_step_y"
-  tmux bind -n "$resize_kb_up" if-shell "$is_vim" "send-keys $resize_kb_up" "resize-pane -U $resize_step_y"
-  tmux bind -n "$resize_kb_right" if-shell "$is_vim" "send-keys $resize_kb_right" "resize-pane -R $resize_step_x"
+	tmux bind -n "$resize_kb_left" if-shell "$is_vim" "send-keys $resize_kb_left" "resize-pane -L $resize_step_x"
+	tmux bind -n "$resize_kb_down" if-shell "$is_vim" "send-keys $resize_kb_down" "resize-pane -D $resize_step_y"
+	tmux bind -n "$resize_kb_up" if-shell "$is_vim" "send-keys $resize_kb_up" "resize-pane -U $resize_step_y"
+	tmux bind -n "$resize_kb_right" if-shell "$is_vim" "send-keys $resize_kb_right" "resize-pane -R $resize_step_x"
 
-  tmux bind-key -T copy-mode-vi "$resize_kb_left" resize-pane -L "$resize_step_x"
-  tmux bind-key -T copy-mode-vi "$resize_kb_down" resize-pane -D "$resize_step_y"
-  tmux bind-key -T copy-mode-vi "$resize_kb_up" resize-pane -U "$resize_step_y"
-  tmux bind-key -T copy-mode-vi "$resize_kb_right" resize-pane -R "$resize_step_x"
+	tmux bind-key -T copy-mode-vi "$resize_kb_left" resize-pane -L "$resize_step_x"
+	tmux bind-key -T copy-mode-vi "$resize_kb_down" resize-pane -D "$resize_step_y"
+	tmux bind-key -T copy-mode-vi "$resize_kb_up" resize-pane -U "$resize_step_y"
+	tmux bind-key -T copy-mode-vi "$resize_kb_right" resize-pane -R "$resize_step_x"
 fi