Compare commits
4 Commits
4e384ffa27
...
ae45a1f016
Author | SHA1 | Date |
---|---|---|
Alyxia Sother | ae45a1f016 | |
Alyxia Sother | b6980f07c5 | |
Alyxia Sother | a77308a761 | |
Alyxia Sother | 2f41ade799 |
|
@ -1,3 +1,4 @@
|
||||||
{
|
{
|
||||||
"workspace.checkThirdParty": false
|
"workspace.checkThirdParty": false,
|
||||||
|
"workspace.library": ["${3rd}/luassert/library", "${3rd}/luv/library"]
|
||||||
}
|
}
|
|
@ -30,11 +30,13 @@ let
|
||||||
jq
|
jq
|
||||||
kubectl
|
kubectl
|
||||||
kubelogin-oidc
|
kubelogin-oidc
|
||||||
|
lua-language-server
|
||||||
mosh
|
mosh
|
||||||
nixpkgs-fmt
|
nixpkgs-fmt
|
||||||
pandoc
|
pandoc
|
||||||
ripgrep
|
ripgrep
|
||||||
sops
|
sops
|
||||||
|
stylua
|
||||||
texlive.combined.scheme-small
|
texlive.combined.scheme-small
|
||||||
vim
|
vim
|
||||||
wget
|
wget
|
||||||
|
@ -62,9 +64,6 @@ let
|
||||||
];
|
];
|
||||||
|
|
||||||
programs = [
|
programs = [
|
||||||
jetbrains.idea-ultimate
|
|
||||||
jetbrains.phpstorm
|
|
||||||
jetbrains.rider
|
|
||||||
rectangle
|
rectangle
|
||||||
slack
|
slack
|
||||||
tailscale
|
tailscale
|
||||||
|
@ -231,12 +230,16 @@ in
|
||||||
"discord-ptb"
|
"discord-ptb"
|
||||||
"docker"
|
"docker"
|
||||||
"firefox"
|
"firefox"
|
||||||
|
"goland"
|
||||||
"google-chrome"
|
"google-chrome"
|
||||||
|
"intellij-idea"
|
||||||
"itch"
|
"itch"
|
||||||
"iterm2"
|
"iterm2"
|
||||||
"obs"
|
"obs"
|
||||||
|
"phpstorm"
|
||||||
"plexamp"
|
"plexamp"
|
||||||
"raycast"
|
"raycast"
|
||||||
|
"rider"
|
||||||
"sequel-ace"
|
"sequel-ace"
|
||||||
"shottr"
|
"shottr"
|
||||||
"spotify"
|
"spotify"
|
||||||
|
|
|
@ -1,4 +1,10 @@
|
||||||
if !has('nvim-0.2.1') | finish | endif
|
if !has('nvim-0.2.1') | finish | endif
|
||||||
call extend(g:dotfiles_coc_extensions, {'coc-stylua': 1})
|
call extend(g:dotfiles_coc_extensions, {'coc-stylua': 1})
|
||||||
let g:coc_user_config['coc.preferences.formatOnSaveFiletypes'] = ['lua']
|
let g:coc_user_config['coc.preferences.formatOnSaveFiletypes'] = ['lua']
|
||||||
|
|
||||||
|
" 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"
|
let g:coc_user_config['stylua.styluaPath'] = "/usr/bin/stylua"
|
||||||
|
endif
|
||||||
|
|
|
@ -9,8 +9,17 @@ if not ok then return end
|
||||||
-- So, the nix-darwin configuration specifies the installation of zig as a
|
-- So, the nix-darwin configuration specifies the installation of zig as a
|
||||||
-- replacement compiler solely so the Treesitter dialects compile. Very
|
-- replacement compiler solely so the Treesitter dialects compile. Very
|
||||||
-- intuitive.
|
-- 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
|
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
|
end
|
||||||
|
|
||||||
local parser_configs = parser_configs.get_parser_configs()
|
local parser_configs = parser_configs.get_parser_configs()
|
||||||
|
|
Loading…
Reference in New Issue