diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 29fbe859..8404166f 100644 --- 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 index 8bf67e5d..49bb7732 100644 --- 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 index b131aba6..d9ccd57c 100644 --- 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 index 65928202..3f7f95cc 100644 --- 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 index 0ecc1cc0..a14ec1ab 100644 --- 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 index 84d77d3c..8c5ba543 100644 --- 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 index bb3b8401..ab65a2a4 100644 --- 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 deleted file mode 100644 index 50f09274..00000000 --- a/config/wezterm/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# WezTerm - -Now I'm not using Wezterm from several reasons. But keeping the config and several note for possibilities to use it again in future... - -## How to debug Lua code? - -CTRL-SHIFT-L - - - -But you may need to disable the hotkey in AMD software. It is preserved in performance logging diff --git a/config/wezterm/wezterm.lua b/config/wezterm/wezterm.lua deleted file mode 100644 index fcac1183..00000000 --- a/config/wezterm/wezterm.lua +++ /dev/null @@ -1,76 +0,0 @@ -local wezterm = require("wezterm") -local mux = wezterm.mux -local config = wezterm.config_builder() -local action = wezterm.action -local launch_menu = {} -local font_with_fallback = wezterm.font_with_fallback({ - { - family = "PlemolJP Console NF", - harfbuzz_features = { "zero" }, - weight = "Medium", - assume_emoji_presentation = false, - }, - { family = "Beedii", assume_emoji_presentation = true }, - "源ノ角ゴシック Code JP", -}) - -config.color_scheme = "iceberg-dark" -config.window_background_opacity = 0.94 -config.default_cursor_style = "BlinkingBar" -config.font = font_with_fallback -config.font_size = 13 -config.adjust_window_size_when_changing_font_size = nil -config.window_frame = { - font = font_with_fallback, - font_size = 12, -} -config.window_close_confirmation = "NeverPrompt" - --- target_triple candidates --- https://doc.rust-lang.org/nightly/rustc/platform-support.html -if string.find(wezterm.target_triple, "pc-windows", 1, true) then - config.default_prog = { "wsl.exe", "--distribution", "Ubuntu-24.04", "--cd", "~" } - table.insert(launch_menu, { - label = "PowerShell", - args = { "pwsh", "-NoLogo" }, - }) -end - --- Using in wayland requires non released versions --- https://github.com/wez/wezterm/issues/5340 -if string.find(wezterm.target_triple, "-linux", 1, true) then - -- Don't set WAYLAND_DISPLAY: https://github.com/wez/wezterm/issues/5263#issuecomment-2095021883 - config.enable_wayland = true - config.use_ime = true -end - -config.keys = { - -- TODO: Consider to move into windows only combination - { key = "v", mods = "CTRL", action = action.PasteFrom("Clipboard") }, - { - key = "r", - mods = "CMD|SHIFT", - action = action.ReloadConfiguration, - }, -} - -wezterm.on("gui-startup", function(cmd) - local tab, pane, window = mux.spawn_window(cmd or {}) - local screen = wezterm.gui.screens().active - local gui_window = window:gui_window() - - gui_window:set_inner_size(screen.width * 0.8, screen.height * 0.8) - gui_window:set_position(screen.width * 0.05, screen.height * 0.05) - - local right_pane = pane:split({ direction = "Right", size = 0.3 }) - right_pane:split({ direction = "Bottom", size = 0.5 }) - pane:activate() -end) - -config.launch_menu = launch_menu - --- By default true, that makes always hiding cursor after typed in wayland --- Might be related to https://github.com/wez/wezterm/issues/3334 -config.hide_mouse_cursor_when_typing = false - -return config diff --git a/flake.nix b/flake.nix index e129db12..bb5b8b65 100644 --- 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 index 98f68f3c..a6accc79 100644 --- 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 index 6a27ec04..c76bea9b 100644 --- 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 index 52e8618f..40ead9cb 100644 --- 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 index 23df6616..b718e773 100644 --- a/treefmt.toml +++ b/treefmt.toml @@ -43,7 +43,3 @@ options = [ "--write", ] includes = ["*.sh", "*.bash", "*.envrc"] - -[formatter.stylua] -command = "stylua" -includes = ["*.lua"]