From 08a543fabe7a9585f7fb988ed19d9624a2bc9f68 Mon Sep 17 00:00:00 2001
From: "Wyatt J. Miller" <wyatt@wyattjmiller.com>
Date: Sun, 21 Jul 2024 10:03:25 -0400
Subject: [PATCH] added significant items

added fish shellInit, removed top level empty configuration, removed
lib.mkIf logic for fish aliases
---
 darwin/default.nix      |  2 +-
 flake.lock              | 18 +++++++++---------
 flake.nix               |  3 +--
 home/default.nix        |  9 ++++++---
 home/direnv/default.nix |  1 +
 home/fish/aliases.nix   |  1 -
 home/fish/default.nix   |  5 +++++
 home/neovim/default.nix |  2 ++
 8 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/darwin/default.nix b/darwin/default.nix
index b524e3d..fc3101e 100644
--- a/darwin/default.nix
+++ b/darwin/default.nix
@@ -1,7 +1,7 @@
 { pkgs, config, ... }:
 
 {
-  homebrew = import ./homebrew.nix;
+  homebrew = import ./homebrew.nix // { enable = true; };
 
   environment.systemPackages = with pkgs; [ 
 	    vim
diff --git a/flake.lock b/flake.lock
index f4009f4..3deac6f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -56,11 +56,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721135958,
-        "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=",
+        "lastModified": 1721534365,
+        "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d",
+        "rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
         "type": "github"
       },
       "original": {
@@ -97,11 +97,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721270582,
-        "narHash": "sha256-MdZmYPPExntE5rJu88IhJSy8Um4UyZCTXhOwvzbjDVI=",
+        "lastModified": 1721550066,
+        "narHash": "sha256-wr6sSb+VpXy8HCvBqU6xvhpaARzWUbEK7uN5tLnqYDg=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "a3e4a7b8ffc08c7dc1973822a77ad432e1ec3dec",
+        "rev": "33bf7df5bbfcbbb49e6559b0c96c9e3b26d14e58",
         "type": "github"
       },
       "original": {
@@ -128,11 +128,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1721303309,
-        "narHash": "sha256-/+Yw4tW/mcTRKmkEAO64ObzCQClpSUZpk2flUD9GDHE=",
+        "lastModified": 1721497942,
+        "narHash": "sha256-EDPL9qJfklXoowl3nEBmjDIqcvXKUZInt5n6CCc1Hn4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7e2fb8e0eb807e139d42b05bf8e28da122396bed",
+        "rev": "d43f0636fc9492e83be8bbb41f9595d7a87106b8",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 36ddbca..23400fe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,8 +13,7 @@
   };
 
   outputs = inputs@{ self, nix-darwin, home-manager, nixpkgs, mac-app-util }:
-    let configuration = { pkgs, ... }: { };
-    in {
+    {
       # Build darwin flake using:
       # $ darwin-rebuild build --flake .#sephiroth
       darwinConfigurations."sephiroth" = nix-darwin.lib.darwinSystem {
diff --git a/home/default.nix b/home/default.nix
index 746d5f0..650ac2a 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -14,11 +14,17 @@
   ];
 
   config = {
+    programs.home-manager.enable = true;
+    fonts.fontconfig.enable = true;
     home.stateVersion = "24.05";
+    home.username = "wyatt";
+    home.homeDirectory = "/Users/wyatt";
 
     home.packages = with pkgs; [
       discord
+      babelfish
       obsidian
+      tmux
       zoxide
       wget
       nerdfonts
@@ -36,8 +42,5 @@
     home.sessionVariables = {
       EDITOR = "nvim";
     };
-
-    fonts.fontconfig.enable = true;
-    programs.home-manager.enable = true;
   };
 }
diff --git a/home/direnv/default.nix b/home/direnv/default.nix
index 0d5b920..242a209 100644
--- a/home/direnv/default.nix
+++ b/home/direnv/default.nix
@@ -3,6 +3,7 @@
 {
   programs.direnv = {
     enable = true;
+    nix-direnv.enable = true;
 
     config = {
       global = {
diff --git a/home/fish/aliases.nix b/home/fish/aliases.nix
index c236579..9bb03d8 100644
--- a/home/fish/aliases.nix
+++ b/home/fish/aliases.nix
@@ -1,5 +1,4 @@
 { lib, config, ... }:
-
 {
   programs.fish = {
     shellAliases = {
diff --git a/home/fish/default.nix b/home/fish/default.nix
index 16e2f8c..7914dc5 100644
--- a/home/fish/default.nix
+++ b/home/fish/default.nix
@@ -8,5 +8,10 @@
 
   programs.fish = {
     enable = true;
+    shellInit = "
+      if test -e /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish
+        source /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish
+      end
+    ";
   };
 }
diff --git a/home/neovim/default.nix b/home/neovim/default.nix
index 29cc019..c65ce98 100644
--- a/home/neovim/default.nix
+++ b/home/neovim/default.nix
@@ -3,5 +3,7 @@
 {
   programs.neovim = {
     enable = true;
+    
+    # nvim configuration here soon!
   };
 }