12 files changed, 234 insertions, 196 deletions

diff --git a/channels.scm b/channels.scm
index 6c4c518..957ec51 100644
--- a/channels.scm
+++ b/channels.scm
@@ -3,7 +3,7 @@
         (url "https://codeberg.org/guix/guix.git")
         (branch "master")
         (commit
-          "abdebfcab0c548a5b63e4a31eb899e400931e4d1")
+          "d65b8b4fa119c5bae519e22a5b7efee25229c8d1")
         (introduction
           (make-channel-introduction
             "9edb3f66fd807b096b48283debdcddccfea34bad"
@@ -14,7 +14,7 @@
         (url "https://gitlab.com/nonguix/nonguix")
         (branch "master")
         (commit
-          "fb6696c598f630ff46fe542a0523d47a788abaa0")
+          "82be0b7adaaaa7a98d47382d7f72dd2e31d8e6d8")
         (introduction
           (make-channel-introduction
             "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
@@ -25,7 +25,7 @@
         (url "https://codeberg.org/hako/rosenthal.git")
         (branch "trunk")
         (commit
-          "eea37a108a39f398036e849022dae94e7d3aca17")
+          "5ac1f7973ad82747402bbd93bb50744a9f9955b8")
         (introduction
           (make-channel-introduction
             "7677db76330121a901604dfbad19077893865f35"
diff --git a/home-config/aerc/accounts.conf b/home-config/aerc/accounts.conf
index 91a75c3..fd3a4dd 100644
--- a/home-config/aerc/accounts.conf
+++ b/home-config/aerc/accounts.conf
@@ -1,24 +1,14 @@
 [Personal]
-source   = imaps://ryan%40rschanz.org@mail.rschanz.org:993
+source   = jmap://ryan%40rschanz.org@mail.rschanz.org/jmap/session
 source-cred-cmd = pass emails/personal 2>/dev/null | tr -d '\n'
-outgoing = smtps://ryan%40rschanz.org@mail.rschanz.org:465
-outgoing-cred-cmd = pass emails/personal 2>/dev/null | tr -d '\n'
-default  = INBOX
+outgoing = jmap://
+default  = Inbox
 from     = Ryan Schanzenbacher <ryan@rschanz.org>
 copy-to  = Sent
 signature-file = ~/.config/aerc/signature_personal
-check-mail = 5m
+#check-mail = 5m
 aliases = Ryan S <ryan+ritlugdemo@rschanz.org>, Ryan Schanzenbacher <ryan+guixdevel@rschanz.org>
-
-[Development]
-source  = imaps://ryan_devel%40rschanz.org@mail.rschanz.org:993
-source-cred-cmd = pass emails/development 2>/dev/null | tr -d '\n'
-outgoing = smtps://ryan_devel%40rschanz.org@mail.rschanz.org:465
-outgoing-cred-cmd = pass emails/development 2>/dev/null | tr -d '\n'
-default = INBOX
-from = Ryan <ryan_devel@rschanz.org>
-copy-to = Sent
-check-mail = 5m
+pgp-self-encrypt = true
 
 [School]
 source  = imaps+oauthbearer://rjs1877%40rit.edu@imap.gmail.com:993?token_endpoint=https%3A%2F%2Faccounts.google.com%2Fo%2Foauth2%2Ftoken&client_id=667738788924-0rdfvaq9ijfo1vk4474eb3quf8206h2t.apps.googleusercontent.com&client_secret=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
@@ -30,3 +20,4 @@ signature-file = ~/.config/aerc/signature_rit_personal
 check-mail = 5m
 default = INBOX
 copy-to = [Gmail]/Sent Mail
+pgp-self-encrypt = true
diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index bfa7ccb..33f5a8e 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -48,10 +48,10 @@
                                                     "fd"
                                                     ;"fish"
                                                     "xdg-utils"
-                                                    "abook"
+                                                    ;"abook"
                                                     "libnotify"
                                                     "fzf"
-                                                    "waypipe"
+                                                    ;"waypipe"
                                                     "foot"
                                                     "pulseaudio" ;only for pactl
                                                     "qpwgraph"
@@ -76,12 +76,12 @@
                                                     "libreoffice"
                                                     "flatpak"
                                                     "gnupg"
-                                                    "spotifyd"
+                                                    ;"spotifyd"
                                                     "lsof"
                                                     "pavucontrol"
                                                     "netcat"
                                                     "bind:utils"
-                                                    "font-cns11643"
+                                                    "font-cns11643-swjz"
                                                     "font-google-noto-emoji"
                                                     "syncthing"
                                                     ;"taskwarrior"
@@ -125,7 +125,7 @@
                                                     "python:tk"
                                                     "file"
                                                     "python-lsp-server"
-                                                    "kdenlive"
+                                                    ;"kdenlive"
                                                     "sqlite"
                                                     ;"mpv" ; Now a nix pkg for MESA stuff
                                                     "qbittorrent"
@@ -195,7 +195,7 @@
                     (".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t))
                     (".nix-channels" ,(local-file "nix-channels"))))
          (service home-pipewire-service-type)
-         (service home-spotifyd-service-type)
+         ;(service home-spotifyd-service-type)
          ; font things for nix to play nice
          (simple-service 'additional-fonts-service
                          home-fontconfig-service-type
diff --git a/home-config/hypr/hyprland.conf b/home-config/hypr/hyprland.conf
index 28d8aee..e354349 100644
--- a/home-config/hypr/hyprland.conf
+++ b/home-config/hypr/hyprland.conf
@@ -17,7 +17,6 @@ env = XCURSOR_SIZE,24
 env = AQ_NO_MODIFIERS,1
 
 render {
-    explicit_sync = false
     expand_undersized_textures = false
 }
 
@@ -119,11 +118,6 @@ dwindle {
 #    new_is_master = true
 #}
 
-gestures {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    workspace_swipe = off
-}
-
 # Example per-device config
 # See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
 device {
diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock
index da6b9a8..71e1959 100644
--- a/home-config/nix-home-manager/flake.lock
+++ b/home-config/nix-home-manager/flake.lock
@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745357003,
-        "narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=",
+        "lastModified": 1762356719,
+        "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "a19cf76ee1a15c1c12083fa372747ce46387289f",
+        "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7",
         "type": "github"
       },
       "original": {
@@ -73,11 +73,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1747046372,
+        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
         "type": "github"
       },
       "original": {
@@ -163,17 +163,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1749526227,
-        "narHash": "sha256-djUEgLQNnOA2SEClYFvBr9tJfMcQajuaU186tpPIYU4=",
+        "lastModified": 1764361670,
+        "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e9763eb195c1e3d508892993cf112bd75d6fd712",
+        "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e9763eb195c1e3d508892993cf112bd75d6fd712",
+        "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
         "type": "github"
       }
     },
@@ -188,17 +188,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1748038505,
-        "narHash": "sha256-7L2MRMB2ONEh7wlgQzraEoA+0o88EOV87KNqZg7vpHA=",
+        "lastModified": 1763589171,
+        "narHash": "sha256-3+k074XQ4quCWQ/WLEeYTTD+AlDlxtzKvH9gkWqn+8Y=",
         "owner": "VirtCode",
         "repo": "hypr-dynamic-cursors",
-        "rev": "761acf0e602e0f6549e5e6c0289a0402e6073489",
+        "rev": "85e6a93f311132d775538c4a016b637b366d2a44",
         "type": "github"
       },
       "original": {
         "owner": "VirtCode",
         "repo": "hypr-dynamic-cursors",
-        "rev": "761acf0e602e0f6549e5e6c0289a0402e6073489",
+        "rev": "85e6a93f311132d775538c4a016b637b366d2a44",
         "type": "github"
       }
     },
@@ -218,11 +218,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745948457,
-        "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=",
+        "lastModified": 1753964049,
+        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "ac903e80b33ba6a88df83d02232483d99f327573",
+        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
         "type": "github"
       },
       "original": {
@@ -247,11 +247,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745015490,
-        "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=",
+        "lastModified": 1762462052,
+        "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "60754910946b4e2dc1377b967b7156cb989c5873",
+        "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162",
         "type": "github"
       },
       "original": {
@@ -276,11 +276,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743953322,
-        "narHash": "sha256-prQ5JKopXtzCMX2eT3dXbaVvGmzjMRE2bXStQDdazpM=",
+        "lastModified": 1759490292,
+        "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "9d7f2687c84c729afbc3b13f7937655570f2978d",
+        "rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
         "type": "github"
       },
       "original": {
@@ -294,11 +294,11 @@
         "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
         "hyprgraphics": "hyprgraphics",
+        "hyprland-guiutils": "hyprland-guiutils",
         "hyprland-protocols": "hyprland-protocols",
-        "hyprland-qtutils": "hyprland-qtutils",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
-        "hyprwayland-scanner": "hyprwayland-scanner",
+        "hyprwayland-scanner": "hyprwayland-scanner_2",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -307,90 +307,64 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1746735318,
-        "narHash": "sha256-iN0Ge4LaVT7rATqzIrAZFSdfYuIXbe4/HGcXle7qK1g=",
+        "lastModified": 1762731096,
+        "narHash": "sha256-Kma5MxOipSBamO6DnwBeqJNjJ+VwEO73zh9h1hs/2Aw=",
         "owner": "hyprwm",
         "repo": "hyprland",
-        "rev": "9958d297641b5c84dcff93f9039d80a5ad37ab00",
+        "rev": "967c3c7404d4fa00234e29c70df3e263386d2597",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "ref": "v0.49.0",
+        "ref": "v0.52.1",
         "repo": "hyprland",
         "type": "github"
       }
     },
-    "hyprland-protocols": {
+    "hyprland-guiutils": {
       "inputs": {
-        "nixpkgs": [
+        "aquamarine": [
           "hyprland",
-          "nixpkgs"
+          "aquamarine"
         ],
-        "systems": [
+        "hyprgraphics": [
           "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743714874,
-        "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=",
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "type": "github"
-      }
-    },
-    "hyprland-qt-support": {
-      "inputs": {
+          "hyprgraphics"
+        ],
         "hyprlang": [
           "hyprland",
-          "hyprland-qtutils",
           "hyprlang"
         ],
+        "hyprtoolkit": "hyprtoolkit",
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
         "nixpkgs": [
           "hyprland",
-          "hyprland-qtutils",
           "nixpkgs"
         ],
         "systems": [
           "hyprland",
-          "hyprland-qtutils",
           "systems"
         ]
       },
       "locked": {
-        "lastModified": 1737634706,
-        "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=",
+        "lastModified": 1762465111,
+        "narHash": "sha256-dS13YZdWjgGGLBjpT4FHB6xf8I/WiAU+mgNWXsZgDUs=",
         "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
-        "rev": "8810df502cdee755993cb803eba7b23f189db795",
+        "repo": "hyprland-guiutils",
+        "rev": "a415eba866a953f3096d661318f771aa0082eb98",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "repo": "hyprland-qt-support",
+        "repo": "hyprland-guiutils",
         "type": "github"
       }
     },
-    "hyprland-qtutils": {
+    "hyprland-protocols": {
       "inputs": {
-        "hyprland-qt-support": "hyprland-qt-support",
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "hyprutils": [
-          "hyprland",
-          "hyprland-qtutils",
-          "hyprlang",
-          "hyprutils"
-        ],
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
@@ -401,16 +375,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1745951494,
-        "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=",
+        "lastModified": 1759610243,
+        "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
         "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
-        "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e",
+        "repo": "hyprland-protocols",
+        "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "repo": "hyprland-qtutils",
+        "repo": "hyprland-protocols",
         "type": "github"
       }
     },
@@ -430,11 +404,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746655412,
-        "narHash": "sha256-kVQ0bHVtX6baYxRWWIh4u3LNJZb9Zcm2xBeDPOGz5BY=",
+        "lastModified": 1758927902,
+        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "557241780c179cf7ef224df392f8e67dab6cef83",
+        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
         "type": "github"
       },
       "original": {
@@ -459,11 +433,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744468525,
-        "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=",
+        "lastModified": 1758927902,
+        "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df",
+        "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
         "type": "github"
       },
       "original": {
@@ -477,31 +451,29 @@
         "hyprgraphics": "hyprgraphics_2",
         "hyprlang": "hyprlang_2",
         "hyprutils": "hyprutils_2",
-        "hyprwayland-scanner": "hyprwayland-scanner_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "hyprwayland-scanner": "hyprwayland-scanner_3",
+        "nixpkgs": "nixpkgs",
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1746281087,
-        "narHash": "sha256-9amK5DEpueAD+aobmBmjbV+C16RO7lcDOdf5ucJtNvM=",
+        "lastModified": 1761675634,
+        "narHash": "sha256-Et1jNDB2d3e0b4okIKuyAMktECS+5hk+vMAA7X598ao=",
         "owner": "hyprwm",
         "repo": "hyprlock",
-        "rev": "6c64630df81b52208b210f02476f55e4db56e6cf",
+        "rev": "98b86752fe4867bd14ef96a92ea788229af93130",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "ref": "v0.8.2",
         "repo": "hyprlock",
+        "rev": "98b86752fe4867bd14ef96a92ea788229af93130",
         "type": "github"
       }
     },
     "hyprpicker-git": {
       "inputs": {
         "hyprutils": "hyprutils_3",
-        "hyprwayland-scanner": "hyprwayland-scanner_3",
+        "hyprwayland-scanner": "hyprwayland-scanner_4",
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -522,6 +494,54 @@
         "type": "github"
       }
     },
+    "hyprtoolkit": {
+      "inputs": {
+        "aquamarine": [
+          "hyprland",
+          "hyprland-guiutils",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": "hyprwayland-scanner",
+        "nixpkgs": [
+          "hyprland",
+          "hyprland-guiutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "hyprland-guiutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1762463729,
+        "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=",
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "type": "github"
+      }
+    },
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
@@ -534,11 +554,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746635225,
-        "narHash": "sha256-W9G9bb0zRYDBRseHbVez0J8qVpD5QbizX67H/vsudhM=",
+        "lastModified": 1762387740,
+        "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "674ea57373f08b7609ce93baff131117a0dfe70d",
+        "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7",
         "type": "github"
       },
       "original": {
@@ -559,11 +579,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743950287,
-        "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=",
+        "lastModified": 1759619523,
+        "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6",
+        "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
         "type": "github"
       },
       "original": {
@@ -601,19 +621,23 @@
       "inputs": {
         "nixpkgs": [
           "hyprland",
+          "hyprland-guiutils",
+          "hyprtoolkit",
           "nixpkgs"
         ],
         "systems": [
           "hyprland",
+          "hyprland-guiutils",
+          "hyprtoolkit",
           "systems"
         ]
       },
       "locked": {
-        "lastModified": 1739870480,
-        "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=",
+        "lastModified": 1755184602,
+        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b",
+        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
         "type": "github"
       },
       "original": {
@@ -625,6 +649,31 @@
     "hyprwayland-scanner_2": {
       "inputs": {
         "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1755184602,
+        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "type": "github"
+      }
+    },
+    "hyprwayland-scanner_3": {
+      "inputs": {
+        "nixpkgs": [
           "hyprlock",
           "nixpkgs"
         ],
@@ -634,11 +683,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739870480,
-        "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=",
+        "lastModified": 1755184602,
+        "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b",
+        "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
         "type": "github"
       },
       "original": {
@@ -647,7 +696,7 @@
         "type": "github"
       }
     },
-    "hyprwayland-scanner_3": {
+    "hyprwayland-scanner_4": {
       "inputs": {
         "nixpkgs": [
           "hyprpicker-git",
@@ -756,17 +805,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1749143949,
-        "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
-        "owner": "nixos",
+        "lastModified": 1759831965,
+        "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
+        "rev": "c9b6fb798541223bbb396d287d16f43520250518",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
-        "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
         "type": "github"
       }
     },
@@ -785,6 +834,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1764242076,
+        "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -795,11 +860,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746537231,
-        "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",
+        "lastModified": 1762441963,
+        "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",
+        "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885",
         "type": "github"
       },
       "original": {
@@ -818,7 +883,7 @@
         "hyprpicker-git": "hyprpicker-git",
         "mozff": "mozff",
         "nixgl": "nixgl",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "wpaperd": "wpaperd",
         "zen-browser": "zen-browser"
       }
@@ -831,16 +896,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1729391507,
-        "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=",
+        "lastModified": 1764902447,
+        "narHash": "sha256-wNqkDBj+tjK619sTHPEA7uhjr7DHHEY8OsFou31dxy0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "784981a9feeba406de38c1c9a3decf966d853cca",
+        "rev": "d914a744a83098eeb28125d2848ad383b209223f",
         "type": "github"
       },
       "original": {
         "owner": "oxalica",
         "repo": "rust-overlay",
+        "rev": "d914a744a83098eeb28125d2848ad383b209223f",
         "type": "github"
       }
     },
@@ -928,17 +994,17 @@
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1748586603,
-        "narHash": "sha256-83MCM6u7mE92HKIRJXDpNoEFoLoJO3H9Mj9mJjhj6D4=",
+        "lastModified": 1761730811,
+        "narHash": "sha256-tGeBjGdhzwCRVJ+/bEghEzmF4dZn9GbG6wBhVVFfp4c=",
         "owner": "danyspin97",
         "repo": "wpaperd",
-        "rev": "37e4504b80d36395b7847ef2e3468e6a75d2a9ad",
+        "rev": "087a1edb5afd78434806f2f185755d0ced7f26ab",
         "type": "github"
       },
       "original": {
         "owner": "danyspin97",
         "repo": "wpaperd",
-        "rev": "37e4504b80d36395b7847ef2e3468e6a75d2a9ad",
+        "rev": "087a1edb5afd78434806f2f185755d0ced7f26ab",
         "type": "github"
       }
     },
@@ -970,11 +1036,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1745871725,
-        "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=",
+        "lastModified": 1761431178,
+        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e",
+        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
         "type": "github"
       },
       "original": {
@@ -993,17 +1059,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1749511163,
-        "narHash": "sha256-0NpDb30Wf1wBeMHQP4N6mUVIq+tNujNX9hplZSvXWKE=",
+        "lastModified": 1764350280,
+        "narHash": "sha256-H8VpXvqEHll38N3YIaZUtqn7BSrq3SRfCL8idWvVRLw=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "4cbc88072f1597e1757ec82fefaacc02f49c6c98",
+        "rev": "504383097cbd6793aa62d1ec2d90d67ce7e4542e",
         "type": "github"
       },
       "original": {
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "4cbc88072f1597e1757ec82fefaacc02f49c6c98",
+        "rev": "504383097cbd6793aa62d1ec2d90d67ce7e4542e",
         "type": "github"
       }
     }
diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix
index 82229eb..35390b1 100644
--- a/home-config/nix-home-manager/flake.nix
+++ b/home-config/nix-home-manager/flake.nix
@@ -3,21 +3,21 @@
 
   inputs = {
     # Specify the source of Home Manager and Nixpkgs.
-    nixpkgs.url = "github:nixos/nixpkgs/d3d2d80a2191a73d1e86456a751b83aa13085d7d";
+    nixpkgs.url = "github:nixos/nixpkgs/2fad6eac6077f03fe109c4d4eb171cf96791faa4";
     home-manager = {
-      url = "github:nix-community/home-manager/e9763eb195c1e3d508892993cf112bd75d6fd712";
+      url = "github:nix-community/home-manager/780be8ef503a28939cf9dc7996b48ffb1a3e04c6";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprlock = {
-      url = "github:hyprwm/hyprlock/v0.8.2";
-      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:hyprwm/hyprlock/98b86752fe4867bd14ef96a92ea788229af93130";
+      #inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprpicker-git = {
       url = "github:hyprwm/hyprpicker/v0.4.5";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprland = {
-      url = "github:hyprwm/hyprland/v0.49.0";
+      url = "github:hyprwm/hyprland/v0.52.1";
       inputs.nixpkgs.follows = "nixpkgs";
       #inputs.hyprutils.url = "github:hyprwm/hyprutils/v0.6.0";
     };
@@ -26,8 +26,9 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     wpaperd = {
-      url = "github:danyspin97/wpaperd/37e4504b80d36395b7847ef2e3468e6a75d2a9ad";
+      url = "github:danyspin97/wpaperd/087a1edb5afd78434806f2f185755d0ced7f26ab";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.rust-overlay.url = "github:oxalica/rust-overlay/d914a744a83098eeb28125d2848ad383b209223f";
     };
     mozff = {
       url = "github:nix-community/flake-firefox-nightly/3391372604cd3def19e6df88a51f1882aabcd59f";
@@ -38,12 +39,12 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hypr-dynamic-cursors = {
-        url = "github:VirtCode/hypr-dynamic-cursors/761acf0e602e0f6549e5e6c0289a0402e6073489";
+        url = "github:VirtCode/hypr-dynamic-cursors/85e6a93f311132d775538c4a016b637b366d2a44";
         inputs.hyprland.follows = "hyprland";
         inputs.nixpkgs.follows = "hyprland/nixpkgs";
     };
     zen-browser = {
-        url = "github:0xc000022070/zen-browser-flake/4cbc88072f1597e1757ec82fefaacc02f49c6c98";
+        url = "github:0xc000022070/zen-browser-flake/504383097cbd6793aa62d1ec2d90d67ce7e4542e";
         inputs.nixpkgs.follows = "nixpkgs";
         inputs.home-manager.follows = "home-manager";
     };
diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix
index a88af0e..6ac9a1d 100644
--- a/home-config/nix-home-manager/home.nix
+++ b/home-config/nix-home-manager/home.nix
@@ -106,6 +106,7 @@
     kubectl
     fluxcd
     restic
+    kdePackages.kdenlive
 
     # Here until i can fix firefox's stupid devtools issue
     chromium
@@ -130,7 +131,7 @@
     dejavu_fonts
     liberation_ttf
     noto-fonts-cjk-sans
-    noto-fonts-emoji
+    noto-fonts-color-emoji
 
     # # It is sometimes useful to fine-tune packages, for example, by applying
     # # overrides. You can do that directly here, just don't forget the
diff --git a/home-config/nvim/config/init.vim b/home-config/nvim/config/init.vim
index 6735d81..3fe7fc8 100644
--- a/home-config/nvim/config/init.vim
+++ b/home-config/nvim/config/init.vim
@@ -50,12 +50,6 @@ require("mason-lspconfig").setup {
 
 require('leap').add_default_mappings()
 
-require("mason-lspconfig").setup_handlers {
-    function (server_name)
-        require("lspconfig")[server_name].setup {}
-    end,
-}
-
 require('nvim-treesitter.configs').setup {
     highlight = {
         enable = true,
diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index 402dc82..47b62a8 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -162,8 +162,8 @@
                                                           "dconf"
                                                           "wireplumber"
                                                           "wireshark"
-                                                          "openconnect"
-                                                          "openconnect-sso"
+                                                          ;"openconnect"
+                                                          ;"openconnect-sso"
                                                           "webkitgtk-with-libsoup2" ; Needed for Go wails development
                                                           "zsh"))
                       (list my-ca-certs virt-manager-ovmf bluez-ryan blueman-ryan neovim-ryan)
@@ -250,7 +250,10 @@
                               (inherit config)
                               (handle-power-key `ignore)
                               (handle-suspend-key `ignore)
+                              (handle-hibernate-key 'ignore)
                               (handle-lid-switch `ignore)
+                              (handle-lid-switch-docked 'ignore)
+                              (handle-lid-switch-external-power 'ignore)
                               (kill-user-processes? #t)))
       (network-manager-service-type config =>
                             (network-manager-configuration
diff --git a/modules/ryan-packages/bootloaders.scm b/modules/ryan-packages/bootloaders.scm
index 10f38d1..4cbb8da 100644
--- a/modules/ryan-packages/bootloaders.scm
+++ b/modules/ryan-packages/bootloaders.scm
@@ -18,7 +18,7 @@
   #:use-module (guix build-system meson)
   #:use-module (guix build-system python))
 
-(define systemd-version "255")
+(define systemd-version "258")
 (define systemd-source
   (origin
     (method git-fetch)
@@ -28,7 +28,7 @@
     (file-name (git-file-name "systemd" systemd-version))
     (sha256
       (base32
-        "1qdyw9g3jgvsbc1aryr11gpc3075w5pg00mqv4pyf3hwixxkwaq6"))))
+        "18gnp45gl1154jra6qv95k8y7ny6phdm87yqi5jdq13cadlrklf6"))))
 
 (define-public (systemd-stub-name)
   (let ((arch (cond ((target-x86-32?) "ia32")
@@ -54,7 +54,7 @@
                ,(string-append "-Dsbat-distro-pkgname=" name)
                ,(string-append "-Dsbat-distro-version=" version))
         #:phases
-        #~(let ((stub #$(string-append "src/boot/efi/" (systemd-stub-name))))
+        #~(let ((stub #$(string-append "src/boot/" (systemd-stub-name))))
             (modify-phases %standard-phases
               (replace 'build
                 (lambda* (#:key parallel-build? #:allow-other-keys)
diff --git a/modules/ryan-packages/linux.scm b/modules/ryan-packages/linux.scm
index d5b215c..272280c 100644
--- a/modules/ryan-packages/linux.scm
+++ b/modules/ryan-packages/linux.scm
@@ -54,7 +54,7 @@
                 (base32
                   "0arypdiycmss5g9wav21hfdc384v1ly82jnsc32zincl2y3f628q"))))
     (native-inputs (modify-inputs (package-native-inputs neovim) (prepend gcc-14)))
-    (inputs (modify-inputs (package-inputs neovim) (append utf8proc-2.10.0) (replace "tree-sitter" treesitter-ryan)))))
+    (inputs (modify-inputs (package-inputs neovim) (append utf8proc) (replace "tree-sitter" treesitter-ryan)))))
 
 (define-public treesitter-ryan
   (package
@@ -73,20 +73,4 @@
               (snippet #~(begin
                            (delete-file-recursively "lib/src/unicode")))))))
 
-(define-public utf8proc-2.10.0
-  (package
-    (inherit utf8proc-2.7.0)
-    (version "2.10.0")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/JuliaStrings/utf8proc")
-                     (commit (string-append "v" version))))
-              (file-name (git-file-name "utf8proc" version))
-              (sha256
-                (base32
-                  "1n1k67x39sk8xnza4w1xkbgbvgb1g7w2a7j2qrqzqaw1lyilqsy2"))))
-    (native-inputs (modify-inputs (package-native-inputs utf8proc-2.7.0) (prepend julia)))
-    (arguments (append (package-arguments utf8proc-2.7.0) (list #:tests? #f)))))
-
 neovim-ryan
diff --git a/modules/ryan-packages/package-management.scm b/modules/ryan-packages/package-management.scm
index dac8929..18c7be4 100644
--- a/modules/ryan-packages/package-management.scm
+++ b/modules/ryan-packages/package-management.scm
@@ -108,6 +108,7 @@
     (arguments
       (list
         #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=on")
+        #:tests? #f
         #:phases
         #~(modify-phases %standard-phases
             (add-after 'unpack 'enter-build-directory
@@ -135,6 +136,9 @@
         (sha256
           (base32 "0d15b50cf9jgvh3w99xh6crh03bn2dmv9bdyvzq6knsk2diql1dj"))))
     (build-system cmake-build-system)
+    (arguments
+      (list
+        #:tests? #f))
     (home-page "https://github.com/ToruNiina/toml11")
     (synopsis "TODO")
     (description "TODO")