From 54876c09683a2aa7e7ba4e95195f7901e301a8cb Mon Sep 17 00:00:00 2001 From: Daniel Ziltener Date: Tue, 26 Dec 2023 23:34:36 +0100 Subject: [PATCH] . --- home/Makefile | 3 +++ home/emacs/init.el | 6 ++++-- home/fontforge/Makefile | 27 +++++++++++++++++++++++++++ home/home-configuration.scm | 16 +++++++++++++--- home/kitty/kitty.conf | 2 +- home/liquidprompt/liquidpromptrc | 12 ++++++++++++ 6 files changed, 60 insertions(+), 6 deletions(-) create mode 100644 home/Makefile create mode 100644 home/fontforge/Makefile create mode 100644 home/liquidprompt/liquidpromptrc diff --git a/home/Makefile b/home/Makefile new file mode 100644 index 0000000..082e096 --- /dev/null +++ b/home/Makefile @@ -0,0 +1,3 @@ +reconfigure: + guix home reconfigure ./home-configuration.scm + cd fontforge; direnv exec . make install diff --git a/home/emacs/init.el b/home/emacs/init.el index 33c8b1f..f199eda 100644 --- a/home/emacs/init.el +++ b/home/emacs/init.el @@ -133,6 +133,7 @@ :custom-face ;;(default ((t (:weight bold :height 113 :width normal :family "VictorMono Nerd Font")))) (fixed-pitch ((t (:weight normal :height 105 :width narrow :family "MonaspiceXe Nerd Font Mono")))) + ;; (fixed-pitch ((t (:weight normal :height 105 :width condensed :family "LibertinusMono Nerd Font Mono")))) (variable-pitch ((t (:weight normal :height 130 :family "LibertinusSerif Nerd Font Propo")))) ;(variable-pitch ((t (:weight normal :height 105 :width narrow :family "MonaspiceXe Nerd Font Propo")))) :hook @@ -236,7 +237,8 @@ :config (ligature-set-ligatures 't - '(;; SS01 + '(";;" + ;; SS01 "==" "===" "=/=" "!=" "!==" "/=" "/==" "~~" "=~" "!~" ;; SS02 ">=" "<=" @@ -256,7 +258,7 @@ "//" "///" "&&" "!!" "??" "?." "?:" "||" "::" ":::" ";;" ".." "..." "=!=" "#=" ":=" "=:" "=:=" ":>" ">:" "<:" ":<" "..=" "..-" )) - (global-ligature-mode t)) + (global-ligature-mode nil)) (set-frame-parameter nil 'alpha-background 90) (add-to-list 'default-frame-alist '(alpha-background . 90)) diff --git a/home/fontforge/Makefile b/home/fontforge/Makefile new file mode 100644 index 0000000..e615e9c --- /dev/null +++ b/home/fontforge/Makefile @@ -0,0 +1,27 @@ +font-patcher: + tmp=$(mktemp); \ + trap "rm -rf '$tmp'" exit; \ + curl -L https://github.com/ryanoasis/nerd-fonts/releases/latest/download/FontPatcher.zip > $tmp; \ + unzip $tmp + +LibertinusKeyboard-Regular.otf LibertinusSans-Bold.otf LibertinusSerif-Bold.otf LibertinusSerif-Regular.otf LibertinusSerifDisplay-Regular.otf LibertinusMath-Regular.otf LibertinusSans-Italic.otf LibertinusSerif-BoldItalic.otf LibertinusSerif-Semibold.otf LibertinusSerifInitials-Regular.otf LibertinusMono-Regular.otf LibertinusSans-Regular.otf LibertinusSerif-Italic.otf LibertinusSerif-SemiboldItalic.otf: + curl -L https://github.com/alerque/libertinus/releases/download/v7.040/Libertinus-7.040.tar.xz | tar xJ + ln -sf Libertinus-7.040/static/OTF/* . + +LibertinusSerifNerdFontPropo-%.otf: LibertinusSerif-%.otf font-patcher + ./font-patcher $< -c --variable-width-glyphs + +LibertinusSansNerdFontPropo-%.otf: LibertinusSans-%.otf font-patcher + ./font-patcher $< -c --variable-width-glyphs + +LibertinusMonoNerdFontMono-%.otf: LibertinusMono-%.otf font-patcher + ./font-patcher $< -c --mono + +install-%: % + install -C -D $< $$XDG_DATA_HOME/fonts/$< + +install-serif: install-LibertinusSerifNerdFontPropo-Regular.otf install-LibertinusSerifNerdFontPropo-Bold.otf install-LibertinusSerifNerdFontPropo-BoldItalic.otf install-LibertinusSerifNerdFontPropo-Italic.otf + +install-mono: install-LibertinusMonoNerdFontMono-Regular.otf + +install: install-serif install-mono diff --git a/home/home-configuration.scm b/home/home-configuration.scm index e5baa94..5cc397a 100644 --- a/home/home-configuration.scm +++ b/home/home-configuration.scm @@ -8,6 +8,7 @@ (use-modules (gnu packages) (gnu packages gnupg) + (gnu packages shellutils) (gnu services) (guix gexp) (guix channels) @@ -83,6 +84,7 @@ ("waybar/style.css" ,(local-file "./waybar/style.css")) ("fuzzel/fuzzel.ini" ,(local-file "./fuzzel/fuzzel.ini")) ("git/config" ,(local-file "./git/config")) + ("liquidpromptrc" ,(local-file "./liquidprompt/liquidpromptrc")) ("emacs/init.el" ,(local-file "./emacs/init.el")) ("emacs/early-init.el" ,(local-file "./emacs/early-init.el")) ("emacs/init.org" ,(local-file "./emacs/init.org")) @@ -97,12 +99,20 @@ ("ll" . "ls -l") ("ls" . "ls --color=tty") ("create-guix-patch" . "git format-patch --minimal --to guix-patches@gnu.org --cc dziltener@lyrion.ch --inline --no-attach master; ls *.patch | xargs sed -i '1d'") - ("send-guix-patch-series" . "for FILE in $(ls *.patch); do cat $FILE | msmtp -t; done"))) + ("send-guix-patch-series" . "for FILE in `find . -name '*.patch'`; do cat $FILE | msmtp -t; done"))) (bashrc (list (local-file "./.bashrc" - "bashrc"))))) + "bashrc") + (mixed-text-file "liquidprompt" + "[[ $- = *i* ]] && source " + liquidprompt + "/share/liquidprompt/liquidprompt") + (mixed-text-file "liquidprompt-theme" + "[[ $- = *i* ]] && source " + liquidprompt + "/share/liquidprompt/themes/alternate_vcs/alternate_vcs.theme"))))) (service home-batsignal-service-type (home-batsignal-configuration (ignore-missing? #t))) @@ -159,7 +169,7 @@ "icedove-wayland" "kitty" "ksshaskpass" - ;; "liquidprompt" https://issues.guix.gnu.org/67942 + "liquidprompt" "make" "nm-tray" "nnn" diff --git a/home/kitty/kitty.conf b/home/kitty/kitty.conf index ebd9065..dfc61d9 100644 --- a/home/kitty/kitty.conf +++ b/home/kitty/kitty.conf @@ -1,4 +1,4 @@ -font_family VictorMono Nerd Font Mono +font_family MonaspiceXe Nerd Font Mono font_size 10 background_opacity 0.85 kitty_mod ctrl+shift diff --git a/home/liquidprompt/liquidpromptrc b/home/liquidprompt/liquidpromptrc new file mode 100644 index 0000000..7b43a8a --- /dev/null +++ b/home/liquidprompt/liquidpromptrc @@ -0,0 +1,12 @@ +LP_MARK_PREFIX=$'\n' +LP_PATH_LENGTH=50 +LP_ENABLE_BATT=1 +LP_ENABLE_CONTAINER=1 +LP_ENABLE_DIRSTACK=1 +LP_ENABLE_RUNTIME_BELL=1 +LP_ENABLE_TITLE=1 +LP_ENABLE_SCREEN_TITLE=1 +LP_ENABLE_SSH_COLORS=1 +LP_ENABLE_TIME=1 +LP_TIME_ANALOG=1 +LP_ENABLE_WIFI_STRENGTH=1