diff options
| -rw-r--r-- | npins/sources.json | 34 | ||||
| -rw-r--r-- | system/mba.nix | 1 | ||||
| -rw-r--r-- | system/settings/dev.nix | 3 | ||||
| -rw-r--r-- | user/emacs/init.el | 12 | ||||
| -rw-r--r-- | user/settings/development/golang.nix | 4 |
5 files changed, 31 insertions, 23 deletions
diff --git a/npins/sources.json b/npins/sources.json index ad19dd7f..54e46bfb 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -20,9 +20,9 @@ "repo": "nix-darwin" }, "branch": "master", - "revision": "50581970f37f06a4719001735828519925ef8310", - "url": "https://github.com/lnl7/nix-darwin/archive/50581970f37f06a4719001735828519925ef8310.tar.gz", - "hash": "1c2zihl124j7xz5fyhkjvcpabyrvs1qgix1fzr0fc002mnkcrf13" + "revision": "ec12b88104d6c117871fad55e931addac4626756", + "url": "https://github.com/lnl7/nix-darwin/archive/ec12b88104d6c117871fad55e931addac4626756.tar.gz", + "hash": "1c1v6r77majxhs8a9gz3czqnsf94hy28bwk7kq50879cc2cw7cb4" }, "emacs-overlay": { "type": "Git", @@ -32,9 +32,9 @@ "repo": "emacs-overlay" }, "branch": "master", - "revision": "012409732a53433d75db7bb2e06dd0bdaf8ca7ea", - "url": "https://github.com/nix-community/emacs-overlay/archive/012409732a53433d75db7bb2e06dd0bdaf8ca7ea.tar.gz", - "hash": "1rsxi3xlrll0s3brwr1s1yb6zjzzkjzm704j4dzf05ss0m4pzc0d" + "revision": "e2e8c7303eafd8d3657e06c28be7b3b74c7024e6", + "url": "https://github.com/nix-community/emacs-overlay/archive/e2e8c7303eafd8d3657e06c28be7b3b74c7024e6.tar.gz", + "hash": "1b8a5jkwb43apmipiph1yg10hwlxwdjyzdaimksnsnc7zjh1vlrg" }, "home-manager": { "type": "Git", @@ -44,9 +44,9 @@ "repo": "home-manager" }, "branch": "master", - "revision": "7e68e55d2e16d3a1e92a679430728c35a30fd24e", - "url": "https://github.com/nix-community/home-manager/archive/7e68e55d2e16d3a1e92a679430728c35a30fd24e.tar.gz", - "hash": "1qxshjyx38i6sqg8x3a2hxxgpzajspzf95991iwgv04m33ry4k83" + "revision": "bbe6e94737289c8cb92d4d8f9199fbfe4f11c0ba", + "url": "https://github.com/nix-community/home-manager/archive/bbe6e94737289c8cb92d4d8f9199fbfe4f11c0ba.tar.gz", + "hash": "0xrmly1gvmn598bpgqlykqgk1czjjfq86lbjvzlsbjg2adv5ilib" }, "nix-index-database": { "type": "Git", @@ -68,15 +68,15 @@ "repo": "nixos-hardware" }, "branch": "master", - "revision": "231274268ff2250d4730e274b808f66ef91b6381", - "url": "https://github.com/NixOS/nixos-hardware/archive/231274268ff2250d4730e274b808f66ef91b6381.tar.gz", - "hash": "1rpxx6ymqvbdfzfi2qqyl63lgvz7jipwx48pwn0krprp0jlzzx9s" + "revision": "6e253f12b1009053eff5344be5e835f604bb64cd", + "url": "https://github.com/NixOS/nixos-hardware/archive/6e253f12b1009053eff5344be5e835f604bb64cd.tar.gz", + "hash": "18qkn7qnnfiyq97n55j0v267irarknwy0b5bqnjsh5ak48hy7mn4" }, "nixpkgs": { "type": "Channel", "name": "nixos-unstable", - "url": "https://releases.nixos.org/nixos/unstable/nixos-24.11pre644565.b2852eb9365c/nixexprs.tar.xz", - "hash": "0jykdcs08z1cfjaqgdaqf5dadsx9sj3lr0nsfkz2ydp9rx5vhb7i" + "url": "https://releases.nixos.org/nixos/unstable/nixos-24.11pre647193.9f4128e00b0a/nixexprs.tar.xz", + "hash": "02ixm7pzl0jzanv7lmwfzqg7znjmq3wwads1l8r94xhln758lm1z" }, "nur": { "type": "Git", @@ -86,9 +86,9 @@ "repo": "NUR" }, "branch": "master", - "revision": "a0498a771e9d6d3f66dba3bd166a9ebf3cc3cb8c", - "url": "https://github.com/nix-community/NUR/archive/a0498a771e9d6d3f66dba3bd166a9ebf3cc3cb8c.tar.gz", - "hash": "037cmcrhcrjypnrvazvg531jkp3y8wxa5hl8zy1c88vbw2q4fabx" + "revision": "d133dd578e4610c60dba865df97ba1f4da282de8", + "url": "https://github.com/nix-community/NUR/archive/d133dd578e4610c60dba865df97ba1f4da282de8.tar.gz", + "hash": "1bi3irkilnc503cqpf2rc52igg0wx5i17yq249acj3dvmi9g04z3" } }, "version": 3 diff --git a/system/mba.nix b/system/mba.nix index cc8c81da..b1a17922 100644 --- a/system/mba.nix +++ b/system/mba.nix @@ -14,7 +14,6 @@ networking = { hostName = "mba"; }; - services.tailscale.enable = true; services.activate-system.enable = true; diff --git a/system/settings/dev.nix b/system/settings/dev.nix index 7d2e6193..b1817914 100644 --- a/system/settings/dev.nix +++ b/system/settings/dev.nix @@ -1,9 +1,6 @@ { ... }: { services.caddy = { enable = true; - globalConfig = '' - auto_https disable_redirects - ''; virtualHosts = let local_tls = '' 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 39baf910..8798fbc6 100644 --- a/user/settings/development/golang.nix +++ b/user/settings/development/golang.nix @@ -23,4 +23,8 @@ programs.neovim.plugins = with pkgs.vimPlugins; [ coc-go ]; + programs.fish.shellAbbrs = { + gmt = "go mod tidy"; + gmd = "go mod download"; + }; } |