diff --git a/home-config/alacritty/alacritty.yml b/home-config/alacritty/alacritty.yml index 37c52d4..c7d7850 100644 --- a/home-config/alacritty/alacritty.yml +++ b/home-config/alacritty/alacritty.yml @@ -4,10 +4,10 @@ import: # Window settings window: - opacity: .85 + opacity: 0.85 padding: - x: 5 - y: 5 + x: 10 + y: 10 # Set font font: diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm index 3b9edaa..0b6b8a1 100644 --- a/home-config/home-configuration.scm +++ b/home-config/home-configuration.scm @@ -28,65 +28,80 @@ (home-environment ;; Below is the list of packages that will show up in your ;; Home profile, unser ~/.guix-home/profile. - (packages (append (specifications->packages (list "xdg-utils" - "mako" - "vscodium" - "libnotify" - "i3-autotiling" - "wofi" - "qrencode" - "sassc" - "binutils" - "clang-toolchain" - "racket" - "libreoffice" - "gnupg" - "pavucontrol" - "bind:utils" - "syncthing" - "imv" - "unzip" - "p7zip" + (packages (append (specifications->packages (list "unzip" ;; cli command packages + "p7zip" ;; pacakges usefull in the terminal "curl" "htop" "curl" + "mpv" + "qrencode" + "tree" + "rlwrap" + "netcat" + "jq" + "pfetch" + "grim" + "slurp" + "bind:utils" + "zsh" + + + "nasm" ;; devlopment packages + "rust" ;; packages usefull for coding and devlopment + "gcc-toolchain" + "racket" + "python" + "node" + "make" + "pkg-config" + + + "ripgrep" ;; lunar vim packages + "tree-sitter-cli" ;; vimmmmmmm + "python-pynvim" + "fd" + + + "retroarch" ;; gayming + "steam" ;; gayyyyymeeeesss :3 + "wine-staging" + "winetricks" + + + "swayfx" ;; window manager packages + "swaybg" ;; time to swayyyyyy + "swayidle" + "wl-clipboard" + "libnotify" + "xdg-utils" + "brightnessctl" + "i3-autotiling" + + + "gnome-themes-extra" ;; themes + "adwaita-icon-theme" ;; gtk stuff idk + "hicolor-icon-theme" + + + "alacritty" ;; gui applicatiosn + "wlogout" ;; applications that gui :0 + "waybar" + "mako" + "wofi" + "libreoffice" + "imv" "zathura" "zathura-pdf-mupdf" "gimp" "weechat" - "mpv" - "git" - "pinentry" - "ungoogled-chromium" "element-desktop" "nm-tray" - "pfetch" - "acpi" - "brightnessctl" - "neofetch" - "python" - "make" - "tree" - "rlwrap" - "netcat" - "ripgrep" - "fd" - "nasm" - "wine-staging" - "winetricks" - "steam" - "node" - "ncurses" - "jq" - "rust" - "gcc-toolchain" - "openssl" - "pkg-config" - "tree-sitter-cli" - "python-pynvim")) - - (list neovim-new - easyeffects + "pavucontrol" + "syncthing" + "pinentry" + "ungoogled-chromium")) + (list neovim-new ;; custom made packages + easyeffects ;; thanks guix for not having them or doing them wrong >:( firefox-wayland-new lavanda-gtk-theme zsh-autosuggestions diff --git a/home-config/lvim/config.lua b/home-config/lvim/config.lua index 09776ff..c39dd6f 100644 --- a/home-config/lvim/config.lua +++ b/home-config/lvim/config.lua @@ -17,6 +17,7 @@ lvim.plugins = { lvim.log.level = "warn" lvim.format_on_save.enabled = false lvim.colorscheme = "catppuccin" +lvim.transparent_window = true -- Keybinds lvim.leader = "space" diff --git a/home-config/sway/config b/home-config/sway/config index 497b549..50d3964 100755 --- a/home-config/sway/config +++ b/home-config/sway/config @@ -22,8 +22,8 @@ set $radius 0 set $shadows on set $shadow_blur 15 set $blur enable -set $blur_radius 4 -set $blur_passes 2 +set $blur_radius 10 +set $blur_passes 3 # Set browser set $browser firefox diff --git a/home-config/sway/config.d/workspaces b/home-config/sway/config.d/workspaces index fe87bc1..2d5b378 100644 --- a/home-config/sway/config.d/workspaces +++ b/home-config/sway/config.d/workspaces @@ -21,7 +21,6 @@ bindsym $mod+6 workspace number 6 bindsym $mod+7 workspace number 7 bindsym $mod+8 workspace number 8 bindsym $mod+9 workspace number 9 -bindsym $mod+0 workspace number 10 # Move focused container to workspace bindsym $mod+Shift+1 move container to workspace number 1 @@ -33,7 +32,6 @@ bindsym $mod+Shift+6 move container to workspace number 6 bindsym $mod+Shift+7 move container to workspace number 7 bindsym $mod+Shift+8 move container to workspace number 8 bindsym $mod+Shift+9 move container to workspace number 9 -bindsym $mod+Shift+0 move container to workspace number 10 # Layout stuff: diff --git a/home-config/sway/scripts.d/auto.sh b/home-config/sway/scripts.d/auto.sh index 68a28e2..2bbd14b 100755 --- a/home-config/sway/scripts.d/auto.sh +++ b/home-config/sway/scripts.d/auto.sh @@ -7,12 +7,12 @@ mako & nm-applet --indicator & -GTK_THEME= waybar & - autotiling & /usr/bin/gnome-keyring-daemon --foreground & +GTK_THEME=">:(" waybar & + discord --enable-features=UseOzonePlatform --ozone-platform=wayland & element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland & #thunderbird & diff --git a/home-config/sway/scripts.d/project.sh b/home-config/sway/scripts.d/project.sh index afb8507..fbcd0cc 100755 --- a/home-config/sway/scripts.d/project.sh +++ b/home-config/sway/scripts.d/project.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +PID=$$ + get_mode() { swaymsg -t get_outputs -r | jq ".[$1].modes[0]" } @@ -7,7 +9,7 @@ get_mode() { get_name() { swaymsg -t get_outputs -r | jq -r ".[$1].name" } - +sg get_width() { get_mode "$1" | jq ".width" } @@ -60,16 +62,14 @@ get_id() { echo "$i" exit 0 elif [ "$NAME" == "null" ]; then + notify-send -u critical -t 3000 "Sway" "Failed to get display" + kill $PID exit 1 fi ((i=i+1)) done } -die() { - notify-send -u critical -t 3000 "Sway" "Failed to get display" -} - PRIMARY=$(get_id "eDP-1") EXTERNAL=$(get_id "DP-1" || get_id "HDMI-1") diff --git a/home-config/waybar/config b/home-config/waybar/config index 68b2adc..881ea04 100644 --- a/home-config/waybar/config +++ b/home-config/waybar/config @@ -1,5 +1,6 @@ { "height": 24, + "position": "top", "spacing": 4, "modules-left": [ "sway/workspaces", diff --git a/home-config/waybar/style.css b/home-config/waybar/style.css index 2452a0b..b405649 100644 --- a/home-config/waybar/style.css +++ b/home-config/waybar/style.css @@ -32,6 +32,8 @@ button { } #workspaces button { + margin: 1px 0px; + padding: 0px 5px; color: #c7c6c3; background-color: rgba(0, 0, 0, 0); } diff --git a/modules/home-config/base-system.scm b/modules/home-config/base-system.scm index e35e0fa..486b48c 100644 --- a/modules/home-config/base-system.scm +++ b/modules/home-config/base-system.scm @@ -23,11 +23,9 @@ #:use-module (gnu services ssh) #:use-module (gnu services nix) #:use-module (gnu services sound) - #:use-module (gnu services docker) #:use-module (gnu services avahi) #:use-module (gnu services spice) #:use-module (gnu services virtualization) - #:use-module (home-services ntp) #:use-module (home-packages wm) #:use-module (home-packages certs) #:use-module (home-packages virtualization)) @@ -63,56 +61,37 @@ (group "users") (home-directory "/home/tylerm") (shell (file-append zsh "/bin/zsh")) - (supplementary-groups '("wheel" "audio" "lp" "docker" "plugdev" "libvirt" "kvm" "netdev" "video" "tty"))) + (supplementary-groups '("wheel" "audio" "lp" "plugdev" "libvirt" "kvm" "netdev" "video" "tty"))) %base-user-accounts)) - (packages (append (map specification->package (list "swayfx" - "swaybg" - "wlogout" - "sof-firmware" - "intel-microcode" - "alsa-utils" - "chrony" - "swayidle" - "dconf" - "alacritty" - "gnome-themes-extra" - "adwaita-icon-theme" - "hicolor-icon-theme" - "git" - "nss-certs" - "gvfs" - "gnupg" - "light" - "waybar" - "avahi" - "mako" - "grim" - "slurp" - "wl-clipboard" - "bluez" - "blueman" - "opendoas" - "wireguard-tools" - "xdg-desktop-portal" - "xdg-desktop-portal-wlr" - "v4l2loopback-linux-module" - "docker" - "linux-pam" - "pulseaudio" - "libx11" - "xorg-server-xwayland" - "fprintd" - "wireplumber" - "qemu" - "spice" - "xf86-video-qxl" - "zsh" + (packages (append (map specification->package (list "sof-firmware" ;; core system + "intel-microcode" ;; kernel utils,drivers, firmware, etc. "mesa" "mesa-utils" - "glu" - "vulkan-loader" - "vulkan-validationlayers" + "linux-pam" + + + "openssl" ;; system packages + "ncurses" ;; usefull packages needed by scripts or packages + "acpi" + "git" + "binutils" + "nss-certs" + "opendoas" + "chrony" + "gnupg" + + + "alsa-utils" ;; sound and bluetooth + "pulseaudio" ;; i am the one who knocks (and you hear it :3) + "bluez" + "blueman" + "wireplumber" + + + "glu" ;; drivers or modules s runtime packages or headers + "vulkan-loader" ;; usefull for devlopmet as headers or runtime dependicies with those headers + "vulkan-validationlayers" ;; mostly graphics "vulkan-tools" "vulkan-headers" "spirv-tools" @@ -120,9 +99,21 @@ "sdl2" "openal" "freealut" - "wxwidgets" - "libpcap" + "xf86-video-qxl" "v4l2loopback-linux-module" + + + "xdg-desktop-portal" ;; graphics + "xdg-desktop-portal-wlr" ;; xdg and other display utilities + "xorg-server-xwayland" + "libx11" + + + "wireguard-tools" ;; misc + "qemu" ;; shit i cant sort, they exist + "dconf" + "avahi" + "libpcap" "neovim")) (list swaylock-effects-new virt-manager-new freya-ca-certs) %my-base-packages)) @@ -147,8 +138,6 @@ (avahi-configuration (publish? #f) ;; do not advertise this machiene (publish-workstation? #f))) ; do not advertise, I want this to be as silent as possible - (service docker-service-type) - ;(service chrony-sericve-type) (service nix-service-type) (service libvirt-service-type (libvirt-configuration diff --git a/modules/home-packages/golang.scm b/modules/home-packages/golang.scm deleted file mode 100644 index 3fd8fd2..0000000 --- a/modules/home-packages/golang.scm +++ /dev/null @@ -1,833 +0,0 @@ -(define-module (home-packages golang) - #: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 package-management) - #:use-module (gnu packages build-tools) - #:use-module (gnu packages) - #:use-module (guix packages) - #:use-module (gnu packages) - #:use-module (guix git-download) - #:use-module (guix download) - #:use-module (gnu packages golang) - #:use-module (guix build-system go) - #:use-module (guix build-system trivial) - #:use-module (guix build utils) - #:use-module (guix utils)) - -(define (go-package name version url hash path inputs) - (package - (name name) - (version version) - (source (origin - (method git-fetch) - (uri (git-reference - (url url) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - hash)))) - (build-system go-build-system) - (propagated-inputs inputs) - (arguments - `(#:go ,go-1.20 - #:import-path ,path - #:phases %standard-phases - #:install-source? #t - #:tests? #f)) - (synopsis (string-append name " go package")) - (description (string-append name " go package")) - (home-page url) - (license license:expat))) - -(define (go-version-go-package name version url hash path inputs) - (package - (inherit (go-package name version url hash path inputs)) - (source (origin - (method git-fetch) - (uri (git-reference - (url url) - (commit (go-version->git-ref version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - hash)))))) - -(define (commit-go-package name comm url hash path inputs) - (package - (inherit (go-package name comm url hash path inputs)) - (source (origin - (method git-fetch) - (uri (git-reference - (url url) - (commit comm))) - (file-name (git-file-name name comm)) - (sha256 - (base32 - hash)))))) - - -(define (source-only gopackage) - (package - (inherit gopackage) - (arguments - (substitute-keyword-arguments (package-arguments gopackage) - ((#:phases phases) - #~(modify-phases #$phases - (delete 'build))))))) - -(define (set-go gopackage gover) - (package - (inherit gopackage) - (arguments - (substitute-keyword-arguments (package-arguments gopackage) - ((#:go _) gover))))) - -(define (set-unpack gopackage unpack) - (package - (inherit gopackage) - (arguments - (substitute-keyword-arguments (package-arguments gopackage) - ((#:unpack-path _) unpack))))) - -(define (set-inputs gopackage inputs) - (package - (inherit gopackage) - (native-inputs inputs))) - - -(define go-github-com-matttproud-golang-protobuf-extensions - (source-only (go-package - "go-github-com-matttproud-golang-protobuf-extensions" - "2.0.0" - "https://github.com/matttproud/golang_protobuf_extensions" - "0jw4vjycwx0a82yvixmp25805krdyqd960y8lnyggllb6br0vh41" - "github.com/matttproud/golang_protobuf_extensions" - (list)))) - -(define go-github-com-beorn7-perks - (source-only (go-package - "go-github-com-beorn7-perks" - "1.0.1" - "https://github.com/beorn7/perks" - "17n4yygjxa6p499dj3yaqzfww2g7528165cl13haj97hlx94dgl7" - "github.com/beorn7/perks" - (list)))) - -(define go-github-com-golang-protobuf - (source-only (go-package - "go-github-com-golang-protobuf" ; name - "1.5.3" ; version - "https://github.com/golang/protobuf" ; url - "03f1w2cd4s8a3xhl61x7yjx81kbzlrjpvnnwmbhqnz814yi7h43i" ; hash - "github.com/golang/protobuf" ; path - (list)))) ; inputs - -(define go-go-uber-org-multierr - (go-package - "go-go-uber-org-multierr" - "1.11.0" - "https://github.com/uber-go/multierr" - "1s6skad93nbsq4b0sy5dsgacrdh2kzg0p8wjlhvff49vasqsi3qx" - "go.uber.org/multierr" - (list))) - -(define go-go-uber-org-zap - (go-package - "go-go-uber-org-zap" - "1.26.0" - "https://github.com/uber-go/zap" - "1aw7zba4f06835vm6l6j1y1jaz2p92gi2nv52hfn1a62gixj8nq4" - "go.uber.org/zap" - (list go-go-uber-org-multierr))) - -(define go-github-com-cespare-xxhash - (go-package - "go-github-com-cespare-xxhash" - "2.2.0" - "https://github.com/cespare/xxhash" - "055xvgyv78xl6bdj8kgy0105n9cq33w4rb0sg84lp9r85i9qx2l5" - "github.com/cespare/xxhash" - (list))) - -(define go-golang-org-x-exp - (source-only (go-version-go-package - "go-golang-org-x-exp" ; name - "v0.0.0-20230310171629-522b1b587ee0" ; version - "https://go.googlesource.com/exp" ; url - "054hbk826n3kprk75m19ik89mnicbshq6kdiwd60xxfczdjf88rn" ; hash - "golang.org/x/exp" ; path - (list)))) ; inputs - -(define go-golang-org-x-sync - (source-only (go-package - "go-golang-org-x-text" ; namie - "0.3.0" ; version - "https://go.googlesource.com/sync" ; url - "0jmkqah45db9nz6yjdd8vvanpjfzb5lsv6bxf0d1dih4zhp4l8kc" ; hash - "golang.org/x/sync" ; path - (list)))) ; inputs - -(define go-golang-org-x-text - (source-only (go-package - "go-golang-org-x-text" ; namie - "0.11.0" ; version - "https://go.googlesource.com/text" ; url - "1a0d6f9qqzd9njd8xb59mjrfv5jrz8130crcxbqaiy7lk434nq1k" ; hash - "golang.org/x/text" ; path - (list)))) ; inputs - -(define go-golang-org-x-term - (source-only (go-package - "go-golang-org-x-term" ; namie - "0.10.0" ; version - "https://go.googlesource.com/term" ; url - "19abybnsqix924d9ak4p93bgq1312zp1yk11bilrrmsjplhbrzqf" ; hash - "golang.org/x/term" ; path - (list)))) ; inputs - -(define go-golang-org-x-net - (source-only (go-package - "go-golang-org-x-net" ; name - "0.14.0" ; version - "https://go.googlesource.com/net" ; url - "0pk9pfd5n5hlg5zx1ab3gfzi6lfcs41dfds6fyn661g5xs00l9s1" ; hash - "golang.org/x/net" ; path - (list)))) ; inputs - - -(define go-golang-org-x-crypto - (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 - -(define go-golang-org-x-sys - (source-only (go-package - "go-golang-org-x-sys" ; name - "0.11.0" ; version - "https://go.googlesource.com/sys" ; url - "1pp0479l9w92kr6p97d19s8y0hj16gblg4hvdqqzcrf3d9mr4cs3" ; hash - "golang.org/x/sys" ; path - (list)))) ; inputs - -(define go-github-com-quic-go-qtls-go1-20 - (go-package - "go-github-com-quic-go-qtls-go1-20" ; name - "0.3.4" ; version - "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 - go-golang-org-x-sys))) - -(define go-github-com-google-go-cmp - (source-only (go-package - "go-github-com-google-go-cmp" - "0.5.9" - "https://github.com/google/go-cmp" - "0a13m7l1jrysa7mrlmra8y7n83zcnb23yjyg3a609p8i9lxkh1wm" - "github.com/google/go-cmp/go" - (list)))) - -(define go-github-com-hashicorp-go-uuid - (go-package - "go-github-com-hashicorp-go-uuid" - "1.0.3" - "https://github.com/hashicorp/go-uuid" - "0wd4maaq20alxwcvfhr52rzfnwwpmc2a698ihyr0vfns2sl7gkzk" - "github.com/hashicorp/go-uuid" - (list))) - -(define go-github-com-google-uuid - (go-package - "go-github-com-google-uuid" - "1.3.1" - "https://github.com/google/uuid" - "1pd1lkl50prswl91dpwml66s2ildjqipnsqi9a7m25lv3l008417" - "github.com/google/uuid" - (list))) - -(define go-github-com-marten-seemann-qtls-go1-19 - (set-go (go-package - "go-github-com-marten-seemann-qtls-go1-19" - "0.3.3" - "https://github.com/quic-go/qtls-go1-19" - "07i56533033cd0kn67fvyyvwbmfwfdk3y5x5wl4y00zplyhhys9q" - "github.com/marten-seemann/qtls-go1-19" - (list go-golang-org-x-sys - go-golang-org-x-crypto)) - go-1.19)) - -(define go-github-com-lucas-clemente-quic-go - (set-go (go-package - "go-github-com-lucas-clemente-quic-go" - "0.31.1" - "https://github.com/quic-go/quic-go" - "1vn72wlcyb4j2lw3pfqfvhb3pz7r61j3sddj4r1sf32vc3csis97" - "github.com/lucas-clemente/quic-go" - (list go-golang-org-x-crypto - go-golang-org-x-net - go-golang-org-x-exp - go-golang-org-x-sys - go-github-com-marten-seemann-qtls-go1-19)) - go-1.19)) - -(define go-github-com-quic-go-quic-go - (go-package - "go-github-com-quic-go-quic-go" ; name - "0.39.0" ; version - "https://github.com/quic-go/quic-go" ; url - "0jiwh97xpvswrbq5glnafc2jc3ybpl17ffa0cg9x3f03raa2q8vg" ; hash - "github.com/quic-go/quic-go" ; path - (list go-golang-org-x-crypto ; inputs - go-golang-org-x-exp - go-golang-org-x-net - go-golang-org-x-sys - go-github-com-quic-go-qtls-go1-20))) - -(define go-github-com-prometheus-procfs - (go-package - "go-github-com-prometheus-procfs" ; name - "0.8.0" ; version - "https://github.com/prometheus/procfs" ; url - "0k2d27pm6q6im42x8ikwz0d4sb31wn6rvfs9wlf51d9gldncmpqz" ; hash - "github.com/prometheus/procfs" ; path - (list go-golang-org-x-sys))) ; inputs - -(define go-github-com-prometheus-client-model - (source-only (go-package - "go-github-com-prometheus-client-model" ; name - "0.4.0" ; version - "https://github.com/prometheus/client_model" ; url - "0w3hxsc0qmb5vdm8lyhsvkm0g9yk81vrpcyf31haysvid8yjrzg0" ; hash - "github.com/prometheus/client_model" ; path - (list go-github-com-golang-protobuf)))) ; inputs - -(define go-github-com-prometheus-common - (source-only (go-package - "go-github-com-prometheus-common" ; name - "0.37.0" ; version - "https://github.com/prometheus/common" ; url - "161ayg76ag1h21kaf0qycpy7cizvy3xrm0dn598hj91n44v4z0hf" ; hash - "github.com/prometheus/common" ; path - (list go-github-com-golang-protobuf ; inputs - go-github-com-matttproud-golang-protobuf-extensions - go-github-com-prometheus-client-model)))) - -(define go-github-com-prometheus-client-golang - (source-only (go-package - "go-github-com-prometheus-client-golang" ; name - "1.14.0" ; version - "https://github.com/prometheus/client_golang" ; url - "041br6n309bajwdv871f69fwy1yq3vk46rmzxnkr1ldpq1bhd63n" ; hash - "github.com/prometheus/client_golang" ; path - (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 - "2.2.5" ; version - "https://github.com/klauspost/cpuid" ; url - "127jlppxs226lnq499rjnjyzgmp849xlxhq7380w2ypdkhvafni1" ; hash - "github.com/klauspost/cpuid/v2" ; path - (list))) ; inputs - -(define go-github-com-libdns-libdns - (go-package - "go-github-com-libdns-libdns" ; name - "0.2.1" ; version - "https://github.com/libdns/libdns" ; url - "1ix668h4n2n9iph4xiznzdfw7hy0ijy906mvnys4kq9f0v9ih4bg" ; hash - "github.com/libdns/libdns" ; path - (list))) ; inputs - -(define go-github-com-mholt-acmez - (go-package - "go-github-com-mholt-acmez" ; name - "1.2.0" ; version - "https://github.com/mholt/acmez" ; url - "1wzkgbgnp23vbcz4nc3c8x7vi1lkqp36485f7g05zbshc7hzby6d" ; hash - "github.com/mholt/acmez" ; path - (list go-go-uber-org-zap ; inputs - go-golang-org-x-crypto - go-golang-org-x-text - go-golang-org-x-net))) - -(define go-github-com-miekg-dns - (go-package - "go-github-com-miekg-dns" ; name - "1.1.50" ; version - "https://github.com/miekg/dns" ; url - "1svvx9qamy3hy0ms8iwbisqjmfkbza0zljmds6091siq150ggmws" ; hash - "github.com/miekg/dns" ; path - (list go-golang-org-x-net ; inputs - go-golang-org-x-sys))) - -(define go-github-com-zeebo-blake3 - (go-package - "go-github-com-zeebo-blake3" ; name - "0.2.3" ; version - "https://github.com/zeebo/blake3" ; url - "1pkk97d1jwfcg3hs9g09zbwn31l96icx1vk4d9l2rhcvfw0aw0fc" ; hash - "github.com/zeebo/blake3" ; path - (list go-github-com-klauspost-cpuid-v2))) ; inputs - -(define go-github-com-caddy-certmagic - (go-package - "go-github-com-caddy-certmagic" ; name - "0.19.2" ; version - "https://github.com/caddyserver/certmagic" ; url - "07a1xiynbbaqm7qzg0q1xhvab99x8mvzr2rw68npxws4dshgdv5f" ; hash - "github.com/caddyserver/certmagic" ; path - (list go-github-com-klauspost-cpuid-v2 ; inputs - go-github-com-libdns-libdns - go-go-uber-org-zap - go-golang-org-x-crypto - go-github-com-mholt-acmez - go-github-com-zeebo-blake3 - go-github-com-miekg-dns - go-golang-org-x-sys - go-golang-org-x-net - go-golang-org-x-text))) - -(define go-github-com-quic-go-qpack - (go-package - "go-github-com-quic-go-qpack" ; name - "0.4.0" ; version - "https://github.com/quic-go/qpack" ; url - "00mjz445hhx4yar5l8p21bpp4d06jyg2ajw0ax7bh64d37l4kx39" ; hash - "github.com/quic-go/qpack" ; path - (list go-golang-org-x-net))) ; inputs - -(define go-google-golang-org-protobuf - (source-only (go-package - "go-google-golang-org-protobuf" ; name - "1.31.0" ; version - "https://go.googlesource.com/protobuf" ; url - "1xf18kzz96hgfy1vlbnydrizzpxkqj2iamfdbj3dx5a1zz5mi8n0" ; hash - "google.golang.org/protobuf" ; path - (list go-github-com-google-go-cmp ; inputs - go-github-com-golang-protobuf)))) - -(define go-github-com-google-cel-go - (source-only (go-package - "go-github-com-google-cel-go" - "0.18.1" - "https://github.com/google/cel-go" - "07jp5n266jyk74zaj1n1g15apn2nw1lr6v5zmi13fhir91k6sybr" - "github.com/google/cel-go" - (list)))) - -(define go-github-com-klauspost-compress - (go-package - "go-github-com-klauspost-compress" - "1.17.0" - "https://github.com/klauspost/compress" - "1fjch04mz11lyikzw1xmm541wc5fkvxk18a9wgzxvdvszs84xfjn" - "github.com/klauspost/compress" - (list))) - -(define go-github-com-rs-xid - (go-package - "go-github-com-rs-xid" - "1.2.1" - "https://github.com/rs/xid" - "1vgw1dikqw273awcci6pzifs7shkl5ah4l88j1zjbnpgbiwzlx9j" - "github.com/rs/xid" - (list))) - -(define go-github-com-micromdm-scep - (source-only (go-package - "go-github-com-micromdm-scep" - "2.1.0" - "https://github.com/micromdm/scep" - "1a3knshfmh8lniz098ir0rl7ixb2a0zwvdlwy22a6q8fsicfk40q" - "github.com/micromdm/scep" - (list)))) - -(define go-github-com-smallstep-certificates - (source-only (go-package - "go-github-com-smallstep-certificates" - "0.25.0" - "https://github.com/smallstep/certificates" - "1f7ignpnsj5q1qfdn040hjh9gzix4bg88wspjzx0qms9s9c42n1g" - "github.com/smallstep/certificates" - (list go-github-com-rs-xid - go-github-com-micromdm-scep)))) - -(define go-github-com-smallstep-truststore - (source-only (go-package - "go-github-com-smallstep-truststore" - "0.12.1" - "https://github.com/smallstep/truststore" - "06a73r4h69q3626x14xcc4rkiparyvhwbn19g22y2r9pgvxirfi9" - "github.com/smallstep/truststore" - (list)))) - -(define gopkg-in-square-go-jose-v2 - (go-package - "gopkg-in-square-go-jose-v2" - "2.6.0" - "https://github.com/square/go-jose" - "1b1nhqxfmhzwrfk7pkvp2w3z3d0pf5ir00vizmy2d4xdbnldn70r" - "gopkg.in/square/go-jose.v2" - (list go-golang-org-x-crypto))) - -(define go-filippo-io-edwards25519 - (go-package - "go-filippo-io-edwards25519" - "1.0.0" - "https://github.com/FiloSottile/edwards25519" - "01m8hpaj0cwp250f7b0din09cf8j6j5y631grx67qfhvfrmwr1zr" - "filippo.io/edwards25519" - (list))) - -(define go-github-com-masterminds-goutils - (go-package - "go-github-com-masterminds-goutils" - "1.1.1" - "https://github.com/Masterminds/goutils" - "09m4mbcdlv9ng3xcrmjlxi0niavby52y9nl2jhjnbx1xxpjw0jrh" - "github.com/Masterminds/goutils" - (list))) - -(define go-github-com-shopspring-decimal - (go-package - "go-github-com-shopspring-decimal" - "1.3.1" - "https://github.com/shopspring/decimal" - "1w1wjv2aqyqp22s8gc2nxp8gk4h0dxvp15xsn5lblghaqjcd239h" - "github.com/shopspring/decimal" - (list))) - -(define go-github-com-imdario-mergo - (go-package - "go-github-com-imdario-mergo" - "1.0.0" - "https://github.com/imdario/mergo" - "037k2bd97vnbyhn2sczxk0j6ijmv06n1282f76i3ky73s3qmqnlf" - "github.com/imdario/mergo" - (list))) - -(define go-github-com-huandu-xstrings - (go-package - "go-github-com-huandu-xstrings" - "1.4.0" - "https://github.com/huandu/xstrings" - "0y6afn5yp5pw1gjc4a6gxxkj753w2aaw46nwbi7scnqdqlb2l3cp" - "github.com/huandu/xstrings" - (list))) - -(define go-github-com-mitchellh-reflectwalk - (go-package - "go-github-com-mitchellh-reflectwalk" - "1.0.2" - "https://github.com/mitchellh/reflectwalk" - "1nxgb4gskzv045539vb312n0a443308dvh1akz7vi6x1l0z46zsm" - "github.com/mitchellh/reflectwalk" - (list))) - -(define go-github-com-mitchellh-copystructure - (go-package - "go-github-com-mitchellh-copystructure" - "1.2.0" - "https://github.com/mitchellh/copystructure" - "1izw243b3r03nvgnnxvk706l3s3v3q7k69kq3n4asnzjkcymq7sm" - "github.com/mitchellh/copystructure" - (list go-github-com-mitchellh-reflectwalk))) - -(define go-github-com-spf13-cast - (go-package - "go-github-com-spf13-cast" - "1.5.1" - "https://github.com/spf13/cast" - "05ahl8kicdhz95rxraavqsfsb8bvj03abpk8zclypy1gchc0vm7y" - "github.com/spf13/cast" - (list))) - -(define go-github-com-masterminds-semver - (go-package - "go-github-com-masterminds-semver" - "3.2.1" - "https://github.com/Masterminds/semver" - "1h4c647dgq6k5q78j3m98ccdrzd7kbcq4ahdy25j72rbxjmci8al" - "github.com/Masterminds/semver" - (list))) - -(define go-github-com-masterminds-sprig - (go-package - "go-github-com-masterminds-sprig" - "3.2.2" - "https://github.com/Masterminds/sprig" - "0wfbzhmv971si9gx9c77gz89b9va2y03bhdmds9hzal4i7cccw2x" - "github.com/Masterminds/sprig" - (list go-github-com-masterminds-goutils - go-github-com-masterminds-semver - go-github-com-google-uuid - go-golang-org-x-crypto - go-github-com-shopspring-decimal - go-github-com-huandu-xstrings - go-github-com-imdario-mergo - go-github-com-spf13-cast - go-github-com-mitchellh-copystructure))) - -(define go-step-sm-crypto - (source-only (go-package - "go-step-sm-crypto" - "0.35.1" - "https://github.com/smallstep/crypto" - "0fb77246iyxhw91d52ph6b3bl32182xs3cw1fzhs884km9wary8v" - "go.step.sm/crypto" - (list gopkg-in-square-go-jose-v2 - go-filippo-io-edwards25519 - go-github-com-masterminds-sprig)))) - -(define go-step-sm-cli-utils - (source-only (go-package - "go-step-sm-cli-utils" - "0.8.0" - "https://github.com/smallstep/cli-utils" - "1239ivvmjvmmy5jkv6n7zg9qpk5wlnsb4prw4k3fx3nycx8nd3pa" - "go.step.sm/cli-utils" - (list)))) - -(define go-github-com-go-logr-logr - (go-package - "go-github-com-go-logr-logr" - "1.2.4" - "https://github.com/go-logr/logr" - "1ara5lacbzwqw8m6800837jgf5gbcfj6namm0zwzb45xqgfl64c0" - "github.com/go-logr/logr" - (list))) - -(define go-github-com-go-logr-stdr - (go-package - "go-github-com-go-logr-stdr" - "1.2.2" - "https://github.com/go-logr/stdr" - "1dl2rzvjacwqlnvw7azrxqbh4jvzaq8v399f6drs146l39ss21c1" - "github.com/go-logr/stdr" - (list go-github-com-go-logr-logr))) - -(define go-github-com-grpc-ecosystem-grpc-gateway - (source-only (go-package - "go-github-com-grpc-ecosystem-grpc-gateway" - "2.18.0" - "https://github.com/grpc-ecosystem/grpc-gateway" - "0rkymxrwm4bk2sizawnrmn54jjkiwlzh2mxrsz435lhrzk3zfmhm" - "github.com/grpc-ecosystem/grpc-gateway" - (list)))) - -(define go-google-golang-org-genproto - (source-only (commit-go-package - "go-google-golang-org-genproto" - "e6e6cdab5c137738d2c1bc9d66183cfbd9f440d1" - "https://github.com/googleapis/go-genproto" - "1c7dm3iwc0k25ynxqnzfqf9mn47fw5sy4sbgm5v4akg1klzkvkpg" - "google.golang.org/genproto" - (list)))) - -(define go-google-golang-org-grpc - (go-package - "go-google-golang-org-grpc" - "1.58.2" - "https://github.com/grpc/grpc-go" - "1qchzb1kv03mjd5k4j5lcr3arwvlridgfmsdlv9grmnpx7caw8sf" - "google.golang.org/grpc" - (list go-google-golang-org-protobuf - go-golang-org-x-sys - go-golang-org-x-net - go-golang-org-x-text - go-google-golang-org-genproto))) - -(define go-opentelemetry-io-proto-otlp - (source-only (set-unpack (go-package - "go-opentelemetry-io-proto-otlp" - "1.0.0" - "https://github.com/open-telemetry/opentelemetry-proto-go" - "0w69grih4qv8pw6ywpa9f675mixrxhqzcqafrp6ibrd7z3mdzfyq" - "go.opentelemetry.io/proto" - (list go-github-com-grpc-ecosystem-grpc-gateway)) - "go.opentelemetry.io/proto/otlp"))) - -(define go-opentelemetry-io-otel - (go-package - "go-opentelemetry-io-otel" - "1.19.0" - "https://github.com/open-telemetry/opentelemetry-go" - "06lmf7pnxp9b5ciy5yv7qwzph8k7w2m48g7p72fl5y3g57lh8v7w" - "go.opentelemetry.io/otel" - (list go-github-com-go-logr-stdr - go-opentelemetry-io-proto-otlp - go-google-golang-org-grpc))) - -(define go-github-com-yuin-goldmark - (go-package - "go-github-com-yuin-goldmark" - "1.5.5" - "https://github.com/yuin/goldmark" - "0kziqic2rgnb0fyng9rmlg8akk4bv07qhscy4n6z45f235r1l955" - "github.com/yuin/goldmark" - (list))) - -(define go-github-com-dlclark-regexp2 - (go-package - "go-github-com-dlclark-regexp2" - "1.10.0" - "https://github.com/dlclark/regexp2" - "137jrvg6w6ivc0qm4zgk3hjf06kfl900m8730hbd5xnhxzyf6717" - "github.com/dlclark/regexp2" - (list))) - -(define go-github-com-alecthomas-chroma - (go-package - "go-github-com-alecthomas-chroma" - "2.7.0" - "https://github.com/alecthomas/chroma" - "0i4ck23gn0v7x6r8wa2k7qiwhxpxqqnaknb9iy9rz8pjcj14ai75" - "github.com/alecthomas/chroma/v2" - (list go-github-com-dlclark-regexp2))) - -(define go-github-com-yuin-goldmark-highlighting - (set-go (set-inputs (go-version-go-package - "go-github-com-yuin-goldmark-highlighting" - "v2.0.0-20230729083705-37449abec8cc" - "https://github.com/yuin/goldmark-highlighting" - "163jbi8si9qxcabzni39qypj495y48rabkkchc03ay68p19v160y" - "github.com/yuin/goldmark-highlighting/v2" - (list)) - (list (set-go (go-package - "go-github-com-yuin-goldmark" - "1.4.15" - "https://github.com/yuin/goldmark" - "0qs08hy288zdr0xpd49rp8h1048s1n7frmzcmb8diqpcv5hvbmgm" - "github.com/yuin/goldmark" - (list)) - go-1.14) - (set-go (go-package - "go-github-com-alecthomas-chroma" - "2.2.0" - "https://github.com/alecthomas/chroma" - "0rxsi4kdf363p6ysvxvgndbvcb0a5zgm0iaxkkqllj3m8nfwmzlk" - "github.com/alecthomas/chroma/v2" - (list go-std-1.17 go-github-com-dlclark-regexp2)) - go-1.14))) - go-1.14)) - -(define go-github-com-mitchellh-go-ps - (go-package - "go-github-com-mitchellh-go-ps" - "1.0.0" - "https://github.com/mitchellh/go-ps" - "0ipcbz66x7q8xczi7cyfq06y7n7v0syvkp730vn9jrn7s8f5ag0z" - "github.com/mitchellh/go-ps" - (list))) - -(define go-github-com-tailscale-tscert - (commit-go-package - "go-github-com-tailscale-tscert" - "28a91b69a0467442178b62e2cfb9ab272ed3b64c" - "https://github.com/tailscale/tscert" - "0zzpkff4nrknh345nqiaz88hvlc5pynhzyws02f3rlcyjh7kj2sh" - "github.com/tailscale/tscert" - (list go-golang-org-x-sys - go-github-com-mitchellh-go-ps))) - -(define go-opentelemetry-io-contrib - (go-package - "go-opentelemetry-io-contrib" - "1.20.0" - "https://github.com/open-telemetry/opentelemetry-go-contrib" - "0vsv2ihjk3i3k1mwkdjngcp497knw85fz1m32lycl6qf3fcpzaiy" - "go.opentelemetry.io/contrib" - (list))) - -(define go-github-com-dustin-go-humanize - (go-package - "go-github-com-dustin-go-humanize" - "1.0.1" - "https://github.com/dustin/go-humanize" - "1iyhd90pnmxh64nhsh6k02c1b1glpmhh4whga9jgb9g0i5hz3sya" - "github.com/dustin/go-humanize" - (list))) - -(define go-github-com-burntsushi-toml - (go-package - "go-github-com-burntsushi-toml" - "1.3.2" - "https://github.com/BurntSushi/toml" - "1s1d3622al03xgx84iqai384ycfp5hgy2r6h4db29byamqgk530l" - "github.com/BurntSushi/toml" - (list))) - -(define-public caddy - (package - (name "caddy") - (version "2.7.4") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/caddyserver/caddy") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0jgbkj0azkbs828vsd3gycpab8pycgf55vrxkvnfmwfjpdiq1551")))) - (build-system go-build-system) - (inputs (list go-github-com-hashicorp-go-uuid - go-github-com-burntsushi-toml - go-github-com-dustin-go-humanize - go-github-com-yuin-goldmark - go-github-com-yuin-goldmark-highlighting - go-github-com-tailscale-tscert - go-github-com-google-cel-go - go-step-sm-crypto - go-step-sm-cli-utils - go-github-com-smallstep-certificates - go-github-com-smallstep-truststore - go-opentelemetry-io-otel - go-opentelemetry-io-contrib - go-github-com-google-uuid - go-github-com-lucas-clemente-quic-go - go-github-com-prometheus-client-golang - go-github-com-prometheus-procfs - go-github-com-prometheus-common - go-google-golang-org-protobuf - go-github-com-beorn7-perks - go-github-com-cespare-xxhash - go-go-uber-org-zap - go-golang-org-x-term - go-github-com-caddy-certmagic - go-github-com-quic-go-quic-go - go-github-com-quic-go-qpack - go-github-com-klauspost-compress - go-github-com-golang-protobuf - go-golang-org-x-net - go-golang-org-x-sync)) - (arguments - `(#:go ,go-1.20 - #:substitutable? #f - #:install-source? #t - #:import-path "github.com/caddyserver/caddy" - #:tests? #f - #:phases (modify-phases %standard-phases - (replace 'build - (lambda arguments - (apply (assoc-ref %standard-phases - 'build) - `(,@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. - 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/") - (license license:asl2.0)))