Revert "Switch back to flakes"

This reverts commit c0384c43821474d28af1d9696ceb473a0d769292.

8 files changed, 19 insertions, 10 deletions

diff --git a/user/marvin.nix b/user/marvin.nix
index c74e621c..58ee2dc3 100644
--- a/user/marvin.nix
+++ b/user/marvin.nix
@@ -15,6 +15,9 @@
     ./settings/tabnine.nix
     ./settings/user-interface.nix
     ./settings/nix.nix
+    ../private
+    ../private/ssh.nix
+    ../private/tabnine.nix
   ];
 
   home.username = "alan";
diff --git a/user/prefect.nix b/user/prefect.nix
index dc074b19..6cf31cbc 100644
--- a/user/prefect.nix
+++ b/user/prefect.nix
@@ -20,6 +20,8 @@
     ./settings/tabnine.nix
     ./settings/user-interface.nix
     ./settings/xresources.nix
+    <private>
+    <private/ssh.nix>
   ];
 
   home.username = "alan";
diff --git a/user/server.nix b/user/server.nix
index e1946206..ed25bf5c 100644
--- a/user/server.nix
+++ b/user/server.nix
@@ -7,6 +7,8 @@
     ./settings/git.nix
     ./settings/fish.nix
     ./settings/nixos.nix
+    ./settings/development/base.nix
+    <private>
   ];
   home = {
     username = "alan";
diff --git a/user/settings/base.nix b/user/settings/base.nix
index edfe692b..aa131ad3 100644
--- a/user/settings/base.nix
+++ b/user/settings/base.nix
@@ -1,4 +1,4 @@
-{ config
+args@{ config
 , lib
 , pkgs
 , ...
@@ -6,7 +6,10 @@
   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 = {
diff --git a/user/settings/darwin.nix b/user/settings/darwin.nix
index f65cfaa2..b4da1cd3 100644
--- a/user/settings/darwin.nix
+++ b/user/settings/darwin.nix
@@ -87,7 +87,7 @@
 
   home.shellAliases = {
     rb = "darwin-rebuild";
-    rbs = "darwin-rebuild switch --flake '.?submodules=1'";
+    rbs = "darwin-rebuild switch";
 
     dig = "dig +noall +answer";
 
diff --git a/user/settings/nix.nix b/user/settings/nix.nix
index 85f4c65d..5c8543fa 100644
--- a/user/settings/nix.nix
+++ b/user/settings/nix.nix
@@ -15,11 +15,10 @@ in
   };
 
   home.packages = with pkgs; [
-    age
-    agenix
     cached-nix-shell
     nixd
     nil
+    npins
     nix-prefetch-scripts
     nix-init
     nix-update
@@ -32,7 +31,7 @@ in
   ];
   xdg.configFile."nix-init/config.toml".source = toml.generate "config.toml" {
     maintainers = [ "alanpearce" ];
-    nixpkgs = "builtins.getFlake \"nixpkgs\"";
+    nixpkgs = "<nixpkgs>";
   };
   programs.emacs.extraPackages = epkgs: (with epkgs; [
     nix-mode
diff --git a/user/settings/nixos.nix b/user/settings/nixos.nix
index 862ccdf5..0745b010 100644
--- a/user/settings/nixos.nix
+++ b/user/settings/nixos.nix
@@ -5,8 +5,8 @@
   ];
 
   home.shellAliases = {
-    rbs = "nixos-rebuild switch --flake '.?submodules=1'";
-    rbb = "nixos-rebuild boot --flake '.?submodules=1'";
+    rbs = "nixos-rebuild switch";
+    rbb = "nixos-rebuild boot";
     rbr = "nixos-rebuild switch --rollback";
   };
 }
diff --git a/user/settings/shell.nix b/user/settings/shell.nix
index 446c9fd4..e35564ef 100644
--- a/user/settings/shell.nix
+++ b/user/settings/shell.nix
@@ -112,8 +112,8 @@ in
 
       ho = "home-manager";
       hob = "home-manager build";
-      hos = "home-manager switch --flake '.?submodules=1' -b hm_bak_$(date +%Y%m%d%H%M)";
-      hon = "home-manager news --flake '.?submodules=1'";
+      hos = "home-manager switch";
+      hon = "home-manager news";
       hoh = "home-manager help";
       hop = "home-manager packages";
       hol = "home-manager generations";
@@ -122,7 +122,7 @@ in
       lw = "lorri watch";
       lwo = "lorri watch --once";
 
-      nsh = "nix shell";
+      nsh = "nix-shell";
       nb = "nix build";
       nd = "nix develop";
       nl = "nix log"; # shadows `coreutils.nl`, but I've never used that yet