jgrogan/dotfiles
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge conflict

Browse source
This commit is contained in:
James Grogan 2025-07-09 07:24:37 +01:00
commit 1e56e2a54c
4 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
emacs/.emacs.d/modules/jg-dev.el
View file

@ -99,6 +99,16 @@
(use-package nix-mode (use-package nix-mode
:mode "\\.nix\\'") :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) ;;(ac-config-default)
;;(require 'ac-geiser) ;;(require 'ac-geiser)
;;(;add-hook 'geiser-mode-hook 'ac-geiser-setup) ;;(;add-hook 'geiser-mode-hook 'ac-geiser-setup)

BIN
guix/.home-config.scm.swp
View file

Binary file not shown.

10
guix/home-config.scm
View file

@ -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) (define-module (guix-home-config)
#:use-module (gnu home) #:use-module (gnu home)
#:use-module (gnu home services) #:use-module (gnu home services)
#:use-module (gnu home services shells) #:use-module (gnu home services shells)
#:use-module (gnu home services sway)
#:use-module (gnu services) #:use-module (gnu services)
#:use-module (gnu system shadow) #:use-module (gnu system shadow)
#:use-module (gnu packages)) #:use-module (gnu packages))
@ -52,11 +50,7 @@
(services (services
(list (list
;; Uncomment the shell you wish to use for your user: (service home-bash-service-type)
(service home-bash-service-type)
;(service home-fish-service-type)
;(service home-zsh-service-type)
(service home-files-service-type (service home-files-service-type
`((".guile" ,%default-dotguile) `((".guile" ,%default-dotguile)
(".Xdefaults" ,%default-xdefaults))) (".Xdefaults" ,%default-xdefaults)))

6
sway/.config/sway/config
View file

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