update things

14 files changed, 354 insertions, 110 deletions

diff --git a/modules/home-packages/audio.scm b/modules/freya/packages/audio.scm
index 0970fdb..beae55e 100644
--- a/modules/home-packages/audio.scm
+++ b/modules/freya/packages/audio.scm
@@ -1,4 +1,4 @@
-(define-module (home-packages audio)
+(define-module (freya packages audio)
                #:use-module ((guix licenses) #:prefix license:)
                #:use-module (guix gexp)
                #:use-module (guix build-system meson)
diff --git a/modules/home-packages/certs.scm b/modules/freya/packages/certs.scm
index 442c8b2..6a39608 100644
--- a/modules/home-packages/certs.scm
+++ b/modules/freya/packages/certs.scm
@@ -1,4 +1,4 @@
-(define-module (home-packages certs)
+(define-module (freya packages certs)
                #:use-module ((guix licenses) #:prefix license:)
                #:use-module (guix gexp)
                #:use-module (guix build-system trivial)
@@ -13,7 +13,7 @@
   (package
     (name "freya-ca-certs")
     (version "1")
-    (source (local-file "../home-config/ca-certs"
+    (source (local-file "../../../certs"
                         #:recursive? #t))
     (build-system trivial-build-system)
     (license license:mpl2.0)
diff --git a/modules/home-packages/gnome-xyz.scm b/modules/freya/packages/gnome-xyz.scm
index 32abb18..d05abf1 100644
--- a/modules/home-packages/gnome-xyz.scm
+++ b/modules/freya/packages/gnome-xyz.scm
@@ -1,4 +1,4 @@
-(define-module (home-packages gnome-xyz)
+(define-module (freya packages gnome-xyz)
                #:use-module ((guix licenses) #:prefix license:)
                #:use-module (guix gexp)
                #:use-module (gnu packages base)
@@ -40,7 +40,7 @@
          (use-modules (guix build utils))
          (let* ((out    (assoc-ref %outputs "out"))
                 (bin    (string-append out "/share/themes"))
-                (bash   (string-append 
+                (bash   (string-append
                           (assoc-ref %build-inputs "bash")
                           "/bin/sh"))
                 (coreutils (string-append
diff --git a/modules/home-packages/golang.scm b/modules/freya/packages/golang.scm
index 3fd8fd2..f626ade 100644
--- a/modules/home-packages/golang.scm
+++ b/modules/freya/packages/golang.scm
@@ -1,4 +1,4 @@
-(define-module (home-packages golang)
+(define-module (freya packages golang)
                #:use-module ((guix licenses) #:prefix license:)
                #:use-module (guix gexp)
                #:use-module (gnu packages base)
@@ -123,7 +123,7 @@
     "https://github.com/golang/protobuf"                    ; url
     "03f1w2cd4s8a3xhl61x7yjx81kbzlrjpvnnwmbhqnz814yi7h43i"  ; hash
     "github.com/golang/protobuf"                            ; path
-    (list))))                                               ; inputs 
+    (list))))                                               ; inputs
 
 (define go-go-uber-org-multierr
   (go-package
@@ -159,7 +159,7 @@
     "https://go.googlesource.com/exp"                       ; url
     "054hbk826n3kprk75m19ik89mnicbshq6kdiwd60xxfczdjf88rn"  ; hash
     "golang.org/x/exp"                                      ; path
-    (list))))                                               ; inputs 
+    (list))))                                               ; inputs
 
 (define go-golang-org-x-sync
   (source-only (go-package
@@ -168,7 +168,7 @@
     "https://go.googlesource.com/sync"                      ; url
     "0jmkqah45db9nz6yjdd8vvanpjfzb5lsv6bxf0d1dih4zhp4l8kc"  ; hash
     "golang.org/x/sync"                                     ; path
-    (list))))                                               ; inputs 
+    (list))))                                               ; inputs
 
 (define go-golang-org-x-text
   (source-only (go-package
@@ -177,7 +177,7 @@
     "https://go.googlesource.com/text"                      ; url
     "1a0d6f9qqzd9njd8xb59mjrfv5jrz8130crcxbqaiy7lk434nq1k"  ; hash
     "golang.org/x/text"                                     ; path
-    (list))))                                               ; inputs 
+    (list))))                                               ; inputs
 
 (define go-golang-org-x-term
   (source-only (go-package
@@ -186,7 +186,7 @@
     "https://go.googlesource.com/term"                      ; url
     "19abybnsqix924d9ak4p93bgq1312zp1yk11bilrrmsjplhbrzqf"  ; hash
     "golang.org/x/term"                                     ; path
-    (list))))                                               ; inputs 
+    (list))))                                               ; inputs
 
 (define go-golang-org-x-net
   (source-only (go-package
@@ -195,17 +195,17 @@
     "https://go.googlesource.com/net"                       ; url
     "0pk9pfd5n5hlg5zx1ab3gfzi6lfcs41dfds6fyn661g5xs00l9s1"  ; hash
     "golang.org/x/net"                                      ; path
-    (list))))                                               ; inputs 
+    (list))))                                               ; inputs
 
 
 (define go-golang-org-x-crypto
-  (source-only (go-package 
+  (source-only (go-package
     "go-golang-org-x-crypto"                                ; name
     "0.12.0"                                                ; version
     "https://go.googlesource.com/crypto"                    ; url
     "00cg67w0n01a64fc4kqg5j7r47fx5y9vyqlanwb60513dv6lzacs"  ; hash
     "golang.org/x/crypto"                                   ; path
-    (list))))                                               ; inputs 
+    (list))))                                               ; inputs
 
 (define go-golang-org-x-sys
   (source-only (go-package
@@ -214,7 +214,7 @@
     "https://go.googlesource.com/sys"                       ; url
     "1pp0479l9w92kr6p97d19s8y0hj16gblg4hvdqqzcrf3d9mr4cs3"  ; hash
     "golang.org/x/sys"                                      ; path
-    (list))))                                               ; inputs 
+    (list))))                                               ; inputs
 
 (define go-github-com-quic-go-qtls-go1-20
   (go-package
@@ -223,7 +223,7 @@
     "https://github.com/quic-go/qtls-go1-20"                ; url
     "0fl3yv1w8cygag3lav45vvzb4k9i72p92x13wcq0xn13wxirzirn"  ; hash
     "github.com/quic-go/qtls-go1-20"                        ; path
-    (list go-golang-org-x-crypto                            ; inputs 
+    (list go-golang-org-x-crypto                            ; inputs
           go-golang-org-x-sys)))
 
 (define go-github-com-google-go-cmp
@@ -285,7 +285,7 @@
     "https://github.com/quic-go/quic-go"                    ; url
     "0jiwh97xpvswrbq5glnafc2jc3ybpl17ffa0cg9x3f03raa2q8vg"  ; hash
     "github.com/quic-go/quic-go"                            ; path
-    (list go-golang-org-x-crypto                            ; inputs 
+    (list go-golang-org-x-crypto                            ; inputs
           go-golang-org-x-exp
           go-golang-org-x-net
           go-golang-org-x-sys
@@ -298,7 +298,7 @@
     "https://github.com/prometheus/procfs"                  ; url
     "0k2d27pm6q6im42x8ikwz0d4sb31wn6rvfs9wlf51d9gldncmpqz"  ; hash
     "github.com/prometheus/procfs"                          ; path
-    (list go-golang-org-x-sys)))                            ; inputs 
+    (list go-golang-org-x-sys)))                            ; inputs
 
 (define go-github-com-prometheus-client-model
   (source-only (go-package
@@ -307,7 +307,7 @@
     "https://github.com/prometheus/client_model"            ; url
     "0w3hxsc0qmb5vdm8lyhsvkm0g9yk81vrpcyf31haysvid8yjrzg0"  ; hash
     "github.com/prometheus/client_model"                    ; path
-    (list go-github-com-golang-protobuf))))                 ; inputs 
+    (list go-github-com-golang-protobuf))))                 ; inputs
 
 (define go-github-com-prometheus-common
   (source-only (go-package
@@ -316,7 +316,7 @@
     "https://github.com/prometheus/common"                  ; url
     "161ayg76ag1h21kaf0qycpy7cizvy3xrm0dn598hj91n44v4z0hf"  ; hash
     "github.com/prometheus/common"                          ; path
-    (list go-github-com-golang-protobuf                     ; inputs 
+    (list go-github-com-golang-protobuf                     ; inputs
           go-github-com-matttproud-golang-protobuf-extensions
           go-github-com-prometheus-client-model))))
 
@@ -327,10 +327,10 @@
     "https://github.com/prometheus/client_golang"           ; url
     "041br6n309bajwdv871f69fwy1yq3vk46rmzxnkr1ldpq1bhd63n"  ; hash
     "github.com/prometheus/client_golang"                   ; path
-    (list go-github-com-prometheus-client-model             ; inputs 
+    (list go-github-com-prometheus-client-model             ; inputs
           go-github-com-prometheus-procfs
           go-github-com-prometheus-common))))
-  
+
 (define go-github-com-klauspost-cpuid-v2
   (go-package
     "go-github-com-klauspost-cpuid-v2"                      ; name
@@ -338,7 +338,7 @@
     "https://github.com/klauspost/cpuid"                    ; url
     "127jlppxs226lnq499rjnjyzgmp849xlxhq7380w2ypdkhvafni1"  ; hash
     "github.com/klauspost/cpuid/v2"                         ; path
-    (list)))                                                ; inputs 
+    (list)))                                                ; inputs
 
 (define go-github-com-libdns-libdns
   (go-package
@@ -347,7 +347,7 @@
     "https://github.com/libdns/libdns"                      ; url
     "1ix668h4n2n9iph4xiznzdfw7hy0ijy906mvnys4kq9f0v9ih4bg"  ; hash
     "github.com/libdns/libdns"                              ; path
-    (list)))                                                ; inputs 
+    (list)))                                                ; inputs
 
 (define go-github-com-mholt-acmez
   (go-package
@@ -356,7 +356,7 @@
     "https://github.com/mholt/acmez"                        ; url
     "1wzkgbgnp23vbcz4nc3c8x7vi1lkqp36485f7g05zbshc7hzby6d"  ; hash
     "github.com/mholt/acmez"                                ; path
-     (list go-go-uber-org-zap                               ; inputs 
+     (list go-go-uber-org-zap                               ; inputs
            go-golang-org-x-crypto
            go-golang-org-x-text
            go-golang-org-x-net)))
@@ -368,7 +368,7 @@
     "https://github.com/miekg/dns"                          ; url
     "1svvx9qamy3hy0ms8iwbisqjmfkbza0zljmds6091siq150ggmws"  ; hash
     "github.com/miekg/dns"                                  ; path
-    (list go-golang-org-x-net                               ; inputs 
+    (list go-golang-org-x-net                               ; inputs
           go-golang-org-x-sys)))
 
 (define go-github-com-zeebo-blake3
@@ -378,7 +378,7 @@
     "https://github.com/zeebo/blake3"                       ; url
     "1pkk97d1jwfcg3hs9g09zbwn31l96icx1vk4d9l2rhcvfw0aw0fc"  ; hash
     "github.com/zeebo/blake3"                               ; path
-    (list go-github-com-klauspost-cpuid-v2)))               ; inputs 
+    (list go-github-com-klauspost-cpuid-v2)))               ; inputs
 
 (define go-github-com-caddy-certmagic
   (go-package
@@ -387,7 +387,7 @@
     "https://github.com/caddyserver/certmagic"              ; url
     "07a1xiynbbaqm7qzg0q1xhvab99x8mvzr2rw68npxws4dshgdv5f"  ; hash
     "github.com/caddyserver/certmagic"                      ; path
-    (list go-github-com-klauspost-cpuid-v2                  ; inputs 
+    (list go-github-com-klauspost-cpuid-v2                  ; inputs
           go-github-com-libdns-libdns
           go-go-uber-org-zap
           go-golang-org-x-crypto
@@ -405,7 +405,7 @@
     "https://github.com/quic-go/qpack"                      ; url
     "00mjz445hhx4yar5l8p21bpp4d06jyg2ajw0ax7bh64d37l4kx39"  ; hash
     "github.com/quic-go/qpack"                              ; path
-    (list go-golang-org-x-net)))                            ; inputs 
+    (list go-golang-org-x-net)))                            ; inputs
 
 (define go-google-golang-org-protobuf
   (source-only (go-package
@@ -414,7 +414,7 @@
     "https://go.googlesource.com/protobuf"                  ; url
     "1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0"  ; hash
     "google.golang.org/protobuf"                            ; path
-    (list go-github-com-google-go-cmp                       ; inputs 
+    (list go-github-com-google-go-cmp                       ; inputs
           go-github-com-golang-protobuf))))
 
 (define go-github-com-google-cel-go
@@ -710,7 +710,7 @@
               "https://github.com/yuin/goldmark"
               "0qs08hy288zdr0xpd49rp8h1048s1n7frmzcmb8diqpcv5hvbmgm"
               "github.com/yuin/goldmark"
-              (list)) 
+              (list))
             go-1.14)
           (set-go (go-package
               "go-github-com-alecthomas-chroma"
@@ -826,7 +826,7 @@
                              `(,@arguments #:import-path
                                "github.com/caddyserver/caddy/cmd/caddy")))))))
     (synopsis "A powerful, enterprise-ready, open source web server with automatic HTTPS written in Go ")
-    (description "Caddy simplifies your infrastructure. It takes care of TLS certificate renewals, OCSP stapling, static file serving, reverse proxying, Kubernetes ingress, and more. 
+    (description "Caddy simplifies your infrastructure. It takes care of TLS certificate renewals, OCSP stapling, static file serving, reverse proxying, Kubernetes ingress, and more.
                  Its modular architecture means you can do more with a single, static binary that compiles for any platform.
                  Caddy runs great in containers because it has no dependencies—not even libc. Run Caddy practically anywhere.")
     (home-page "https://caddyserver.com/")
diff --git a/modules/home-packages/mozillia.scm b/modules/freya/packages/mozillia.scm
index 34f582f..57c9b54 100644
--- a/modules/home-packages/mozillia.scm
+++ b/modules/freya/packages/mozillia.scm
@@ -1,12 +1,12 @@
-(define-module (home-packages mozillia)
-  #:use-module (gnu)
-  #:use-module (guix download)
-  #:use-module (guix packages)
+(define-module (freya packages mozillia)
   #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (gnu)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages linux)
-  #:use-module (nonguix build-system binary)
+  #:use-module (guix download)
+  #:use-module (guix packages)
   #:use-module (guix build-system trivial)
+  #:use-module (nonguix build-system binary)
   #:use-module (nongnu packages mozilla))
 
 (define-public firefox-wayland-new
diff --git a/modules/home-packages/shells.scm b/modules/freya/packages/shells.scm
index b9ba646..ce0e6e7 100644
--- a/modules/home-packages/shells.scm
+++ b/modules/freya/packages/shells.scm
@@ -1,16 +1,16 @@
-(define-module (home-packages shells)
+(define-module (freya packages shells)
                #:use-module ((guix licenses) #:prefix license:)
-               #:use-module (guix gexp)
                #:use-module (gnu packages base)
                #:use-module (gnu packages version-control)
                #:use-module (gnu packages web)
                #:use-module (gnu packages bash)
                #:use-module (gnu packages)
                #:use-module (guix packages)
-               #:use-module (guix git-download)
                #:use-module (guix download)
+               #:use-module (guix git-download)
                #:use-module (guix build-system trivial)
-               #:use-module (guix utils))
+               #:use-module (guix utils)
+               #:use-module (guix gexp))
 
 (define-public zsh-autosuggestions
   (package
diff --git a/modules/home-packages/vim.scm b/modules/freya/packages/vim.scm
index 05532f2..60323f3 100644
--- a/modules/home-packages/vim.scm
+++ b/modules/freya/packages/vim.scm
@@ -1,12 +1,12 @@
-(define-module (home-packages vim)
+(define-module (freya packages vim)
                #:use-module ((guix licenses) #:prefix license:)
-               #:use-module (guix packages)
                #:use-module (gnu packages)
+               #:use-module (gnu packages vim)
+               #:use-module (gnu packages gcc)
+               #:use-module (guix packages)
                #:use-module (guix git-download)
                #:use-module (guix utils)
-               #:use-module (guix build-system trivial)
-               #:use-module (gnu packages vim)
-               #:use-module (gnu packages gcc))
+               #:use-module (guix build-system trivial))
 
 (define-public neovim-new
   (package
@@ -47,4 +47,4 @@
    (description "Minimalist Vim Plugin Manager")
    (license license:expat)))
 
-    
+
diff --git a/modules/home-packages/virtualization.scm b/modules/freya/packages/virtualization.scm
index e85b0af..8f92915 100644
--- a/modules/home-packages/virtualization.scm
+++ b/modules/freya/packages/virtualization.scm
@@ -1,11 +1,11 @@
-(define-module (home-packages virtualization)
-               #:use-module (guix packages)
-               #:use-module (guix utils)
+(define-module (freya packages virtualization)
                #:use-module (gnu packages)
                #:use-module (gnu packages package-management)
                #:use-module (gnu packages build-tools)
                #:use-module (gnu packages virtualization)
                #:use-module (gnu packages firmware)
+               #:use-module (guix packages)
+               #:use-module (guix utils)
                #:use-module (guix gexp))
 
 (define-public libvirt-new
diff --git a/modules/freya/packages/wm.scm b/modules/freya/packages/wm.scm
new file mode 100644
index 0000000..f333fcb
--- /dev/null
+++ b/modules/freya/packages/wm.scm
@@ -0,0 +1,277 @@
+(define-module (freya packages wm)
+               #:use-module ((guix licenses) #:prefix license:)
+               #:use-module (gnu packages)
+               #:use-module (gnu packages wm)
+               #:use-module (gnu packages freedesktop)
+               #:use-module (gnu packages cpp)
+               #:use-module (gnu packages gcc)
+               #:use-module (gnu packages build-tools)
+               #:use-module (gnu packages pkg-config)
+               #:use-module (gnu packages xdisorg)
+               #:use-module (gnu packages gtk)
+               #:use-module (gnu packages gl)
+               #:use-module (gnu packages linux)
+               #:use-module (gnu packages pciutils)
+               #:use-module (guix download)
+               #:use-module (guix packages)
+               #:use-module (guix gexp)
+               #:use-module (guix git-download)
+               #:use-module (guix build-system cmake)
+               #:use-module (guix build-system meson)
+               #:use-module (guix build utils)
+               #:use-module (rosenthal packages wm)
+               #:use-module (rosenthal packages freedesktop)
+               #:use-module (guix utils))
+
+
+(define-public swaylock-effects-new
+  (package
+    (inherit swaylock-effects)
+    (version "1.6.11")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/jirutka/swaylock-effects")
+                     (commit (string-append "v" version))))
+              (sha256
+                (base32
+                  "0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h"))))
+    (inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam")))))
+
+
+(define hwdata-for-hyprland
+  (package
+    (inherit hwdata)
+    (arguments
+     (substitute-keyword-arguments (package-arguments hwdata)
+       ((#:phases _) #~%standard-phases)))
+    (outputs '("out"))))
+
+
+(define libdrm-for-hyprland
+  (package
+    (inherit libdrm)
+    (name "libdrm")
+    (version "2.4.120")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://dri.freedesktop.org/libdrm/libdrm-"
+                    version ".tar.xz"))
+              (sha256
+               (base32
+                "0yijzgg6rdsa68bz03sw0lcfa2nclv9m3as1cja50wkcyxim7x9v"))))))
+
+
+(define wayland-protocols-new
+  (package
+    (inherit wayland-protocols)
+    (name "wayland-protocols")
+    (version "1.36")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://gitlab.freedesktop.org/wayland/wayland-protocols"
+                    "/-/releases/" version "/downloads/"
+                    "wayland-protocols-" version ".tar.xz"))
+              (sha256
+               (base32
+                "14kyxywpfkgpjpkrybs28q1s2prnz30k1b4zap5a3ybrbvh4vzbi"))))))
+
+
+(define hyprland-unbundle-wlroots-patch
+  (origin
+    (method url-fetch)
+    (uri (string-append "https://github.com/hyprwm/Hyprland" "/raw/"
+                        "cba1ade848feac44b2eda677503900639581c3f4"
+                        "/nix/patches/meson-build.patch"))
+    (sha256
+     (base32 "0fwvsshz3k6061p3hdl175pydmj80vnw5rm4xfcn64w1ssfq7liw"))))
+
+
+(define wayland-protocols-for-hyprland
+  (package
+    (inherit wayland-protocols)
+    (name "wayland-protocols")
+    (version "1.36")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://gitlab.freedesktop.org/wayland/wayland-protocols"
+                    "/-/releases/" version "/downloads/"
+                    "wayland-protocols-" version ".tar.xz"))
+              (sha256
+               (base32
+                "14kyxywpfkgpjpkrybs28q1s2prnz30k1b4zap5a3ybrbvh4vzbi"))))))
+
+
+(define wlroots-for-hyprland
+  (let ((base wlroots)
+        (revision "1")
+        (commit "5c1d51c5a2793480f5b6c4341ad0797052aec2ea"))
+    (package
+      (inherit base)
+      (name "wlroots")
+      (version (git-version "0.18.0-dev-hyprland" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/hyprwm/wlroots-hyprland")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "0gy0g0kxb3q1wjqrypnvmrxcb4ld3advikchygpwpfp4s9v0mmvd"))))
+      (arguments
+       (substitute-keyword-arguments (package-arguments wlroots)
+         ((#:phases phases #~%standard-phases)
+          #~(modify-phases #$phases
+              (add-after 'unpack 'adjust-patching-script
+                (lambda _
+                  (substitute* "patches/apply.sh"
+                    (("apply \\|\\| check_applied \\|\\| fail")
+                     "patch -Np1 < $PATCH"))))))))
+      (propagated-inputs
+       (modify-inputs (package-propagated-inputs wlroots)
+         (prepend libdrm-for-hyprland)
+         (replace "libinput-minimal" libinput-minimal-1.24.0)
+         (replace "wayland-protocols" wayland-protocols-for-hyprland)))
+      (native-inputs
+       (modify-inputs (package-native-inputs base)
+         (replace "hwdata" `(,hwdata-for-hyprland "out")))))))
+
+
+(define-public hyprland-new
+  (package
+    (inherit hyprland)
+    (version "0.40.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/hyprwm/Hyprland"
+                                  "/releases/download/v" version
+                                  "/source-v" version ".tar.gz"))
+              (patches (list hyprland-unbundle-wlroots-patch))
+              (sha256
+               (base32
+                "0f4hs8qzmfmg4lr491b2inanb02xn4xa0gwb8a0ks3m64iwzx589"))))
+    (inputs
+      (modify-inputs
+        (package-inputs hyprland)
+        (append tomlplusplus)))))
+
+
+(define-public hyprland-plugin-hy3
+  (package
+    (name "hyprland-plugin-hy3")
+    (version "0.40.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/outfoxxed/hy3"
+                                  "/archive/refs/tags/hl" version ".tar.gz"))
+              (sha256
+               (base32
+                "13rnv24nc52fzvh7ryl7q91cr59z0qsv4vlnps5vr78g58lx11j0"))))
+    (build-system cmake-build-system)
+    (arguments
+      `(#:tests? #f
+        #:configure-flags '("DCMAKE_BUILD_TYPE=Release")))
+    (native-inputs
+      (list meson pkg-config))
+    (inputs
+      (list pixman
+            libdrm
+            pango
+            gcc-13
+            libinput
+            hyprland-new
+            hyprland-protocols
+            hyprwayland-scanner
+            hyprlang
+            wayland
+            wlroots-for-hyprland))
+    (license license:gpl3)
+    (home-page "https://github.com/outfoxxed/hy3")
+    (synopsis "i3 / sway like layout for hyprland.")
+    (description "Hyprland plugin for an i3 / sway like manual tiling layout")))
+
+
+(define-public hyprland-plugin-hyprbars
+  (let ((commit "fd133914bf1921db2a26627698f914478f6a9471")
+        (revision "1"))
+    (package
+      (name "hyprland-plugin-hyprbars")
+      (version (git-version "0.40.0" revision commit))
+      (source
+        (origin
+        (method git-fetch)
+        (uri (git-reference
+               (url "https://github.com/hyprwm/hyprland-plugins.git")
+               (commit commit)))
+        (sha256
+          (base32
+            "0518ggbam7rllf9xfzhfn9fp364rbiycsrkag74jscy5br5cyl4g"))
+        (file-name (git-file-name name version))))
+      (build-system meson-build-system)
+      (arguments
+        `(#:tests? #f
+          #:phases
+          (modify-phases %standard-phases
+            (add-after 'unpack 'chdir
+              (lambda _ (chdir "../source/hyprbars/"))))))
+      (native-inputs
+        (list pkg-config))
+      (inputs
+        (list pango
+              gcc-13
+              libinput
+              hyprland-new
+              hyprland-protocols
+              hyprwayland-scanner
+              hyprlang
+              wayland
+              wlroots-for-hyprland))
+      (license license:bsd-3)
+      (home-page "https://github.com/hyprwm/hyprland-plugins")
+      (synopsis "adds simple title bars to windows")
+      (description "adds simple title bars to windows"))))
+
+
+(define-public hyprlock
+  (let ((commit "d9a6229434fba475ea42b634ee2f03919236798d")
+        (revision "1"))
+    (package
+      (name "hyprlock")
+      (version (git-version "0.3.0" revision commit))
+      (source
+        (origin
+          (method git-fetch)
+          (uri (git-reference
+                 (url "https://github.com/hyprwm/hyprlock")
+                 (commit commit)))
+          (file-name (git-file-name name version))
+          (sha256
+            (base32 "19cg8vj4sgz5pxib9m08af1lilay9bckjhlr6h333s014l7y09sw"))))
+      (build-system cmake-build-system)
+      (arguments
+        `(#:tests? #f))
+      (native-inputs
+        (list gcc-13
+              pkg-config
+              mesa-headers
+              wayland))
+      (inputs
+        (list cairo
+              pango
+              libxkbcommon
+              hyprlang
+              mesa
+              wayland-protocols
+              linux-pam))
+      (propagated-inputs
+        (list libdrm
+              libglvnd))
+      (home-page "https://github.com/hyprwm/hyprlock")
+      (license license:bsd-3)
+      (synopsis "Screen locker for Hyprland")
+      (description "Screen locker for hyprland."))))
+
diff --git a/modules/home-services/pipewire.scm b/modules/freya/services/pipewire.scm
index 3a96977..ccc71a3 100644
--- a/modules/home-services/pipewire.scm
+++ b/modules/freya/services/pipewire.scm
@@ -1,4 +1,4 @@
-(define-module (home-services pipewire)
+(define-module (freya services pipewire)
                #:use-module (gnu packages)
                #:use-module (gnu packages linux)
                #:use-module (gnu services)
diff --git a/modules/home-config/base-system.scm b/modules/freya/system.scm
index db91682..6ff5d19 100644
--- a/modules/home-config/base-system.scm
+++ b/modules/freya/system.scm
@@ -1,4 +1,4 @@
-(define-module (home-config base-system)
+(define-module (freya system)
            #:use-module (gnu)
            #:use-module (gnu system setuid)
            #:use-module (gnu packages)
@@ -6,12 +6,10 @@
            #:use-module (gnu packages avahi)
            #:use-module (gnu packages shells)
            #:use-module (gnu packages tls)
+           #:use-module (gnu packages gtk)
            #:use-module (gnu packages vpn)
            #:use-module (gnu packages security-token)
            #:use-module (gnu packages virtualization)
-           #:use-module (guix packages)
-           #:use-module (nongnu packages linux)
-           #:use-module (srfi srfi-1)
            #:use-module (gnu services)
            #:use-module (gnu services linux)
            #:use-module (gnu services authentication)
@@ -27,9 +25,13 @@
            #:use-module (gnu services avahi)
            #:use-module (gnu services spice)
            #:use-module (gnu services virtualization)
-           #:use-module (home-packages wm)
-           #:use-module (home-packages certs)
-           #:use-module (home-packages virtualization))
+           #:use-module (guix packages)
+           #:use-module (nongnu packages linux)
+           #:use-module (rosenthal packages wm)
+           #:use-module (srfi srfi-1)
+           #:use-module (freya packages wm)
+           #:use-module (freya packages certs)
+           #:use-module (freya packages virtualization))
 
 (define %my-base-packages
   (remove (lambda (package)
@@ -49,11 +51,11 @@
 (define-public base-operating-system
     (operating-system
          (kernel linux)
-         (firmware (list linux-firmware intel-microcode sof-firmware))
+         (firmware (list linux-firmware amd-microcode sof-firmware))
          (locale "en_US.utf8")
          (timezone "America/New_York")
          (keyboard-layout (keyboard-layout "us"))
-         (host-name "ThisWillChange") 
+         (host-name "ThisWillChange")
 
          ;; The list of user accounts ('root' is implicit).
          (users (cons* (user-account
@@ -68,18 +70,19 @@
          (packages (append (map specification->package (list "swayfx"
                                                              "swaybg"
                                                              "wlogout"
+                                                             "cage"
                                                              "sof-firmware"
-                                                             "intel-microcode"
+                                                             "amd-microcode"
                                                              "alsa-utils"
                                                              "chrony"
                                                              "swayidle"
                                                              "dconf"
                                                              "alacritty"
+                                                             "kitty"
                                                              "gnome-themes-extra"
                                                              "adwaita-icon-theme"
                                                              "hicolor-icon-theme"
                                                              "git"
-                                                             "nss-certs"
                                                              "gvfs"
                                                              "gnupg"
                                                              "light"
@@ -95,6 +98,7 @@
                                                              "wireguard-tools"
                                                              "xdg-desktop-portal"
                                                              "xdg-desktop-portal-wlr"
+                                                             "xdg-desktop-portal-hyprland"
                                                              "v4l2loopback-linux-module"
                                                              "docker"
                                                              "linux-pam"
@@ -122,8 +126,16 @@
                                                              "wxwidgets"
                                                              "libpcap"
                                                              "v4l2loopback-linux-module"
-                                                             "neovim"))
-                           (list swaylock-effects-new virt-manager-new freya-ca-certs)
+                                                             "neovim"
+                                                             "gtk+"
+                                                             "font-jetbrains-mono"))
+                           (list swaylock-effects-new
+                                 virt-manager-new
+                                 freya-ca-certs
+                                 hyprland-new
+                                 hyprland-plugin-hy3
+                                 hyprland-plugin-hyprbars
+                                 hyprlock)
                            %my-base-packages))
 
          ;; Below is the list of system services. TO search for available
@@ -187,7 +199,7 @@
                             (delete gdm-service-type)
                             (delete avahi-service-type)
                             (delete alsa-service-type))))
-    
+
          (name-service-switch %mdns-host-lookup-nss)
 
          (setuid-programs
diff --git a/modules/home-config/ca-certs/freya_ca.crt b/modules/home-config/ca-certs/freya_ca.crt
deleted file mode 100644
index 06be120..0000000
--- a/modules/home-config/ca-certs/freya_ca.crt
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBnDCCAUKgAwIBAgIRANSS7G2uorge5TXlGr7z2qswCgYIKoZIzj0EAwIwLDEQ
-MA4GA1UEChMHZnJleWFDQTEYMBYGA1UEAxMPZnJleWFDQSBSb290IENBMB4XDTIz
-MTAwNDIxMzczMFoXDTMzMTAwMTIxMzczMFowLDEQMA4GA1UEChMHZnJleWFDQTEY
-MBYGA1UEAxMPZnJleWFDQSBSb290IENBMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcD
-QgAEvyoFgV7LYPyYzubVKEAmDRtp/1Fd/+/txbFBOXE0lX3EC0pPgfr2G8S7FC5P
-aNv+ZxmnSSI8vLJbVofLKNu3GaNFMEMwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB
-/wQIMAYBAf8CAQEwHQYDVR0OBBYEFIWAMA1zgd/KEOAV/26yfuJS48O1MAoGCCqG
-SM49BAMCA0gAMEUCIQDX9oivOL5hueuikrAEoiVw0jwTOOQ51zEQD1v4Xlp1RQIg
-LitR7EYp6R0ejK66ZSE0cUdsF/4WbgtrlS3p/MQgDdw=
------END CERTIFICATE-----
diff --git a/modules/home-config/ca-certs/freya_intermediate.crt b/modules/home-config/ca-certs/freya_intermediate.crt
deleted file mode 100644
index 44bfa35..0000000
--- a/modules/home-config/ca-certs/freya_intermediate.crt
+++ /dev/null
@@ -1,12 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIBxTCCAWqgAwIBAgIQKD7wGJ+2vQCA1+8z2waLiTAKBggqhkjOPQQDAjAsMRAw
-DgYDVQQKEwdmcmV5YUNBMRgwFgYDVQQDEw9mcmV5YUNBIFJvb3QgQ0EwHhcNMjMx
-MDA0MjEzNzMxWhcNMzMxMDAxMjEzNzMxWjA0MRAwDgYDVQQKEwdmcmV5YUNBMSAw
-HgYDVQQDExdmcmV5YUNBIEludGVybWVkaWF0ZSBDQTBZMBMGByqGSM49AgEGCCqG
-SM49AwEHA0IABAygCEQ06w0AKgqXVWCL1iX0oRqS6QEb0VY49zZimPRVmI+FdJ0O
-KB4kANOJABYyFfpzoK9omJXdz6BvsFHx6c+jZjBkMA4GA1UdDwEB/wQEAwIBBjAS
-BgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBQFRP1PrOhDg13b9m/oPHg4IAuy
-KjAfBgNVHSMEGDAWgBSFgDANc4HfyhDgFf9usn7iUuPDtTAKBggqhkjOPQQDAgNJ
-ADBGAiEAoY0OsXihuhxIQAx8Fp5agkE70UaOHmT5JLJhVGH7sQYCIQCzId4kEMJ8
-N4/afVgJI7R5hHbcu1Wge40SSkMx1pplFA==
------END CERTIFICATE-----
diff --git a/modules/home-packages/wm.scm b/modules/home-packages/wm.scm
deleted file mode 100644
index 9de5dc0..0000000
--- a/modules/home-packages/wm.scm
+++ /dev/null
@@ -1,22 +0,0 @@
-(define-module (home-packages wm)
-               #:use-module (guix download)
-               #:use-module (guix packages)
-               #:use-module (guix gexp)
-               #:use-module (gnu packages)
-               #:use-module (guix git-download)
-               #:use-module (guix utils)
-               #:use-module (gnu packages wm))
-
-(define-public swaylock-effects-new
-  (package
-    (inherit swaylock-effects)
-    (version "1.6.11")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/jirutka/swaylock-effects")
-                     (commit (string-append "v" version))))
-              (sha256
-                (base32
-                  "0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h"))))
-    (inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam")))))