Merge pull request #1027 from kachick/bye-wezterm-and-lua

Remove wezterm config and lua helpers
kachick · Jan 6, 2025 · 84d9910 · 84d9910
2 parents 0d9e433 + 2789caf
commit 84d9910
Show file tree

Hide file tree

Showing 14 changed files with 2 additions and 143 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -34,18 +34,6 @@ jobs:
             .github
             .vscode
 
-  stylua:
-    timeout-minutes: 15
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v4
-      # Pinning because of needed the GITHUB_TOKEN
-      - uses: JohnnyMorganz/stylua-action@b6661824b86c9c33121bed87a778b660ba90cf77 # v4.0.0
-        with:
-          token: ${{ github.token }}
-          version: '0.20.0' # selfup {"extract":"\\d\\.\\d+\\.\\d+","replacer":["stylua", "--version"], "nth": 2}
-          args: --check .
-
   # Don't use lycheeverse/lychee-action. There is no benefit rather than using the CLI for my use. And considering the targets should be simple with `git ls-files` rather than built-in glob
   link-checker:
     runs-on: ubuntu-24.04

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -10,7 +10,6 @@
     "jnoortheen.nix-ide",
     "golang.go",
     "kdl-org.kdl",
-    "JohnnyMorganz.stylua",
     "davidanson.vscode-markdownlint",
     "TheNuProjectContributors.vscode-nushell-lang",
     "rszyma.vscode-kanata"

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,9 +10,6 @@
   "[go]": {
     "editor.defaultFormatter": "golang.go"
   },
-  "[lua]": {
-    "editor.defaultFormatter": "JohnnyMorganz.stylua"
-  },
   "[kanata]": {
     "editor.defaultFormatter": "rszyma.vscode-kanata"
   },
@@ -21,7 +18,6 @@
   "gopls": {
     "build.buildFlags": ["-tags=linux,windows,darwin"]
   },
-  "stylua.searchBinaryInPATH": true,
   "shellformat.useEditorConfig": true,
   "shellcheck.ignorePatterns": {
     "dependencies/**": true,

diff --git a/.zed/settings.json b/.zed/settings.json
@@ -38,14 +38,6 @@
           "arguments": ["--language-dialect", "bash", "-"]
         }
       }
-    },
-    "Lua": {
-      "formatter": {
-        "external": {
-          "command": "stylua",
-          "arguments": ["-"]
-        }
-      }
     }
   }
 }
diff --git a/cmd/deps/main.go b/cmd/deps/main.go
@@ -16,7 +16,6 @@ func main() {
 		{Path: "shfmt", Args: []string{"--version"}},
 		{Path: "typos", Args: []string{"--version"}},
 		{Path: "trufflehog", Args: []string{"--version"}},
-		{Path: "stylua", Args: []string{"--version"}},
 		{Path: "nixpkgs-lint", Args: []string{"--version"}},
 		{Path: "selfup", Args: []string{"-version"}},
 

diff --git a/config/vscode/extensions.txt b/config/vscode/extensions.txt
@@ -9,7 +9,6 @@ foxundermoon.shell-format
 github.vscode-github-actions
 golang.go
 jnoortheen.nix-ide
-johnnymorganz.stylua
 ms-azuretools.vscode-docker
 ms-ceintl.vscode-language-pack-ja
 rubocop.vscode-rubocop

diff --git a/config/vscode/settings.json b/config/vscode/settings.json
@@ -27,9 +27,6 @@
   "[ruby]": {
     "editor.defaultFormatter": "rubocop.vscode-rubocop"
   },
-  "[lua]": {
-    "editor.defaultFormatter": "JohnnyMorganz.stylua"
-  },
   "[elm]": {
     "editor.defaultFormatter": "elmTooling.elm-ls-vscode"
   },
@@ -105,7 +102,6 @@
   "files.defaultLanguage": "powershell",
   "editor.wordSeparators": "`~!@#%^&*()-=+[{]}\\|;:'\",.<>/?",
   "workbench.colorTheme": "Base16 Dark Ashes",
-  "stylua.searchBinaryInPATH": true,
   "shellformat.useEditorConfig": true,
   "editor.cursorSurroundingLines": 5,
   "redhat.telemetry.enabled": false,

diff --git a/config/wezterm/README.md b/config/wezterm/README.md
diff --git a/config/wezterm/wezterm.lua b/config/wezterm/wezterm.lua
diff --git a/flake.nix b/flake.nix
@@ -121,7 +121,6 @@
                   # Don't use treefmt(treefmt1) that does not have crucial feature to cover hidden files
                   # https://github.com/numtide/treefmt/pull/250
                   treefmt2
-                  stylua
                   typos
                   typos-lsp # For zed-editor typos extension
                   go_1_23

diff --git a/home-manager/helix.nix b/home-manager/helix.nix
@@ -175,18 +175,6 @@ in
           formatter = mkDprint "kdl";
           language-servers = [ "typos" ];
         }
-        {
-          name = "lua";
-          auto-format = true;
-          formatter = {
-            command = lib.getExe pkgs.stylua;
-            args = [ "-" ];
-          };
-          language-servers = [
-            "lua-language-server"
-            "typos"
-          ];
-        }
       ];
     };
 
@@ -218,7 +206,7 @@ in
       marksman
 
       # https://github.com/helix-editor/helix/blob/24.03/languages.toml#L1164
-      lua-language-server
+      # lua-language-server
 
       # https://github.com/helix-editor/helix/blob/24.03/languages.toml#L94
       vscode-langservers-extracted

diff --git a/nixos/desktop/GUI.md b/nixos/desktop/GUI.md
@@ -1,11 +1,5 @@
 # GUI
 
-Started from KDE for the battery-included and stable behaviors.\
-However I need tilling window manager for several reasons, especially unstable wezterm and zelliji cannot define multiple modifier.\
-So I started to using Hyprland. This maybe the note.
-
-=> And switched to GNOME
-
 ## GNOME
 
 Q: How to reload GNOME on wayland settings without reboot?\

diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix
@@ -272,7 +272,7 @@
     MOZ_ENABLE_WAYLAND = "1";
     NIXOS_OZONE_WL = "1";
 
-    # Avoiding hidden or unstable mouse cursors when using Alacritty/Wezterm on Wayland
+    # Avoiding hidden or unstable mouse cursors when using Alacritty on Wayland
     #
     # https://github.com/NixOS/nixpkgs/issues/22652
     # https://github.com/alacritty/alacritty/issues/6703#issuecomment-2222503206

diff --git a/treefmt.toml b/treefmt.toml
@@ -43,7 +43,3 @@ options = [
   "--write",
 ]
 includes = ["*.sh", "*.bash", "*.envrc"]
-
-[formatter.stylua]
-command = "stylua"
-includes = ["*.lua"]