From af4ac64135ba8b25b224338e2e8869ca6d67a444 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Sat, 23 Mar 2024 15:19:23 -0400
Subject: [PATCH] home-manager: removed common.nix, split gnome.nix into
 separate file

---
 home/aly.nix                   | 15 +++++----------
 home/{common.nix => gnome.nix} | 12 ------------
 home/shell.nix                 | 26 ++++++++++++++++++--------
 3 files changed, 23 insertions(+), 30 deletions(-)
 rename home/{common.nix => gnome.nix} (81%)

diff --git a/home/aly.nix b/home/aly.nix
index c34b2761..54313a16 100644
--- a/home/aly.nix
+++ b/home/aly.nix
@@ -2,32 +2,27 @@
 
 {
     imports = [
-        ./common.nix
+        ./gnome.nix
         ./shell.nix
     ];
 
-    # TODO please change the username & home directory to your own
     home.username = "aly";
     home.homeDirectory = "/home/aly";
 
-    services.syncthing.enable = true;
+    home.stateVersion = "23.11";
+    programs.home-manager.enable = true;
 
     # Packages that should be installed to the user profile.
     home.packages = with pkgs; [
         # warp-terminal
-        # backblaze-b2
-        curl
         discord
-        gh
-        git
         github-desktop
         obsidian
-        syncthing
         vscode
-        wget
-        nixfmt
     ];
 
+    services.syncthing.enable = true;
+
     programs.alacritty = {
         enable = true;
         settings = {
diff --git a/home/common.nix b/home/gnome.nix
similarity index 81%
rename from home/common.nix
rename to home/gnome.nix
index 3d38bbe9..5f42f752 100644
--- a/home/common.nix
+++ b/home/gnome.nix
@@ -37,16 +37,4 @@
             uris = ["qemu:///system"];
         };
     };
-    # This value determines the home Manager release that your
-    # configuration is compatible with. This helps avoid breakage
-    # when a new home Manager release introduces backwards
-    # incompatible changes.
-    #
-    # You can update home Manager without changing this value. See
-    # the home Manager release notes for a list of state version
-    # changes in each release.
-    home.stateVersion = "23.11";
-
-    # Let home Manager install and manage itself.
-    programs.home-manager.enable = true;
 }
\ No newline at end of file
diff --git a/home/shell.nix b/home/shell.nix
index e3cc81b6..80c4d3c8 100644
--- a/home/shell.nix
+++ b/home/shell.nix
@@ -1,6 +1,16 @@
 { config, pkgs, ... }:
 
 {
+
+    home.packages = with pkgs; [
+        # backblaze-b2
+        curl
+        gh
+        git
+        wget
+        nixfmt
+    ];
+
     programs.bash = {
         enable = true;
         enableCompletion = true;
@@ -13,21 +23,21 @@
         enable = true;
         extraPackages = ( epkgs: (with epkgs; [
             better-defaults
+            markdown-mode
+            nix-mode
             org
             org-bullets
             org-journal
             org-roam     
-            nix-mode
-            treemacs
-            treemacs-tab-bar
-            treemacs-projectile
+            ox-pandoc
             projectile
+            python
+            treemacs
+            treemacs-projectile
+            treemacs-tab-bar
+            use-package
             yaml
             yaml-mode
-            markdown-mode
-            ox-pandoc
-            use-package
-            python
             ])
         );
         package = pkgs.emacs-nox;