diff --git a/flake.lock b/flake.lock index 2840787..deea8d2 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1694228071, - "narHash": "sha256-OxEzUiIu2LFSdhsayV8Jk8DKg+kwLBSSKezURwjkFQU=", + "lastModified": 1694317719, + "narHash": "sha256-Z3M1vktETVP0QTRWGJdr8NEqAabe8T01Qwyv/WbI5Qk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a9bbef37c102aafd6a9247c011f2ae90f3c71b16", + "rev": "cda419bccab17c45d00f200a987d30e9c93c9590", "type": "github" }, "original": { @@ -351,11 +351,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693985761, - "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", + "lastModified": 1694183432, + "narHash": "sha256-YyPGNapgZNNj51ylQMw9lAgvxtM2ai1HZVUu3GS8Fng=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", + "rev": "db9208ab987cdeeedf78ad9b4cf3c55f5ebd269b", "type": "github" }, "original": { diff --git a/home/laptop/packages/default.nix b/home/laptop/packages/default.nix index 24e9291..913ea4b 100644 --- a/home/laptop/packages/default.nix +++ b/home/laptop/packages/default.nix @@ -27,15 +27,14 @@ bat trashy yewtube + lolcat # programming - nixfmt sqlite tectonic ffmpeg nodePackages_latest.pnpm rustup poetry - lolcat deno bun nodejs_20 diff --git a/home/laptop/programs/neovim/default.nix b/home/laptop/programs/neovim/default.nix index f12cbf8..c506859 100644 --- a/home/laptop/programs/neovim/default.nix +++ b/home/laptop/programs/neovim/default.nix @@ -3,25 +3,36 @@ enable = true; viAlias = true; extraPackages = with pkgs; [ + # nix + rnix-lsp alejandra - black + # go go gopls + # c/c++ libclang + # lua lua lua-language-server + stylua + # js/ts nodePackages_latest.prettier nodePackages_latest.typescript nodePackages_latest.typescript-language-server nodePackages_latest."@tailwindcss/language-server" nodePackages_latest."@prisma/language-server" + # bash + nodePackages_latest.bash-language-server + shfmt + # python python311Packages.python-lsp-black python311Packages.python-lsp-server - ripgrep - rnix-lsp - stylua - haskell-language-server + black + # haskell ghc + haskell-language-server + # neovim + ripgrep ]; plugins = with pkgs.vimPlugins; [ nvim-surround diff --git a/home/laptop/programs/neovim/nvim/init.lua b/home/laptop/programs/neovim/nvim/init.lua index 9251cfc..fd16730 100644 --- a/home/laptop/programs/neovim/nvim/init.lua +++ b/home/laptop/programs/neovim/nvim/init.lua @@ -73,7 +73,8 @@ local servers = { gopls = {}, tailwindcss = {}, prismals = {}, - hls = {} + hls = {}, + bashls = {}, } local cmp_capabilities = require("cmp_nvim_lsp").default_capabilities() local on_attach = function(client, bufnr)