From fbad743c3767b0d15338f7bae5ccadd4ca94c35a Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Sun, 24 Mar 2024 13:15:26 -0400
Subject: [PATCH] home-manager: moved gui apps to common-gui.nix.

---
 home/aly-gnome.nix    | 15 +--------------
 home/aly-hyprland.nix | 20 ++------------------
 home/aly-kde.nix      | 14 +-------------
 home/aly-nox.nix      |  5 +----
 home/common-gui.nix   | 12 ++++++++++++
 home/common.nix       | 10 +++++-----
 home/shell/emacs.el   |  4 +++-
 7 files changed, 25 insertions(+), 55 deletions(-)
 create mode 100644 home/common-gui.nix

diff --git a/home/aly-gnome.nix b/home/aly-gnome.nix
index 8204755e..09bcbc1e 100644
--- a/home/aly-gnome.nix
+++ b/home/aly-gnome.nix
@@ -1,18 +1,5 @@
 { config, pkgs, ... }:
 
 {
-    imports = [
-        ./common.nix
-        ./gnome
-        ./alacritty
-    ];
-
-    # Packages that should be installed to the user profile.
-    home.packages = with pkgs; [
-        # warp-terminal
-        discord
-        github-desktop
-        obsidian
-        vscode
-    ];
+  imports = [ ./common.nix ./common-gui.nix ./gnome ];
 }
diff --git a/home/aly-hyprland.nix b/home/aly-hyprland.nix
index 0356dfa0..9a3fb585 100644
--- a/home/aly-hyprland.nix
+++ b/home/aly-hyprland.nix
@@ -1,22 +1,6 @@
 { config, pkgs, ... }:
 
 {
-    imports = [
-        ./common.nix
-        ./shell
-        ./hypr
-        ./waybar
-        ./mako
-        ./bemenu
-        ./alacritty
-    ];
-
-    # Packages that should be installed to the user profile.
-    home.packages = with pkgs; [
-        # warp-terminal
-        discord
-        github-desktop
-        obsidian
-        vscode
-    ];
+  imports =
+    [ ./common.nix ./common-gui.nix ./shell ./hypr ./waybar ./mako ./bemenu ];
 }
diff --git a/home/aly-kde.nix b/home/aly-kde.nix
index 98c99553..f3195194 100644
--- a/home/aly-kde.nix
+++ b/home/aly-kde.nix
@@ -1,17 +1,5 @@
 { config, pkgs, ... }:
 
 {
-    imports = [
-        ./common.nix
-        ./alacritty
-    ];
-
-    # Packages that should be installed to the user profile.
-    home.packages = with pkgs; [
-        # warp-terminal
-        discord
-        github-desktop
-        obsidian
-        vscode
-    ];
+  imports = [ ./common.nix ./common-gui.nix ];
 }
diff --git a/home/aly-nox.nix b/home/aly-nox.nix
index 5dd978f2..296cb525 100644
--- a/home/aly-nox.nix
+++ b/home/aly-nox.nix
@@ -1,8 +1,5 @@
 { config, pkgs, ... }:
 
 {
-    imports = [
-        ./common.nix
-        ./shell
-    ];
+  imports = [ ./common.nix ./shell ];
 }
diff --git a/home/common-gui.nix b/home/common-gui.nix
new file mode 100644
index 00000000..197adad5
--- /dev/null
+++ b/home/common-gui.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+
+{
+    # Packages that should be installed to the user profile.
+    home.packages = with pkgs; [
+        # warp-terminal
+        github-desktop
+        obsidian
+        vscode
+        webcord
+    ];
+}
diff --git a/home/common.nix b/home/common.nix
index 130eb23a..b3f04da0 100644
--- a/home/common.nix
+++ b/home/common.nix
@@ -1,11 +1,11 @@
 { config, pkgs, ... }:
 
 {
-    home.username = "aly";
-    home.homeDirectory = "/home/aly";
+  home.username = "aly";
+  home.homeDirectory = "/home/aly";
 
-    home.stateVersion = "23.11";
-    programs.home-manager.enable = true;
+  home.stateVersion = "23.11";
+  programs.home-manager.enable = true;
 
-    services.syncthing.enable = true;
+  services.syncthing.enable = true;
 }
diff --git a/home/shell/emacs.el b/home/shell/emacs.el
index 4f5b2c58..9bb6acff 100644
--- a/home/shell/emacs.el
+++ b/home/shell/emacs.el
@@ -37,6 +37,8 @@
 (setq-default fill-column 80)
 (add-hook 'prog-mode-hook #'display-fill-column-indicator-mode)
 
+(make-directory "~/Sync/org-roam")
 (setq org-directory "~/Sync/org-roam/")
 (setq org-roam-directory (file-truename "~/Sync/org-roam"))
-(org-roam-db-autosync-mode)
\ No newline at end of file
+(setq org-roam-dailies-directory "journal/")
+(org-roam-db-autosync-mode)