Changed some packages around for update to succeed

ca201bd9f1ce… · Ryan Schanzenbacher ·

parent 1c883be601dd… diff

Changed files

diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index 52ad152..6289453 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -22,7 +22,7 @@
(ryan-config utils)
(ryan-packages freedesktop)
(ryan-packages calcurse)
- (ryan-packages binaries)
+ ;(ryan-packages binaries)
(rosenthal packages binaries)
(ryan-packages mozilla))
@@ -56,7 +56,7 @@
"pulseaudio" ;only for pactl
"qpwgraph"
"gnunet"
- "ffmpeg"
+ ;"ffmpeg" ; removed for mpv prop input
"qrencode"
"tmux"
"binutils"
@@ -134,7 +134,7 @@
"signal-desktop"
"sc-im"
"git-lfs"))
- (list my-neovim wl-mirror firefox-wrapped calcurse-fixed superfile-bin)))
+ (list my-neovim wl-mirror firefox-wrapped calcurse-fixed )))
;; Below is the list of Home services. To search for available
;; services, run 'guix home search KEYWORD' in a terminal.
diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index 566b9fe..7839c60 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -12,6 +12,7 @@
#:use-module (gnu packages spice)
#:use-module (srfi srfi-1)
#:use-module (ryan-packages freedesktop)
+ ;#:use-module (ryan-packages hyprland)
#:use-module (ryan-packages wm)
#:use-module (ryan-packages virtualization)
#:use-module (ryan-packages linux)
@@ -132,7 +133,7 @@
"adwaita-icon-theme"
"hicolor-icon-theme"
"git"
- ;"waybar"
+ "waybar-experimental"
"gnupg"
"light"
"avahi"
@@ -148,7 +149,7 @@
"libfdk"
"opendoas"
;"xdg-desktop-portal-wlr"
- "xdg-desktop-portal"
+ ;"xdg-desktop-portal"
"xdg-desktop-portal-gtk"
"v4l2loopback-linux-module"
"pipewire"
@@ -160,7 +161,7 @@
"wireshark"
"webkitgtk-with-libsoup2" ; Needed for Go wails development
"zsh"))
- (list my-ca-certs swaylock-effects-new xdg-desktop-portal-hyprland-ryan virt-manager-ovmf bluez-ryan blueman-ryan swayidle-new waybar-new)
+ (list my-ca-certs xdg-desktop-portal-hyprland-ryan virt-manager-ovmf bluez-ryan blueman-ryan swayidle-new)
%my-base-packages ))
;; Below is the list of system services. To search for available
@@ -183,6 +184,7 @@
(service docker-service-type)
; Tailscale daemon from rosenthal
(service tailscale-service-type) ; TODO: Add BIRD socket
+ (service containerd-service-type)
(service nix-service-type)
(service libvirt-service-type
(libvirt-configuration
@@ -235,11 +237,11 @@
(delete alsa-service-type) )))
(name-service-switch %mdns-host-lookup-nss) ;; Enable .local lookup
(setuid-programs
- (append (list (file-like->setuid-program
- (file-append
+ (append (list ;(file-like->setuid-program
+ ;(file-append
;(specification->package "swaylock-effects")
- swaylock-effects-new
- "/bin/swaylock"))
+ ; swaylock-effects-new
+ ; "/bin/swaylock"))
(file-like->setuid-program
(file-append
(specification->package "wireshark")