Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove wezterm config and lua helpers #1027

Merged
merged 2 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"jnoortheen.nix-ide",
"golang.go",
"kdl-org.kdl",
"JohnnyMorganz.stylua",
"davidanson.vscode-markdownlint",
"TheNuProjectContributors.vscode-nushell-lang",
"rszyma.vscode-kanata"
Expand Down
4 changes: 0 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
"[go]": {
"editor.defaultFormatter": "golang.go"
},
"[lua]": {
"editor.defaultFormatter": "JohnnyMorganz.stylua"
},
"[kanata]": {
"editor.defaultFormatter": "rszyma.vscode-kanata"
},
Expand All @@ -21,7 +18,6 @@
"gopls": {
"build.buildFlags": ["-tags=linux,windows,darwin"]
},
"stylua.searchBinaryInPATH": true,
"shellformat.useEditorConfig": true,
"shellcheck.ignorePatterns": {
"dependencies/**": true,
Expand Down
8 changes: 0 additions & 8 deletions .zed/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,6 @@
"arguments": ["--language-dialect", "bash", "-"]
}
}
},
"Lua": {
"formatter": {
"external": {
"command": "stylua",
"arguments": ["-"]
}
}
}
}
}
1 change: 0 additions & 1 deletion cmd/deps/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"}},

Expand Down
1 change: 0 additions & 1 deletion config/vscode/extensions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions config/vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@
"[ruby]": {
"editor.defaultFormatter": "rubocop.vscode-rubocop"
},
"[lua]": {
"editor.defaultFormatter": "JohnnyMorganz.stylua"
},
"[elm]": {
"editor.defaultFormatter": "elmTooling.elm-ls-vscode"
},
Expand Down Expand Up @@ -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,
Expand Down
11 changes: 0 additions & 11 deletions config/wezterm/README.md

This file was deleted.

76 changes: 0 additions & 76 deletions config/wezterm/wezterm.lua

This file was deleted.

1 change: 0 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 1 addition & 13 deletions home-manager/helix.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
];
}
];
};

Expand Down Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions nixos/desktop/GUI.md
Original file line number Diff line number Diff line change
@@ -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?\
Expand Down
2 changes: 1 addition & 1 deletion nixos/desktop/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions treefmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,3 @@ options = [
"--write",
]
includes = ["*.sh", "*.bash", "*.envrc"]

[formatter.stylua]
command = "stylua"
includes = ["*.lua"]
Loading