5 files changed, 4 insertions, 14 deletions
diff --git a/user/settings/base.nix b/user/settings/base.nix
index 52cb14ac..d202332b 100644
--- a/user/settings/base.nix
+++ b/user/settings/base.nix
@@ -1,4 +1,4 @@
-args@{ config
+{ config
 , lib
 , pkgs
 , ...
@@ -6,10 +6,7 @@ args@{ config
   imports = [
     ./neovim.nix
     ./shell.nix
-    (import <nix-index-database/home-manager-module.nix>
-      (args // { databases = import <nix-index-database/packages.nix>; }))
   ];
-
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
   manual = {
@@ -65,10 +62,7 @@ args@{ config
   programs.bat = {
     enable = true;
     extraPackages = with pkgs.bat-extras; [
-      batdiff
       batman
-      batgrep
-      batpipe
     ];
     config = {
       theme = "ansi";
diff --git a/user/settings/darwin.nix b/user/settings/darwin.nix
index acb0697b..e894bebd 100644
--- a/user/settings/darwin.nix
+++ b/user/settings/darwin.nix
@@ -16,10 +16,6 @@
 
   home.file.".hushlogin".text = "";
 
-  services.syncthing = {
-    enable = true;
-  };
-
   launchd.agents = {
     home-manager-expire-generations = {
       enable = true;
diff --git a/user/settings/development/golang.nix b/user/settings/development/golang.nix
index 8798fbc6..7fe5ad1e 100644
--- a/user/settings/development/golang.nix
+++ b/user/settings/development/golang.nix
@@ -15,6 +15,7 @@
   home.sessionPath = [
     "$HOME/go/bin"
   ];
+  home.sessionVariables.GOTOOLCHAIN = "local"; # use installed go tools
   programs.emacs.extraPackages = epkgs: (with epkgs; [
     go-eldoc
     go-tag
diff --git a/user/settings/nix.nix b/user/settings/nix.nix
index 66c00daf..94b28e52 100644
--- a/user/settings/nix.nix
+++ b/user/settings/nix.nix
@@ -20,7 +20,6 @@ in
   home.packages = with pkgs; [
     cached-nix-shell
     nil
-    npins
     nix-prefetch-scripts
     nix-init
     nix-update
@@ -33,7 +32,7 @@ in
   ];
   xdg.configFile."nix-init/config.toml".source = toml.generate "config.toml" {
     maintainers = [ "alanpearce" ];
-    nixpkgs = "<nixpkgs>";
+    nixpkgs = "builtins.getFlake \"nixpkgs\"";
   };
   programs.emacs.extraPackages = epkgs: (with epkgs; [
     nix-mode
diff --git a/user/settings/shell.nix b/user/settings/shell.nix
index fe2b4690..0335e23e 100644
--- a/user/settings/shell.nix
+++ b/user/settings/shell.nix
@@ -129,7 +129,7 @@ in
       lw1 = "lorri watch --once";
       lwo = "lorri watch --once";
 
-      nsh = "nix-shell";
+      nsh = "nix shell";
       nb = "nix build";
       nl = "nix log"; # shadows `coreutils.nl`, but I've never used that yet
       nr = "nix run";