aboutsummaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
Diffstat (limited to 'nix')
-rw-r--r--nix/lib/mkSystem.nix9
-rw-r--r--nix/lib/overlays.nix9
-rw-r--r--nix/users/fcuny/darwin.nix2
-rw-r--r--nix/users/fcuny/dev.nix7
4 files changed, 14 insertions, 13 deletions
diff --git a/nix/lib/mkSystem.nix b/nix/lib/mkSystem.nix
index b0f17ee..9cc504b 100644
--- a/nix/lib/mkSystem.nix
+++ b/nix/lib/mkSystem.nix
@@ -1,6 +1,10 @@
# This function creates a NixOS system based on our VM setup for a
# particular architecture.
-{ nixpkgs, inputs }:
+{
+ nixpkgs,
+ inputs,
+ overlays,
+}:
name:
{
@@ -27,6 +31,9 @@ systemFunc rec {
# Allow unfree packages.
{ nixpkgs.config.allowUnfree = true; }
+ # Add overlays
+ { nixpkgs.overlays = overlays; }
+
machineConfig
userOSConfig
home-manager.home-manager
diff --git a/nix/lib/overlays.nix b/nix/lib/overlays.nix
deleted file mode 100644
index 7b338c6..0000000
--- a/nix/lib/overlays.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-let
- path = ../../overlays;
-in
-with builtins;
-map (n: import (path + ("/" + n))) (
- filter (n: match ".*\\.nix" n != null || pathExists (path + ("/" + n + "/default.nix"))) (
- attrNames (readDir path)
- )
-)
diff --git a/nix/users/fcuny/darwin.nix b/nix/users/fcuny/darwin.nix
index 1291031..fc412c9 100644
--- a/nix/users/fcuny/darwin.nix
+++ b/nix/users/fcuny/darwin.nix
@@ -1,7 +1,5 @@
{ pkgs, ... }:
{
- nixpkgs.overlays = import ../../../nix/lib/overlays.nix;
-
# The user should already exist, but we need to set this up so Nix knows
# what our home directory is (https://github.com/LnL7/nix-darwin/issues/423).
users.users.fcuny = {
diff --git a/nix/users/fcuny/dev.nix b/nix/users/fcuny/dev.nix
index d2bb6eb..1f602c4 100644
--- a/nix/users/fcuny/dev.nix
+++ b/nix/users/fcuny/dev.nix
@@ -1,4 +1,8 @@
-{ config, pkgs, ... }:
+{
+ config,
+ pkgs,
+ ...
+}:
{
home.packages = with pkgs; [
_1password-cli
@@ -14,6 +18,7 @@
# python
uv
python3
+ llmPython.llm
# nix
nil # nix lsp