From 5456ef3d2be2c535d11acc29d7f2783c4c3defb8 Mon Sep 17 00:00:00 2001
From: Lucas Sta Maria <lucas@priime.dev>
Date: Sat, 27 Jul 2024 22:33:27 -0700
Subject: [PATCH] fix(nix): move environment variables and enable programs

Signed-off-by: Lucas Sta Maria <lucas@priime.dev>
---
 nix/hosts/common/sys.nix     |  4 +++-
 nix/hosts/framework/home.nix | 11 ++++-------
 nix/hosts/framework/sys.nix  |  7 +++++++
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/nix/hosts/common/sys.nix b/nix/hosts/common/sys.nix
index 01d5874..1e03dff 100644
--- a/nix/hosts/common/sys.nix
+++ b/nix/hosts/common/sys.nix
@@ -50,11 +50,13 @@
         xdotool
         ripgrep
         fd
+        home-manager
 
         nix-index
+        nixfmt
 
+        rustc
         cargo
-        rustup
         rustfmt
         clippy
         rust-analyzer
diff --git a/nix/hosts/framework/home.nix b/nix/hosts/framework/home.nix
index 627e437..4937a45 100644
--- a/nix/hosts/framework/home.nix
+++ b/nix/hosts/framework/home.nix
@@ -40,6 +40,7 @@
       nitrogen
       redshift
       networkmanager
+      nixfmt
 
       firefox
       discord
@@ -71,13 +72,6 @@
     ];
   in packages;
 
-  home.sessionVariables = {
-    EDITOR = "emacsclient";
-    CC = "gcc";
-    LSP_USE_PLISTS = "true";
-    MOZ_USE_XINPUT2 = "1";
-  };
-
   ### Services
 
   # Compositor
@@ -96,6 +90,9 @@
   };
 
   ### Programs
+  programs.home-manager.enable = true;
+  programs.fish.enable = true;
+
   programs.alacritty = {
     enable = true;
     settings = {
diff --git a/nix/hosts/framework/sys.nix b/nix/hosts/framework/sys.nix
index 3d28f90..62b08d0 100644
--- a/nix/hosts/framework/sys.nix
+++ b/nix/hosts/framework/sys.nix
@@ -80,6 +80,13 @@
 
   documentation.dev.enable = true;
 
+  environment.variables = {
+    EDITOR = "emacsclient";
+    CC = "gcc";
+    LSP_USE_PLISTS = "true";
+    MOZ_USE_XINPUT2 = "1";
+  };
+
   ### Services
 
   # xserver and i3