diff options
| author | William Carroll <wpcarro@gmail.com> | 2021-12-14T03·51-0800 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2021-12-15T15·49+0000 |
| commit | b6d143e5d225e6aa293c23512336b7136ac58dcf (patch) | |
| tree | 5cb070270342957f39415ab396a1d5f18a8a1fee /users/wpcarro/emacs | |
| parent | 38ec27e834b3d177b846d35064bba58fd70f41df (diff) | |
fix(wpcarro/nix): Remove <briefcase> references r/3249
Angle-bracketed references are a Nix anti-pattern, and thankfully this repository enforces this as a standard. TL;DR: - Drop angle-bracketed references - Change `briefcase` -> `users.wpcarro` - Fix any resulting regressions - Fix //users/wpcarro/tools/simple_vim - Mark //users/wpcarro/boilerplate/typescript and related projects as broken - drop .skip-subtree file, enabling depot CI Change-Id: I7153cbabafa617bfd6b199370cbec65cb75441f6 Reviewed-on: https://cl.tvl.fyi/c/depot/+/4325 Tested-by: BuildkiteCI Reviewed-by: wpcarro <wpcarro@gmail.com> Reviewed-by: tazjin <mail@tazj.in> Reviewed-by: grfn <grfn@gws.fyi> Autosubmit: wpcarro <wpcarro@gmail.com>
Diffstat (limited to 'users/wpcarro/emacs')
| -rw-r--r-- | users/wpcarro/emacs/.emacs.d/snippets/nix-mode/shell-nix | 9 | ||||
| -rw-r--r-- | users/wpcarro/emacs/.emacs.d/wpc/wpc-misc.el | 4 | ||||
| -rw-r--r-- | users/wpcarro/emacs/default.nix | 4 |
3 files changed, 5 insertions, 12 deletions
diff --git a/users/wpcarro/emacs/.emacs.d/snippets/nix-mode/shell-nix b/users/wpcarro/emacs/.emacs.d/snippets/nix-mode/shell-nix index 45cb24e2b9..b5eb5a2447 100644 --- a/users/wpcarro/emacs/.emacs.d/snippets/nix-mode/shell-nix +++ b/users/wpcarro/emacs/.emacs.d/snippets/nix-mode/shell-nix @@ -2,12 +2,11 @@ # name: shell.nix boilerplate # key: import # -- -let - briefcase = with import <briefcase> {}; - pkgs = briefcase.third_party.pkgs; -in stdenv.mkDerivation { +{ pkgs, ... }: + +pkgs.stdenv.mkDerivation { name = "$1"; buildInputs = [ $2 ]; -} \ No newline at end of file +} diff --git a/users/wpcarro/emacs/.emacs.d/wpc/wpc-misc.el b/users/wpcarro/emacs/.emacs.d/wpc/wpc-misc.el index 574162fbfd..5b147dc77d 100644 --- a/users/wpcarro/emacs/.emacs.d/wpc/wpc-misc.el +++ b/users/wpcarro/emacs/.emacs.d/wpc/wpc-misc.el @@ -294,10 +294,6 @@ :config (add-hook 'lsp-mode-hook #'lsp-ui-mode)) -(use-package company-lsp - :config - (push 'company-lsp company-backends)) - ;; Wilfred/suggest.el - Tool for discovering functions basesd on declaring your ;; desired inputs and outputs. (use-package suggest) diff --git a/users/wpcarro/emacs/default.nix b/users/wpcarro/emacs/default.nix index 4c50d3294c..b25968ecbf 100644 --- a/users/wpcarro/emacs/default.nix +++ b/users/wpcarro/emacs/default.nix @@ -2,7 +2,7 @@ let inherit (builtins) path; - inherit (depot.third_party) emacsPackagesGen emacs27; + inherit (depot.third_party.nixpkgs) emacsPackagesGen emacs27; inherit (pkgs) writeShellScript writeShellScriptBin; inherit (pkgs.lib.strings) concatStringsSep makeBinPath; @@ -49,7 +49,6 @@ let clipmon # TODO: Prefer an Emacs client for clipmenud. evil evil-collection - evil-magit evil-commentary evil-surround key-chord @@ -103,7 +102,6 @@ let eglot dap-mode lsp-ui - company-lsp suggest paradox flymake-shellcheck |