diff --git a/.luarc.json b/.luarc.json index 18eefe7..23b9ee2 100644 --- a/.luarc.json +++ b/.luarc.json @@ -1,4 +1,3 @@ { - "workspace.checkThirdParty": false, - "workspace.library": ["${3rd}/luassert/library", "${3rd}/luv/library"] -} + "workspace.checkThirdParty": false +} \ No newline at end of file diff --git a/nix/hosts/alymac/default.nix b/nix/hosts/alymac/default.nix index 7d8cee9..49f0ccb 100644 --- a/nix/hosts/alymac/default.nix +++ b/nix/hosts/alymac/default.nix @@ -30,13 +30,11 @@ let jq kubectl kubelogin-oidc - lua-language-server mosh nixpkgs-fmt pandoc ripgrep sops - stylua texlive.combined.scheme-small vim wget @@ -64,6 +62,9 @@ let ]; programs = [ + jetbrains.idea-ultimate + jetbrains.phpstorm + jetbrains.rider rectangle slack tailscale @@ -230,16 +231,12 @@ in "discord-ptb" "docker" "firefox" - "goland" "google-chrome" - "intellij-idea" "itch" "iterm2" "obs" - "phpstorm" "plexamp" "raycast" - "rider" "sequel-ace" "shottr" "spotify" diff --git a/nvim/coc-languages/lua.vim b/nvim/coc-languages/lua.vim index c8c8489..a102961 100644 --- a/nvim/coc-languages/lua.vim +++ b/nvim/coc-languages/lua.vim @@ -1,10 +1,4 @@ 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'] - -" 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 +let g:coc_user_config['stylua.styluaPath'] = "/usr/bin/stylua" diff --git a/nvim/plugin/treesitter.lua b/nvim/plugin/treesitter.lua index bcdfe6f..63cb55c 100644 --- a/nvim/plugin/treesitter.lua +++ b/nvim/plugin/treesitter.lua @@ -9,17 +9,8 @@ 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 - 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" } + require('nvim-treesitter.install').compilers = { "zig" } end local parser_configs = parser_configs.get_parser_configs()