Compare commits

...

3 commits

Author SHA1 Message Date
6054dccc67 Add some indentation into zsh function 2023-09-19 00:38:04 -07:00
0bf5c4ee89 Update to latest emacs config 2023-09-19 00:37:47 -07:00
8341bb5d24 Add abcde as an alias for running through guix shell
I don't use ‘abcde’ frequently enough to keep it in my home profile all the
time.
2023-09-19 00:36:44 -07:00
3 changed files with 17 additions and 12 deletions

View file

@ -92,6 +92,7 @@
"alias sbcl=\"rlwrap sbcl\"\n" "alias sbcl=\"rlwrap sbcl\"\n"
"alias hc=herbstclient\n" "alias hc=herbstclient\n"
"alias reco=\"pushd ~/projects/new-dotfiles/ && guix home reconfigure config.scm; popd\"\n" "alias reco=\"pushd ~/projects/new-dotfiles/ && guix home reconfigure config.scm; popd\"\n"
"alias abcde=\"guix shell abcde -- abcde\"\n"
"setopt SHARE_HISTORY\n" "setopt SHARE_HISTORY\n"
"setopt HIST_IGNORE_ALL_DUPS\n" "setopt HIST_IGNORE_ALL_DUPS\n"
"setopt HIST_IGNORE_SPACE\n" "setopt HIST_IGNORE_SPACE\n"
@ -105,8 +106,8 @@
"autoload -Uz compinit\n" "autoload -Uz compinit\n"
"compinit\n" "compinit\n"
"function horizontal-rule() {\n" "function horizontal-rule() {\n"
"local width=$(tput cols)\n" " local width=$(tput cols)\n"
"echo -e \"\\033[0;32m${(pl:$width::━:)}\\033[0m\"\n" " echo -e \"\\033[0;32m${(pl:$width::━:)}\\033[0m\"\n"
"}\n" "}\n"
"preexec_functions+=(horizontal-rule)\n" "preexec_functions+=(horizontal-rule)\n"
"precmd_functions+=(horizontal-rule)\n" "precmd_functions+=(horizontal-rule)\n"

View file

@ -238,6 +238,8 @@
(fade-in-step 3) (fade-in-step 3)
(fade-out-step 3)))) (fade-out-step 3))))
(define my-emacs emacs-next-tree-sitter)
(home-environment (home-environment
(packages (list mpv mpv-mpris easytag (packages (list mpv mpv-mpris easytag
(specification->package+output "glibc-locales") (specification->package+output "glibc-locales")
@ -247,7 +249,7 @@
pick-random-wallpaper pick-random-wallpaper
notmuch-collect-tasks notmuch-collect-tasks
notmuch-tag-mailinglists notmuch-tag-mailinglists
(inbox-size emacs-next-tree-sitter) (inbox-size my-emacs)
count-emails count-emails
shutdown-rofi shutdown-rofi
emacs-org-roam emacs-org-roam
@ -263,7 +265,7 @@
emacs-outli emacs-outli
emacs-guix emacs-guix
emacs-oni-org-roam (emacs-oni-org-roam my-emacs)
emacs-oni-vterm emacs-oni-vterm
emacs-oni-elisp emacs-oni-elisp
emacs-oni-core emacs-oni-core
@ -320,7 +322,6 @@
gforth gforth
recutils recutils
emacs-rec-mode emacs-rec-mode
abcde
;; Might be needed for certain icons? ;; Might be needed for certain icons?
hicolor-icon-theme hicolor-icon-theme
;; Might be needed for cetrificates ;; Might be needed for cetrificates
@ -393,7 +394,7 @@
(service home-emacs-service-type (service home-emacs-service-type
(home-emacs-configuration (home-emacs-configuration
(package emacs-next-tree-sitter) (package my-emacs)
(configurations (configurations
(list (list
(local-file "../services/emacs/init.el") (local-file "../services/emacs/init.el")

View file

@ -13,7 +13,7 @@
#:use-module (oni packages go)) #:use-module (oni packages go))
(define-public emacs-oni-config (define-public emacs-oni-config
(let ((commit "655ce45b2f4f8ebcc0e1937e1a362228022dd95d") (let ((commit "e6a7b37ce47422db495d647b30643b9e26c58e67")
(revision "0")) (revision "0"))
(package (package
(name "emacs-oni-config") (name "emacs-oni-config")
@ -26,7 +26,7 @@
(commit commit))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "00l4g6n3rk3fwnz6sfmfyagdqik5w21cm8mg3biz48qjnhhm1n5w")))) (base32 "1qi64x699fg3nazzwch4y3ypdddppm7nsnvsjvr92ivv13p33sab"))))
(build-system emacs-build-system) (build-system emacs-build-system)
(home-page "https://code.ryuslash.org/ryuslash/emacs-config") (home-page "https://code.ryuslash.org/ryuslash/emacs-config")
(synopsis "My Emacs configuration") (synopsis "My Emacs configuration")
@ -303,7 +303,7 @@ Emacs")))
(synopsis "My Emacs Bats coding configuration") (synopsis "My Emacs Bats coding configuration")
(description "This package provides my configuration for coding in Bats"))) (description "This package provides my configuration for coding in Bats")))
(define-public emacs-oni-org (define-public (emacs-oni-org emacs)
(package (package
(inherit emacs-oni-config) (inherit emacs-oni-config)
(name "emacs-oni-org") (name "emacs-oni-org")
@ -315,7 +315,10 @@ Emacs")))
#:include '("\\.el$" #:include '("\\.el$"
"^snippets\\/org-mode\\/" "^snippets\\/org-mode\\/"
"^capture-templates\\/" "^capture-templates\\/"
"^icons\\/"))) "^icons\\/")
;; The default #:emacs (emacs-minimal) doesn't include `range.el' and
;; throws an error while trying to byte-compile oni-org.
#:emacs ,emacs))
(propagated-inputs (propagated-inputs
`(("emacs-oni-yasnippet" ,emacs-oni-yasnippet) `(("emacs-oni-yasnippet" ,emacs-oni-yasnippet)
("emacs-oni-alert" ,emacs-oni-alert) ("emacs-oni-alert" ,emacs-oni-alert)
@ -334,14 +337,14 @@ Emacs")))
(synopsis "My Emacs Org configuration") (synopsis "My Emacs Org configuration")
(description "This package provides my configuration for org"))) (description "This package provides my configuration for org")))
(define-public emacs-oni-org-roam (define-public (emacs-oni-org-roam emacs)
(package (package
(inherit emacs-oni-config) (inherit emacs-oni-config)
(name "emacs-oni-org-roam") (name "emacs-oni-org-roam")
(arguments (arguments
'(#:include '("oni-org-roam.el"))) '(#:include '("oni-org-roam.el")))
(propagated-inputs (propagated-inputs
`(("emacs-oni-org" ,emacs-oni-org) `(("emacs-oni-org" ,(emacs-oni-org emacs))
("emacs-org-roam" ,emacs-org-roam))) ("emacs-org-roam" ,emacs-org-roam)))
(synopsis "My Emacs Org Roam configuration") (synopsis "My Emacs Org Roam configuration")
(description "This package provides my configuration for Org Roam"))) (description "This package provides my configuration for Org Roam")))