Merge remote-tracking branch 'origin/master'

Emacs.org

@@ -735,6 +735,7 @@ Sets HTML strings to have the background of the color they represent.
 #+end_src
 
 *** Ruby
+<<<<<<< HEAD
 **** Code Completion
 #+begin_src emacs-lisp
 (use-package robe
@@ -744,6 +745,10 @@ Sets HTML strings to have the background of the color they represent.
 #+begin_src emacs-lisp
 (use-package bundler
   :straight t)
+=======
+#+begin_src emacs-lisp
+
+>>>>>>> origin/master
 #+end_src
 
 *** Lisp

Guix.org

@@ -235,32 +235,190 @@ Disclaimer: I use the nonguix channel only for the use of building Firefox from
 #+end_src 
 
 * Home
-#+begin_src scheme
+#+begin_src emacs-lisp
-;; List of packages that I need to add to a home configuration.
+(use-modules
-(list
+ (gnu)
- python-pip
+ (gnu home)
- libtool
+ (gnu home services)
- emacs-vterm
+ (gnu home services shells)
- emacs-geiser
+ (gnu home services shepard)
- emacs-geiser-guile
+ (gnu packages libreoffice)
- make
+ (gnu packages mail)
- cmake
+ (gnu packages pdf))
- nyxt
+
- sbcl
+(home-environment
- python
+ (packages
- alacritty
+  (append
- perl
+   ;; Tools/Libraries
- gcc
+   (list
- zsh
+    gcc-toolchain
- curl
+    wget
- wget
+    curl
- zathura
+    cmake
- zathura-pdf-mupdf
+    make
- zathura-pdf-poppler
+    zip
- zip
+    unzip
- unzip
+    libtool
- thunar
+    binutils-gold
- papirus-icon-theme
+    openssl
- guile
+    openssh
- python-lsp-server)
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+    gst-libav
+    wl-clipboard
+    zsh
+    gnupg)
+    ;; Applications
+    (list
+     alacritty
+     nyxt
+     zathura-pdf-mupdf
+     thunar
+     firefox
+     wl-randr
+     libreoffice
+     calibre
+     mpv
+     youtube-dl
+     icedove)
+     ;; Emacs
+     (list
+      emacs-vterm
+      emacs-geiser
+      emacs-geiser-guile
+      emacs-doom-modeline
+      emacs-all-the-icons
+      emacs-all-the-icons-dired
+      emacs-general
+      emacs-which-key
+      emacs-alert
+      emacs-helpful
+      emacs-pinentry
+      emacs-doom-themes
+      emacs-evil
+      emacs-evil-collection
+      emacs-vertico
+      emacs-orderless
+      emacs-consult
+      emacs-company
+      emacs-marginalia
+      emacs-perspective
+      emacs-dired-rsync
+      emacs-dired-hacks
+      emacs-org-bullets
+      emacs-org-make-toc
+      emacs-visual-fill-column
+      emacs-flycheck
+      emacs-rainbow-mode
+      emacs-rainbow-delimiters
+      emacs-magit
+      emacs-projectile
+      emacs-lsp-mode
+      emacs-lsp-ui
+      emacs-treemacs
+      emacs-lsp-treemacs
+      emacs-parinfer
+      emacs-yasnippet
+      emacs-pdf-tools)
+     ;; Languages
+     (list
+      ruby
+      python
+      guile
+      sbcl
+      perl
+      python-lsp-server
+      ruby-solargraph)
+     ;; Aesthetics/Fonts
+     (list
+      papirus-icon-theme
+      arc-theme
+      font-fira-mono
+      font-fira-code
+      font-fira-sans
+      font-abattis-cantarell
+      font-google-noto
+      font-awesome)))
+ (services
+  (append
+   ;; Shell
+   (list
+    (service home-zsh-service-type
+             (home-zsh-configuration
+              ;; Place all configs to $XDG_CONFIG_HOME/zsh. Makes
+              ;; ~/.zshenv to set ZDOTDIR to $XDG_CONFIG_HOME/zsh
+              ;; and shell process starts with ~/.config/zsh/.zshenv
+              (xdg-flavor? #t)
+              ;; .zshenv
+              (zshenv
+               (list
+                (local-file
+                 (string-append (getenv "HOME")
+                                "/Dotfiles/.config/zsh/.zshenv")
+                 "/.config/zsh/.zshenv")))
+              ;; .zprofile
+              (zprofile
+               (list
+                (local-file
+                 (string-append (getenv "HOME")
+                                "/Dotfiles/.config/zsh/.zprofile")
+                 "/.config/zsh/.zprofile")))
+              (zshrc
+               (list
+                (local-file
+                 (string-append (getenv "HOME")
+                                "/Dotfiles/.config/zsh/.zshrc")
+                 "/.config/zsh/.zshrc"))))))
+   ;; Files
+   (list
+    (simple-service 'emacs-config
+                    home-files-service-type
+                    (list
+                     `(".config/emacs/init.el"
+                       ,(local-file
+                         (string-append (getenv "HOME")
+                                        "/Dotfiles/emacs/init.el")))))
+    
+    (simple-service 'nyxt-config
+                    home-files-service-type
+                    (list
+                     `(".config/nyxt/init.lisp"
+                       ,(local-file
+                         (string-append (getenv "HOME")
+                                        "/Dotfiles/nyxt/init.lisp")))))
+    
+    (simple-service 'dunst-config
+                    home-files-service-type
+                    (list
+                     `(".config/dunst/dunstrc"
+                       ,(local-file
+                         (string-append (getenv "HOME")
+                                        "/Dotfiles/dunst/dunstrc")))))
+    
+    (simple-service 'alacritty-config
+                    home-files-service-type
+                    (list
+                     `(".config/alacritty/alacritty.yml"
+                       ,(local-file
+                         (string-append (getenv "HOME")
+                                        "/Dotfiles/alacritty/alacritty.yml")))))
+    
+    (simple-service 'alacritty-config
+                    )
+   ;; Daemons
+   (list
+    (service home-shepard-service-type
+             (home-shepherd-configuration
+              (services
+               (list
+                (shepard-service
+                 (provision '(emacs))
+                 (start #~(make-system-constructor "emacs --daemon"))
+                 (stop #~(make-system-constructor "emacsclient -e '(kill-emacs)'")))
+                (shepard-service
+                 (provision '(gnome-keyring-daemon))
+                 (start #~(make-system-contructor "gnome-keyring-daemon --daemonize"))
+                 (stop #~(make-system-contructor "pkill gnome-keyring-daemon")))))))))))
 #+end_src