Add gaps and small smart borders to sway

Can't really separate these since I also alphabetized the package
list. I didn't like the default Guix build setting of having cataclysm
place its stuff in the home directory, so I made a child package that
puts it in the XDG config directory instead.

home/kitty.conf

@@ -6,7 +6,7 @@
 #: individual font faces and even specify special fonts for particular
 #: characters.
 
-font_family      Hack
+font_family      Iosevka Term Slab Extended
 # bold_font        auto
 # italic_font      auto
 # bold_italic_font auto

home/sanderson-home.scm

@@ -1,76 +1,98 @@
 (use-modules (gnu home)
              (gnu packages)
+			 (gnu packages games)
 			 (gnu packages mpd)
              (gnu services)
              (guix gexp)
+			 (guix packages)
 			 (gnu home services)
              (gnu home services shells)
 			 (gnu home services shepherd))
 
+(define cataclysm-dda-xdg
+  (package
+	(inherit cataclysm-dda)
+	(name "cataclysm-dda-xdg")
+	(arguments
+	 (list
+	  #:make-flags
+	  #~(list (string-append "PREFIX=" #$output)
+			  "USE_XDG_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1"
+			  "LOCALIZE=1" "LANGUAGES=all")
+	  #:phases
+	  #~(modify-phases %standard-phases
+		  (delete 'configure))
+	  #:tests? #f))))
+
 (home-environment
  ;; Below is the list of packages that will show up in your
  ;; Home profile, under ~/.guix-home/profile.
- (packages (specifications->packages (list "alsa-utils"
-										   "bat"
-										   "deluge"
-										   "emacs-aggressive-indent"
-										   "fish"
-										   "font-awesome"
-										   "font-hack"
-										   "guile-goblins"
-										   "guile-hall"
-										   "guile-ncurses"
-										   "harmonist"
-										   "haunt"
-										   "jq"
-										   "lagrange"
-										   "mpd"
-										   "mpd-mpc"
-										   "mpv"
-										   "musescore"
-										   "ncmpcpp"
-										   "nethack"
-										   "neomutt"
-										   "picom"
-										   "python"
-										   "skribilo"
-										   "steam"
-										   "waybar"
-										   "xterm"
-										   "emacs-magit"
-										   "curl"
-										   "emacs"
-										   "emacs-company"
-										   "emacs-geiser"
-										   "emacs-geiser-guile"
-										   "emacs-ivy"
-										   "emacs-paredit"
-										   "emacs-sly"
-										   "emacs-swiper"
-										   "emacs-which-key"
-										   "emacs-yasnippet"
-										   "firefox-wayland"
-										   "font-google-noto"
-										   "font-google-noto-emoji"
-										   "fossil"
-										   "gcc-toolchain"
-										   "git"
-										   "gnome-keyring"
-										   "gnupg"
-										   "guile"
-										   "guile-ts"
-										   "kitty"
-										   "make"
-										   "nheko"
-										   "password-store"
-										   "pinentry-qt"
-										   "rofi-wayland"
-										   "sbcl"
-										   "sway"
-										   "syncthing"
-										   "tree-sitter-scheme"
-										   "zoom"
-										   )))
+ (packages (append
+			(specifications->packages (list "alsa-utils"
+											"bat"
+											"curl"
+											"deluge"
+											"emacs"
+											"emacs-aggressive-indent"
+											"emacs-company"
+											"emacs-geiser"
+											"emacs-geiser-guile"
+											"emacs-ivy"
+											"emacs-ligature"
+											"emacs-magit"
+											"emacs-paredit"
+											"emacs-sly"
+											"emacs-swiper"
+											"emacs-which-key"
+											"emacs-yasnippet"
+											"firefox-wayland"
+											"fish"
+											"font-awesome"
+											"font-google-noto"
+											"font-google-noto-emoji"
+											"font-iosevka-etoile"
+											"font-iosevka-slab"
+											"font-iosevka-term-slab"
+											"fossil"
+											"gcc-toolchain"
+											"git"
+											"gnome-keyring"
+											"gnupg"
+											"guile"
+											"guile-goblins"
+											"guile-hall"
+											"guile-ncurses"
+											"guile-ts"
+											"harmonist"
+											"haunt"
+											"jq"
+											"kitty"
+											"lagrange"
+											"make"
+											"mpd"
+											"mpd-mpc"
+											"mpv"
+											"musescore"
+											"ncmpcpp"
+											"neomutt"
+											"nethack"
+											"nheko"
+											"password-store"
+											"picom"
+											"pinentry-qt"
+											"python"
+											"rofi-wayland"
+											"sbcl"
+											"skribilo"
+											"steam"
+											"sway"
+											"syncthing"
+											"tree-sitter-scheme"
+											"waybar"
+											"xterm"
+											"yt-dlp"
+											"zoom"))
+			`(,cataclysm-dda-xdg)))
 
  ;; Below is the list of Home services.  To search for available
  ;; services, run 'guix home search KEYWORD' in a terminal.

home/sway

@@ -1,3 +1,4 @@
+# -*- mode: conf -*-
 # Default config for sway
 #
 # Copy this to ~/.config/sway/config and edit it to your liking.
@@ -227,4 +228,6 @@ bindsym XF86AudioMicMute exec amixer sset 'Capture' toggle
 
 bindsym $mod+home exec mpc toggle
 
-include /gnu/store/vm0yg0pbnn4jpfy463nxiis98xpr6qz7-sway-1.8.1/etc/sway/config.d/*
+default_border pixel 2
+smart_borders on
+gaps inner 10

home/waybar/style.css

@@ -1,6 +1,6 @@
 * {
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: FontAwesome, Hack, Roboto, Helvetica, Arial, sans-serif;
+    font-family: FontAwesome, Iosevka Slab, Roboto, Helvetica, Arial, sans-serif;
     font-size: 13px;
 }