From e4849cd801e13f79e2683da124453b083a06defe Mon Sep 17 00:00:00 2001
From: Cameron Reed <cameron@cam123.dev>
Date: Sat, 17 Feb 2024 12:49:12 -0700
Subject: [PATCH] Add git config and update nvim config

---
 common/desktop/hyprland.nix               |  2 ++
 common/desktop/sway.nix                   |  2 ++
 common/users/cameron/home-manager/git.nix | 10 ++++++++++
 common/users/cameron/home.nix             |  2 ++
 flake.lock                                | 20 ++++++++++----------
 5 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 common/users/cameron/home-manager/git.nix

diff --git a/common/desktop/hyprland.nix b/common/desktop/hyprland.nix
index 4085549..f9adb0e 100644
--- a/common/desktop/hyprland.nix
+++ b/common/desktop/hyprland.nix
@@ -15,6 +15,8 @@
     swaylock
     swayidle
     hyprpaper
+    imv
+    mpv
   ]);
 
   fonts.packages = with pkgs; [
diff --git a/common/desktop/sway.nix b/common/desktop/sway.nix
index d029501..54dd13f 100644
--- a/common/desktop/sway.nix
+++ b/common/desktop/sway.nix
@@ -14,6 +14,8 @@
       i3status
       brightnessctl
       wob
+      imv
+      mpv
     ];
   };
 
diff --git a/common/users/cameron/home-manager/git.nix b/common/users/cameron/home-manager/git.nix
new file mode 100644
index 0000000..15fc6b3
--- /dev/null
+++ b/common/users/cameron/home-manager/git.nix
@@ -0,0 +1,10 @@
+{ pkgs, lib, config, ... }:
+
+{
+    programs.git = {
+        enable = true;
+        
+        userEmail = "cameron@cam123.dev";
+        userName = "Cameron Reed";
+    };
+}
diff --git a/common/users/cameron/home.nix b/common/users/cameron/home.nix
index 0f33c8d..899dd6c 100644
--- a/common/users/cameron/home.nix
+++ b/common/users/cameron/home.nix
@@ -19,6 +19,7 @@
     ./home-manager/nvim.nix
     ./home-manager/tmux.nix
     ./home-manager/lf.nix
+    ./home-manager/git.nix
   ];
 
   home.username = "cameron";
@@ -30,6 +31,7 @@
 
   home.packages = with pkgs; [
     eza
+    signal-desktop
   ];
 
   term = "alacritty";
diff --git a/flake.lock b/flake.lock
index bdfae49..9eb773f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -94,11 +94,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1707978831,
-        "narHash": "sha256-UblFdWQ2MMZNzD9C/w8+7RjAJ2QIbebbzHUniQ/a44o=",
+        "lastModified": 1708105575,
+        "narHash": "sha256-sS4AItZeUnAei6v8FqxNlm+/27MPlfoGym/TZP0rmH0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c68a9fc85c2cb3a313be6ff40511635544dde8da",
+        "rev": "1d1817869c47682a6bee85b5b0a6537b6c0fba26",
         "type": "github"
       },
       "original": {
@@ -124,11 +124,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1707956935,
-        "narHash": "sha256-ZL2TrjVsiFNKOYwYQozpbvQSwvtV/3Me7Zwhmdsfyu4=",
+        "lastModified": 1708118438,
+        "narHash": "sha256-kk9/0nuVgA220FcqH/D2xaN6uGyHp/zoxPNUmPCMmEE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a4d4fe8c5002202493e87ec8dbc91335ff55552c",
+        "rev": "5863c27340ba4de8f83e7e3c023b9599c3cb3c80",
         "type": "github"
       },
       "original": {
@@ -140,11 +140,11 @@
     "nvim-config": {
       "flake": false,
       "locked": {
-        "lastModified": 1707365412,
-        "narHash": "sha256-ixFGfsbbpIGl74tGgzX/trZDFW7Xw1JzFbdt32b76II=",
+        "lastModified": 1708199214,
+        "narHash": "sha256-7R7CUPV5yZCCvL/THsMaHNGzm7s44d0jmKwIGS0bZT0=",
         "ref": "refs/heads/main",
-        "rev": "f6ca6ee8d2c61a1b613873280e75d78289e57a90",
-        "revCount": 3,
+        "rev": "96c6bf462130b3bcdcb8669a81b1e5c73823f777",
+        "revCount": 4,
         "type": "git",
         "url": "https://gitea.cam123.dev/CameronReed/Neovim-Config"
       },