commit b914d35bf5e80602507005d88e82975d7328b03e
parent 3e44e0c6d7f67cc2766081d98f63272c453a5519
Author: Luke Willis <lukejw@loquat.dev>
Date: Thu, 23 Oct 2025 18:14:55 -0400
Rework a bunch of stuff... again
Diffstat:
4 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/orchard/home/lukejw.scm b/orchard/home/lukejw.scm
@@ -6,6 +6,7 @@
#:use-module (gnu home services mpv)
#:use-module (gnu home services shells)
#:use-module (gnu home services sound)
+ #:use-module (gnu home services ssh)
#:use-module (gnu home services sway)
#:use-module (gnu home services xdg)
#:use-module (gnu packages admin)
@@ -14,10 +15,12 @@
#:use-module (gnu packages fonts)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages games)
+ #:use-module (gnu packages gimp)
#:use-module (gnu packages gl)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnome-xyz)
#:use-module (gnu packages gnupg)
+ #:use-module (gnu packages inkscape)
#:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages librewolf)
#:use-module (gnu packages linux)
@@ -216,10 +219,11 @@ Xcursor.size: 24"))
(guix-defaults? #f)
(aliases `(("gs" . "git status")
("yta" . "yt-dlp -t aac --add-metadata -o \"~/Audio/%(channel)s/%(upload_date)s - %(title)s.%(ext)s\"")
- ("camera" . "ffplay -fflags nobuffer /dev/video0")
+ ;; Todo: Make fancy sway recording script w/ i3block indicator
("record" . "wf-recorder --audio -c h264_vaapi -d /dev/dri/renderD128")))))
;; Automatically start pipewire
(service home-pipewire-service-type)
+ (service home-ssh-agent-service-type)
;; TODO: Make a home service for using kvantum with lxqt-qtplugin
(simple-service 'qt-environment-variables
home-environment-variables-service-type
@@ -236,9 +240,7 @@ Xcursor.size: 24"))
(prefer
(family "Fira Mono"))
(prefer
- (family "Noto Color Emoji"))
- (prefer
- (family "Noto Emoji")))))
+ (family "Noto Color Emoji")))))
;; TODO: Setup more advanced MPV config
(service home-mpv-service-type
(make-home-mpv-configuration
diff --git a/orchard/home/lukejw/sway.scm b/orchard/home/lukejw/sway.scm
@@ -47,7 +47,8 @@
lxqt-policykit
wlsunset
grim
- slurp))
+ slurp
+ wl-clipboard))
(define %sway-inputs
(list
@@ -195,7 +196,14 @@
(resolution "3840x2160@60Hz")
(extra-content
(list
- "scale 2")))))
+ "scale 2")))
+ ;; Work monitor
+ (sway-output
+ (identifier "Dell Inc. DELL P2214H KW14V53238VB")
+ (resolution "1920x1080@60Hz")
+ (extra-content
+ (list
+ "scale 1")))))
(define %sway-startup-programs
(list
@@ -221,7 +229,6 @@
;; Make my camera floating by default
"for_window [title=\"/dev/video0\"] floating enable"
;; This removes the title from the foot terminal
- "for_window [app_id=\"foot\"] border pixel"
- "xwayland enable")
+ "for_window [app_id=\"foot\"] border pixel")
%sway-theme))))
diff --git a/orchard/system/abraham.scm b/orchard/system/abraham.scm
@@ -3,9 +3,12 @@
#:use-module (gnu bootloader)
#:use-module (gnu bootloader grub)
#:use-module (gnu packages games)
+ #:use-module (gnu packages wm)
#:use-module (gnu services)
#:use-module (gnu services base)
+ #:use-module (gnu services desktop)
#:use-module (gnu services guix)
+ #:use-module (gnu services sddm)
#:use-module (gnu system)
#:use-module (gnu system keyboard)
#:use-module (gnu system nss)
@@ -58,22 +61,17 @@
(supplementary-groups '("wheel" "netdev" "audio" "video")))
%base-user-accounts))
- (packages %loquat-base-packages)
+ (packages
+ (append
+ (list sway
+ labwc)
+ %loquat-base-packages))
(services
(append
- (list (service guix-home-service-type
- `(("lukejw" ,lukejw-home-environment)))
- (service greetd-service-type
- (greetd-configuration
- (motd "Welcome to Abraham!")
- (terminals
- (list
- (greetd-terminal-configuration
- (terminal-vt "1")
- (terminal-switch #t))
- (greetd-terminal-configuration (terminal-vt "2"))
- (greetd-terminal-configuration (terminal-vt "3")))))))
+ (list
+ (service sddm-service-type)
+ (service xfce-desktop-service-type))
(modify-services %loquat-laity-base-services
(delete login-service-type)
(delete mingetty-service-type)
diff --git a/orchard/system/moses.scm b/orchard/system/moses.scm
@@ -13,6 +13,7 @@
#:use-module (gnu services base)
#:use-module (gnu services desktop)
#:use-module (gnu services guix)
+ #:use-module (gnu services sddm)
#:use-module (gnu system)
#:use-module (gnu system file-systems)
#:use-module (gnu system keyboard)
@@ -91,22 +92,9 @@
(services
(append
- (list (service greetd-service-type
- (greetd-configuration
- (terminals
- (list
- ;; Setup tuigreet as the login manager in TTY1
- (greetd-terminal-configuration
- (terminal-vt "1")
- (terminal-switch #t)
- (default-session-command
- (let ((command (file-append tuigreet "/bin/tuigreet")))
- (program-file
- "tuigreet-wrapper"
- #~(execl #$command #$command "-i")))))
- ;; Use agreety for the other TTYs
- (greetd-terminal-configuration (terminal-vt "2"))
- (greetd-terminal-configuration (terminal-vt "3")))))))
+ (list
+ (service sddm-service-type)
+ (service xfce-desktop-service-type))
(modify-services %loquat-clergy-base-services
(delete login-service-type)
(delete mingetty-service-type)
