From 6b4469a98d7b2d88a3442b1051174000538199f0 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 29 Apr 2024 00:23:51 +0200
Subject: de-flake local systems

---
 user/mba.nix            | 2 ++
 user/prefect.nix        | 2 ++
 user/server.nix         | 1 +
 user/settings/base.nix  | 5 ++++-
 user/settings/nix.nix   | 3 ++-
 user/settings/shell.nix | 2 +-
 6 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'user')

diff --git a/user/mba.nix b/user/mba.nix
index a205fea4..eaa8fd5d 100644
--- a/user/mba.nix
+++ b/user/mba.nix
@@ -15,6 +15,8 @@
     ./settings/ssh.nix
     ./settings/tabnine.nix
     ./settings/user-interface.nix
+    <private>
+    <private/ssh.nix>
   ];
 
   home.username = "alan";
diff --git a/user/prefect.nix b/user/prefect.nix
index b5c4789e..18cde5d2 100644
--- a/user/prefect.nix
+++ b/user/prefect.nix
@@ -25,6 +25,8 @@
     ./settings/trezor.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 235e6908..9b3db3fc 100644
--- a/user/server.nix
+++ b/user/server.nix
@@ -9,6 +9,7 @@
     ./settings/nix.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 6725b6db..d0c01b87 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/nix.nix b/user/settings/nix.nix
index 08380286..b194bb42 100644
--- a/user/settings/nix.nix
+++ b/user/settings/nix.nix
@@ -17,6 +17,7 @@ in
 
   home.packages = with pkgs; [
     nil
+    niv
     nix-prefetch-scripts
     nix-init
     nix-update
@@ -30,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/shell.nix b/user/settings/shell.nix
index 5358f618..e5fe4f77 100644
--- a/user/settings/shell.nix
+++ b/user/settings/shell.nix
@@ -125,7 +125,7 @@ in
       hol = "home-manager generations";
       hox = "home-manager expire-generations '-30 days'";
 
-      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";
-- 
cgit 1.4.1