ryan77627/guix-dotfiles
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix-config.git synced 2024-11-07 09:36:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

many changes, mostly migrations to using shepherd home services

Browse source
This commit is contained in:
Ryan 2023-05-18 01:57:03 -04:00
parent 232a9f91d2
commit 3d495ba0b5
Signed by: ryan77627
GPG key ID: 81B0E222A3E2308E
5 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
home-config/bashrc
View file

@ -41,6 +41,6 @@ alias cat='bat --paging=never'
export XDG_DATA_DIRS=$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:/home/ryan/.local/share/flatpak/exports/share
# GPG SETUP FOR SSH
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
gpgconf --launch gpg-agent
#export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
#gpgconf --launch gpg-agent
export GPG_TTY=$(tty)

21
home-config/home-configuration.scm
View file

@ -8,11 +8,15 @@
(gnu packages)
(gnu packages vim)
(gnu packages gcc)
(gnu packages gnupg)
(gnu services)
(guix packages)
(guix gexp)
(gnu home services shells)
(gnu home services))
(gnu home services desktop)
(gnu home services gnupg)
(gnu home services)
(ryan-services pipewire))
(define my-neovim
(package
@ -52,7 +56,7 @@
"texlive-amsfonts"
"texlive-lm"
"texlive-lm-math"
"texlive-generic-iftex"
"texlive-iftex"
"texlive-unicode-math"
"texlive-fontspec"
"texlive-xcolor"
@ -97,6 +101,13 @@
(service home-files-service-type
`((".local/share/nvim/site/autoload/plug.vim" ,(local-file "nvim/plugin-manager/plug.vim"))
(".ssh/config" ,(local-file "ssh/config"))
(".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol"))
(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf"))
(".fonts" ,(local-file "fonts" #:recursive? #t)) )))))
;(".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol"))
;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf"))
(".fonts" ,(local-file "fonts" #:recursive? #t))))
(service home-pipewire-service-type)
(service home-dbus-service-type)
(service home-gpg-agent-service-type
(home-gpg-agent-configuration
(pinentry-program
(file-append pinentry "/bin/pinentry"))
(ssh-support? #t))) )))

8
home-config/sway/config
View file

@ -24,7 +24,7 @@
exec sh ~/.profile
# Load up the user session dbus
exec dbus-daemon --session --address=unix:path=$XDG_RUNTIME_DIR/bus
#exec dbus-daemon --session --address=unix:path=$XDG_RUNTIME_DIR/bus
#
# Logo key. Use Mod1 for Alt.
@ -280,14 +280,14 @@ exec hash dbus-update-activation-environment 2>/dev/null && dbus-update-activati
# Numlock on startup
input * xkb_numlock enabled
# Bluetooth
exec blueman-applet
# Audio Server
#exec pipewire
#exec wireplumber
#exec pipewire-pulse
# Bluetooth
exec blueman-applet
# Spotifyd
#exec spotifyd

6
home-config/pipewire.scm → modules/ryan-services/pipewire.scm
View file

@ -1,4 +1,4 @@
(define-module (home-configuration pipewire)
(define-module (ryan-services pipewire)
#:use-module (gnu packages)
#:use-module (gnu packages linux)
#:use-module (gnu services)
@ -37,7 +37,7 @@
(start #~(make-forkexec-constructor
(list #$(file-append pipewire "/bin/pipewire-pulse"))
#:log-file (string-append
(or (getend "XDG_LOG_HOME")
(or (getenv "XDG_LOG_HOME")
(format #f "~a/.local/var/log"
(getenv "HOME")))
"/pipewire-pulse.log")
@ -71,7 +71,7 @@
">\n<"
#$(file-append
pipewire "/share/alsa/alsa.conf.d/99-pipewire-default.conf")
">/n"
">\n"
"
pcm_type.pipewire {
lib " #$(file-append pipewire "/lib/alsa-lib/libasound_module_pcm_pipewire.so")

12
system.scm
View file

@ -19,7 +19,7 @@
(use-modules (gnu packages tls))
(use-modules (srfi srfi-1))
(use-package-modules security-token)
(use-service-modules cups desktop networking xorg ssh sound security-token docker)
(use-service-modules cups desktop networking xorg ssh sound security-token docker virtualization)
; Define package that installs my root ca public keys
(define my-ca-certs
@ -94,7 +94,7 @@
(group "users")
;(shell (file-append zsh "/bin/zsh"))
(home-directory "/home/ryan")
(supplementary-groups '("wheel" "netdev" "audio" "video" "lp" "plugdev" "docker")))
(supplementary-groups '("wheel" "netdev" "audio" "video" "lp" "plugdev" "docker" "libvirt" "kvm")))
%base-user-accounts))
;; Packages installed system-wide. Users can also install packages
@ -120,11 +120,16 @@
"wl-clipboard"
"bluez"
"blueman"
"ldacbt"
"libfreeaptx"
"libfdk"
"opendoas"
"xdg-desktop-portal-wlr"
"xdg-desktop-portal"
"pipewire"
"docker"
"libvirt"
"virt-manager"
"wireplumber"
"zsh"))
(list my-ca-certs)
@ -140,6 +145,9 @@
(service openssh-service-type)
(service pcscd-service-type)
(service docker-service-type)
(service libvirt-service-type
(libvirt-configuration
(unix-sock-group "libvirt")))
(service bluetooth-service-type)
(udev-rules-service 'fido2 libfido2 #:groups '("plugdev")))