diff options
author | Ryan Schanzenbacher <ryan@rschanz.org> | 2024-05-21 19:14:36 -0400 |
---|---|---|
committer | Ryan Schanzenbacher <ryan@rschanz.org> | 2024-05-21 19:14:36 -0400 |
commit | d3fc4f944422d2357540377eabc6867dd7a182ed (patch) | |
tree | 332fd1cbb9a97e083b4f8f77c6ede9c85203cb9d | |
parent | b05ac87742fd8db92a85e97063ffdd5221da1de9 (diff) |
committing some changes
-rw-r--r-- | home-config/home-configuration.scm | 4 | ||||
-rw-r--r-- | modules/ryan-packages/binaries.scm | 55 | ||||
-rw-r--r-- | modules/ryan-packages/wm.scm | 7 |
3 files changed, 62 insertions, 4 deletions
diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm index b89ff26..a3454cd 100644 --- a/home-config/home-configuration.scm +++ b/home-config/home-configuration.scm | |||
@@ -22,6 +22,8 @@ | |||
22 | (ryan-config utils) | 22 | (ryan-config utils) |
23 | (ryan-packages freedesktop) | 23 | (ryan-packages freedesktop) |
24 | (ryan-packages calcurse) | 24 | (ryan-packages calcurse) |
25 | (ryan-packages binaries) | ||
26 | (rosenthal packages binaries) | ||
25 | (ryan-packages mozilla)) | 27 | (ryan-packages mozilla)) |
26 | 28 | ||
27 | (define my-neovim | 29 | (define my-neovim |
@@ -127,7 +129,7 @@ | |||
127 | ;"firefox" | 129 | ;"firefox" |
128 | "signal-desktop" | 130 | "signal-desktop" |
129 | "git-lfs")) | 131 | "git-lfs")) |
130 | (list my-neovim wl-mirror firefox-wrapped calcurse-fixed))) | 132 | (list my-neovim wl-mirror firefox-wrapped calcurse-fixed superfile-bin))) |
131 | 133 | ||
132 | ;; Below is the list of Home services. To search for available | 134 | ;; Below is the list of Home services. To search for available |
133 | ;; services, run 'guix home search KEYWORD' in a terminal. | 135 | ;; services, run 'guix home search KEYWORD' in a terminal. |
diff --git a/modules/ryan-packages/binaries.scm b/modules/ryan-packages/binaries.scm new file mode 100644 index 0000000..f05636d --- /dev/null +++ b/modules/ryan-packages/binaries.scm | |||
@@ -0,0 +1,55 @@ | |||
1 | (define-module (ryan-packages binaries) | ||
2 | #:use-module ((guix licenses) #:prefix license:) | ||
3 | #:use-module (guix gexp) | ||
4 | #:use-module (guix packages) | ||
5 | #:use-module (guix download) | ||
6 | #:use-module (guix build-system copy) | ||
7 | #:use-module (gnu packages base) | ||
8 | #:use-module (gnu packages bootstrap) | ||
9 | #:use-module (gnu packages compression) | ||
10 | #:use-module (gnu packages elf) | ||
11 | #:use-module (gnu packages gcc) | ||
12 | #:use-module (gnu packages glib)) | ||
13 | |||
14 | (define-public superfile-bin | ||
15 | (package | ||
16 | (name "superfile-bin") | ||
17 | (version "1.1.2") | ||
18 | (source (origin | ||
19 | (method url-fetch) | ||
20 | (uri (string-append | ||
21 | "https://github.com/yorukot/superfile" "/releases/download/v" | ||
22 | version "/superfile-linux-v" version "-amd64.tar.gz")) | ||
23 | (sha256 | ||
24 | (base32 | ||
25 | "1hnhkd6ihp0wcrn54ipyki500xmz1kapaj8sykg7ykh1vv8y6hmm")))) | ||
26 | (build-system copy-build-system) | ||
27 | (arguments | ||
28 | (list #:install-plan #~'((#$(string-append | ||
29 | "superfile-linux-v" (package-version this-package) "-amd64/spf") | ||
30 | "bin/spf")) | ||
31 | #:phases | ||
32 | #~(modify-phases %standard-phases | ||
33 | (delete 'strip) | ||
34 | (add-after 'install 'patch-elf | ||
35 | (lambda _ | ||
36 | (let ((spf (string-append #$output "/bin/spf"))) | ||
37 | (invoke "patchelf" "--set-interpreter" | ||
38 | (string-append #$(this-package-input "glibc") | ||
39 | #$(glibc-dynamic-linker)) | ||
40 | spf) | ||
41 | (invoke "patchelf" "--set-rpath" | ||
42 | (string-append (ungexp (this-package-input "gcc") | ||
43 | "lib") | ||
44 | "/lib") | ||
45 | spf))))))) | ||
46 | (supported-systems '("x86_64-linux")) | ||
47 | (native-inputs (list patchelf)) | ||
48 | (inputs (list `(,gcc "lib") glibc)) | ||
49 | (home-page "https://github.com/yorukot/superfile") | ||
50 | (synopsis "Pretty fancy and modern terminal file manager") | ||
51 | (description | ||
52 | "Terminal file-manager written in Go that is modern and extensible.") | ||
53 | (license license:expat))) | ||
54 | |||
55 | superfile-bin | ||
diff --git a/modules/ryan-packages/wm.scm b/modules/ryan-packages/wm.scm index 3f951cc..407c5fb 100644 --- a/modules/ryan-packages/wm.scm +++ b/modules/ryan-packages/wm.scm | |||
@@ -97,7 +97,7 @@ | |||
97 | (define-public hyprlock | 97 | (define-public hyprlock |
98 | (package | 98 | (package |
99 | (name "hyprlock") | 99 | (name "hyprlock") |
100 | (version "0.2.0") | 100 | (version "0.3.0") |
101 | (source | 101 | (source |
102 | (origin | 102 | (origin |
103 | (method git-fetch) | 103 | (method git-fetch) |
@@ -106,7 +106,7 @@ | |||
106 | (commit (string-append "v" version)))) | 106 | (commit (string-append "v" version)))) |
107 | (file-name (git-file-name name version)) | 107 | (file-name (git-file-name name version)) |
108 | (sha256 | 108 | (sha256 |
109 | (base32 "0vj8jfflc8zw769dqdqq7ms3dfafsirb2c0g37xsqkc4rzzri7nn")))) | 109 | (base32 "0w2a25hivn8xd8p05vc9xg57rd9siv12dwmr4skpqx4dcmxxbg5d")))) |
110 | (build-system cmake-build-system) | 110 | (build-system cmake-build-system) |
111 | (native-inputs | 111 | (native-inputs |
112 | (list gcc-13 | 112 | (list gcc-13 |
@@ -117,6 +117,7 @@ | |||
117 | (list cairo | 117 | (list cairo |
118 | pango | 118 | pango |
119 | libxkbcommon | 119 | libxkbcommon |
120 | libdrm | ||
120 | hyprlang | 121 | hyprlang |
121 | mesa | 122 | mesa |
122 | wayland-protocols | 123 | wayland-protocols |
@@ -126,4 +127,4 @@ | |||
126 | (synopsis "Screen locker for Hyprland") | 127 | (synopsis "Screen locker for Hyprland") |
127 | (description "Screen locker for hyprland."))) | 128 | (description "Screen locker for hyprland."))) |
128 | 129 | ||
129 | waybar-new | 130 | hyprlock |