This commit is contained in:
Daniel Ziltener 2023-12-08 10:46:43 +01:00
parent f59c3c6f14
commit 021a3c5356
Signed by: zilti
GPG key ID: B38976E82C9DAE42
6 changed files with 122 additions and 50 deletions

View file

@ -1,5 +1,4 @@
eval "$(/nix/store/idmgjy1irgzlsi89rdjw6a1baj83yiys-starship-1.16.0/bin/starship init bash)" eval "$(starship init bash)"
# Commands that should be applied only for interactive shells. # Commands that should be applied only for interactive shells.
[[ $- == *i* ]] || return [[ $- == *i* ]] || return
@ -31,5 +30,4 @@ eval "$(SHELL=bash /nix/store/vrcxmwrgsdgwm51rxdpyzp6ppslavn3n-keychain-2.8.5/bi
eval "$(/nix/store/h9m0s8n535y69jg4vpj41i8alhilld8c-hstr-3.1/bin/hstr --show-configuration)" eval "$(/nix/store/h9m0s8n535y69jg4vpj41i8alhilld8c-hstr-3.1/bin/hstr --show-configuration)"
eval "$(/nix/store/j39wscasn8f5qjdranl3ba0vh6crxf2m-direnv-2.32.3/bin/direnv hook bash)" eval "$(direnv hook bash)"

View file

@ -102,10 +102,13 @@
;;;; Org Mode ;;;; Org Mode
(use-package org (use-package org
:ensure t :ensure t
:custom
(org-babel-load-languages '((emacs-lisp . t)
(scheme . t)))
:hook :hook
(org-mode . org-indent-mode) (org-mode . org-indent-mode)
(org-src-mode . hack-local-variables) (org-src-mode . hack-local-variables)
(org-mode . auto-fill-mode) (org-mode . visual-line-mode)
:config :config
(setq org-directory "~/org") (setq org-directory "~/org")
(add-to-list 'org-modules 'collector)) (add-to-list 'org-modules 'collector))
@ -115,7 +118,7 @@
:custom :custom
(org-roam-directory "~/org/roam") (org-roam-directory "~/org/roam")
:config :config
(progn (org-roam-db-autosync-mode))) (org-roam-db-autosync-mode))
(use-package consult-notes (use-package consult-notes
:config :config
@ -220,6 +223,12 @@
;; load preferred theme ;; load preferred theme
(load-theme 'lambda-dark)) (load-theme 'lambda-dark))
(use-package visual-fill-column
:custom
(visual-fill-column-center-text t)
(visual-fill-column-enable-sensible-window-split t)
:hook visual-line-mode)
;;;; Security ;;;; Security
(use-package keychain-environment (use-package keychain-environment
:init :init
@ -332,8 +341,21 @@
;;;;; Code Completion ;;;;; Code Completion
(use-package cape (use-package cape
:config :init
(advice-add 'eglot-completion-at-point :around #'cape-wrap-buster)) (defun my/capf ()
(interactive)
(setq-local completion-at-point-functions
(list (cape-capf-super
#'tempel-complete
#'cape-dabbrev
#'cape-file
#'cape-dict
#'cape-line
#'cape-emoji
#'cape-keyword))))
(advice-add 'eglot-completion-at-point :around #'cape-wrap-buster)
(add-hook 'org-mode-hook #'my/capf)
(add-hook 'prog-mode-hook #'my/capf))
(defun my/corfu-combined-sort (candidates) (defun my/corfu-combined-sort (candidates)
"Sort CANDIDATES using both display-sort-function and corfu-sort-function." "Sort CANDIDATES using both display-sort-function and corfu-sort-function."
@ -498,16 +520,20 @@ Point must be at the beginning of balanced expression (sexp)."
(use-package flymake (use-package flymake
:delight '(:eval (cons "" (flymake--mode-line-counters)))) :delight '(:eval (cons "" (flymake--mode-line-counters))))
(use-package eglot
:preface
(defun my/eglot-capf () (defun my/eglot-capf ()
(interactive)
(setq-local completion-at-point-functions (setq-local completion-at-point-functions
(list (cape-super-capf (list (cape-capf-super
#'eglot-completion-at-point #'eglot-completion-at-point
#'tempel-complete #'tempel-complete
#'cape-dabbrev #'cape-dabbrev
#'cape-file #'cape-file
#'cape-dict)))) #'cape-dict
#'cape-line
(use-package eglot #'cape-emoji
#'cape-keyword))))
:custom :custom
(eglot-connect-timeout 90) (eglot-connect-timeout 90)
(eglot-autoshutdown t) (eglot-autoshutdown t)
@ -599,7 +625,7 @@ Point must be at the beginning of balanced expression (sexp)."
(eval-after-load 'eglot (eval-after-load 'eglot
'(add-to-list 'eglot-server-programs '(add-to-list 'eglot-server-programs
'(scheme-mode '(scheme-mode
. ("env" "CHICKEN_DOC_REPOSITORY=/home/zilti/.local/share/chicken-doc" "chicken-lsp-server")))) . ("chicken-lsp-server"))))
:hook :hook
(scheme-mode . eglot-ensure)) (scheme-mode . eglot-ensure))

View file

@ -13,6 +13,31 @@ prog-mode
(bug (if (derived-mode-p 'emacs-lisp-mode) ";; " comment-start) "BUG ") (bug (if (derived-mode-p 'emacs-lisp-mode) ";; " comment-start) "BUG ")
(hack (if (derived-mode-p 'emacs-lisp-mode) ";; " comment-start) "HACK ") (hack (if (derived-mode-p 'emacs-lisp-mode) ";; " comment-start) "HACK ")
scheme-mode
(define-guix-egg
"(define-public chicken-" (s egg-name)
n> "(package"
n> "(name \"chicken-" egg-name "\")"
n> "(version \"" (s egg-version) "\")"
n> "(source"
n> "(origin"
n> "(method url-fetch)"
n> "(uri (egg-uri \"" egg-name "\" version))"
n> "(sha256"
n> "(base32"
n> "\"0z05x7f154n9bgmainrsmncf5i6dil43r9ymr3rdgwbg4wnxmz4s\"))))"
n> "(propagated-inputs"
n> "(list " (s inputs) "))"
n> "(native-inputs"
n> "(list " (s native-inputs) "))"
n> "(build-system chicken-build-system)"
n> "(arguments '(#:egg-name \"" egg-name "\"))"
n> "(synopsis \"" (s synopsis) "\")"
n> "(home-page \"https://wiki.call-cc.org/eggref/5/" egg-name "\")"
n> "(description \"" synopsis "\")"
n> "(license license:" (s license) ")))")
;; Local Variables: ;; Local Variables:
;; mode: lisp-data ;; mode: lisp-data
;; outline-regexp: "[a-z]" ;; outline-regexp: "[a-z]"

View file

@ -30,16 +30,25 @@
(specifications->packages (specifications->packages
(list "bsd-games" (list "bsd-games"
"chicken" "chicken"
"curl"
"direnv"
"emacs" "emacs"
"emacs-direnv"
"fuzzel" "fuzzel"
"gammastep" "gammastep"
"guile"
;; "glibc-locales" ;; "glibc-locales"
"icecat" "icecat"
"icedove-wayland"
"kitty" "kitty"
#;"nss-certs" ; This package is broken
"password-store" "password-store"
"pass-otp" "pass-otp"
"passff-icecat" "passff-icecat"
"pinentry-qt" "pinentry-qt"
"rust"
"rust-cargo"
"senpai"
"swayfx" "swayfx"
"swayidle" "swayidle"
"waybar" "waybar"
@ -50,35 +59,38 @@
(list (list
(service home-shepherd-service-type) (service home-shepherd-service-type)
#;(service home-msmtp-service-type #;(service home-msmtp-service-type
(home-msmtp-configuration (home-msmtp-configuration ;
(accounts (accounts ;
(list (list ;
(msmtp-account (msmtp-account ;
(name "LMail") (name "LMail") ;
(configuration (configuration ;
(msmtp-configuration (msmtp-configuration ;
(host "lyrion.ch") (host "lyrion.ch") ;
(port 587) (port 587) ;
(user "dziltener") (user "dziltener") ;
(password-eval "pass Privat/Mailaccount | head -n 1")))) (password-eval "pass Privat/Mailaccount | head -n 1")))) ;
(msmtp-account (msmtp-account ;
(name "Red Sky") (name "Red Sky") ;
(configuration (configuration ;
(msmtp-configuration (msmtp-configuration ;
(host "gmail.com") (host "gmail.com") ;
(port 587) (port 587) ;
(user "dz@redsky.io") (user "dz@redsky.io") ;
(password-eval "pass Privat/RedSkyGMail")))))))) (password-eval "pass Privat/RedSkyGMail"))))))))
(simple-service 'ziltis-environment-variable-service (simple-service 'ziltis-environment-variable-service
home-environment-variables-service-type home-environment-variables-service-type
`(("PASSWORD_STORE_DIR" . "$XDG_DATA_HOME/password-store") `(("PATH" . "$PATH:~/.local/bin")
("PASSWORD_STORE_DIR" . "$XDG_DATA_HOME/password-store")
("SSH_ASKPASS" . "ksshaskpass") ("SSH_ASKPASS" . "ksshaskpass")
("ELM_DISPLAY" . "wl") ("ELM_DISPLAY" . "wl")
("SDL_VIDEODRIVER" . "wayland") ("SDL_VIDEODRIVER" . "wayland")
("MOZ_ENABLE_WAYLAND" . "1") ("MOZ_ENABLE_WAYLAND" . "1")
("SSL_CERT_FILE" . "$HOME/.guix-profile/etc/ssl/certs/ca-certificates.crt")
("CHICKEN_DOC_REPOSITORY" . "$XDG_DATA_HOME/chicken/doc") ("CHICKEN_DOC_REPOSITORY" . "$XDG_DATA_HOME/chicken/doc")
("CHICKEN_INSTALL_REPOSITORY" . "$XDG_DATA_HOME/chicken/eggs") ("CHICKEN_INSTALL_REPOSITORY" . "$XDG_DATA_HOME/chicken/eggs")
("CHICKEN_INSTALL_PREFIX" . "$XDG_DATA_HOME/bin"))) ("CHICKEN_REPOSITORY_PATH" . "$HOME/.guix-home/profile/var/lib/chicken/11/:$XDG_DATA_HOME/chicken/eggs")
("CHICKEN_INSTALL_PREFIX" . "$HOME/.local")))
(simple-service 'ziltis-home-files-service (simple-service 'ziltis-home-files-service
home-files-service-type home-files-service-type
`((".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf")))) `((".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf"))))
@ -90,7 +102,8 @@
("emacs/init.el" ,(local-file "./emacs/init.el")) ("emacs/init.el" ,(local-file "./emacs/init.el"))
("emacs/init.org" ,(local-file "./emacs/init.org")) ("emacs/init.org" ,(local-file "./emacs/init.org"))
("emacs/templates" ,(local-file "./emacs/templates")) ("emacs/templates" ,(local-file "./emacs/templates"))
("kitty/kitty.conf" ,(local-file "./kitty/kitty.conf")))) ("kitty/kitty.conf" ,(local-file "./kitty/kitty.conf"))
("senpai/senpai.scfg" ,(local-file "./senpai/senpai.scfg"))))
(service home-bash-service-type (service home-bash-service-type
(home-bash-configuration (home-bash-configuration
(aliases (aliases
@ -128,6 +141,11 @@
(home-openssh-configuration (home-openssh-configuration
(hosts (hosts
(list (list
(openssh-host
(name "www.opencode.net")
(host-name "www.opencode.net")
(user "git")
(identity-file "~/.ssh/personal_ed"))
(openssh-host (openssh-host
(name "gitea.lyrion.ch") (name "gitea.lyrion.ch")
(host-name "gitea.lyrion.ch") (host-name "gitea.lyrion.ch")
@ -135,12 +153,12 @@
(port 7920) (port 7920)
(identity-file "~/.ssh/personal_ed")))))) (identity-file "~/.ssh/personal_ed"))))))
#;(service home-gpg-agent-service-type #;(service home-gpg-agent-service-type
(home-gpg-agent-configuration (home-gpg-agent-configuration ;
(pinentry-program (pinentry-program ;
(file-append pinentry-qt "/bin/pinentry-qt")) (file-append pinentry-qt "/bin/pinentry-qt")) ;
(ssh-support? #t) (ssh-support? #t) ;
(default-cache-ttl 7200) (default-cache-ttl 7200) ;
(default-cache-ttl-ssh 7200) (default-cache-ttl-ssh 7200) ;
(extra-content "allow-emacs-pinentry\nallow-loopback-pinentry"))) (extra-content "allow-emacs-pinentry\nallow-loopback-pinentry")))
(service home-dbus-service-type) (service home-dbus-service-type)
))) )))

5
home/senpai/senpai.scfg Normal file
View file

@ -0,0 +1,5 @@
address ircs://lyrion.ch
nickname zilti
realname "Daniel Ziltener"
password-cmd pass show Privat/Soju

View file

@ -13,8 +13,8 @@
"", "",
"" ""
], ],
"on-scroll-down": "/nix/store/30jb0hsd8smaqmn8dzjf898vwrhl1qyk-brightnessctl-0.5.1/bin/brightnessctl set 1%-", "on-scroll-down": "brightnessctl set 1%-",
"on-scroll-up": "/nix/store/30jb0hsd8smaqmn8dzjf898vwrhl1qyk-brightnessctl-0.5.1/bin/brightnessctl set +1%" "on-scroll-up": "brightnessctl set +1%"
}, },
"battery": { "battery": {
"format": "{capacity}% {icon}", "format": "{capacity}% {icon}",