diff options
Diffstat (limited to 'user')
-rw-r--r-- | user/emacs/init.el | 12 | ||||
-rw-r--r-- | user/settings/development/golang.nix | 7 |
2 files changed, 17 insertions, 2 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el index b666e033..45054237 100644 --- a/user/emacs/init.el +++ b/user/emacs/init.el @@ -689,7 +689,7 @@ _C-k_: prev _u_pper _=_: upper/lower _s_mart resolve (setq dired-dwim-target t dired-recursive-copies 'top - dired-listing-switches "-alh --group-directories-first" + dired-listing-switches "-alh" dired-kill-when-opening-new-dired-buffer t dired-recursive-deletes (if delete-by-moving-to-trash 'always @@ -997,13 +997,21 @@ _C-k_: prev _u_pper _=_: upper/lower _s_mart resolve :config (progn (treemacs-load-theme "simple"))) +(defun ap/consult-ghq-switch-project (dir) + "Append a slash to avoid project.el remembering two different +paths for the same project." + (interactive) + (project-switch-project (if (string-suffix-p "/" dir) + dir + (concat dir "/")))) (use-package consult-ghq :defer 5 :general (:keymaps 'project-prefix-map "o" #'consult-ghq-switch-project) :config (progn (setq consult-ghq-grep-function #'consult-grep - consult-ghq-find-function #'consult-find))) + consult-ghq-find-function #'consult-find + consult-ghq-switch-project-function #'ap/consult-ghq-switch-project))) (use-package envrc :defer 2 diff --git a/user/settings/development/golang.nix b/user/settings/development/golang.nix index a9293a31..8798fbc6 100644 --- a/user/settings/development/golang.nix +++ b/user/settings/development/golang.nix @@ -12,6 +12,9 @@ golangci-lint-langserver personal.prettier-plugin-go-template ]; + home.sessionPath = [ + "$HOME/go/bin" + ]; programs.emacs.extraPackages = epkgs: (with epkgs; [ go-eldoc go-tag @@ -20,4 +23,8 @@ programs.neovim.plugins = with pkgs.vimPlugins; [ coc-go ]; + programs.fish.shellAbbrs = { + gmt = "go mod tidy"; + gmd = "go mod download"; + }; } |