diff --git a/home/config/hypr/config.d/keybinds.conf b/home/config/hypr/config.d/keybinds.conf index 4c24083..f7ecf4e 100644 --- a/home/config/hypr/config.d/keybinds.conf +++ b/home/config/hypr/config.d/keybinds.conf @@ -28,3 +28,4 @@ bind = $mod SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy -t image/png && notif bind = , Print, exec, grim - | wl-copy -t iamge/png && notify-send -t 3000 "Hyprland" "Full screen copied to clipboard" bind = SHIFT, Print, exec, slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy +bind = $mod, tab, hyprexpo:expo, toggle diff --git a/home/config/hypr/config.d/plugins.conf b/home/config/hypr/config.d/plugins.conf index 16da0e4..a7a4de5 100644 --- a/home/config/hypr/config.d/plugins.conf +++ b/home/config/hypr/config.d/plugins.conf @@ -1,2 +1,3 @@ exec-once = hyprctl plugin load /run/current-system/profile/lib/libhy3.so exec-once = hyprctl plugin load /run/current-system/profile/lib/libhyprbars.so +exec-once = hyprctl plugin load /run/current-system/profile/lib/libhyprexpo.so diff --git a/home/config/xdg/portals.conf b/home/config/xdg/portals.conf new file mode 100644 index 0000000..74796c9 --- /dev/null +++ b/home/config/xdg/portals.conf @@ -0,0 +1,3 @@ +[preferred] +default=hyprland;gtk +org.freedesktop.impl.portal.FileChooser=gtk diff --git a/home/home.scm b/home/home.scm index 03e90e5..e1b9cbd 100644 --- a/home/home.scm +++ b/home/home.scm @@ -131,6 +131,7 @@ ("desktop-common" ,(local-file "config/desktop-common" #:recursive? #t)) ("mimeapps.list" ,(local-file "config/xdg/mimeapps.list" #:recursive? #t)) ("user-dirs.dirs" ,(local-file "config/xdg/user-dirs.dirs" #:recursive? #t)) + ("xdg-desktop-portal/portals.conf" ,(local-file "config/xdg/portals.conf")) ("starship.toml" ,(local-file "config/starship/starship.toml" #:recursive? #t)) ("home-manager/home.nix" ,(local-file "home.nix" #:recursive? #t)) )) @@ -142,6 +143,7 @@ (".local/share/fonts" ,(local-file "local/fonts" #:recursive? #t)) (".local/share/applications" ,(local-file "local/applications" #:recursive? #t)) (".local/share/icons" ,(local-file "local/icons" #:recursive? #t)) + (".local/share/dbus-1/services" ,(local-file "local/dbus/services" #:recursive? #t)) (".nix-channels" ,(local-file "nix-channels")) (".gitconfig" ,(local-file "config/git/gitconfig")))) diff --git a/modules/freya/packages/linux.scm b/modules/freya/packages/linux.scm new file mode 100644 index 0000000..dffe996 --- /dev/null +++ b/modules/freya/packages/linux.scm @@ -0,0 +1,34 @@ +(define-module (freya packages linux) + #:use-module (guix download) + #:use-module (guix packages) + #:use-module (guix gexp) + #:use-module (gnu packages) + #:use-module (gnu packages linux) + #:use-module (gnu packages python-xyz) + #:use-module (guix git-download) + #:use-module (guix utils)) + +(define-public bluez-new + (package + (inherit bluez) + (version "5.72") + (source + (origin + (method url-fetch) + (uri (string-append + "mirror://kernel.org/linux/bluetooth/bluez-" + version ".tar.xz")) + (sha256 + (base32 + "0vjk4ihywzv8k07bxq7clqgi2afrw54nfp0gcnxw35m98nipz7a9")))) + (arguments + (list + #:configure-flags + #~(list "--sysconfdir=/etc" + "--localstatedir=/var" + "--enable-library" + "--disable-manpages" + "--disable-systemd" + "--enable-hid2hci" + (string-append "--with-dbusconfdir=" #$output "/etc") + (string-append "--with-udevdir=" #$output "/lib/udev")))))) diff --git a/modules/freya/packages/networking.scm b/modules/freya/packages/networking.scm new file mode 100644 index 0000000..e18d357 --- /dev/null +++ b/modules/freya/packages/networking.scm @@ -0,0 +1,16 @@ +(define-module (freya packages networking) + #:use-module (guix gexp) + #:use-module (guix packages) + #:use-module (gnu packages) + #:use-module (gnu packages networking) + #:use-module (freya packages linux) + #:use-module (guix utils)) + +(define-public blueman-new + (package + (inherit blueman) + (inputs + (modify-inputs + (package-inputs blueman) + (delete "bluez") + (prepend bluez-new))))) diff --git a/modules/freya/packages/wm.scm b/modules/freya/packages/wm.scm index 0d355e4..fc21aed 100644 --- a/modules/freya/packages/wm.scm +++ b/modules/freya/packages/wm.scm @@ -20,6 +20,7 @@ #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system meson) + #:use-module (guix build-system trivial) #:use-module (guix build utils) #:use-module (rosenthal packages wm) #:use-module (rosenthal packages freedesktop) @@ -201,47 +202,67 @@ (synopsis "i3 / sway like layout for hyprland.") (description "Hyprland plugin for an i3 / sway like manual tiling layout"))) +(define-syntax hyprland-plugin-impl + (syntax-rules () + ((_ plugin) + (let ((commit "fd133914bf1921db2a26627698f914478f6a9471") + (revision "1")) + (package + (name (string-append "hyprland-plugin-" plugin)) + (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 (string-append "../source/" plugin "/"))))))) + (native-inputs + (list pkg-config + gcc-13)) + (inputs + (list gcc-13 + pango + libinput + hyprland-protocols + hyprwayland-scanner + hyprland + hyprlang + wayland + wlroots-for-hyprland)) + (license license:bsd-3) + (home-page "https://github.com/hyprwm/hyprland-plugins") + (synopsis (string-append "official " plugin " plugin for hyprland")) + (description (string-append "official " plugin " plugin for hyprland"))))))) -(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-protocols - hyprwayland-scanner - hyprlang - hyprland - 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 hyprland-plugins + (package + (name "hyprland-plugins") + (version "0.40.0") + (source #f) + (build-system trivial-build-system) + (arguments '(#:builder (begin (mkdir %output) #t))) + (license license:bsd-3) + (home-page "https://github.com/hyprwm/hyprland-plugins") + (synopsis "A collection of all the official hyprland plugins") + (description "A metapackage containing inputs for each official plugin") + (propagated-inputs + (list (hyprland-plugin-impl "borders-plus-plus") + (hyprland-plugin-impl "csgo-vulkan-fix") + (hyprland-plugin-impl "hyprbars") + (hyprland-plugin-impl "hyprexpo") + (hyprland-plugin-impl "hyprtrails") + (hyprland-plugin-impl "hyprwinwrap"))))) (define-public hyprlock (let ((commit "d9a6229434fba475ea42b634ee2f03919236798d") diff --git a/modules/freya/system.scm b/modules/freya/system.scm index 1432b5a..79eacbf 100644 --- a/modules/freya/system.scm +++ b/modules/freya/system.scm @@ -31,6 +31,8 @@ #:use-module (srfi srfi-1) #:use-module (freya packages wm) #:use-module (freya packages certs) + #:use-module (freya packages linux) + #:use-module (freya packages networking) #:use-module (freya packages virtualization)) (define %my-base-packages @@ -118,7 +120,8 @@ ; xdg "xdg-utils" "xdg-desktop-portal" - "xdg-desktop-portal-wlr" + ;"xdg-desktop-portal-wlr" + "xdg-desktop-portal-gtk" "xdg-desktop-portal-hyprland" ; firmware @@ -159,8 +162,6 @@ "pinentry" "light" "brightnessctl" - "bluez" - "blueman" "wireguard-tools" "fprintd" "wireplumber" @@ -176,10 +177,12 @@ virt-manager-new freya-ca-certs hyprland-plugin-hy3 - hyprland-plugin-hyprbars + hyprland-plugins hyprlock hyprpaper - hypridle) + hypridle + bluez-new + blueman-new) %my-base-packages)) ;; Below is the list of system services. TO search for available @@ -213,8 +216,9 @@ (service virtlog-service-type) (service bluetooth-service-type (bluetooth-configuration - (experimental #t) - (fast-connectable? #t))) + (bluez bluez-new) + (experimental #t) + (fast-connectable? #t))) (service pam-limits-service-type) (service fprintd-service-type) (udev-rules-service 'fido2 libfido2 #:groups '("plugdev"))) diff --git a/node_modules/.yarn-integrity b/node_modules/.yarn-integrity deleted file mode 100644 index e14c4cc..0000000 --- a/node_modules/.yarn-integrity +++ /dev/null @@ -1,10 +0,0 @@ -{ - "systemParams": "linux-x64-64", - "modulesFolders": [], - "flags": [], - "linkedModules": [], - "topLevelPatterns": [], - "lockfileEntries": {}, - "files": [], - "artifacts": {} -} \ No newline at end of file