From 1cbce535ea40a6402480573b4f12a14f170a41f4 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Wed, 4 Feb 2026 06:46:21 -0800 Subject: [PATCH 1/2] feat: i3status, foot, emacs --- dotfiles/.config/emacs/config.el | 7 ++++ dotfiles/.config/foot/foot.ini | 2 + dotfiles/.config/i3status-rust/config.toml | 46 ++++++++++++++++++++++ home.scm | 14 ++++--- 4 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 dotfiles/.config/foot/foot.ini create mode 100644 dotfiles/.config/i3status-rust/config.toml diff --git a/dotfiles/.config/emacs/config.el b/dotfiles/.config/emacs/config.el index a88990e..e013b18 100644 --- a/dotfiles/.config/emacs/config.el +++ b/dotfiles/.config/emacs/config.el @@ -13,3 +13,10 @@ (add-hook 'geiser-repl-mode-hook 'ac-geiser-setup) (eval-after-load "auto-complete" '(add-to-list 'ac-modes 'geiser-repl-mode)) + +(load-theme 'gruvbox-dark-medium t) + +(menu-bar-mode -1) +(tool-bar-mode -1) + +(add-to-list 'default-frame-alist '(alpha-background . 90)) diff --git a/dotfiles/.config/foot/foot.ini b/dotfiles/.config/foot/foot.ini new file mode 100644 index 0000000..3264309 --- /dev/null +++ b/dotfiles/.config/foot/foot.ini @@ -0,0 +1,2 @@ +[colors] +alpha=0.9 diff --git a/dotfiles/.config/i3status-rust/config.toml b/dotfiles/.config/i3status-rust/config.toml new file mode 100644 index 0000000..236c4f9 --- /dev/null +++ b/dotfiles/.config/i3status-rust/config.toml @@ -0,0 +1,46 @@ +icons_format = "{icon}" + +[theme] +theme = "native" + +[icons] +icons = "none" +[icons.overrides] +bat = ["|E|", "|_|", "|=|", "|F|"] +bat_charging = "|^| " + +[[block]] +block = "cpu" +info_cpu = 20 +warning_cpu = 50 +critical_cpu = 90 + +[[block]] +block = "disk_space" +path = "/" +info_type = "available" +alert_unit = "GB" +interval = 20 +warning = 20.0 +alert = 10.0 +format = " $icon root: $available.eng(w:2) " + +[[block]] +block = "memory" +format = " $icon $mem_total_used_percents.eng(w:2) " +format_alt = " $icon_swap $swap_used_percents.eng(w:2) " + +[[block]] +block = "sound" +[[block.click]] +button = "left" +cmd = "pavucontrol" + +[[block]] +block = "time" +interval = 1 +format = " $timestamp.datetime(f:'%F %T %Z') " + +[[block]] +block = "battery" +interval = 30 diff --git a/home.scm b/home.scm index fde2ab0..d0a27b6 100644 --- a/home.scm +++ b/home.scm @@ -20,6 +20,7 @@ librewolf ; self-explanatory lua ; fennel terminals ; foot + admin ; fastfetch ) (define neovim-packages @@ -31,18 +32,17 @@ vim-guix-vim)) (define emacs-packages - (list emacs + (list emacs-pgtk emacs-paredit emacs-geiser emacs-geiser-guile + emacs-gruvbox-theme emacs-evil emacs-evil-collection emacs-evil-commentary emacs-evil-paredit)) -(define sway-bar-status #~(string-append "while " - #$coreutils "/bin/date" - " +'%Y-%m-%d %X'; do sleep 1; done")) +(define sway-bar-status (file-append i3status-rust "/bin/i3status-rs")) (define sway-config (sway-configuration @@ -57,8 +57,9 @@ (keybindings %sway-default-keybindings) (gestures %sway-default-gestures) (packages (append (list - grimshot - wl-clipboard) %sway-default-packages)) + grimshot + i3status-rust + wl-clipboard) %sway-default-packages)) (modes %sway-default-modes) ;(startup-programs %sway-default-startup-programs) (inputs (list (sway-input (identifier "type:keyboard") @@ -69,6 +70,7 @@ (packages (append neovim-packages emacs-packages (list jujutsu + fastfetch ripgrep fd sd From fcab6218647b4e52ba4d8c6e54161312e26bd00e Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Thu, 5 Feb 2026 10:07:14 -0800 Subject: [PATCH 2/2] feat: atkinson hyperlegible next --- dotfiles/.config/emacs/config.el | 6 +- dotfiles/.config/foot/foot.ini | 3 + dotfiles/.config/i3status-rust/config.toml | 2 +- files/starship.fish | 1 + home.scm | 72 ++++++++++++++++++++-- packages/fonts.scm | 22 +++++++ 6 files changed, 97 insertions(+), 9 deletions(-) create mode 100644 files/starship.fish create mode 100644 packages/fonts.scm diff --git a/dotfiles/.config/emacs/config.el b/dotfiles/.config/emacs/config.el index e013b18..f848fd3 100644 --- a/dotfiles/.config/emacs/config.el +++ b/dotfiles/.config/emacs/config.el @@ -5,8 +5,8 @@ (add-hook 'emacs-lisp-mode-hook 'evil-paredit-mode) ;; scheme paredit -(add-hook 'scheme 'enable-paredit-mode) -(add-hook 'scheme 'evil-paredit-mode) +(add-hook 'scheme-mode-hook 'enable-paredit-mode) +(add-hook 'scheme-mode-hook 'evil-paredit-mode) ;; geiser (add-hook 'geiser-mode-hook 'ac-geiser-setup) @@ -18,5 +18,7 @@ (menu-bar-mode -1) (tool-bar-mode -1) +(scroll-bar-mode -1) (add-to-list 'default-frame-alist '(alpha-background . 90)) +(set-frame-font "Atkinson Hyperlegible Next 10" nil t) diff --git a/dotfiles/.config/foot/foot.ini b/dotfiles/.config/foot/foot.ini index 3264309..03b4cd7 100644 --- a/dotfiles/.config/foot/foot.ini +++ b/dotfiles/.config/foot/foot.ini @@ -1,2 +1,5 @@ +[main] +font=Atkinson Hyperlegible Next:size=10 + [colors] alpha=0.9 diff --git a/dotfiles/.config/i3status-rust/config.toml b/dotfiles/.config/i3status-rust/config.toml index 236c4f9..54caaa0 100644 --- a/dotfiles/.config/i3status-rust/config.toml +++ b/dotfiles/.config/i3status-rust/config.toml @@ -4,7 +4,7 @@ icons_format = "{icon}" theme = "native" [icons] -icons = "none" +icons = "awesome4" [icons.overrides] bat = ["|E|", "|_|", "|=|", "|F|"] bat_charging = "|^| " diff --git a/files/starship.fish b/files/starship.fish new file mode 100644 index 0000000..c179c03 --- /dev/null +++ b/files/starship.fish @@ -0,0 +1 @@ +starship init fish | source diff --git a/home.scm b/home.scm index d0a27b6..7182908 100644 --- a/home.scm +++ b/home.scm @@ -6,7 +6,10 @@ (gnu home services dotfiles) (gnu home services shells) (gnu home services sway) + (gnu home services desktop) + (gnu home services sound) (packages nvim) + (packages fonts) (gnu system keyboard) (gnu services) (gnu system shadow)) @@ -19,8 +22,12 @@ vim ; self-explanatory librewolf ; self-explanatory lua ; fennel + video ; mpv, yt-dlp terminals ; foot admin ; fastfetch + pulseaudio ; pavucontrol + fonts ; cozette + shellutils ; starship ) (define neovim-packages @@ -46,16 +53,60 @@ (define sway-config (sway-configuration - (inherit %empty-sway-configuration) + (inherit %empty-sway-configuration) (bar (sway-bar (identifier 'bar0) (position 'top) + (colors (sway-color (background "$dark") + (statusline "$light") + (focused-workspace + (sway-border-color (border "$gray") + (background "$gray") + (text "$light"))) + (active-workspace + (sway-border-color (border "$mid") + (background "$mid") + (text "$light"))) + (inactive-workspace + (sway-border-color (border "$inactive") + (background "$inactive") + (text "$light"))) + (urgent-workspace + (sway-border-color (border "$urgent") + (background "$urgent") + (text "$light"))))) (status-command sway-bar-status))) ;;(startup+reload-programs TODO) - ;;(extra-content TODO) - (variables %sway-default-variables) + (extra-content (list + "client.focused $focused $focused $light $focused $focused" + "client.focused_inactive $inactive $inactive $light $inactive $inactive" + "client.unfocused $unfocused $unfocused $light $unfocused $unfocused" + "client.urgent $urgent $urgent $light $urgent $urgent" + "smart_gaps on" + "gaps inner 0" + "gaps outer -4" + "gaps top -2" + "gaps bottom 0" + "default_border pixel 0" + "default_floating_border pixel 2" + "font pango:Atkinson Hyperlegible Next 10" + )) + (variables (append `((mod . "Mod4") + (light . "#ebdbb2") + (dark . "#3c3836") + (gray . "#928374") + (mid . "#665c54") + (focused . "#3c3836") + (inactive . "#282828") + (unfocused . "#282828") + (urgent . "#b8bb26") + ) %sway-default-variables)) (keybindings %sway-default-keybindings) (gestures %sway-default-gestures) + (outputs + (list (sway-output + (identifier '*) + (background (local-file "files/homu-wallpaper.jpg"))))) (packages (append (list grimshot i3status-rust @@ -70,7 +121,13 @@ (packages (append neovim-packages emacs-packages (list jujutsu + yt-dlp + mpv + starship + font-awesome + font-atkinson-hyperlegible-next fastfetch + pavucontrol ripgrep fd sd @@ -85,13 +142,16 @@ home-environment-variables-service-type '(("EDITOR" . "nvim"))) - (service home-fish-service-type) + (service home-fish-service-type (home-fish-configuration (config (list (local-file "files/starship.fish"))))) (service home-sway-service-type sway-config) + (service home-dbus-service-type) + (service home-pipewire-service-type) + (service home-dotfiles-service-type - (home-dotfiles-configuration - (directories '("./dotfiles")))) + (home-dotfiles-configuration + (directories '("./dotfiles")))) (service home-files-service-type `((".guile" ,%default-dotguile) diff --git a/packages/fonts.scm b/packages/fonts.scm new file mode 100644 index 0000000..5091757 --- /dev/null +++ b/packages/fonts.scm @@ -0,0 +1,22 @@ +(define-module (packages fonts) + #:use-module (guix build-system font)) + +(define-public font-atkinson-hyperlegible-next + (package + (name "font-atkinson-hyperlegible-next") + (version "2.001-unstable-2025-02-21") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/googlefonts/atkinson-hyperlegible-next") + (commit "7925f50f649b3813257faf2f4c0b381011f434f1"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0000000000000000000000000000000000000000000000000000")))) + (build-system font-build-system) + (home-page "https://www.brailleinstitute.org/freefont/") + (synopsis "New (2024) second version of the Atkinson Hyperlegible fonts") + (description + "Read Easier With Our Family of Hyperlegible® Fonts") + (license license:ofl)))