diff --git a/flake.lock b/flake.lock index a2d4639..0d72b93 100644 --- a/flake.lock +++ b/flake.lock @@ -116,11 +116,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1735535921, - "narHash": "sha256-cfsHww91bRA2Frni54+blIGZGU9/269vaWzeGcNRNN0=", + "lastModified": 1735589157, + "narHash": "sha256-s5fJn9LSwz3cfkKSvicQppCnXVs8F05OH96yaa5K2Dc=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "87bd0bb744d6a1c45022aa39f21219d0b6ff3261", + "rev": "ef542c6e63b40b3541dc5efd625c0b95f750bbc6", "type": "github" }, "original": { @@ -309,11 +309,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1735412871, - "narHash": "sha256-Qoz0ow6jDGUIBHxduc7Y1cjYFS71tvEGJV5Src/mj98=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f94733f93e4fe6e82f516efae007096e4ab5a21", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ce544bd..170ca39 100644 --- a/flake.nix +++ b/flake.nix @@ -67,6 +67,7 @@ packages = with pkgs; [ just nh + nixd ]; }; diff --git a/home/common/devel.nix b/home/common/devel.nix index 21cffd0..910900e 100644 --- a/home/common/devel.nix +++ b/home/common/devel.nix @@ -2,30 +2,13 @@ { home.packages = with pkgs; [ age-plugin-fido2-hmac - bacon - cargo - clang - codeium comma dogdns file - gnumake - go just - ldns - minio-client - nil nix-output-monitor - nixd - nixfmt-rfc-style - nodejs_22 passage rage - prettierd - rust-analyzer - rustc - stylua - tree-sitter ]; home.sessionVariables = { diff --git a/home/common/nvim/default.nix b/home/common/nvim/default.nix index d6dd694..ab9a1b0 100644 --- a/home/common/nvim/default.nix +++ b/home/common/nvim/default.nix @@ -24,36 +24,38 @@ extraLuaConfig = lib.fileContents ./init.lua; extraPackages = with pkgs; [ - black codeium - cue - go - gopls - gotools harper lua-language-server - nil nixd - nodePackages.prettier - nodePackages.typescript - nodePackages.typescript-language-server - nodePackages.bash-language-server - rust-analyzer - rustfmt shellcheck shfmt stylua - superhtml - vscode-langservers-extracted ]; plugins = with pkgs.vimPlugins; [ - direnv-vim friendly-snippets go-nvim targets-vim ts-comments-nvim + { + plugin = pkgs.vimUtils.buildVimPlugin { + name = "direnv-nvim"; + src = pkgs.fetchFromGitHub { + owner = "actionshrimp"; + repo = "direnv.nvim"; + rev = "main"; + hash = "sha256-7NcVskgAurbIuEVIXxHvXZfYQBOEXLURGzllfVEQKNE="; + }; + }; + type = "lua"; + config = '' + require('direnv-nvim').setup { + type = "dir" + } + ''; + } { plugin = nvim-lspconfig; type = "lua"; @@ -174,6 +176,7 @@ type = "lua"; config = lib.fileContents ./rust.lua; } + ]; }; }