freya/dotfiles-guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: freya:054f6a8fe77be4dd6f2498d650a2d5f6d4ea0927
Branches Tags
freya:main
..
compare: freya:01f9c0119a397d7d919f1b6c15cffa735c9dbd7a
Branches Tags
freya:main

No commits in common. "054f6a8fe77be4dd6f2498d650a2d5f6d4ea0927" and "01f9c0119a397d7d919f1b6c15cffa735c9dbd7a" have entirely different histories.
054f6a8fe7 ... 01f9c0119a

22 changed files with 403 additions and 550 deletions
Show stats Expand all files Collapse all files

4
channels.scm
View file

@ -3,7 +3,7 @@
(url "https://git.savannah.gnu.org/git/guix.git") (url "https://git.savannah.gnu.org/git/guix.git")
(branch "master") (branch "master")
(commit (commit
"91dd354a10edbb0d3d4bc3220b671504eda871a7") "de714bcb46d61922e0efc10783ea23fb0202f583")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"9edb3f66fd807b096b48283debdcddccfea34bad" "9edb3f66fd807b096b48283debdcddccfea34bad"
@ -14,7 +14,7 @@
(url "https://gitlab.com/nonguix/nonguix") (url "https://gitlab.com/nonguix/nonguix")
(branch "master") (branch "master")
(commit (commit
"e355a2ff675abd48f671a867c211c98707ca1e82") "57d6d0cd4beb489e045231eb7066073ebe8a0dc5")
(introduction (introduction
(make-channel-introduction (make-channel-introduction
"897c1a470da759236cc11798f4e0a5f7d4d59fbc" "897c1a470da759236cc11798f4e0a5f7d4d59fbc"

2
home/config/hypr/config.d/keybinds.conf
View file

@ -24,7 +24,7 @@ binde =, XF86AudioPrev, exec, playerctl previous
binde =, XF86MonBrightnessDown, exec, brightnessctl set 5%- binde =, XF86MonBrightnessDown, exec, brightnessctl set 5%-
binde =, XF86MonBrightnessUp, exec, brightnessctl set 5%+ binde =, XF86MonBrightnessUp, exec, brightnessctl set 5%+
bind = $mod SHIFT, s, exec, grimblast copy area && notify-send -t 3000 "Hyprland" "Screenshot copied to clipboard" bind = $mod SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Hyprland" "Screenshot copied to clipboard"
bind = , Print, exec, grim - | wl-copy -t iamge/png && notify-send -t 3000 "Hyprland" "Full screen copied to clipboard" 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 = SHIFT, Print, exec, slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy

1
home/config/hypr/config.d/plugins.conf
View file

@ -1,2 +1,3 @@
exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhy3.so exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhy3.so
#exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhyprbars.so
exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhyprexpo.so exec-once = hyprctl plugin load ~/.guix-home/profile/lib/libhyprexpo.so

12
home/config/hypr/config.d/theme.conf
View file

@ -32,6 +32,18 @@ plugin {
enable = true enable = true
} }
} }
#hyprbars {
# bar_height = 24
# bar_part_of_window = true
# bar_color = $base_color
# col.text = $text_color
# bar_text_size = 9
# bar_text_font = JetBrains Mono Nerd Font Mono Bold
# bar_button_padding = 12
# bar_padding = 10
# bar_precedence_over_border = true
#}
} }
decoration { decoration {

6
home/config/hypr/monitors.conf
View file

@ -1,2 +1,4 @@
monitor=HDMI-A-1,1920x1080@60.0,0x0,1.0 # Generated by nwg-displays on 2024-06-18 at 20:22:23. Do not edit manually.
monitor=DP-2,2560x1440@59.95,1920x0,1.0
monitor=eDP-1,2560x1600@90.0,0x0,1.25
monitor=DP-2,2560x1440@59.95,2048x0,1.0

2
home/config/kitty/kitty.conf
View file

@ -14,7 +14,7 @@ show_hyperlink_targets yes
show_hyperlink_targets no show_hyperlink_targets no
background_opacity 0.75 background_opacity 0.85
window_padding_width 10 window_padding_width 10

2
home/config/nvim/lua/lsp.lua
View file

@ -3,6 +3,7 @@ local lsp = require('lsp-zero').preset('recommended')
require('mason').setup({}) require('mason').setup({})
require('mason-lspconfig').setup({ require('mason-lspconfig').setup({
ensure_installed = { ensure_installed = {
'tsserver',
'eslint', 'eslint',
'rust_analyzer', 'rust_analyzer',
'clangd', 'clangd',
@ -14,7 +15,6 @@ require('mason-lspconfig').setup({
'jdtls', 'jdtls',
'bashls', 'bashls',
'lua_ls', 'lua_ls',
'csharp_ls',
}, },
handlers = { handlers = {
lsp.default_setup, lsp.default_setup,

2
home/config/nvim/lua/plugin.lua
View file

@ -9,6 +9,7 @@ Plug('ryanoasis/vim-devicons')
Plug('SirVer/ultisnips') Plug('SirVer/ultisnips')
Plug('honza/vim-snippets') Plug('honza/vim-snippets')
Plug('preservim/nerdcommenter') Plug('preservim/nerdcommenter')
Plug('neoclide/coc.nvim', { branch = 'release' })
Plug('nvim-telescope/telescope.nvim', { tag = '0.1.3' }) Plug('nvim-telescope/telescope.nvim', { tag = '0.1.3' })
Plug('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' }) Plug('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
Plug('nvim-lua/plenary.nvim') Plug('nvim-lua/plenary.nvim')
@ -40,6 +41,5 @@ Plug('folke/todo-comments.nvim')
Plug('gbprod/phpactor.nvim') Plug('gbprod/phpactor.nvim')
Plug('gleam-lang/gleam.vim') Plug('gleam-lang/gleam.vim')
Plug('edluffy/hologram.nvim') Plug('edluffy/hologram.nvim')
Plug('lukas-reineke/virt-column.nvim')
vim.call('plug#end') vim.call('plug#end')

6
home/config/nvim/lua/theme.lua
View file

@ -16,6 +16,7 @@ catppuccin.setup({
dim_context = false, dim_context = false,
alt_background = false, alt_background = false,
}, },
coc_nvim = true,
fidget = true, fidget = true,
markdown = true, markdown = true,
notify = true, notify = true,
@ -65,8 +66,3 @@ require('alpha').setup(theme.config)
require('hologram').setup { require('hologram').setup {
auto_display = true auto_display = true
} }
require("virt-column").setup {
enabled = true,
virtcolumn = "80"
}

8
home/config/nvim/lua/vimopt.lua
View file

@ -1,8 +1,8 @@
local set = vim.opt local set = vim.opt
set.tabstop = 8 set.tabstop = 4
set.softtabstop = 8 set.softtabstop = 4
set.shiftwidth = 8 set.shiftwidth = 4
set.expandtab = false --set.noexpandtab = true
set.mouse = "a" set.mouse = "a"
set.clipboard = "unnamedplus" set.clipboard = "unnamedplus"
set.hlsearch = true set.hlsearch = true

71
home/config/ssh/config
View file

@ -1,64 +1,31 @@
Match Host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye" Match host * exec "gpg-connect-agent UPDATESTARTUPTTY /bye"
Host shun* Host icarus
HostName shun.freya.cat HostName icarus.freya.cat
user freya User freya
Host *.in.freya.cat Host tardis
User root HostName tardis.freya.cat
User freya
Host lenga
HostName 10.2.0.8
User root
Port 1111 Port 1111
Host ospf.lenga*
HostName ospf.lenga.in.freya.cat
User root
Port 22
Host router.lenga*
HostName router.lenga.in.freya.cat
User root
Port 22
Host services.lenga*
HostName services.lenga.in.freya.cat
User root
Port 22
Host plex.lenga*
HostName plex.lenga.in.freya.cat
User root
Port 22
Host minecraft.lenga*
HostName minecraft.lenga.in.freya.cat
User root
Port 22
Host tangela*
HostName tangela.in.freya.cat
User root
Port 22
Host router.tangela*
HostName router.tangela.in.freya.cat
User root
Port 22
Host stationery Host stationery
HostName stationery.faith HostName stationery.faith
User freya User freya
Host redcom Host queeg
HostName fmurphy-dev.redcom.com Hostname queeg.cs.rit.edu
User fmurphy
Host *.cs.rit.edu
User tam2214 User tam2214
Host nitron
Hostname nitron.cs.rit.edu
User tam2214
Host github.com
Hostname github.com
User tam2214
IdentityFile /home/freya/.ssh/id_rit
Host * Host *
HostkeyAlgorithms +ssh-rsa
PubkeyAcceptedKeyTypes +ssh-rsa
KexAlgorithms -sntrup761x25519-sha512@openssh.com KexAlgorithms -sntrup761x25519-sha512@openssh.com

11
home/config/zsh/zprofile
View file

@ -27,16 +27,7 @@ export EDITOR=nvim
export CC=$(which gcc) export CC=$(which gcc)
export LD=$(which gcc) export LD=$(which gcc)
# nvidia # theming
#export LIBVA_DRIVER_NAME=nvidia
#export GBM_BACKEND=nvidia-drm
#export __GLX_VENDOR_LIBRARY_NAME=nvidia
#export __NV_PRIME_RENDER_OFFLOAD=1
#export __VK_LAYER_NV_optimus=NVIDIA_only
# nvk
#export MESA_LOADER_DRIVER_OVERRIDE=zink
#export NOUVEAU_USE_ZINK=1
# ricing # ricing
export QT_QPA_PLATFORM_THEME=gtk2 export QT_QPA_PLATFORM_THEME=gtk2

11
home/config/zsh/zshrc
View file

@ -101,17 +101,6 @@ _wine() {
alias wine32="_wine 32" alias wine32="_wine 32"
alias wine64="_wine 64" alias wine64="_wine 64"
_winetricks() {
export WINEPREFIX="$HOME/.wine$1"
export WINEARCH="win$1"
/usr/bin/winetricks "${@:2}"
unset WINEARCH
unset WINEPREFIX
}
alias winetricks32="_winetricks 32"
alias winetricks64="_winetricks 64"
proton() { proton() {
if [ $# -lt 1 ]; then if [ $# -lt 1 ]; then
return return

3
modules/freya/packages/bootloaders.scm
View file

@ -4,7 +4,6 @@
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages gperf) #:use-module (gnu packages gperf)
#:use-module (gnu packages crypto)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages python-crypto) #:use-module (gnu packages python-crypto)
@ -66,7 +65,7 @@
(install-file stub (string-append #$output "/libexec")))) (install-file stub (string-append #$output "/libexec"))))
(delete 'check))))) (delete 'check)))))
(inputs (list libcap python-pyelftools `(,util-linux "lib"))) (inputs (list libcap python-pyelftools `(,util-linux "lib")))
(native-inputs (list libxcrypt gperf pkg-config python-3 python-jinja2)) (native-inputs (list gperf pkg-config python-3 python-jinja2))
(home-page "https://systemd.io") (home-page "https://systemd.io")
(synopsis "Unified kernel image UEFI stub") (synopsis "Unified kernel image UEFI stub")
(description "Simple UEFi boot stub that loads a conjoined kernel image and (description "Simple UEFi boot stub that loads a conjoined kernel image and

6
modules/freya/packages/cmake.scm
View file

@ -8,11 +8,11 @@
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
#:use-module (gnu packages python)) #:use-module (gnu packages python))
(define-public cmake-minimal-3.30.0 (define-public cmake-minimal-3.27.0
(package (package
(inherit cmake-minimal) (inherit cmake-minimal)
(name "cmake-minimal") (name "cmake-minimal")
(version "3.30.0") (version "3.27.0")
(source (origin (source (origin
(inherit (package-source cmake-minimal)) (inherit (package-source cmake-minimal))
(method url-fetch) (method url-fetch)
@ -21,7 +21,7 @@
"/cmake-" version ".tar.gz")) "/cmake-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0ygmk5wfs00kjx59ackda13049ighgjmyyc0yls4q5aw0pk5nzhm")))) "1f1w9mb868q38nzy145b6q9mc5waf8yi521cwfkd14xr51mxpvda"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments cmake-minimal) (substitute-keyword-arguments (package-arguments cmake-minimal)
((#:configure-flags flags ''()) ((#:configure-flags flags ''())

16
modules/freya/packages/freedesktop.scm
View file

@ -1,6 +1,5 @@
(define-module (freya packages freedesktop) (define-module (freya packages freedesktop)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix download)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
@ -23,18 +22,3 @@
(native-inputs (native-inputs
(modify-inputs (package-native-inputs libinput) (modify-inputs (package-native-inputs libinput)
(append python-minimal-wrapper python-pytest))))) (append python-minimal-wrapper python-pytest)))))
(define-public wayland-1.23.1
(package
(inherit wayland)
(name "wayland")
(version "1.23.1")
(source (origin
(method url-fetch)
(uri (string-append "https://gitlab.freedesktop.org/" name
"/" name "/-/releases/" version "/downloads/"
name "-" version ".tar.xz"))
(sha256
(base32
"1vg5h6d94hglh7724q6wx9dpg4y0afvxksankp1hwbcy76lb4kw6"))))))

4
modules/freya/packages/linux.scm
View file

@ -12,7 +12,7 @@
(define-public bluez-new (define-public bluez-new
(package (package
(inherit bluez) (inherit bluez)
(version "5.78") (version "5.77")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -21,7 +21,7 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1qy5fc6z1l3fvcqkvyszzz2xr86yzi2nyphgvsw7bly52lcys3w3")))) "04h82lfhxh4vd1pyavk1nfrcxc0z5qg5jmsgal9mh22a3pf2y0sx"))))
(arguments (list (arguments (list
#:configure-flags #:configure-flags
#~(list (string-append "--prefix=" #$output) #~(list (string-append "--prefix=" #$output)

8
modules/freya/packages/patches/hyprland-fix-cmake.patch
View file

@ -11,6 +11,14 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa58b63d..51ea6cfa 100644 index fa58b63d..51ea6cfa 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -26,7 +26,6 @@ execute_process(COMMAND ./scripts/generateVersion.sh
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
# udis
-add_subdirectory("subprojects/udis86")
if(CMAKE_BUILD_TYPE)
string(TOLOWER ${CMAKE_BUILD_TYPE} BUILDTYPE_LOWER)
@@ -85,7 +84,7 @@ if(LEGACY_RENDERER) @@ -85,7 +84,7 @@ if(LEGACY_RENDERER)
else() else()
set(GLES_VERSION "GLES3") set(GLES_VERSION "GLES3")

188
modules/freya/packages/wm.scm
View file

@ -25,7 +25,6 @@
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages man)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix packages) #:use-module (guix packages)
@ -49,8 +48,7 @@
(define-public swaylock-effects-new (define-public swaylock-effects-new
(package (package
(inherit swaylock-effects) (inherit swaylock-effects)
(name "swaylock-effects-new") (version "1.6.11")
(version "1.7.0.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -58,14 +56,15 @@
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"0cgpbzdpxj6bbpa8jwql1snghj21mhryyvj6sk46g66lqvwlrqbj")))))) "0j7dxn66xqlf6iv2arqzz7mxlh7nf85anvpyf30d2frcidarda9h"))))
(inputs (modify-inputs (package-inputs swaylock-effects) (delete "linux-pam")))))
(define-public waybar-new (define-public waybar-new
(package (package
(inherit waybar) (inherit waybar)
(name "waybar-new") (name "waybar-new")
(version "0.11.0") (version "0.10.4")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -74,7 +73,7 @@
(commit version))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "1bw6d3bf8rm4mgrbcprxxljfxbyabbj2lwabk2z19r8lhfz38myy")))) (base32 "0liiyz6212pmyhpsrb6773qf5b9b4kb76nggizygr9abfidbg5gw"))))
(arguments (arguments
(list (list
#:configure-flags #~(list "--wrap-mode=nodownload" "-Dexperimental=true"))))) #:configure-flags #~(list "--wrap-mode=nodownload" "-Dexperimental=true")))))
@ -94,7 +93,7 @@
(build-system meson-build-system) (build-system meson-build-system)
(native-inputs (list gcc-13 (native-inputs (list gcc-13
pkg-config pkg-config
cmake-minimal-3.30.0 cmake-minimal-3.27.0
libdrm)) libdrm))
(home-page "https://github.com/emersion/libliftoff") (home-page "https://github.com/emersion/libliftoff")
(synopsis "Lightweight KMS plane library") (synopsis "Lightweight KMS plane library")
@ -121,7 +120,7 @@
(define-public hyprlang (define-public hyprlang
(package (package
(name "hyprlang") (name "hyprlang")
(version "0.5.3") (version "0.5.2")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -130,11 +129,9 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0yvfrz3hdyxzhngzhr0bgc5279ra5fv01hbfi6pdj84pz0lpaw02")))) "17i0372yv0fcwnyki36crz7afw8c5f3j985m083p7rjbh4fn3br6"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (list gcc-13 (native-inputs (list gcc-13))
pkg-config))
(inputs (list hyprutils))
(home-page "https://hyprland.org/hyprlang/") (home-page "https://hyprland.org/hyprlang/")
(synopsis "Official implementation library for hypr config language") (synopsis "Official implementation library for hypr config language")
(description (description
@ -146,7 +143,7 @@ language used in @code{hyprland}.")
(define-public hyprcursor (define-public hyprcursor
(package (package
(name "hyprcursor") (name "hyprcursor")
(version "0.1.10") (version "0.1.9")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -155,7 +152,7 @@ language used in @code{hyprland}.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1rdn03ln7pqcwp8h4nmi7nc489q8y25dd3v4paq8ykvwzhvs3a1n")))) "0z3ar580n630145nq80qw0p8v0kai6knvhi6nr9z0y1jrb07b0ql"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (list #:tests? #f)) (arguments (list #:tests? #f))
(inputs (list cairo hyprlang librsvg libzip tomlplusplus)) (inputs (list cairo hyprlang librsvg libzip tomlplusplus))
@ -170,7 +167,7 @@ language used in @code{hyprland}.")
(define-public hyprland-protocols (define-public hyprland-protocols
(package (package
(name "hyprland-protocols") (name "hyprland-protocols")
(version "0.4.0") (version "0.3.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -179,7 +176,7 @@ language used in @code{hyprland}.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0x86w7z3415qvixfhk9a8v5fnbnxdydzx366qz0mpmfg5h86qyha")))) "01j5hc8qnjzqiiwryfawx1wzrhkn0m794knphyc0vsxwkcmjaj8x"))))
(build-system meson-build-system) (build-system meson-build-system)
(home-page "https://hyprland.org") (home-page "https://hyprland.org")
(synopsis "Wayland protocol extensions for Hyprland") (synopsis "Wayland protocol extensions for Hyprland")
@ -195,7 +192,7 @@ protocols used by Hyprland to bridge the aforementioned gap.")
(define-public hyprwayland-scanner (define-public hyprwayland-scanner
(package (package
(name "hyprwayland-scanner") (name "hyprwayland-scanner")
(version "0.4.2") (version "0.4.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -204,7 +201,7 @@ protocols used by Hyprland to bridge the aforementioned gap.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0r7ay4zjkfyr0xd73wz99qhnqjq7nma98gm51wm9lmai4igw90qw")))) "1xc2xcxpq61lg964ihk0wbfzqqvibw20iz09g0p33ym51gwlpxr4"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (list #:tests? #f)) (arguments (list #:tests? #f))
(inputs (list pugixml)) (inputs (list pugixml))
@ -220,7 +217,7 @@ for c++.")
(define-public hyprutils (define-public hyprutils
(package (package
(name "hyprutils") (name "hyprutils")
(version "0.2.3") (version "0.2.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -229,7 +226,7 @@ for c++.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"01dh24rf62gb6xm32f7mfv6wx0dxprr1q9y73hvv7xanrjyia2zn")))) "0nxx5yb5k9726x95n8gi27xyxyzwb0ma0nj3czpb51sda1k0hz0g"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (list #:tests? #f)) (arguments (list #:tests? #f))
(native-inputs (list gcc-13 pkg-config)) (native-inputs (list gcc-13 pkg-config))
@ -253,7 +250,7 @@ for c++.")
(define-public aquamarine (define-public aquamarine
(package (package
(name "aquamarine") (name "aquamarine")
(version "0.4.3") (version "0.3.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -264,7 +261,7 @@ for c++.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0x1zz1ywchs0awkjkvdgskgqnp6pz5lqwmgr8g0zc0i7inhyg1p3")))) "114fspibmrwvzdmzv4xdy000vg7mn9r5vas3pr1ndb9xyl15ja1s"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:tests? #f)) (list #:tests? #f))
@ -288,7 +285,7 @@ for c++.")
xcb-util-errors xcb-util-errors
xcb-util-keysyms xcb-util-keysyms
xcb-util-wm xcb-util-wm
wayland-1.23.1 wayland
wayland-protocols-1.36)) wayland-protocols-1.36))
(inputs (inputs
(list hyprutils)) (list hyprutils))
@ -317,7 +314,7 @@ for c++.")
(define-public hyprland (define-public hyprland
(package (package
(name "hyprland") (name "hyprland")
(version "0.44.1") (version "0.42.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -334,12 +331,12 @@ for c++.")
"subprojects")))) "subprojects"))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "11vw1h9al4jvqprwbrmxvcpxwhvsjj398wbz4flqbnmxa8idvdq1")))) (base32 "1hp2xafvlymikxsi6pr8iik35g46683bg376n9hkjxgh9y6njzqv"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:tests? #f (list #:tests? #f
#:build-type "release" #:build-type "release"
#:cmake cmake-minimal-3.30.0 #:cmake cmake-minimal-3.27.0
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'fix-path (add-after 'unpack 'fix-path
@ -379,13 +376,13 @@ for c++.")
`("__EGL_VENDOR_LIBRARY_DIRS" prefix ,(list (string-append mesa "/share/glvnd/egl_vendor.d"))))))) `("__EGL_VENDOR_LIBRARY_DIRS" prefix ,(list (string-append mesa "/share/glvnd/egl_vendor.d")))))))
))) )))
(native-inputs (native-inputs
(list gcc-14 (list gcc-13
jq jq
pkg-config pkg-config
hyprwayland-scanner hyprwayland-scanner
hwdata-for-hyprland)) hwdata-for-hyprland))
(inputs (inputs
(list gcc-14 (list gcc-13
cairo cairo
pango pango
@ -521,7 +518,7 @@ mo .")
(define-public xdg-desktop-portal-hyprland (define-public xdg-desktop-portal-hyprland
(package (package
(name "xdg-desktop-portal-hyprland") (name "xdg-desktop-portal-hyprland")
(version "1.3.6") (version "1.3.3")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -530,7 +527,7 @@ mo .")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"17ba9jkccyp8gv79ds70khgm5wm6x8zs5m9nkilq4n2j7fsa8cfl")))) "14n4a8b91ili0kp2kjqlw3h57bsxkrjwg5bhlw2h3q93zaxv2b3k"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:tests? #f ;No tests (list #:tests? #f ;No tests
@ -547,13 +544,11 @@ mo .")
(native-inputs (native-inputs
(list gcc-13 (list gcc-13
pkg-config pkg-config
wayland wayland))
hyprwayland-scanner))
(inputs (inputs
(list bash-minimal (list bash-minimal
grim grim
hyprland hyprland
hyprutils
hyprland-protocols hyprland-protocols
wayland-protocols-1.36 wayland-protocols-1.36
hyprlang hyprlang
@ -574,21 +569,23 @@ extra portals specific to Hyprland, mostly for window sharing.")
(define-public hyprland-plugin-hy3 (define-public hyprland-plugin-hy3
(let ((commit "93759c8032995eb566008537389543b3e1b4a65c")
(revision "1"))
(package (package
(name "hyprland-plugin-hy3") (name "hyprland-plugin-hy3")
(version "0.44.0") (version (git-version "0.42.0" revision commit))
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/outfoxxed/hy3.git") (url "https://github.com/outfoxxed/hy3.git")
(commit (string-append "hl" version)))) (commit commit)))
(sha256 (sha256
(base32 (base32
"03gxjkn43j85ff8d0hx9nhv5bfwv7vw7m8kacpmajmfnx43mldg9")))) "0g59zd5724ply38h14r6hafklb8mh0xwb81i0jzzh3xz0r9pmv3s"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:tests? #f (list #:tests? #f
#:cmake cmake-minimal-3.30.0 #:cmake cmake-minimal-3.27.0
#:configure-flags #~(list "DCMAKE_BUILD_TYPE=Release"))) #:configure-flags #~(list "DCMAKE_BUILD_TYPE=Release")))
(native-inputs (native-inputs
(list gcc-13 (list gcc-13
@ -607,7 +604,7 @@ extra portals specific to Hyprland, mostly for window sharing.")
(license license:gpl3) (license license:gpl3)
(home-page "https://github.com/outfoxxed/hy3") (home-page "https://github.com/outfoxxed/hy3")
(synopsis "i3 / sway like layout for hyprland.") (synopsis "i3 / sway like layout for hyprland.")
(description "Hyprland plugin for an i3 / sway like manual tiling layout"))) (description "Hyprland plugin for an i3 / sway like manual tiling layout"))))
(define-syntax hyprland-plugin-impl (define-syntax hyprland-plugin-impl
@ -615,7 +612,7 @@ extra portals specific to Hyprland, mostly for window sharing.")
((_ plugin) ((_ plugin)
(package (package
(name (string-append "hyprland-plugin-" plugin)) (name (string-append "hyprland-plugin-" plugin))
(version "0.44.0") (version "0.42.0")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -624,12 +621,12 @@ extra portals specific to Hyprland, mostly for window sharing.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(sha256 (sha256
(base32 (base32
"0v2zwvrjgc7zg4l8c50934kyq3y5x9f0d34gh3kyh44grfn8w9zx")) "1qzi8c29bam3cj1rngw3gidgphldw7q196iwa9ji5jq071nc1z38"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list #:tests? #f (list #:tests? #f
#:cmake cmake-minimal-3.30.0 #:cmake cmake-minimal-3.27.0
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'chdir (add-after 'unpack 'chdir
@ -653,34 +650,10 @@ extra portals specific to Hyprland, mostly for window sharing.")
(description (string-append "official " plugin " plugin for hyprland")))))) (description (string-append "official " plugin " plugin for hyprland"))))))
(define-public hyprland-plugin-borders-plus-plus
(hyprland-plugin-impl "borders-plus-plus"))
(define-public hyprland-plugin-csgo-vulkan-fix
(hyprland-plugin-impl "csgo-vulkan-fix"))
(define-public hyprland-plugin-hyprbars
(hyprland-plugin-impl "hyprbars"))
(define-public hyprland-plugin-hyprexpo
(hyprland-plugin-impl "hyprexpo"))
(define-public hyprland-plugin-hyprtrails
(hyprland-plugin-impl "hyprtrails"))
(define-public hyprland-plugin-hyprwinwrap
(hyprland-plugin-impl "hyprwinwrap"))
(define-public hyprland-plugins (define-public hyprland-plugins
(package (package
(name "hyprland-plugins") (name "hyprland-plugins")
(version "0.44.0") (version "0.42.0")
(source #f) (source #f)
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments '(#:builder (begin (mkdir %output) #t))) (arguments '(#:builder (begin (mkdir %output) #t)))
@ -688,81 +661,12 @@ extra portals specific to Hyprland, mostly for window sharing.")
(home-page "https://github.com/hyprwm/hyprland-plugins") (home-page "https://github.com/hyprwm/hyprland-plugins")
(synopsis "A collection of all the official hyprland plugins") (synopsis "A collection of all the official hyprland plugins")
(description "A metapackage containing inputs for each official plugin") (description "A metapackage containing inputs for each official plugin")
(propagated-inputs (list hyprland-plugin-borders-plus-plus (propagated-inputs
hyprland-plugin-csgo-vulkan-fix (list (hyprland-plugin-impl "borders-plus-plus")
hyprland-plugin-hyprbars (hyprland-plugin-impl "csgo-vulkan-fix")
hyprland-plugin-hyprexpo (hyprland-plugin-impl "hyprbars")
hyprland-plugin-hyprtrails (hyprland-plugin-impl "hyprexpo")
hyprland-plugin-hyprwinwrap)))) (hyprland-plugin-impl "hyprtrails")
(hyprland-plugin-impl "hyprwinwrap")))))
(define-syntax hyprland-contrib-impl
(syntax-rules ()
((_ contrib)
(package
(name (string-append "hyprland-conrib-" contrib))
(version "0.1")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/hyprwm/contrib.git")
(commit (string-append "v" version))))
(sha256
(base32
"0ld0sj7ahf9jf8cqzbqkhj3m2w60027ixic24ih26nwy90b5qjwx"))
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
`(#:phases (modify-phases %standard-phases
(delete 'configure)
(delete 'build)
(delete 'check)
(add-after 'unpack 'chdir
(lambda _ (chdir (string-append "../source/" contrib "/"))))
(add-after 'chdir 'patch-make
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "Makefile"
(("scdoc") (string-append (assoc-ref inputs "scdoc") "/bin/scdoc")))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "install" (string-append "PREFIX=" (assoc-ref outputs "out")))))
)))
(native-inputs (list scdoc))
(license license:expat)
(home-page "https://github.com/hyprwm/contrib")
(synopsis (string-append "official " contrib " script for hyprland"))
(description (string-append "official " contrib " script for hyprland"))))))
(define-public hyprland-contrib-grimblast
(hyprland-contrib-impl "grimblast"))
(define-public hyprland-contrib-hyprprop
(hyprland-contrib-impl "hyprprop"))
(define-public hyprland-contrib-scratchpad
(hyprland-contrib-impl "scratchpad"))
(define-public hyprland-contrib-shellevents
(hyprland-contrib-impl "shellevents"))
(define-public hyprland-contrib
(package
(name "hyprland-contrib")
(version "0.1")
(source #f)
(build-system trivial-build-system)
(arguments '(#:builder (begin (mkdir %output) #t)))
(license license:bsd-3)
(home-page "https://github.com/hyprwm/contrib")
(synopsis "A collection of all the official hyprland contrib scripts")
(description "A metapackage containing inputs for each official contrib script")
(propagated-inputs (list hyprland-contrib-grimblast
hyprland-contrib-hyprprop
hyprland-contrib-scratchpad
hyprland-contrib-shellevents))))