guix:(home) Change to librewolf & restracture

1 files changed, 21 insertions, 15 deletions

diff --git a/guix/home.scm b/guix/home.scm
index 09dd5fd..ef018b4 100644
--- a/guix/home.scm
+++ b/guix/home.scm
@@ -15,25 +15,30 @@
   #:use-module (gnu home services shells)
   #:use-module (gnu home services desktop)
   #:use-module (gnu home services gnupg)
-  #:use-module (dwl-guile home-service)
-  #:use-module (dwl-guile patches)
   #:export (home))
 
+(define thanos/dotfiles-path
+  (format #f "~a/dotfiles" (getenv "HOME")))
+
+(define thanos/emacs-packages
+  (list "emacs-pgtk" "emacs-nov-el" "emacs-pdf-tools"
+	"emacs-elpy" "emacs-geiser" "emacs-geiser-guile"
+	"emacs-vterm" "emacs-jabber" "emacs-yeetube"))
+
 (home-environment
  ;; Below is the list of packages that will show up in your
  ;; Home profile, under ~/.guix-home/profile.
  (packages (specifications->packages
-	    (list "anki" "emacs-pgtk" "torbrowser" "mu" "perl" "tree" "iptables" ;; iptables for tailscale
-		  "hyfetch" "font-iosevka-aile" "font-jetbrains-mono" "isync"
-		  "emacs-nov-el" "syncthing" "emacs-pdf-tools" "ungoogled-chromium"
-		  "python-lsp-server" "transmission" "mpv" "yt-dlp" "icecat" "dino"
-		  "0ad" "git" "torbrowser" "emacs-elpy" "python-mypy" "fuzzel" "wl-clipboard"
-		  "alacritty" "wtype" "emacs-geiser" "emacs-geiser-guile" "password-store"
-		  "emacs-ox-haunt" "sbcl" "curl" "emacs-vterm" "emacs-jabber" "bind"
-		  "nmap" "hunspell" "guile-syntax-highlight" "hunspell-dict-en-us"
-		  "mlocate" "rsync" "grimshot" "nyxt" "haunt" "texlive" "texlive-cbfonts"
-		  "network-manager-applet" "swayidle" "wl-clipboard" "btop" "htop"
-		  "hugo-bin" "net-tools" "gnupg")))
+	    (append (list "anki" "torbrowser" "mu" "perl" "tree" "iptables"
+			  "hyfetch" "font-iosevka-aile" "font-jetbrains-mono"
+			  "syncthing" "ungoogled-chromium" "transmission" "isync"
+			  "mpv" "yt-dlp" "librewolf" "dino" "0ad" "git" "torbrowser"
+			  "fuzzel" "wl-clipboard" "alacritty" "wtype" "password-store"
+			  "curl" "bind" "nmap" "hunspell" "guile-syntax-highlight" "sbcl"
+			  "hunspell-dict-en-us" "mlocate" "rsync" "grimshot" "nyxt" "haunt"
+			  "texlive" "texlive-cbfonts" "network-manager-applet" "swayidle"
+			  "wl-clipboard" "btop" "hugo-bin" "net-tools" "gnupg")
+		    thanos/emacs-packages)))
  ;; Below is the list of Home services.  To search for available
  ;; services, run 'guix home search KEYWORD' in a terminal.
  (services
@@ -55,10 +60,11 @@
                              ("weather" . "curl wttr.in")
                              ("ytd" . "yt-dlp")
 			     ("gx" . "guix")))
-                  (bashrc (list (local-file "/home/thanos/dotfiles/bash-prompt.sh" #:recursive? #f)))))
+		  (bashrc (list (local-file (format #f "~a/bash-prompt.sh" thanos/dotfiles-path)
+					    #:recursive? #f)))))
 	(service home-dotfiles-service-type
 		 (home-dotfiles-configuration
-		  (directories '("/home/thanos/dotfiles/"))
+		  (directories (list thanos/dotfiles-path))
 		  (excluded '(".*~" ".*\\.swp" "\\.git" "\\.gitignore"
 			      "vimium-options.json" "README" "LICENSE" ".*\\.scm" "__pycache__"
 			      "bash-prompt.sh"))