podman, bat, and shell init changes

1 files changed, 40 insertions, 19 deletions

diff --git a/home.scm b/home.scm
index 7f49514..bfd5fe2 100644
--- a/home.scm
+++ b/home.scm
@@ -520,18 +520,11 @@ visit otherwise."
 	 ("url \"rad://\""
 	  ("insteadOf" . "https://rad.go/")))))))
 
-(define guix-gaming-config (cdr (assq 'guix-gaming-config secrets)))
+(define bat-config
+  (string-append "--theme=Nord\n"
+		 "--pager=\"less -R -F -X\""))
 
-(define rz/user-dirs
-  (string-append "XDG_DESKTOP_DIR=\"$HOME/desktop\"\n"
-		 "XDG_DOWNLOAD_DIR=\"$HOME/downloads\"\n"
-		 "XDG_TEMPLATES_DIR=\"$HOME/templates\"\n"
-		 "XDG_PUBLICSHARE_DIR=\"$HOME/public\"\n"
-		 "XDG_DOCUMENTS_DIR=\"$HOME/documents\"\n"
-		 "XDG_MUSIC_DIR=\"$HOME/music\"\n"
-		 "XDG_PICTURES_DIR=\"$HOME/pictures\"\n"
-		 "XDG_VIDEOS_DIR=\"$HOME/videos\"\n"
-		 "XDG_DATA_DIRS=\"/var/lib/flatpak/exports/share:$XDG_DATA_HOME/flatpak/exports/share:$XDG_DATA_DIRS\"\n"))
+(define guix-gaming-config (cdr (assq 'guix-gaming-config secrets)))
 
 (define log-dir (or (getenv "XDG_LOG_HOME") "/home/robby/.local/var/log"))
 
@@ -579,7 +572,22 @@ visit otherwise."
 			     ("poweroff" . "loginctl poweroff")
 			     ("hibernate" . "loginctl hibernate")
 			     ("p1" . "ping 1.1.1.1")
-			     ("p8" . "ping 8.8.8.8")))
+			     ("p8" . "ping 8.8.8.8")
+			     ("e" . "emacsclient -r -n")
+			     ("kubectl" . "minikube kubectl --")
+			     ("duckdb" . "env LD_LIBRARY_PATH=/home/robby/.guix-profile/lib:$LD_LIBRARY_PATH $HOME/.local/bin/duckdb")
+			     ("nats" . "LD_LIBRARY_PATH=\"/gnu/store/9p1z62lff9czkr95n3sal97rjw5lm7wl-gcc-toolchain-14.2.0/lib:$LD_LIBRARY_PATH\" nats")
+			     ("sway" . "XDG_CURRENT_DESKTOP=sway dbus-run-session sway")))
+		  (environment-variables
+		   '(("BUN_INSTALL" . "$HOME/.bun")
+		     ("PATH" . "$BUN_INSTALL/bin:$PATH")
+		     ("PATH" . "$HOME/go/bin:$PATH")
+		     ("PATH" . "$HOME/.local/bin:$PATH")
+		     ("PATH" . "$HOME/.cargo/bin:$PATH")
+		     ("PATH" . "$HOME/.vnode/bin:$PATH")
+		     ("PODMAN_COMPOSE_WARNING_LOGS" . "false")
+		     ("BROWSER" . "xdg-open")
+		     ("XDG_DATA_DIRS" . "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:/home/robby/.local/share/flatpak/exports/share")))
                   (bashrc (list (local-file "home.bashrc"
 					    "bashrc")))
                   (bash-profile (list (local-file
@@ -587,12 +595,12 @@ visit otherwise."
                                        "bash_profile")))))
 	(service home-dbus-service-type)
 	(service home-xdg-configuration-files-service-type
-		 `(("user-dirs.dirs" ,(plain-file "user-dirs" rz/user-dirs))
-		   ;; ("sway/config" ,(plain-file "sway-config" rz/sway-config))
+		 `(;; ("sway/config" ,(plain-file "sway-config" rz/sway-config))
 		   ("emacs/init.el" ,(plain-file "init.el" emacs-config))
 		   ("foot/foot.ini" ,(plain-file "foot.ini" foot-config))
 		   ("wofi/config" ,(computed-file "wofi-config" wofi-config))
 		   ("git/config" ,(plain-file "git-config" git-config))
+		   ("bat/config" ,(plain-file "bat-config" bat-config))
 		   ("guix-gaming-channels/games.scm" ,(plain-file "guix-gaming-config" guix-gaming-config))))
 	(service home-files-service-type
 		 `((".mbsyncrc" ,(local-file "mbsyncrc"))
@@ -652,11 +660,24 @@ visit otherwise."
 		     (respawn? #t))))))
 	(service home-pipewire-service-type)
 	(simple-service 'some-useful-env-vars-service
-          		home-environment-variables-service-type
-          		`(("LESSHISTFILE" . "$XDG_CACHE_HOME/.lesshst")
-			  ("XDG_DATA_DIRS" . "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:/home/robby/.local/share/flatpak/exports/share")
-			  ("EDITOR" . "emacsclient -n -a emacs")
-			  ("EMACSLOADPATH" . "$HOME/.guix-home/profile/share/emacs/site-lisp/")))
+                home-environment-variables-service-type
+                `(("LESSHISTFILE" . "$XDG_CACHE_HOME/.lesshst")
+                  ("XDG_DATA_DIRS" . "$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:/home/robby/.local/share/flatpak/exports/share")
+                  ("EDITOR" . "emacsclient -n -a emacs")
+                  ("EMACSLOADPATH" . "$HOME/.guix-home/profile/share/emacs/site-lisp/")
+                  ("XDG_DESKTOP_DIR" . "$HOME/desktop")
+                  ("XDG_DOWNLOAD_DIR" . "$HOME/downloads")
+                  ("XDG_TEMPLATES_DIR" . "$HOME/templates")
+                  ("XDG_PUBLICSHARE_DIR" . "$HOME/public")
+                  ("XDG_DOCUMENTS_DIR" . "$HOME/documents")
+                  ("XDG_MUSIC_DIR" . "$HOME/music")
+                  ("XDG_PICTURES_DIR" . "$HOME/pictures")
+                  ("XDG_VIDEOS_DIR" . "$HOME/videos")
+		  ("BROWSER" . "xdg-open")
+		  ("PODMAN_COMPOSE_WARNING_LOGS" . "false")
+		  ;; Required to open links in Firefox with DBUS instead of X11 sockets
+		  ("MOZ_DBUS_REMOTE" . "1")
+		  ("MOZ_ENABLE_WAYLAND" . "1")))
 	(service home-openssh-service-type
 		 (home-openssh-configuration
 		  (hosts