summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/ryan-config/base-system.scm91
-rw-r--r--modules/ryan-packages/bootloaders.scm6
-rw-r--r--modules/ryan-packages/linux.scm40
-rw-r--r--modules/ryan-packages/package-management.scm12
4 files changed, 97 insertions, 52 deletions
diff --git a/modules/ryan-config/base-system.scm b/modules/ryan-config/base-system.scm
index 39c7aa1..47b62a8 100644
--- a/modules/ryan-config/base-system.scm
+++ b/modules/ryan-config/base-system.scm
@@ -125,49 +125,49 @@
125 ;; under their own account: use 'guix search KEYWORD' to search 125 ;; under their own account: use 'guix search KEYWORD' to search
126 ;; for packages and 'guix install PACKAGE' to install a package. 126 ;; for packages and 'guix install PACKAGE' to install a package.
127 (packages (append (map specification->package (list "sway" 127 (packages (append (map specification->package (list "sway"
128 ;"hyprland" 128 ;"hyprland"
129 "swaybg" 129 "swaybg"
130 ;"swayidle" 130 ;"swayidle"
131 ;"swaylock-effects" 131 ;"swaylock-effects"
132 "fuzzel" 132 "fuzzel"
133 "foot" 133 "foot"
134 "linux-pam" ; installed directly to get libs in profile directly 134 "linux-pam" ; installed directly to get libs in profile directly
135 "pinentry-qt" 135 "pinentry-qt"
136 "adwaita-icon-theme" 136 "adwaita-icon-theme"
137 "hicolor-icon-theme" 137 "hicolor-icon-theme"
138 "git" 138 "git"
139 "waybar-experimental" 139 "waybar-experimental"
140 "gnupg" 140 "gnupg"
141 "light" 141 "light"
142 "avahi" 142 "avahi"
143 "mako" 143 "mako"
144 "grim" 144 "grim"
145 "grimblast" 145 "grimblast"
146 "slurp" 146 "slurp"
147 "wl-clipboard" 147 "wl-clipboard"
148 ;"bluez" 148 ;"bluez"
149 ;"blueman" 149 ;"blueman"
150 "ldacbt" 150 "ldacbt"
151 "libfreeaptx" 151 "libfreeaptx"
152 "libfdk" 152 "libfdk"
153 "opendoas" 153 "opendoas"
154 ;"xdg-desktop-portal-wlr" 154 ;"xdg-desktop-portal-wlr"
155 ;"xdg-desktop-portal" 155 ;"xdg-desktop-portal"
156 ;"xdg-desktop-portal-gtk" 156 ;"xdg-desktop-portal-gtk"
157 "v4l2loopback-linux-module" 157 "v4l2loopback-linux-module"
158 "pipewire" 158 "pipewire"
159 "docker" 159 "docker"
160 ;"libvirt" ;New version inherited from service 160 ;"libvirt" ;New version inherited from service
161 ;"virt-manager" 161 ;"virt-manager"
162 "dconf" 162 "dconf"
163 "wireplumber" 163 "wireplumber"
164 "wireshark" 164 "wireshark"
165 "openconnect" 165 ;"openconnect"
166 "openconnect-sso" 166 ;"openconnect-sso"
167 "webkitgtk-with-libsoup2" ; Needed for Go wails development 167 "webkitgtk-with-libsoup2" ; Needed for Go wails development
168 "zsh")) 168 "zsh"))
169 (list my-ca-certs virt-manager-ovmf bluez-ryan blueman-ryan) 169 (list my-ca-certs virt-manager-ovmf bluez-ryan blueman-ryan neovim-ryan)
170 %my-base-packages )) 170 %my-base-packages ))
171 171
172 ;; Below is the list of system services. To search for available 172 ;; Below is the list of system services. To search for available
173 ;; services, run 'guix system search KEYWORD' in a terminal. 173 ;; services, run 'guix system search KEYWORD' in a terminal.
@@ -229,7 +229,7 @@
229 (guix-configuration 229 (guix-configuration
230 (inherit config) 230 (inherit config)
231 (substitute-urls 231 (substitute-urls
232 (append (list "https://substitutes.nonguix.org") 232 (append (list "https://nonguix-proxy.ditigal.xyz/")
233 %default-substitute-urls)) 233 %default-substitute-urls))
234 (authorized-keys 234 (authorized-keys
235 (cons* (plain-file "non-guix.pub" 235 (cons* (plain-file "non-guix.pub"
@@ -250,7 +250,10 @@
250 (inherit config) 250 (inherit config)
251 (handle-power-key `ignore) 251 (handle-power-key `ignore)
252 (handle-suspend-key `ignore) 252 (handle-suspend-key `ignore)
253 (handle-hibernate-key 'ignore)
253 (handle-lid-switch `ignore) 254 (handle-lid-switch `ignore)
255 (handle-lid-switch-docked 'ignore)
256 (handle-lid-switch-external-power 'ignore)
254 (kill-user-processes? #t))) 257 (kill-user-processes? #t)))
255 (network-manager-service-type config => 258 (network-manager-service-type config =>
256 (network-manager-configuration 259 (network-manager-configuration
diff --git a/modules/ryan-packages/bootloaders.scm b/modules/ryan-packages/bootloaders.scm
index 10f38d1..4cbb8da 100644
--- a/modules/ryan-packages/bootloaders.scm
+++ b/modules/ryan-packages/bootloaders.scm
@@ -18,7 +18,7 @@
18 #:use-module (guix build-system meson) 18 #:use-module (guix build-system meson)
19 #:use-module (guix build-system python)) 19 #:use-module (guix build-system python))
20 20
21(define systemd-version "255") 21(define systemd-version "258")
22(define systemd-source 22(define systemd-source
23 (origin 23 (origin
24 (method git-fetch) 24 (method git-fetch)
@@ -28,7 +28,7 @@
28 (file-name (git-file-name "systemd" systemd-version)) 28 (file-name (git-file-name "systemd" systemd-version))
29 (sha256 29 (sha256
30 (base32 30 (base32
31 "1qdyw9g3jgvsbc1aryr11gpc3075w5pg00mqv4pyf3hwixxkwaq6")))) 31 "18gnp45gl1154jra6qv95k8y7ny6phdm87yqi5jdq13cadlrklf6"))))
32 32
33(define-public (systemd-stub-name) 33(define-public (systemd-stub-name)
34 (let ((arch (cond ((target-x86-32?) "ia32") 34 (let ((arch (cond ((target-x86-32?) "ia32")
@@ -54,7 +54,7 @@
54 ,(string-append "-Dsbat-distro-pkgname=" name) 54 ,(string-append "-Dsbat-distro-pkgname=" name)
55 ,(string-append "-Dsbat-distro-version=" version)) 55 ,(string-append "-Dsbat-distro-version=" version))
56 #:phases 56 #:phases
57 #~(let ((stub #$(string-append "src/boot/efi/" (systemd-stub-name)))) 57 #~(let ((stub #$(string-append "src/boot/" (systemd-stub-name))))
58 (modify-phases %standard-phases 58 (modify-phases %standard-phases
59 (replace 'build 59 (replace 'build
60 (lambda* (#:key parallel-build? #:allow-other-keys) 60 (lambda* (#:key parallel-build? #:allow-other-keys)
diff --git a/modules/ryan-packages/linux.scm b/modules/ryan-packages/linux.scm
index 7ccfc2d..272280c 100644
--- a/modules/ryan-packages/linux.scm
+++ b/modules/ryan-packages/linux.scm
@@ -5,6 +5,11 @@
5 #:use-module (guix build utils) 5 #:use-module (guix build utils)
6 #:use-module (gnu packages) 6 #:use-module (gnu packages)
7 #:use-module (gnu packages linux) 7 #:use-module (gnu packages linux)
8 #:use-module (gnu packages vim)
9 #:use-module (gnu packages gcc)
10 #:use-module (gnu packages textutils)
11 #:use-module (gnu packages tree-sitter)
12 #:use-module (gnu packages julia)
8 #:use-module (gnu packages python-xyz) 13 #:use-module (gnu packages python-xyz)
9 #:use-module (guix git-download) 14 #:use-module (guix git-download)
10 #:use-module (guix utils)) 15 #:use-module (guix utils))
@@ -35,4 +40,37 @@
35 (("bluetoothd-fix-permissions:") "install-IGNORED2:") 40 (("bluetoothd-fix-permissions:") "install-IGNORED2:")
36 (("bluetoothd-fix-permissions") "")))))))))) 41 (("bluetoothd-fix-permissions") ""))))))))))
37 42
38bluez-ryan 43(define-public neovim-ryan
44 (package
45 (inherit neovim)
46 (version "0.11.1")
47 (source (origin
48 (method git-fetch)
49 (uri (git-reference
50 (url "https://github.com/neovim/neovim")
51 (commit (string-append "v" version))))
52 (file-name (git-file-name "neovim" version))
53 (sha256
54 (base32
55 "0arypdiycmss5g9wav21hfdc384v1ly82jnsc32zincl2y3f628q"))))
56 (native-inputs (modify-inputs (package-native-inputs neovim) (prepend gcc-14)))
57 (inputs (modify-inputs (package-inputs neovim) (append utf8proc) (replace "tree-sitter" treesitter-ryan)))))
58
59(define-public treesitter-ryan
60 (package
61 (inherit tree-sitter)
62 (version "0.25.4")
63 (source (origin
64 (method git-fetch)
65 (uri (git-reference
66 (url "https://github.com/tree-sitter/tree-sitter")
67 (commit (string-append "v" version))))
68 (file-name (git-file-name "tree-sitter" version))
69 (sha256
70 (base32
71 "0d4ca0ikpmkqg9xlbx45c7mafr5yz0g99y3s3jy5xk86f0nkz8ga"))
72 (modules '((guix build utils)))
73 (snippet #~(begin
74 (delete-file-recursively "lib/src/unicode")))))))
75
76neovim-ryan
diff --git a/modules/ryan-packages/package-management.scm b/modules/ryan-packages/package-management.scm
index 9629168..18c7be4 100644
--- a/modules/ryan-packages/package-management.scm
+++ b/modules/ryan-packages/package-management.scm
@@ -36,7 +36,7 @@
36(define-public nix-ryan 36(define-public nix-ryan
37 (package 37 (package
38 (name "nix") 38 (name "nix")
39 (version "2.26.3") 39 (version "2.29.0")
40 (source 40 (source
41 (origin 41 (origin
42 (method git-fetch) 42 (method git-fetch)
@@ -45,7 +45,7 @@
45 (commit version))) 45 (commit version)))
46 (file-name (git-file-name "nix" version)) 46 (file-name (git-file-name "nix" version))
47 (sha256 47 (sha256
48 (base32 "1rh9k0cdixahqzziylgg7p8j9p58h55m08h3l1kg369wlmi7r5g5")))) 48 (base32 "19cd94xpjzwmclscpw9x3gfic0vf160llfnh9diz2l4823fw8iky"))))
49 (build-system meson-build-system) 49 (build-system meson-build-system)
50 (arguments 50 (arguments
51 (list 51 (list
@@ -94,7 +94,7 @@
94(define libbl3 94(define libbl3
95 (package 95 (package
96 (name "blake3") 96 (name "blake3")
97 (version "1.7.0") 97 (version "1.8.2")
98 (source 98 (source
99 (origin 99 (origin
100 (method git-fetch) 100 (method git-fetch)
@@ -103,11 +103,12 @@
103 (commit version))) 103 (commit version)))
104 (file-name (git-file-name name version)) 104 (file-name (git-file-name name version))
105 (sha256 105 (sha256
106 (base32 "1dsx5jmr8csgzdvfxf4byc1086rg6vclqgqkz54la8rpfn3gkh6k")))) 106 (base32 "1pm7285insrmpfwwal8rnp3yhvc6s2ki8b6ccmbh2qfnnl95a010"))))
107 (build-system cmake-build-system) 107 (build-system cmake-build-system)
108 (arguments 108 (arguments
109 (list 109 (list
110 #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=on") 110 #:configure-flags #~(list "-DCMAKE_POSITION_INDEPENDENT_CODE=on")
111 #:tests? #f
111 #:phases 112 #:phases
112 #~(modify-phases %standard-phases 113 #~(modify-phases %standard-phases
113 (add-after 'unpack 'enter-build-directory 114 (add-after 'unpack 'enter-build-directory
@@ -135,6 +136,9 @@
135 (sha256 136 (sha256
136 (base32 "0d15b50cf9jgvh3w99xh6crh03bn2dmv9bdyvzq6knsk2diql1dj")))) 137 (base32 "0d15b50cf9jgvh3w99xh6crh03bn2dmv9bdyvzq6knsk2diql1dj"))))
137 (build-system cmake-build-system) 138 (build-system cmake-build-system)
139 (arguments
140 (list
141 #:tests? #f))
138 (home-page "https://github.com/ToruNiina/toml11") 142 (home-page "https://github.com/ToruNiina/toml11")
139 (synopsis "TODO") 143 (synopsis "TODO")
140 (description "TODO") 144 (description "TODO")
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 11:54:49 +0000