From 762111fc67a4f39d8d25a5693b9ca2511afc8fca Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrel@ts-tl-mbp.attlocal.net>
Date: Sun, 1 Jan 2023 21:16:02 -0500
Subject: [PATCH] More Work

---
 flake.nix                   |  2 +-
 hosts/ts-tl-mbp/default.nix | 61 ++++++++++++++++++++++++-------------
 hosts/ts-tl-mbp/home.nix    | 11 -------
 3 files changed, 40 insertions(+), 34 deletions(-)
 delete mode 100644 hosts/ts-tl-mbp/home.nix

diff --git a/flake.nix b/flake.nix
index 4fa9163..0724ad4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,7 +12,7 @@
 
   outputs = { self, nixpkgs, home-manager, darwin }: {
     defaultPackage.x86_64-darwin = home-manager.defaultPackage.x86_64-darwin;
-    homeConfigurations = {
+    homeConfigurations."ts-tl-mbp" = {
       "tyrel" = home-manager.lib.homeManagerConfiguration {
         system = "x86_64-darwin";
         homeDirectory = "/Users/tyrel";
diff --git a/hosts/ts-tl-mbp/default.nix b/hosts/ts-tl-mbp/default.nix
index d72a246..d47893c 100644
--- a/hosts/ts-tl-mbp/default.nix
+++ b/hosts/ts-tl-mbp/default.nix
@@ -1,39 +1,56 @@
 { pkgs, ... }:
 {
-
-
   services.nix-daemon.enable = true;
   programs.zsh.enable = true;
+
   system.defaults.dock.autohide = true;
+
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
   home-manager.users.tyrel = { pkgs, ... }: {
+    programs.home-manager.enable = true;
     home.stateVersion = "22.05";
-    #programs.tmux = { # my tmux configuration, for example
-    #  enable = true;
-    #  keyMode = "vi";
-    #  clock24 = true;
-    #  historyLimit = 10000;
-    #  plugins = with pkgs.tmuxPlugins; [
-    #    vim-tmux-navigator
-    #    gruvbox
-    #  ];
-    #  extraConfig = ''
-    #    new-session -s main
-    #    bind-key -n C-a send-prefix
-    #  '';
-    #};
+
+    home.packages = with pkgs; [
+        (neovim.override {
+              vimAlias = true;
+        })
+	fish
+	htop
+	ripgrep
+	tmux
+	wget
+    ];
+
+    #home.file.".config/".source = "../../config/";
+    #home.file."bin".source = "../../bin";
+    #home.file.".gitconfig".source = "gitconfig";
+    #home.file.".gitignore".source = "../../gitignore";
+    #home.file.".hushlogin".source = "../../hushlogin";
+    #home.file.".pythonstartup.py".source = "../../pythonstartup.py";
+    #home.file.".shell_aliases".source = "../../shell_aliases";
+    #home.file.".shell_funcs".source = "../../shell_funcs";
+    #home.file.".shell_funcs.fish".source = "../../shell_funcs.fish";
+    #home.file.".tmux".source = "../../tmux";
+    #home.file.".tmux.conf".source = "../../tmux.conf";
+
+
   };
   homebrew = {
     enable = true;
-    autoUpdate = true;
-    # updates homebrew packages on activation,
-    # can make darwin-rebuild much slower (otherwise i'd forget to do it ever though)
     casks = [
-      "alfred"
-      "discord"
-      "neovim"
+	"alfred"
+	"discord"
+	"slack"
+	"karabiner-elements"
     ];
   };
 
+ fonts.fonts = with pkgs; [
+   noto-fonts
+   dejavu_fonts
+   nerdfonts # Includes font-awesome, material-icons, powerline-fonts
+   iosevka
+ ];
+
 }
diff --git a/hosts/ts-tl-mbp/home.nix b/hosts/ts-tl-mbp/home.nix
deleted file mode 100644
index bf54e3b..0000000
--- a/hosts/ts-tl-mbp/home.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ ... }: {
-  programs.home-manager.enable = true;
-  home.packages = [
-  ];
-  programs.git = {
-    enable = true;
-  };
-  programs.nvim = {
-    enable = true;
-  };
-}