Fix merge conflict

emacs/.emacs.d/modules/jg-dev.el

@@ -99,6 +99,16 @@
 (use-package nix-mode
   :mode "\\.nix\\'")
 
+(use-package meson-mode
+  :ensure t)
+
+(use-package rustic
+  :ensure t
+  :config
+  (setq rustic-format-on-save nil)
+  :custom
+  (rustic-cargo-use-last-stored-arguments t))
+
 ;;(ac-config-default)
 ;;(require 'ac-geiser)
 ;;(;add-hook 'geiser-mode-hook 'ac-geiser-setup)

guix/home-config.scm

@@ -1,10 +1,8 @@
-;; This is a sample Guix Home configuration which can help setup your
-;; home directory in the same declarative manner as Guix System.
-;; For more information, see the Home Configuration section of the manual.
 (define-module (guix-home-config)
   #:use-module (gnu home)
   #:use-module (gnu home services)
   #:use-module (gnu home services shells)
+  #:use-module (gnu home services sway)
   #:use-module (gnu services)
   #:use-module (gnu system shadow)
   #:use-module (gnu packages))
@@ -52,11 +50,7 @@
    
     (services
       (list
-        ;; Uncomment the shell you wish to use for your user:
-        (service home-bash-service-type)
-        ;(service home-fish-service-type)
-        ;(service home-zsh-service-type)
-
+       (service home-bash-service-type)
         (service home-files-service-type
          `((".guile" ,%default-dotguile)
            (".Xdefaults" ,%default-xdefaults)))

sway/.config/sway/config

@@ -15,10 +15,11 @@ set $up k
 set $right l
 # Your preferred terminal emulator
 set $term foot
+
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
 # on the original workspace that the command was run on.
-set $menu dmenu_path | wmenu | xargs swaymsg exec --
+set $menu wmenu-run
 
 ### Output configuration
 #
@@ -35,8 +36,7 @@ output HDMI-A-1 resolution 1920x1080 position 1920,0
 #
 # Example configuration:
 #
-# exec swayidle -w \
-#          timeout 300 'swaylock -f -c 000000' \
+exec swayidle -w timeout 300 'swaylock -f -c 000000'
 #          timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
 #          before-sleep 'swaylock -f -c 000000'
 #