From 4d4e5bd5cb644383a14589d4084d1c6f6def6d1c Mon Sep 17 00:00:00 2001
From: "Collin J. Doering" <collin@rekahsoft.ca>
Date: Sun, 2 Aug 2020 17:24:02 -0400
Subject: [PATCH] Minor tweaks to user-manifest

---
 user-manifest.scm | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/user-manifest.scm b/user-manifest.scm
index 03cf974..238edad 100644
--- a/user-manifest.scm
+++ b/user-manifest.scm
@@ -1,8 +1,11 @@
 (specifications->manifest
  '("emacs" "emacs-magit" "emacs-auctex" "emacs-geiser" "emacs-slime"
    "emacs-use-package" "emacs-neotree" "emacs-paredit" "emacs-ivy"
+
    "emacs-helm" "emacs-helm-gtags" "emacs-helm-tramp" "emacs-helm-swoop"
    "emacs-helm-descbinds" "emacs-helm-ls-git" "emacs-helm-unicode" "emacs-helm-exwm"
+   "emacs-helm-pass"
+
    "emacs-ag" "emacs-yasnippet" "emacs-yasnippet-snippets" "emacs-helm-c-yasnippet"
    "emacs-auto-yasnippet" "emacs-undo-tree"
 
@@ -17,24 +20,26 @@
    "emacs-fill-column-indicator"
    "emacs-dired-hacks"
 
+   "emacs-emms"
+
    "emacs-elpher"
 
    "emacs-all-the-icons"
 
    "emacs-scribble-mode"
 
-   ;; TODO: Package hash mismatch
-   ;;"emacs-hamlet-mode"
+   "emacs-hamlet-mode"
 
    ;; Packages that are not yet upstream
    "sh-z" "fzf" "spaceship-prompt" "zsh-autosuggestions"
    "emacs-doom-themes" "emacs-doom-modeline" "emacs-rebox2"
-;;  "emacs-ac-geiser"
+   ;; "emacs-ac-geiser" ;; <- hash mismatch; possible non-determinism
    "emacs-vterm" "emacs-multi-term" "emacs-highlight-indent-guides"
    "emacs-ibuffer-vc" "emacs-highlight-parentheses" "emacs-intel-hex-mode"
    "emacs-quack" "emacs-mu4e-maildirs-extension"
 
    "emacs-projectile"
+   "emacs-ibuffer-projectile"
    "emacs-helm-projectile"
 
    "aspell" "aspell-dict-en"
@@ -55,14 +60,12 @@
 
    "nmap" "bmon"
 
-   "beets" "youtube-dl" "ncmpcpp"
+   "beets" "youtube-dl"
+   "ncmpcpp" ;; <- This can be replaced by emacs-emms
 
    "git" "openssh" "direnv"
    "texlive"
 
-   "kitty" "dunst"
-   "rofi"
-
    "ungoogled-chromium"
    "icecat" "mpv"
 
@@ -75,11 +78,23 @@
 
    "glibc-locales"
 
-   ;; ;; Xorg
+   "mpd"
+
+   ;; Xorg
    "xinit" "xorg-server" "xf86-input-libinput" "xf86-video-fbdev"
    "xrandr" "xsetroot" "setxkbmap" "xrdb" "xlsfonts"
    "xkbcomp" "xkeyboard-config" "mesa"
 
+   ;; X programms
+   "unclutter" "feh" "redshift" "xautolock"
+   "kitty"     ;; <- May not need this and instead will use emacs-vterm
+   "dunst"     ;; <- May not need this; use something in emacs
+   "rofi"      ;; <- Look into replacing in emacs
+   "rofi-pass" ;; <- This should be replacable in emacs with helm-pass
+
+   ;; "xbindkeys" <- should be able to depricate this
+   ;; "compton" <- this historyically caused issues with screen locking
+
    ;; Guix
    "graphviz"