Compare commits

..

No commits in common. "9672616f431c8c4161238fe7ad1e2b4cf3040320" and "35907a84c1293b1c7ba13c58563658b8aaee0374" have entirely different histories.

20 changed files with 13 additions and 170 deletions

View file

@ -3,7 +3,7 @@
(url "https://git.savannah.gnu.org/git/guix.git")
(branch "master")
(commit
"cce7a6d2d2b18f51d1fcab67b02a38c11d6f4f2d")
"afdbf7f271529573397474fdb8f1c9d00dceba37")
(introduction
(make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad"
@ -14,7 +14,7 @@
(url "https://gitlab.com/nonguix/nonguix")
(branch "master")
(commit
"e4fe4809f88d91eda5a7dc29e44ee649ded7e830")
"71a53faf2e1925a309b480f17e5b836740ce54bc")
(introduction
(make-channel-introduction
"897c1a470da759236cc11798f4e0a5f7d4d59fbc"
@ -25,7 +25,7 @@
(url "https://codeberg.org/hako/rosenthal.git")
(branch "trunk")
(commit
"d29af1023320c35d3d00162f4794cc01d29c8c0c")
"0d789becf6916017092f85b0d2b0a3f46e90b411")
(introduction
(make-channel-introduction
"7677db76330121a901604dfbad19077893865f35"

View file

@ -1,5 +0,0 @@
X-Mailer: aerc {{version}}
On {{dateFormat (.OriginalDate | toLocal) "Mon Jan 2, 2006 at 3:04 PM MST"}}, {{(index .OriginalFrom 0).Name}} wrote:
{{trimSignature .OriginalText | quote}}

View file

@ -50,6 +50,3 @@ export XDG_DATA_DIRS=$XDG_DATA_DIRS:/var/lib/flatpak/exports/share:/home/ryan/.l
#export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
#gpgconf --launch gpg-agent
export GPG_TTY=$(tty)
# Setup zoxide for cd command provider
eval "$(zoxide init --cmd cd bash)"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 494 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 598 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 836 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 724 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 719 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 677 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 479 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 MiB

View file

@ -189,7 +189,6 @@ bindm = $mainMod, mouse:273, resizewindow
# Bind mainMod + L to screenlocker
bind = $mainMod, L, exec, swaylock --screenshots --clock --indicator --fade-in 0.3 --effect-blur 7x5 --effect-greyscale
bind = $mainMod SHIFT, L, exec, swaylock --screenshots --clock --indicator --effect-blur 7x5 --effect-greyscale & sleep 0.5; loginctl suspend
# Keybind for screenshot
bind = $mainMod SHIFT, S, exec, grimblast copy area
@ -202,9 +201,6 @@ bind = $mainMod SHIFT, N, exec, makoctl dismiss -a
# Color picker
bind = $mainMod SHIFT, C, exec, hyprpicker -a
# LinkedIn Joke (very serious)
bind = $mainMod SHIFT CTRL ALT, L, exec, xdg-open https://linkedin.com
# Window Rules
# Firefox PiP

View file

@ -15,12 +15,6 @@
# release notes.
home.stateVersion = "22.11"; # Please read the comment before changing.
# Enable nix flakes
nix = {
package = pkgs.nix;
settings.experimental-features = [ "nix-command" "flakes" ];
};
# This value will set some environment variables to allow home-manager to
# function better outside of NixOS
nixpkgs.config.allowUnfree = true;
@ -36,12 +30,12 @@
yt-dlp
#pass
rustup
zoxide
nodePackages.pnpm
gcc
pkg-config
wttrbar
swww
hyprpicker
wl-clip-persist
gifski
waypaper

View file

@ -5,7 +5,7 @@
"modules-left": ["hyprland/workspaces", "hyprland/submap"],
"modules-center": ["hyprland/window"],
"modules-right": ["tray", "custom/spotify", "privacy", "custom/weather", "custom/mail", "custom/storage", "backlight", "bluetooth", "pulseaudio", "network", "idle_inhibitor", "battery", "clock"],
"modules-right": ["tray", "custom/spotify", "custom/weather", "custom/mail", "custom/storage", "backlight", "bluetooth", "pulseaudio", "network", "idle_inhibitor", "battery", "clock"],
"hyprland/submap": {
"format": " {}"
},
@ -59,23 +59,6 @@
"on-click": "foot -t alacritty doas nmtui",
"tooltip": false
},
"privacy": {
"icon-spacing":4,
"icon-size":18,
"transition-duration":250,
"modules": [
{
"type":"screenshare",
"tooltip":true,
"tooltip-icon-size":24
},
{
"type":"audio-in",
"tooltip":true,
"tooltip-icon-size":24
}
]
},
"pulseaudio": {
"format-alt": "{icon}",
"format": "{volume} {icon}",

View file

@ -9,13 +9,10 @@
#:use-module (guix build-system trivial)
#:use-module (guix licenses)
#:use-module (gnu packages tls)
#:use-module (gnu packages spice)
#:use-module (srfi srfi-1)
#:use-module (ryan-packages freedesktop)
#:use-module (ryan-packages wm)
#:use-module (ryan-packages virtualization)
#:use-module (ryan-packages linux)
#:use-module (ryan-packages networking)
#:use-module (rosenthal packages wm)
#:use-module (gnu packages security-token)
#:use-module (gnu services security-token)
@ -28,7 +25,6 @@
#:use-module (gnu services sound)
#:use-module (gnu services docker)
#:use-module (gnu services avahi)
#:use-module (gnu services dbus)
#:use-module (gnu services virtualization))
; Define package that installs my root ca public keys
@ -132,8 +128,8 @@
"grimblast"
"slurp"
"wl-clipboard"
;"bluez"
;"blueman"
"bluez"
"blueman"
"ldacbt"
"libfreeaptx"
"libfdk"
@ -150,7 +146,7 @@
"wireplumber"
"wireshark"
"zsh"))
(list my-ca-certs swaylock-effects-new xdg-desktop-portal-hyprland-ryan waybar-new virt-manager-ovmf bluez-ryan blueman-ryan)
(list my-ca-certs swaylock-effects-new xdg-desktop-portal-hyprland-ryan waybar-new virt-manager-ovmf)
%my-base-packages ))
;; Below is the list of system services. To search for available
@ -177,10 +173,8 @@
(libvirt libvirt-ovmf)
(unix-sock-group "libvirt")))
(service virtlog-service-type)
(simple-service 'spice-polkit polkit-service-type (list spice-gtk))
(service bluetooth-service-type
(bluetooth-configuration
(bluez bluez-ryan)
(experimental #t)
(fast-connectable? #t)))
(udev-rules-service 'fido2 libfido2 #:groups '("plugdev")))
@ -207,12 +201,6 @@
(inherit config)
(rules (cons %backlight-udev-rule
(udev-configuration-rules config)))))
(elogind-service-type config =>
(elogind-configuration
(inherit config)
(handle-power-key `ignore)
(handle-suspend-key `ignore)
(handle-lid-switch `ignore)))
(delete pulseaudio-service-type)
(delete gdm-service-type)
(delete avahi-service-type)

View file

@ -3,9 +3,10 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix gexp)
#:use-module (guix build-system meson)
#:use-module (guix build-system cmake)
#:use-module (guix build-system qt)
#:use-module (guix build-system cmake)
#:use-module (guix build utils)
#:use-module (guix build glib-or-gtk-build-system)
#:use-module (guix packages)
#:use-module (guix git-download)
#:use-module (guix utils)
@ -14,7 +15,6 @@
#:use-module (gnu packages linux)
#:use-module (gnu packages image)
#:use-module (gnu packages qt)
#:use-module (gnu packages bash)
#:use-module (gnu packages cmake)
#:use-module (gnu packages gcc)
#:use-module (gnu packages pkg-config)
@ -42,42 +42,6 @@
(append wlroots)))))
(define-public xdg-desktop-portal-hyprland-ryan
(package
(name "xdg-desktop-portal-hyprland")
(version "1.3.1")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hyprwm/xdg-desktop-portal-hyprland")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"0fdbzxanmmzrvb9wfzg1pdsnlg7dl6v5k8bl44w10n48s7bbbzn0"))))
(build-system qt-build-system)
(arguments
(list
#:tests? #f
#:configure-flags #~(list "-Dsystemd=disabled")
#:phases
;; After building the portal, we need to build the share selector using qt
#~(modify-phases %standard-phases
(add-after `unpack `fix-path
(lambda* (#:key inputs #:allow-other-keys)
(substitute* (find-files "." "\\.cp?*$")
(("/bin/sh") "sh")
(("\\<(sh|grim|hyprctl|slurp)\\>" _ cmd)
(search-input-file inputs (string-append "/bin/" cmd)))
(("\\<(hyprctl-share-picker)\\>" _ cmd)
(string-append #$output "/bin/" cmd))))))))
(native-inputs (list gcc-13 pkg-config wayland hyprlang))
(inputs (list bash-minimal grim hyprland hyprland-protocols mesa pipewire qtbase-5 sdbus-c++ slurp wayland-protocols qtwayland-5))
(home-page "")
(synopsis "test")
(description "test")
(license license:bsd-3)))
(define-public xdg-desktop-portal-hyprland-old
(package
(name "xdg-desktop-portal-hyprland")
(version "1.2.4")
@ -140,32 +104,10 @@
(description "test")
(license license:bsd-3)))
(define-public hyprlang
(package
(name "hyprlang")
(version "0.3.2")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hyprwm/hyprlang")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1sxr7whzjamjg9pcvpbxniwph5p3yy2qs87n91zqwb5y9z3gfd7m"))))
(build-system cmake-build-system)
(native-inputs
(list gcc-13))
(home-page "")
(synopsis "test")
(description "test")
(license license:gpl3)))
(define-public wl-mirror
(package
(name "wl-mirror")
(version "0.16.1")
(version "0.13.2")
(source (origin
(method git-fetch)
(uri (git-reference
@ -175,7 +117,7 @@
(file-name (git-file-name name version))
(sha256
(base32
"06i4jrip4q9j1gp81j0jr79cwfj9zdcfcr1n0jpyqlxsysppidlc"))))
"0vkd73x5r2585s3w1ckvslc2mq9qbzrm5xkwg8gpy9ydaxhn8hmp"))))
(inputs (list wayland egl-wayland mesa))
(native-inputs (list pkg-config scdoc wayland-protocols))
(build-system cmake-build-system)

View file

@ -1,35 +0,0 @@
(define-module (ryan-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-ryan
(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"))))))
bluez-ryan

View file

@ -1,14 +0,0 @@
(define-module (ryan-packages networking)
#:use-module (guix gexp)
#:use-module (guix packages)
#:use-module (gnu packages)
#:use-module (gnu packages networking)
#:use-module (ryan-packages linux)
#:use-module (guix utils))
(define-public blueman-ryan
(package
(inherit blueman)
(inputs (modify-inputs (package-inputs blueman) (delete "bluez") (prepend bluez-ryan)))))
blueman-ryan

View file

@ -1,15 +1,11 @@
(define-module (ryan-packages wm)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix download)
#:use-module (guix packages)
#:use-module (guix gexp)
#:use-module (gnu packages)
#:use-module (guix build-system cmake)
#:use-module (gnu packages python)
#:use-module (gnu packages audio)
#:use-module (gnu packages glib)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages gtk)
#:use-module (gnu packages llvm)
#:use-module (gnu packages gcc)
@ -52,3 +48,4 @@
#:configure-flags #~(list "--wrap-mode=nodownload" "-Dexperimental=true")))
(inputs (modify-inputs (package-inputs waybar) (delete "gtkmm") (prepend gtkmm-ryan))))) ;(prepend python cava catch2 gtkmm)))))
;(native-inputs (modify-inputs (package-native-inputs waybar) (prepend gcc-13)))))
swaylock-effects-new