diff --git a/flake.lock b/flake.lock index c4f0a85..135301e 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1711124527, - "narHash": "sha256-nCTtAShwdthp+scvmLevc06gtY9gglXq2vCdsszTqIA=", + "lastModified": 1711349769, + "narHash": "sha256-YyDJq/Cf57QIAvhIRiUkfft7zQP6sWG/KFVdtbptmEU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "d1f6bbea177a3542d9ad3ecead77089b65e09963", + "rev": "a6bc3598b9e686d1d0002df0ce435a10c81e19e9", "type": "gitlab" }, "original": { @@ -61,11 +61,11 @@ ] }, "locked": { - "lastModified": 1711056091, - "narHash": "sha256-tOerD2Fk8ZZQloceDh9vx9zptmoACmS2K9yvtnMerXs=", + "lastModified": 1711257659, + "narHash": "sha256-Z9D/lAibU9lu4Wc/HxfhlEegS5Qk6NGP11ODctlC9xk=", "owner": "getchoo", "repo": "nix-exprs", - "rev": "6493e74983d5549bcc97cb669bf3790b1f4ef284", + "rev": "16d73312136ce647c7bcf2d79605fe1188469fcc", "type": "github" }, "original": { @@ -168,11 +168,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1711101603, - "narHash": "sha256-5/uA1LoIQ6BhvABbTy46w97vO+q5jcngZ4BOsJtKiXs=", + "lastModified": 1711313012, + "narHash": "sha256-d0Shu3dqdJj9QKR3dnE4Mh8t66hUlfLGZl+9A9JsoI8=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "0db5afb9d618571048bc30958e10b1990130bbb4", + "rev": "87fce7923fef1143b3a473abb2fc873e67664475", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1711001935, - "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20f77aa09916374aa3141cbc605c955626762c9a", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 5e976ba..94c16a8 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -6,7 +6,7 @@ ../../modules/home/programs/common.nix ../../modules/home/programs/firefox.nix ../../modules/home/programs/kitty.nix - ../../modules/home/programs/modrinth.nix +# ../../modules/home/programs/modrinth.nix ../../modules/home/programs/neovim ../../modules/home/programs/git.nix ../../modules/home/programs/ssh.nix diff --git a/modules/home/programs/neovim/autocmd.lua b/modules/home/programs/neovim/autocmd.lua index 1ea5e7d..8f53ff7 100644 --- a/modules/home/programs/neovim/autocmd.lua +++ b/modules/home/programs/neovim/autocmd.lua @@ -9,3 +9,9 @@ api.nvim_create_autocmd( "FileType", { pattern = "markdown", command = "setlocal complete+=kspell" } ) + +api.nvim_create_autocmd({ + "BufNewFile", "BufRead" + }, + { pattern = "*.mcfunction", command = "set filetype=mcfunction" } +) diff --git a/modules/home/programs/neovim/default.nix b/modules/home/programs/neovim/default.nix index 31826c0..d12b937 100644 --- a/modules/home/programs/neovim/default.nix +++ b/modules/home/programs/neovim/default.nix @@ -10,6 +10,7 @@ ripgrep marksman wl-clipboard + nodejs_20 ]; programs.neovim = diff --git a/modules/home/programs/neovim/plugins/lsp.lua b/modules/home/programs/neovim/plugins/lsp.lua index 3867e31..da621bc 100644 --- a/modules/home/programs/neovim/plugins/lsp.lua +++ b/modules/home/programs/neovim/plugins/lsp.lua @@ -24,7 +24,11 @@ vim.g.rustaceanvim = { lspconfig.tsserver.setup{} -lspconfig.spyglassmc_language_server.setup{} +lspconfig.spyglassmc_language_server.setup{ + cmd = { + "/home/xeovalyte/.npm-global/bin/spyglassmc-language-server", "--stdio" + } +} lspconfig.arduino_language_server.setup{ cmd = {