commit efb209d47da06cc9f88152df1bcb142eb840f6ad
parent 127c6f99360f69d3c8ce495d3aac3774e9c44a18
Author: Luke Willis <lukejw@loquat.dev>
Date: Tue, 16 Sep 2025 21:02:38 -0400
Add so many changes that I forgot. Sorry
Diffstat:
4 files changed, 106 insertions(+), 15 deletions(-)
diff --git a/orchard/home/lukejw.scm b/orchard/home/lukejw.scm
@@ -64,6 +64,76 @@
;; TODO: Organize
+(define tofi-config
+ (plain-file "config" "\
+anchor = center
+width = 700
+height = 500
+font-size = 14
+prompt-text = \"run: \"
+placeholder-text = \"action\"
+placeholder-color = #575653
+font = monospace
+outline-width = 0
+border-width = 2
+border-color = #403E3C
+text-color = #878580
+background-color = #100F0FCC
+selection-color = #CECDC3
+input-color = #CECDC3
+min-input-width = 120
+result-spacing = 4
+"))
+
+(define i3blocks-config
+ (plain-file "config" "\
+[name]
+command=echo ${USER}@${HOSTNAME}
+interval=once
+
+[weather]
+command=curl wttr.in/?format=\"%t++%c%C\\n\"
+interval=900
+
+[time]
+command=date -R
+interval=1
+
+[battery]
+command=echo \"$(cat /sys/class/power_supply/BAT0/capacity)% ($(cat /sys/class/power_supply/BAT0/status)) \"
+interval=30
+"))
+
+(define foot-config
+ (plain-file "foot.ini" "\
+font=monospace:size=14
+pad=4x4
+
+[colors]
+alpha=0.9
+
+background=100F0F # bg
+foreground=CECDC3 # tx
+
+regular0=100F0F # bg
+regular1=AF3029 # re-2
+regular2=66800B # gr-2
+regular3=AD8301 # ye-2
+regular4=205EA6 # bl-2
+regular5=A02F6F # ma-2
+regular6=24837B # cy-2
+regular7=878580 # tx-2
+
+bright0=1C1B1A # bg-2
+bright1=D14D41 # re
+bright2=879A39 # gr
+bright3=D0A215 # ye
+bright4=4385BE # bl
+bright5=CE5D97 # ma
+bright6=3AA99F # cy
+bright7=CECDC3 # tx
+"))
+
(define lukejw-home-environment
(home-environment
(packages
@@ -74,6 +144,9 @@
kakoune
newsraft
signal-desktop
+ ;; Fonts
+ font-fira-mono
+ font-google-noto-emoji
;; Utils
git
rsync
@@ -140,7 +213,11 @@
'(alias
(family "monospace")
(prefer
- (family "Fira Mono")))))
+ (family "Fira Mono"))
+ (prefer
+ (family "Noto Color Emoji"))
+ (prefer
+ (family "Noto Emoji")))))
;; TODO: Setup more advanced MPV config
(service home-mpv-service-type
(make-home-mpv-configuration
@@ -148,6 +225,11 @@
#:hwdec '("auto")
#:alang '("en")
#:slang '("en"))))
+ (simple-service 'extra-config-files
+ home-xdg-configuration-files-service-type
+ `(("i3blocks/config" ,i3blocks-config)
+ ("tofi/config" ,tofi-config)
+ ("foot/foot.ini" ,foot-config)))
(service home-sway-service-type %sway-configuration))
%base-home-services))))
diff --git a/orchard/home/lukejw/scripts/tofi-exit-sway-prompt.sh b/orchard/home/lukejw/scripts/tofi-exit-sway-prompt.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-case $(printf "Yes\\nNo" | tofi --prompt-text "Exit sway?") in
+case $(printf "Yes\\nNo" | tofi --prompt-text "Log out? ") in
Yes) swaymsg exit ;;
esac
diff --git a/orchard/home/lukejw/sway.scm b/orchard/home/lukejw/sway.scm
@@ -100,14 +100,13 @@
(re . "#D14D41")
(re-2 . "#AF3029")
(ye . "#D0A215")
- (ye-2 . "#AD8301")
- (ye-700 . "#8E6B01"))) ; ye-700 is the yellow version of tx-3 (base-7000)
+ (ye-2 . "#AD8301")))
(define %sway-theme
(list "font monospace 14"
- "client.focused $ye-700 $ye-700 $tx $tx"
- "client.focused_inactive $ui-3 $ui-3 $tx $tx"
- "client.unfocused $ui $ui $tx-2 $tx-2"
+ "client.focused $ui-3 $ui-3 $tx $tx"
+ "client.focused_inactive $ui-2 $ui-2 $tx-2 $tx-2"
+ "client.unfocused $ui $ui $tx-3 $tx-3"
"client.urgent $re-2 $re-2 $tx $tx"
"titlebar_border_thickness 2"))
@@ -128,22 +127,22 @@
(colors
(sway-color
(background "$bg-2")
- (statusline "$tx-2\n separator $tx-2")
+ (statusline "$tx\n separator $tx-3")
(focused-workspace
(sway-border-color
- (border "$ye-700")
- (background "$ye-700")
- (text "$tx")))
- (active-workspace
- (sway-border-color
(border "$ui-3")
(background "$ui-3")
(text "$tx")))
+ (active-workspace
+ (sway-border-color
+ (border "$ui-2")
+ (background "$ui-2")
+ (text "$tx-2")))
(inactive-workspace
(sway-border-color
(border "$ui")
(background "$ui")
- (text "$tx-2")))
+ (text "$tx-3")))
(urgent-workspace
(sway-border-color
(border "$re-2")
diff --git a/orchard/system/moses.scm b/orchard/system/moses.scm
@@ -13,6 +13,7 @@
#:use-module (gnu services desktop)
#:use-module (gnu services guix)
#:use-module (gnu system)
+ #:use-module (gnu system file-systems)
#:use-module (gnu system keyboard)
#:use-module (gnu system linux-initrd)
#:use-module (gnu system nss)
@@ -47,6 +48,13 @@
(bootloader (bootloader-configuration
(bootloader grub-efi-bootloader)
(targets '("/boot/efi"))
+ ;; Add the option to boot Windows
+ (menu-entries
+ (list
+ (menu-entry
+ (label "Windows 11")
+ (device (uuid "1809-4811" 'fat))
+ (chain-loader "/EFI/Microsoft/Boot/bootmgfw.efi"))))
(keyboard-layout keyboard-layout)))
(swap-devices %loquat-swap-devices)
@@ -67,7 +75,9 @@
(services
(append
- (list (service greetd-service-type
+ (list (service guix-home-service-type
+ `(("lukejw" ,lukejw-home-environment)))
+ (service greetd-service-type
(greetd-configuration
(motd "Hello, world!")
(terminals
