home-config/home-configuration.scm

@@ -155,7 +155,6 @@
                     ("nvim/after/ftplugin/mail/custom.vim" ,(local-file "nvim/config/after/ftplugin/mail/custom.vim"))
                     ("sway" ,(local-file "sway" #:recursive? #t))
                     ("hypr" ,(local-file "hypr" #:recursive? #t))
-                    ("wpaperd" ,(local-file "wpaperd" #:recursive? #t))
                     ("mpv" ,(local-file "mpv" #:recursive? #t))
                     ("foot" ,(local-file "foot" #:recursive? #t))
                     ("pulse/client.conf" ,(local-file "pulseaudio/client.conf"))

home-config/hypr/autostart.sh

@@ -11,9 +11,7 @@ nice -n13 swww init &
 #~/.config/hypr/wallpaper-daemon.sh &
 wpaperd -d &
 
-#swayidle -w timeout 300 'swaylock --screenshots --clock --indicator --grace 3 --fade-in 1 --effect-blur 7x5 --effect-greyscale' timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -f -c 000000' &
+swayidle -w timeout 300 'swaylock --screenshots --clock --indicator --grace 3 --fade-in 1 --effect-blur 7x5 --effect-greyscale' timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -f -c 000000' &
-
-hypridle &
 
 syncthing serve --no-browser &
 

home-config/hypr/hypridle.conf

@@ -1,16 +0,0 @@
-general {
-    lock_cmd = pidof hyprlock || hyprlock
-    before_sleep_cmd = loginctl lock-session
-    after_sleep_cmd = hyprctl dispatch dpms on
-}
-
-listener {
-    timeout = 300
-    on-timeout = loginctl lock-session
-}
-
-listener {
-    timeout = 600
-    on-timeout = hyprctl dispatch dpms off
-    on-resume = hyprctl dispatch dpms on
-}

home-config/hypr/hyprland.conf

@@ -203,11 +203,8 @@ bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
 # Bind mainMod + L to screenlocker
-bind = $mainMod, L, exec, hyprlock 
+bind = $mainMod, L, exec, swaylock --screenshots --clock --indicator --fade-in 0.3 --effect-blur 7x5 --effect-greyscale
-bind = $mainMod SHIFT, L, exec, loginctl suspend
+bind = $mainMod SHIFT, L, exec, swaylock --screenshots --clock --indicator --effect-blur 7x5 --effect-greyscale & sleep 0.5; loginctl suspend
-
-# Keybind to toggle "performance mode" (toggles GPU intensive things)
-bind = $mainMod, F1, exec, ~/.config/hypr/perf_mode.sh
 
 # Keybind for screenshot
 bind = $mainMod SHIFT, S, exec, grimblast copy area

home-config/hypr/perf_mode.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-HYPRGAMEMODE=$(hyprctl getoption animations:enabled | awk 'NR==1{print $2}')
-if [ "$HYPRGAMEMODE" = 1 ] ; then
-    hyprctl --batch "\
-        keyword animations:enabled 0;\
-        keyword decoration:drop_shadow 0;\
-        keyword decoration:blur:enabled 0;\
-        keyword general:gaps_in 0;\
-        keyword general:gaps_out 0;\
-        keyword general:border_size 1;\
-        keyword decoration:rounding 0"
-    exit
-fi
-hyprctl reload

home-config/nix-home-manager/home.nix

@@ -45,6 +45,7 @@
     gdu
     spotify-player
     hyprpicker
+    hyprlock
     xwayland
     xdg-desktop-portal
     xdg-desktop-portal-gtk
@@ -53,14 +54,6 @@
     libva
     libvdpau
     wpaperd
-    hypridle
-
-    # Wrapped programs for some env variables
-    (pkgs.writeScriptBin "hyprlock" ''
-      #! ${pkgs.bash}/bin/bash
-      export LD_PRELOAD="/run/current-system/profile/lib/libpam.so.0:$LD_PRELOAD"
-      exec ${pkgs.hyprlock}/bin/hyprlock "$@"
-    '')
 
     # Flakes specific things defined in flake.nix
     hyprland.packages.${pkgs.system}.default

home-config/wpaperd/config.toml

@@ -1,4 +0,0 @@
-[default]
-duration = "30m"
-path = "~/.config/hypr/Wallpapers/static/"
-transition-time = 2000

modules/ryan-config/base-system.scm

@@ -4,7 +4,6 @@
                 #:use-module (gnu system setuid)
                 #:use-module (gnu packages admin)
                 #:use-module (gnu packages avahi)
-                #:use-module (gnu packages wm)
                 #:use-module (guix packages)
                 #:use-module (gnu packages shells)
                 #:use-module (guix build-system trivial)
@@ -130,7 +129,6 @@
   			                                            ;"swaylock-effects"
   			                                            "fuzzel"
                                                         "foot"
-                                                        "linux-pam" ; installed directly to get libs in profile directly
                                                           "pinentry-qt"
                                                           "adwaita-icon-theme"
                                                           "hicolor-icon-theme"
@@ -163,7 +161,7 @@
                                                           "wireshark"
                                                           "webkitgtk-with-libsoup2" ; Needed for Go wails development
                                                           "zsh"))
-                           (list my-ca-certs virt-manager-ovmf bluez-ryan blueman-ryan)
+                           (list my-ca-certs virt-manager-ovmf bluez-ryan blueman-ryan swayidle-new)
                            %my-base-packages ))
 
     ;; Below is the list of system services.  To search for available
@@ -190,24 +188,11 @@
                               (socket "/var/run/tailscale/tailscaled.sock")))
                    (service containerd-service-type)
                    (service nix-service-type)
-                   (simple-service 'hyprlock-pam pam-root-service-type
-                                   (list
-                                     (pam-service
-                                       (name "hyprlock")
-                                       (auth
-                                         (list
-                                           (pam-entry (control "include")
-                                                      (module "login")))))))
                    (service libvirt-service-type
                             (libvirt-configuration
                               (libvirt libvirt-ovmf)
                               (unix-sock-group "libvirt")))
                    (service virtlog-service-type)
-                   ;(service screen-locker-service-type
-                   ;         (screen-locker-configuration
-                   ;           (name "hyprlock")
-                   ;           (program (file-append swaylock "/bin/swaylock"))
-                   ;           (using-pam? #t)))
                    (simple-service 'spice-polkit polkit-service-type (list spice-gtk))
                    (simple-service 'hwdb-creation etc-service-type (list `("udev-here-oneoneone" ,(plain-file "issue" "test\n"))))
                    (service bluetooth-service-type