Compare commits

...

4 Commits

Author SHA1 Message Date
Alyxia Sother ae45a1f016
[nix] Install Stylua and lua-language-server 2023-06-15 10:34:59 +02:00
Alyxia Sother b6980f07c5
[nvim] Fix path to Stylua 2023-06-15 10:34:28 +02:00
Alyxia Sother a77308a761
[nix] Move the JB IDEs to Brew 2023-06-15 10:14:27 +02:00
Alyxia Sother 2f41ade799
[nvim] Lock treesitter down to the old MacBook 2023-06-15 10:13:40 +02:00
4 changed files with 26 additions and 7 deletions

View File

@ -1,3 +1,4 @@
{
"workspace.checkThirdParty": false
}
"workspace.checkThirdParty": false,
"workspace.library": ["${3rd}/luassert/library", "${3rd}/luv/library"]
}

View File

@ -30,11 +30,13 @@ let
jq
kubectl
kubelogin-oidc
lua-language-server
mosh
nixpkgs-fmt
pandoc
ripgrep
sops
stylua
texlive.combined.scheme-small
vim
wget
@ -62,9 +64,6 @@ let
];
programs = [
jetbrains.idea-ultimate
jetbrains.phpstorm
jetbrains.rider
rectangle
slack
tailscale
@ -231,12 +230,16 @@ in
"discord-ptb"
"docker"
"firefox"
"goland"
"google-chrome"
"intellij-idea"
"itch"
"iterm2"
"obs"
"phpstorm"
"plexamp"
"raycast"
"rider"
"sequel-ace"
"shottr"
"spotify"

View File

@ -1,4 +1,10 @@
if !has('nvim-0.2.1') | finish | endif
call extend(g:dotfiles_coc_extensions, {'coc-stylua': 1})
let g:coc_user_config['coc.preferences.formatOnSaveFiletypes'] = ['lua']
let g:coc_user_config['stylua.styluaPath'] = "/usr/bin/stylua"
" We're using Nix here, so point to the right path...
if has('macunix')
let g:coc_user_config['stylua.styluaPath'] = "/etc/profiles/per-user/alyxia/bin/stylua"
else
let g:coc_user_config['stylua.styluaPath'] = "/usr/bin/stylua"
endif

View File

@ -9,8 +9,17 @@ if not ok then return end
-- So, the nix-darwin configuration specifies the installation of zig as a
-- replacement compiler solely so the Treesitter dialects compile. Very
-- intuitive.
-- Sadly, the solution only works on my old MacBook pro, which is a 13 inch
-- model. So my only option is to lock it down to that device.
if vim.loop.os_uname().sysname == 'Darwin' then
require('nvim-treesitter.install').compilers = { "zig" }
local meta = vim.fn.system({"system_profiler", "SPHardwareDataType"});
if not string.match(meta, "MacBookPro13,1") then
return
end
local opts = require('nvim-treesitter.install')
opts.compilers = { "zig" }
opts.command_extra_args = { "--help" }
end
local parser_configs = parser_configs.get_parser_configs()