From c82e83bf59fa8986880362e2c316c1e5b13ce138 Mon Sep 17 00:00:00 2001
From: Random936 <randomdude936@gmail.com>
Date: Tue, 21 May 2024 21:43:28 -0700
Subject: [PATCH] Other config; added new tpm package for tmux

---
 home-manager/common.nix        | 19 ++++++-------------
 home-manager/darwin-home.nix   |  9 ++++++++-
 home-manager/emacs.nix         | 13 +++++++++++++
 home-manager/nixos-home.nix    |  3 +++
 nixos/configuration.nix        | 11 -----------
 nixos/darwin-configuration.nix | 10 +++++++---
 packages/all-packages.nix      |  3 +++
 packages/tpm/default.nix       | 24 ++++++++++++++++++++++++
 8 files changed, 64 insertions(+), 28 deletions(-)
 create mode 100644 packages/all-packages.nix
 create mode 100644 packages/tpm/default.nix

diff --git a/home-manager/common.nix b/home-manager/common.nix
index 2e31712..bb846c6 100644
--- a/home-manager/common.nix
+++ b/home-manager/common.nix
@@ -1,14 +1,17 @@
-{ inputs, config, pkgs, ... }: {
+{ inputs, config, pkgs, ... }:
+{
   nixpkgs.config.allowUnfree = true;
   fonts.fontconfig.enable = true;
 
-  home.packages = with pkgs; [
+  home.packages = (with pkgs; [
     tmux
     clang
     cargo
+    gnumake
     neofetch
     spotify
-  ];
+    bitwarden-cli
+  ]);
 
   programs = {
     home-manager.enable = true;
@@ -25,16 +28,6 @@
 
 
   home.file = {
-    ".mbsyncrc".source = ../dotfiles/.mbsyncrc;
     ".functions.zsh".source = ../dotfiles/.functions.zsh;
-
-    # Emacs files
-    ".emacs".source = ../dotfiles/.emacs;
-    ".emacs.d/config.org".source = ../dotfiles/.emacs.d/config.org;
-    ".emacs.d/terminal.org".source = ../dotfiles/.emacs.d/terminal.org;
-    ".emacs.d/functions.org".source = ../dotfiles/.emacs.d/functions.org;
-    ".emacs.d/email.org".source = ../dotfiles/.emacs.d/email.org;
-    ".emacs.d/org.org".source = ../dotfiles/.emacs.d/org.org;
-    ".emacs.d/lsp.org".source = ../dotfiles/.emacs.d/lsp.org;
   };
 }
diff --git a/home-manager/darwin-home.nix b/home-manager/darwin-home.nix
index 053aa23..8f78359 100644
--- a/home-manager/darwin-home.nix
+++ b/home-manager/darwin-home.nix
@@ -1,4 +1,10 @@
-{ inputs, config, pkgs, ... }: {
+{ inputs, lib, config, pkgs, ... }:
+let
+  mypkgs = import ../packages/all-packages.nix {
+    inherit pkgs lib config;
+  };
+in
+{
 
   home = {
     username = "jadenmaxwell";
@@ -11,5 +17,6 @@
     ./zsh.nix
   ];
 
+  home.file.".tmux/plugins/tpm".source = "${mypkgs.tpm}";
   home.stateVersion = "23.11";
 }
diff --git a/home-manager/emacs.nix b/home-manager/emacs.nix
index 6eb7097..7b2c116 100644
--- a/home-manager/emacs.nix
+++ b/home-manager/emacs.nix
@@ -4,6 +4,7 @@
     isync
     ispell
     ledger
+    texliveFull
     mu
 
     fira-code
@@ -12,6 +13,7 @@
 
   programs.emacs = {
     enable = true;
+    package = pkgs.emacs29;
     extraPackages = epkgs: with epkgs; [
       mu4e
       vterm
@@ -19,4 +21,15 @@
       nerd-icons
     ];
   };
+
+  home.file = {
+    ".emacs".source = ../dotfiles/.emacs;
+    ".emacs.d/config.org".source = ../dotfiles/.emacs.d/config.org;
+    ".emacs.d/terminal.org".source = ../dotfiles/.emacs.d/terminal.org;
+    ".emacs.d/functions.org".source = ../dotfiles/.emacs.d/functions.org;
+    ".emacs.d/email.org".source = ../dotfiles/.emacs.d/email.org;
+    ".emacs.d/org.org".source = ../dotfiles/.emacs.d/org.org;
+    ".emacs.d/lsp.org".source = ../dotfiles/.emacs.d/lsp.org;
+    ".mbsyncrc".source = ../dotfiles/.mbsyncrc;
+  };
 }
diff --git a/home-manager/nixos-home.nix b/home-manager/nixos-home.nix
index 35a9bad..800c49c 100644
--- a/home-manager/nixos-home.nix
+++ b/home-manager/nixos-home.nix
@@ -13,6 +13,9 @@
 
   home.packages = with pkgs; [
     feh
+    microsoft-edge
+    nextcloud-client
+    bitwarden
   ];
 
   gtk = {
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 0c495c9..78e3ccb 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -112,19 +112,8 @@
     vim
     git
     picom
-    microsoft-edge
-    nextcloud-client
-    bitwarden-cli
-    bitwarden
-  ];
-
-  fonts.packages = with pkgs; [
-    fira-code
-    fira-code-symbols
-    meslo-lgs-nf
   ];
 
   services.emacs.enable = true;
-
   system.stateVersion = "23.11";
 }
diff --git a/nixos/darwin-configuration.nix b/nixos/darwin-configuration.nix
index 52179fb..f153f08 100644
--- a/nixos/darwin-configuration.nix
+++ b/nixos/darwin-configuration.nix
@@ -1,8 +1,9 @@
-{ config, pkgs, ... }:
-
-{
+{ config, pkgs, lib, ... }: {
   nix.settings.experimental-features = ["nix-command" "flakes"];
 
+  # Path fix for GUI applications.
+  launchd.user.envVariables.PATH = config.environment.systemPath;
+
   nixpkgs.config.allowUnfree = true;
   environment.systemPackages = with pkgs; [
     git
@@ -13,6 +14,9 @@
 
   homebrew = {
     enable = true;
+    brews = [
+      "coreutils"
+    ];
     casks = [
       "microsoft-edge"
       "bitwarden"
diff --git a/packages/all-packages.nix b/packages/all-packages.nix
new file mode 100644
index 0000000..302b0b7
--- /dev/null
+++ b/packages/all-packages.nix
@@ -0,0 +1,3 @@
+{ pkgs, lib, config, ... }: rec {
+  tpm = pkgs.callPackage ./tpm {};
+}
diff --git a/packages/tpm/default.nix b/packages/tpm/default.nix
new file mode 100644
index 0000000..16fa49f
--- /dev/null
+++ b/packages/tpm/default.nix
@@ -0,0 +1,24 @@
+{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec {
+  pname = "tpm";
+  version = "3.1.0";
+
+  src = fetchFromGitHub {
+    owner = "tmux-plugins";
+    repo = "tpm";
+    rev = "v${version}";
+    hash = "sha256-CeI9Wq6tHqV68woE11lIY4cLoNY8XWyXyMHTDmFKJKI=";
+  };
+
+  doCheck = true;
+
+  installPhase = ''
+    cp -rv $src/ $out
+  '';
+
+  meta = with lib; {
+    description = "A tmux package manager. Installs and loads tmux plugins.";
+    homepage = "https://github.com/tmux-plugins/tpm";
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}