From c0384c43821474d28af1d9696ceb473a0d769292 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 31 Oct 2024 16:49:01 +0100
Subject: Switch back to flakes

This reverts commits:
- 66e56cb0e1c95202133733c0812b794171dc73c5.
- 3fae7d35d9b32ab3c4f7293c418167a52aff8717.
- 417a1ce6481adfc713d8d0d6ad03e211a3d0eb22.
- 6b4469a98d7b2d88a3442b1051174000538199f0.
---
 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, 3 insertions(+), 12 deletions(-)

(limited to 'user')

diff --git a/user/mba.nix b/user/mba.nix
index 890cda69..b76bdd74 100644
--- a/user/mba.nix
+++ b/user/mba.nix
@@ -13,8 +13,6 @@
     ./settings/nixpkgs.nix
     ./settings/ssh.nix
     ./settings/user-interface.nix
-    <private>
-    <private/ssh.nix>
   ];
 
   home.username = "alan";
diff --git a/user/prefect.nix b/user/prefect.nix
index 0a957d64..a15128bf 100644
--- a/user/prefect.nix
+++ b/user/prefect.nix
@@ -19,8 +19,6 @@
     ./settings/ssh.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 9b3db3fc..235e6908 100644
--- a/user/server.nix
+++ b/user/server.nix
@@ -9,7 +9,6 @@
     ./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 5c5d6012..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 = {
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";
-- 
cgit 1.4.1