summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--SmallLaptop.scm4
-rw-r--r--channels.scm8
-rw-r--r--home-config/aerc/accounts.conf21
-rw-r--r--home-config/home-configuration.scm14
-rw-r--r--home-config/hypr/hyprland.conf6
-rw-r--r--home-config/nix-home-manager/flake.lock354
-rw-r--r--home-config/nix-home-manager/flake.nix21
-rw-r--r--home-config/nix-home-manager/home.nix3
-rw-r--r--home-config/nvim/config/init.vim6
-rw-r--r--home-config/waybar/config15
-rw-r--r--home-config/waybar/style.css6
-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
15 files changed, 344 insertions, 263 deletions
diff --git a/SmallLaptop.scm b/SmallLaptop.scm
index d277afe..121e478 100644
--- a/SmallLaptop.scm
+++ b/SmallLaptop.scm
@@ -5,6 +5,7 @@
5(operating-system 5(operating-system
6 (inherit base-operating-system) 6 (inherit base-operating-system)
7 (host-name "SmallLaptop") 7 (host-name "SmallLaptop")
8 (timezone "Europe/Amsterdam")
8 (mapped-devices (list (mapped-device 9 (mapped-devices (list (mapped-device
9 (source (uuid 10 (source (uuid
10 "b22d6f2b-44ce-4b56-9833-dde593d19d75")) 11 "b22d6f2b-44ce-4b56-9833-dde593d19d75"))
@@ -21,7 +22,8 @@
21 'fat32)) 22 'fat32))
22 (type "vfat")) %base-file-systems)) 23 (type "vfat")) %base-file-systems))
23 (bootloader (bootloader-configuration 24 (bootloader (bootloader-configuration
24 (bootloader uefi-uki-bootloader) 25 (bootloader (uefi-uki-signed-bootloader
26 "/var/lib/sbctl/keys/db/db.pem" "/var/lib/sbctl/keys/db/db.key"))
25 (targets (list "/boot/efi")) 27 (targets (list "/boot/efi"))
26 (keyboard-layout (keyboard-layout "us")))) 28 (keyboard-layout (keyboard-layout "us"))))
27 (swap-devices 29 (swap-devices
diff --git a/channels.scm b/channels.scm
index 26ddb69..957ec51 100644
--- a/channels.scm
+++ b/channels.scm
@@ -1,9 +1,9 @@
1(list (channel 1(list (channel
2 (name 'guix) 2 (name 'guix)
3 (url "https://codeberg.org/guix/guix-mirror.git") 3 (url "https://codeberg.org/guix/guix.git")
4 (branch "master") 4 (branch "master")
5 (commit 5 (commit
6 "f9b9116aef228a4455a1112f5d935f5de792370f") 6 "d65b8b4fa119c5bae519e22a5b7efee25229c8d1")
7 (introduction 7 (introduction
8 (make-channel-introduction 8 (make-channel-introduction
9 "9edb3f66fd807b096b48283debdcddccfea34bad" 9 "9edb3f66fd807b096b48283debdcddccfea34bad"
@@ -14,7 +14,7 @@
14 (url "https://gitlab.com/nonguix/nonguix") 14 (url "https://gitlab.com/nonguix/nonguix")
15 (branch "master") 15 (branch "master")
16 (commit 16 (commit
17 "8c41304decb916892fa07ca86893e4cf926ee884") 17 "82be0b7adaaaa7a98d47382d7f72dd2e31d8e6d8")
18 (introduction 18 (introduction
19 (make-channel-introduction 19 (make-channel-introduction
20 "897c1a470da759236cc11798f4e0a5f7d4d59fbc" 20 "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
@@ -25,7 +25,7 @@
25 (url "https://codeberg.org/hako/rosenthal.git") 25 (url "https://codeberg.org/hako/rosenthal.git")
26 (branch "trunk") 26 (branch "trunk")
27 (commit 27 (commit
28 "3da3fa1eee9bce8d00f85cae86d8f412f6259f7c") 28 "5ac1f7973ad82747402bbd93bb50744a9f9955b8")
29 (introduction 29 (introduction
30 (make-channel-introduction 30 (make-channel-introduction
31 "7677db76330121a901604dfbad19077893865f35" 31 "7677db76330121a901604dfbad19077893865f35"
diff --git a/home-config/aerc/accounts.conf b/home-config/aerc/accounts.conf
index 91a75c3..fd3a4dd 100644
--- a/home-config/aerc/accounts.conf
+++ b/home-config/aerc/accounts.conf
@@ -1,24 +1,14 @@
1[Personal] 1[Personal]
2source = imaps://ryan%40rschanz.org@mail.rschanz.org:993 2source = jmap://ryan%40rschanz.org@mail.rschanz.org/jmap/session
3source-cred-cmd = pass emails/personal 2>/dev/null | tr -d '\n' 3source-cred-cmd = pass emails/personal 2>/dev/null | tr -d '\n'
4outgoing = smtps://ryan%40rschanz.org@mail.rschanz.org:465 4outgoing = jmap://
5outgoing-cred-cmd = pass emails/personal 2>/dev/null | tr -d '\n' 5default = Inbox
6default = INBOX
7from = Ryan Schanzenbacher <ryan@rschanz.org> 6from = Ryan Schanzenbacher <ryan@rschanz.org>
8copy-to = Sent 7copy-to = Sent
9signature-file = ~/.config/aerc/signature_personal 8signature-file = ~/.config/aerc/signature_personal
10check-mail = 5m 9#check-mail = 5m
11aliases = Ryan S <ryan+ritlugdemo@rschanz.org>, Ryan Schanzenbacher <ryan+guixdevel@rschanz.org> 10aliases = Ryan S <ryan+ritlugdemo@rschanz.org>, Ryan Schanzenbacher <ryan+guixdevel@rschanz.org>
12 11pgp-self-encrypt = true
13[Development]
14source = imaps://ryan_devel%40rschanz.org@mail.rschanz.org:993
15source-cred-cmd = pass emails/development 2>/dev/null | tr -d '\n'
16outgoing = smtps://ryan_devel%40rschanz.org@mail.rschanz.org:465
17outgoing-cred-cmd = pass emails/development 2>/dev/null | tr -d '\n'
18default = INBOX
19from = Ryan <ryan_devel@rschanz.org>
20copy-to = Sent
21check-mail = 5m
22 12
23[School] 13[School]
24source = imaps+oauthbearer://rjs1877%40rit.edu@imap.gmail.com:993?token_endpoint=https%3A%2F%2Faccounts.google.com%2Fo%2Foauth2%2Ftoken&client_id=667738788924-0rdfvaq9ijfo1vk4474eb3quf8206h2t.apps.googleusercontent.com&client_secret=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 14source = imaps+oauthbearer://rjs1877%40rit.edu@imap.gmail.com:993?token_endpoint=https%3A%2F%2Faccounts.google.com%2Fo%2Foauth2%2Ftoken&client_id=667738788924-0rdfvaq9ijfo1vk4474eb3quf8206h2t.apps.googleusercontent.com&client_secret=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
@@ -30,3 +20,4 @@ signature-file = ~/.config/aerc/signature_rit_personal
30check-mail = 5m 20check-mail = 5m
31default = INBOX 21default = INBOX
32copy-to = [Gmail]/Sent Mail 22copy-to = [Gmail]/Sent Mail
23pgp-self-encrypt = true
diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm
index 5740b26..33f5a8e 100644
--- a/home-config/home-configuration.scm
+++ b/home-config/home-configuration.scm
@@ -48,10 +48,10 @@
48 "fd" 48 "fd"
49 ;"fish" 49 ;"fish"
50 "xdg-utils" 50 "xdg-utils"
51 "abook" 51 ;"abook"
52 "libnotify" 52 "libnotify"
53 "fzf" 53 "fzf"
54 "waypipe" 54 ;"waypipe"
55 "foot" 55 "foot"
56 "pulseaudio" ;only for pactl 56 "pulseaudio" ;only for pactl
57 "qpwgraph" 57 "qpwgraph"
@@ -76,12 +76,12 @@
76 "libreoffice" 76 "libreoffice"
77 "flatpak" 77 "flatpak"
78 "gnupg" 78 "gnupg"
79 "spotifyd" 79 ;"spotifyd"
80 "lsof" 80 "lsof"
81 "pavucontrol" 81 "pavucontrol"
82 "netcat" 82 "netcat"
83 "bind:utils" 83 "bind:utils"
84 "font-cns11643" 84 "font-cns11643-swjz"
85 "font-google-noto-emoji" 85 "font-google-noto-emoji"
86 "syncthing" 86 "syncthing"
87 ;"taskwarrior" 87 ;"taskwarrior"
@@ -125,7 +125,7 @@
125 "python:tk" 125 "python:tk"
126 "file" 126 "file"
127 "python-lsp-server" 127 "python-lsp-server"
128 "kdenlive" 128 ;"kdenlive"
129 "sqlite" 129 "sqlite"
130 ;"mpv" ; Now a nix pkg for MESA stuff 130 ;"mpv" ; Now a nix pkg for MESA stuff
131 "qbittorrent" 131 "qbittorrent"
@@ -142,7 +142,7 @@
142 "signal-desktop" 142 "signal-desktop"
143 "sc-im" 143 "sc-im"
144 "git-lfs")) 144 "git-lfs"))
145 (list my-neovim calcurse-fixed ))) 145 (list calcurse-fixed )))
146 146
147 ;; Below is the list of Home services. To search for available 147 ;; Below is the list of Home services. To search for available
148 ;; services, run 'guix home search KEYWORD' in a terminal. 148 ;; services, run 'guix home search KEYWORD' in a terminal.
@@ -195,7 +195,7 @@
195 (".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t)) 195 (".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t))
196 (".nix-channels" ,(local-file "nix-channels")))) 196 (".nix-channels" ,(local-file "nix-channels"))))
197 (service home-pipewire-service-type) 197 (service home-pipewire-service-type)
198 (service home-spotifyd-service-type) 198 ;(service home-spotifyd-service-type)
199 ; font things for nix to play nice 199 ; font things for nix to play nice
200 (simple-service 'additional-fonts-service 200 (simple-service 'additional-fonts-service
201 home-fontconfig-service-type 201 home-fontconfig-service-type
diff --git a/home-config/hypr/hyprland.conf b/home-config/hypr/hyprland.conf
index 28d8aee..e354349 100644
--- a/home-config/hypr/hyprland.conf
+++ b/home-config/hypr/hyprland.conf
@@ -17,7 +17,6 @@ env = XCURSOR_SIZE,24
17env = AQ_NO_MODIFIERS,1 17env = AQ_NO_MODIFIERS,1
18 18
19render { 19render {
20 explicit_sync = false
21 expand_undersized_textures = false 20 expand_undersized_textures = false
22} 21}
23 22
@@ -119,11 +118,6 @@ dwindle {
119# new_is_master = true 118# new_is_master = true
120#} 119#}
121 120
122gestures {
123 # See https://wiki.hyprland.org/Configuring/Variables/ for more
124 workspace_swipe = off
125}
126
127# Example per-device config 121# Example per-device config
128# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more 122# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
129device { 123device {
diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock
index fbfd48b..71e1959 100644
--- a/home-config/nix-home-manager/flake.lock
+++ b/home-config/nix-home-manager/flake.lock
@@ -20,11 +20,11 @@
20 ] 20 ]
21 }, 21 },
22 "locked": { 22 "locked": {
23 "lastModified": 1742213273, 23 "lastModified": 1762356719,
24 "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", 24 "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=",
25 "owner": "hyprwm", 25 "owner": "hyprwm",
26 "repo": "aquamarine", 26 "repo": "aquamarine",
27 "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", 27 "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7",
28 "type": "github" 28 "type": "github"
29 }, 29 },
30 "original": { 30 "original": {
@@ -73,11 +73,11 @@
73 "flake-compat": { 73 "flake-compat": {
74 "flake": false, 74 "flake": false,
75 "locked": { 75 "locked": {
76 "lastModified": 1696426674, 76 "lastModified": 1747046372,
77 "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", 77 "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
78 "owner": "edolstra", 78 "owner": "edolstra",
79 "repo": "flake-compat", 79 "repo": "flake-compat",
80 "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", 80 "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
81 "type": "github" 81 "type": "github"
82 }, 82 },
83 "original": { 83 "original": {
@@ -103,7 +103,7 @@
103 }, 103 },
104 "flake-utils": { 104 "flake-utils": {
105 "inputs": { 105 "inputs": {
106 "systems": "systems_5" 106 "systems": "systems_4"
107 }, 107 },
108 "locked": { 108 "locked": {
109 "lastModified": 1731533236, 109 "lastModified": 1731533236,
@@ -163,17 +163,17 @@
163 ] 163 ]
164 }, 164 },
165 "locked": { 165 "locked": {
166 "lastModified": 1743639371, 166 "lastModified": 1764361670,
167 "narHash": "sha256-eywYn8ayhVUzFFvIiAIIHn+00Irmhyjqe2cNdyPCLNE=", 167 "narHash": "sha256-jgWzgpIaHbL3USIq0gihZeuy1lLf2YSfwvWEwnfAJUw=",
168 "owner": "nix-community", 168 "owner": "nix-community",
169 "repo": "home-manager", 169 "repo": "home-manager",
170 "rev": "579a71b948533667c6c65e603f18990bdffc8530", 170 "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
171 "type": "github" 171 "type": "github"
172 }, 172 },
173 "original": { 173 "original": {
174 "owner": "nix-community", 174 "owner": "nix-community",
175 "repo": "home-manager", 175 "repo": "home-manager",
176 "rev": "579a71b948533667c6c65e603f18990bdffc8530", 176 "rev": "780be8ef503a28939cf9dc7996b48ffb1a3e04c6",
177 "type": "github" 177 "type": "github"
178 } 178 }
179 }, 179 },
@@ -188,17 +188,17 @@
188 ] 188 ]
189 }, 189 },
190 "locked": { 190 "locked": {
191 "lastModified": 1744109570, 191 "lastModified": 1763589171,
192 "narHash": "sha256-wYBn/AETdeQH866IWvNgNt7YrUeLxjhUSWnJzl3+zLM=", 192 "narHash": "sha256-3+k074XQ4quCWQ/WLEeYTTD+AlDlxtzKvH9gkWqn+8Y=",
193 "owner": "VirtCode", 193 "owner": "VirtCode",
194 "repo": "hypr-dynamic-cursors", 194 "repo": "hypr-dynamic-cursors",
195 "rev": "07a9ca62466edf58a251a3d9d1470f8d502ffee0", 195 "rev": "85e6a93f311132d775538c4a016b637b366d2a44",
196 "type": "github" 196 "type": "github"
197 }, 197 },
198 "original": { 198 "original": {
199 "owner": "VirtCode", 199 "owner": "VirtCode",
200 "repo": "hypr-dynamic-cursors", 200 "repo": "hypr-dynamic-cursors",
201 "rev": "07a9ca62466edf58a251a3d9d1470f8d502ffee0", 201 "rev": "85e6a93f311132d775538c4a016b637b366d2a44",
202 "type": "github" 202 "type": "github"
203 } 203 }
204 }, 204 },
@@ -218,11 +218,11 @@
218 ] 218 ]
219 }, 219 },
220 "locked": { 220 "locked": {
221 "lastModified": 1742215578, 221 "lastModified": 1753964049,
222 "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", 222 "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
223 "owner": "hyprwm", 223 "owner": "hyprwm",
224 "repo": "hyprcursor", 224 "repo": "hyprcursor",
225 "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", 225 "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
226 "type": "github" 226 "type": "github"
227 }, 227 },
228 "original": { 228 "original": {
@@ -247,11 +247,11 @@
247 ] 247 ]
248 }, 248 },
249 "locked": { 249 "locked": {
250 "lastModified": 1739049071, 250 "lastModified": 1762462052,
251 "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", 251 "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=",
252 "owner": "hyprwm", 252 "owner": "hyprwm",
253 "repo": "hyprgraphics", 253 "repo": "hyprgraphics",
254 "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", 254 "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162",
255 "type": "github" 255 "type": "github"
256 }, 256 },
257 "original": { 257 "original": {
@@ -276,11 +276,11 @@
276 ] 276 ]
277 }, 277 },
278 "locked": { 278 "locked": {
279 "lastModified": 1737634889, 279 "lastModified": 1759490292,
280 "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=", 280 "narHash": "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=",
281 "owner": "hyprwm", 281 "owner": "hyprwm",
282 "repo": "hyprgraphics", 282 "repo": "hyprgraphics",
283 "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591", 283 "rev": "9431db625cd9bb66ac55525479dce694101d6d7a",
284 "type": "github" 284 "type": "github"
285 }, 285 },
286 "original": { 286 "original": {
@@ -294,103 +294,77 @@
294 "aquamarine": "aquamarine", 294 "aquamarine": "aquamarine",
295 "hyprcursor": "hyprcursor", 295 "hyprcursor": "hyprcursor",
296 "hyprgraphics": "hyprgraphics", 296 "hyprgraphics": "hyprgraphics",
297 "hyprland-guiutils": "hyprland-guiutils",
297 "hyprland-protocols": "hyprland-protocols", 298 "hyprland-protocols": "hyprland-protocols",
298 "hyprland-qtutils": "hyprland-qtutils",
299 "hyprlang": "hyprlang", 299 "hyprlang": "hyprlang",
300 "hyprutils": "hyprutils", 300 "hyprutils": "hyprutils",
301 "hyprwayland-scanner": "hyprwayland-scanner", 301 "hyprwayland-scanner": "hyprwayland-scanner_2",
302 "nixpkgs": [ 302 "nixpkgs": [
303 "nixpkgs" 303 "nixpkgs"
304 ], 304 ],
305 "pre-commit-hooks": "pre-commit-hooks", 305 "pre-commit-hooks": "pre-commit-hooks",
306 "systems": "systems_2", 306 "systems": "systems",
307 "xdph": "xdph" 307 "xdph": "xdph"
308 }, 308 },
309 "locked": { 309 "locked": {
310 "lastModified": 1744324490, 310 "lastModified": 1762731096,
311 "narHash": "sha256-NddZqhX+75btNvcxhZD0AVXuAAM4Lnip2c+yrQThSVU=", 311 "narHash": "sha256-Kma5MxOipSBamO6DnwBeqJNjJ+VwEO73zh9h1hs/2Aw=",
312 "owner": "hyprwm", 312 "owner": "hyprwm",
313 "repo": "hyprland", 313 "repo": "hyprland",
314 "rev": "382f0f23f144e11bdccac6c5d3c1ed415b4b1855", 314 "rev": "967c3c7404d4fa00234e29c70df3e263386d2597",
315 "type": "github" 315 "type": "github"
316 }, 316 },
317 "original": { 317 "original": {
318 "owner": "hyprwm", 318 "owner": "hyprwm",
319 "ref": "v0.52.1",
319 "repo": "hyprland", 320 "repo": "hyprland",
320 "rev": "382f0f23f144e11bdccac6c5d3c1ed415b4b1855",
321 "type": "github" 321 "type": "github"
322 } 322 }
323 }, 323 },
324 "hyprland-protocols": { 324 "hyprland-guiutils": {
325 "inputs": { 325 "inputs": {
326 "nixpkgs": [ 326 "aquamarine": [
327 "hyprland", 327 "hyprland",
328 "nixpkgs" 328 "aquamarine"
329 ], 329 ],
330 "systems": [ 330 "hyprgraphics": [
331 "hyprland", 331 "hyprland",
332 "systems" 332 "hyprgraphics"
333 ] 333 ],
334 },
335 "locked": {
336 "lastModified": 1738422629,
337 "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=",
338 "owner": "hyprwm",
339 "repo": "hyprland-protocols",
340 "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed",
341 "type": "github"
342 },
343 "original": {
344 "owner": "hyprwm",
345 "repo": "hyprland-protocols",
346 "type": "github"
347 }
348 },
349 "hyprland-qt-support": {
350 "inputs": {
351 "hyprlang": [ 334 "hyprlang": [
352 "hyprland", 335 "hyprland",
353 "hyprland-qtutils",
354 "hyprlang" 336 "hyprlang"
355 ], 337 ],
338 "hyprtoolkit": "hyprtoolkit",
339 "hyprutils": [
340 "hyprland",
341 "hyprutils"
342 ],
356 "nixpkgs": [ 343 "nixpkgs": [
357 "hyprland", 344 "hyprland",
358 "hyprland-qtutils",
359 "nixpkgs" 345 "nixpkgs"
360 ], 346 ],
361 "systems": [ 347 "systems": [
362 "hyprland", 348 "hyprland",
363 "hyprland-qtutils",
364 "systems" 349 "systems"
365 ] 350 ]
366 }, 351 },
367 "locked": { 352 "locked": {
368 "lastModified": 1737634706, 353 "lastModified": 1762465111,
369 "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", 354 "narHash": "sha256-dS13YZdWjgGGLBjpT4FHB6xf8I/WiAU+mgNWXsZgDUs=",
370 "owner": "hyprwm", 355 "owner": "hyprwm",
371 "repo": "hyprland-qt-support", 356 "repo": "hyprland-guiutils",
372 "rev": "8810df502cdee755993cb803eba7b23f189db795", 357 "rev": "a415eba866a953f3096d661318f771aa0082eb98",
373 "type": "github" 358 "type": "github"
374 }, 359 },
375 "original": { 360 "original": {
376 "owner": "hyprwm", 361 "owner": "hyprwm",
377 "repo": "hyprland-qt-support", 362 "repo": "hyprland-guiutils",
378 "type": "github" 363 "type": "github"
379 } 364 }
380 }, 365 },
381 "hyprland-qtutils": { 366 "hyprland-protocols": {
382 "inputs": { 367 "inputs": {
383 "hyprland-qt-support": "hyprland-qt-support",
384 "hyprlang": [
385 "hyprland",
386 "hyprlang"
387 ],
388 "hyprutils": [
389 "hyprland",
390 "hyprland-qtutils",
391 "hyprlang",
392 "hyprutils"
393 ],
394 "nixpkgs": [ 368 "nixpkgs": [
395 "hyprland", 369 "hyprland",
396 "nixpkgs" 370 "nixpkgs"
@@ -401,16 +375,16 @@
401 ] 375 ]
402 }, 376 },
403 "locked": { 377 "locked": {
404 "lastModified": 1739048983, 378 "lastModified": 1759610243,
405 "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", 379 "narHash": "sha256-+KEVnKBe8wz+a6dTLq8YDcF3UrhQElwsYJaVaHXJtoI=",
406 "owner": "hyprwm", 380 "owner": "hyprwm",
407 "repo": "hyprland-qtutils", 381 "repo": "hyprland-protocols",
408 "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", 382 "rev": "bd153e76f751f150a09328dbdeb5e4fab9d23622",
409 "type": "github" 383 "type": "github"
410 }, 384 },
411 "original": { 385 "original": {
412 "owner": "hyprwm", 386 "owner": "hyprwm",
413 "repo": "hyprland-qtutils", 387 "repo": "hyprland-protocols",
414 "type": "github" 388 "type": "github"
415 } 389 }
416 }, 390 },
@@ -430,11 +404,11 @@
430 ] 404 ]
431 }, 405 },
432 "locked": { 406 "locked": {
433 "lastModified": 1741191527, 407 "lastModified": 1758927902,
434 "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", 408 "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
435 "owner": "hyprwm", 409 "owner": "hyprwm",
436 "repo": "hyprlang", 410 "repo": "hyprlang",
437 "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", 411 "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
438 "type": "github" 412 "type": "github"
439 }, 413 },
440 "original": { 414 "original": {
@@ -459,11 +433,11 @@
459 ] 433 ]
460 }, 434 },
461 "locked": { 435 "locked": {
462 "lastModified": 1737634606, 436 "lastModified": 1758927902,
463 "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", 437 "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=",
464 "owner": "hyprwm", 438 "owner": "hyprwm",
465 "repo": "hyprlang", 439 "repo": "hyprlang",
466 "rev": "f41271d35cc0f370d300413d756c2677f386af9d", 440 "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da",
467 "type": "github" 441 "type": "github"
468 }, 442 },
469 "original": { 443 "original": {
@@ -477,67 +451,118 @@
477 "hyprgraphics": "hyprgraphics_2", 451 "hyprgraphics": "hyprgraphics_2",
478 "hyprlang": "hyprlang_2", 452 "hyprlang": "hyprlang_2",
479 "hyprutils": "hyprutils_2", 453 "hyprutils": "hyprutils_2",
480 "hyprwayland-scanner": "hyprwayland-scanner_2", 454 "hyprwayland-scanner": "hyprwayland-scanner_3",
481 "nixpkgs": [ 455 "nixpkgs": "nixpkgs",
482 "nixpkgs" 456 "systems": "systems_2"
483 ],
484 "systems": "systems_3"
485 }, 457 },
486 "locked": { 458 "locked": {
487 "lastModified": 1743294814, 459 "lastModified": 1761675634,
488 "narHash": "sha256-HqzVTylWZA0+cf4cpMGQOgcidJuCogjv51fJShrGxlI=", 460 "narHash": "sha256-Et1jNDB2d3e0b4okIKuyAMktECS+5hk+vMAA7X598ao=",
489 "owner": "hyprwm", 461 "owner": "hyprwm",
490 "repo": "hyprlock", 462 "repo": "hyprlock",
491 "rev": "1ebbc35c55ba9e43d53c4f1038c897be7239c903", 463 "rev": "98b86752fe4867bd14ef96a92ea788229af93130",
492 "type": "github" 464 "type": "github"
493 }, 465 },
494 "original": { 466 "original": {
495 "owner": "hyprwm", 467 "owner": "hyprwm",
496 "repo": "hyprlock", 468 "repo": "hyprlock",
497 "rev": "1ebbc35c55ba9e43d53c4f1038c897be7239c903", 469 "rev": "98b86752fe4867bd14ef96a92ea788229af93130",
498 "type": "github" 470 "type": "github"
499 } 471 }
500 }, 472 },
501 "hyprpicker-git": { 473 "hyprpicker-git": {
502 "inputs": { 474 "inputs": {
503 "hyprutils": "hyprutils_3", 475 "hyprutils": "hyprutils_3",
504 "hyprwayland-scanner": "hyprwayland-scanner_3", 476 "hyprwayland-scanner": "hyprwayland-scanner_4",
505 "nixpkgs": [ 477 "nixpkgs": [
506 "nixpkgs" 478 "nixpkgs"
507 ], 479 ],
508 "systems": "systems_4" 480 "systems": "systems_3"
509 }, 481 },
510 "locked": { 482 "locked": {
511 "lastModified": 1737635601, 483 "lastModified": 1746060866,
512 "narHash": "sha256-/Jb/9HqC5Ou5JtsLHY2MJtj/c0aDG3kaeh4RLvc2X2U=", 484 "narHash": "sha256-ta3eCdXyKTVKhCU2/zC+XljU1Tq5huIyuFBtzOcUU4c=",
513 "owner": "hyprwm", 485 "owner": "hyprwm",
514 "repo": "hyprpicker", 486 "repo": "hyprpicker",
515 "rev": "c3777320b358bb28a0f2112441377fe452d77ea8", 487 "rev": "980ebd486b8a4c2ac1670286f38d163db1e38cd9",
516 "type": "github" 488 "type": "github"
517 }, 489 },
518 "original": { 490 "original": {
519 "owner": "hyprwm", 491 "owner": "hyprwm",
492 "ref": "v0.4.5",
520 "repo": "hyprpicker", 493 "repo": "hyprpicker",
521 "rev": "c3777320b358bb28a0f2112441377fe452d77ea8", 494 "type": "github"
495 }
496 },
497 "hyprtoolkit": {
498 "inputs": {
499 "aquamarine": [
500 "hyprland",
501 "hyprland-guiutils",
502 "aquamarine"
503 ],
504 "hyprgraphics": [
505 "hyprland",
506 "hyprland-guiutils",
507 "hyprgraphics"
508 ],
509 "hyprlang": [
510 "hyprland",
511 "hyprland-guiutils",
512 "hyprlang"
513 ],
514 "hyprutils": [
515 "hyprland",
516 "hyprland-guiutils",
517 "hyprutils"
518 ],
519 "hyprwayland-scanner": "hyprwayland-scanner",
520 "nixpkgs": [
521 "hyprland",
522 "hyprland-guiutils",
523 "nixpkgs"
524 ],
525 "systems": [
526 "hyprland",
527 "hyprland-guiutils",
528 "systems"
529 ]
530 },
531 "locked": {
532 "lastModified": 1762463729,
533 "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=",
534 "owner": "hyprwm",
535 "repo": "hyprtoolkit",
536 "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532",
537 "type": "github"
538 },
539 "original": {
540 "owner": "hyprwm",
541 "repo": "hyprtoolkit",
522 "type": "github" 542 "type": "github"
523 } 543 }
524 }, 544 },
525 "hyprutils": { 545 "hyprutils": {
526 "inputs": { 546 "inputs": {
527 "nixpkgs": "nixpkgs", 547 "nixpkgs": [
528 "systems": "systems" 548 "hyprland",
549 "nixpkgs"
550 ],
551 "systems": [
552 "hyprland",
553 "systems"
554 ]
529 }, 555 },
530 "locked": { 556 "locked": {
531 "lastModified": 1743950287, 557 "lastModified": 1762387740,
532 "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", 558 "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=",
533 "owner": "hyprwm", 559 "owner": "hyprwm",
534 "repo": "hyprutils", 560 "repo": "hyprutils",
535 "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", 561 "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7",
536 "type": "github" 562 "type": "github"
537 }, 563 },
538 "original": { 564 "original": {
539 "owner": "hyprwm", 565 "owner": "hyprwm",
540 "ref": "v0.6.0",
541 "repo": "hyprutils", 566 "repo": "hyprutils",
542 "type": "github" 567 "type": "github"
543 } 568 }
@@ -554,11 +579,11 @@
554 ] 579 ]
555 }, 580 },
556 "locked": { 581 "locked": {
557 "lastModified": 1737978343, 582 "lastModified": 1759619523,
558 "narHash": "sha256-TfFS0HCEJh63Kahrkp1h9hVDMdLU8a37Zz+IFucxyfA=", 583 "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=",
559 "owner": "hyprwm", 584 "owner": "hyprwm",
560 "repo": "hyprutils", 585 "repo": "hyprutils",
561 "rev": "6a8bc9d2a4451df12f5179dc0b1d2d46518a90ab", 586 "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef",
562 "type": "github" 587 "type": "github"
563 }, 588 },
564 "original": { 589 "original": {
@@ -596,19 +621,23 @@
596 "inputs": { 621 "inputs": {
597 "nixpkgs": [ 622 "nixpkgs": [
598 "hyprland", 623 "hyprland",
624 "hyprland-guiutils",
625 "hyprtoolkit",
599 "nixpkgs" 626 "nixpkgs"
600 ], 627 ],
601 "systems": [ 628 "systems": [
602 "hyprland", 629 "hyprland",
630 "hyprland-guiutils",
631 "hyprtoolkit",
603 "systems" 632 "systems"
604 ] 633 ]
605 }, 634 },
606 "locked": { 635 "locked": {
607 "lastModified": 1739870480, 636 "lastModified": 1755184602,
608 "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", 637 "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
609 "owner": "hyprwm", 638 "owner": "hyprwm",
610 "repo": "hyprwayland-scanner", 639 "repo": "hyprwayland-scanner",
611 "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", 640 "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
612 "type": "github" 641 "type": "github"
613 }, 642 },
614 "original": { 643 "original": {
@@ -620,6 +649,31 @@
620 "hyprwayland-scanner_2": { 649 "hyprwayland-scanner_2": {
621 "inputs": { 650 "inputs": {
622 "nixpkgs": [ 651 "nixpkgs": [
652 "hyprland",
653 "nixpkgs"
654 ],
655 "systems": [
656 "hyprland",
657 "systems"
658 ]
659 },
660 "locked": {
661 "lastModified": 1755184602,
662 "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
663 "owner": "hyprwm",
664 "repo": "hyprwayland-scanner",
665 "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
666 "type": "github"
667 },
668 "original": {
669 "owner": "hyprwm",
670 "repo": "hyprwayland-scanner",
671 "type": "github"
672 }
673 },
674 "hyprwayland-scanner_3": {
675 "inputs": {
676 "nixpkgs": [
623 "hyprlock", 677 "hyprlock",
624 "nixpkgs" 678 "nixpkgs"
625 ], 679 ],
@@ -629,11 +683,11 @@
629 ] 683 ]
630 }, 684 },
631 "locked": { 685 "locked": {
632 "lastModified": 1735493474, 686 "lastModified": 1755184602,
633 "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", 687 "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=",
634 "owner": "hyprwm", 688 "owner": "hyprwm",
635 "repo": "hyprwayland-scanner", 689 "repo": "hyprwayland-scanner",
636 "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", 690 "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d",
637 "type": "github" 691 "type": "github"
638 }, 692 },
639 "original": { 693 "original": {
@@ -642,7 +696,7 @@
642 "type": "github" 696 "type": "github"
643 } 697 }
644 }, 698 },
645 "hyprwayland-scanner_3": { 699 "hyprwayland-scanner_4": {
646 "inputs": { 700 "inputs": {
647 "nixpkgs": [ 701 "nixpkgs": [
648 "hyprpicker-git", 702 "hyprpicker-git",
@@ -751,11 +805,11 @@
751 }, 805 },
752 "nixpkgs": { 806 "nixpkgs": {
753 "locked": { 807 "locked": {
754 "lastModified": 1744232761, 808 "lastModified": 1759831965,
755 "narHash": "sha256-gbl9hE39nQRpZaLjhWKmEu5ejtQsgI5TWYrIVVJn30U=", 809 "narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=",
756 "owner": "NixOS", 810 "owner": "NixOS",
757 "repo": "nixpkgs", 811 "repo": "nixpkgs",
758 "rev": "f675531bc7e6657c10a18b565cfebd8aa9e24c14", 812 "rev": "c9b6fb798541223bbb396d287d16f43520250518",
759 "type": "github" 813 "type": "github"
760 }, 814 },
761 "original": { 815 "original": {
@@ -782,17 +836,17 @@
782 }, 836 },
783 "nixpkgs_2": { 837 "nixpkgs_2": {
784 "locked": { 838 "locked": {
785 "lastModified": 1743583204, 839 "lastModified": 1764242076,
786 "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", 840 "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
787 "owner": "nixos", 841 "owner": "nixos",
788 "repo": "nixpkgs", 842 "repo": "nixpkgs",
789 "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", 843 "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
790 "type": "github" 844 "type": "github"
791 }, 845 },
792 "original": { 846 "original": {
793 "owner": "nixos", 847 "owner": "nixos",
794 "repo": "nixpkgs", 848 "repo": "nixpkgs",
795 "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", 849 "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
796 "type": "github" 850 "type": "github"
797 } 851 }
798 }, 852 },
@@ -806,11 +860,11 @@
806 ] 860 ]
807 }, 861 },
808 "locked": { 862 "locked": {
809 "lastModified": 1742058297, 863 "lastModified": 1762441963,
810 "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", 864 "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=",
811 "owner": "cachix", 865 "owner": "cachix",
812 "repo": "git-hooks.nix", 866 "repo": "git-hooks.nix",
813 "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", 867 "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885",
814 "type": "github" 868 "type": "github"
815 }, 869 },
816 "original": { 870 "original": {
@@ -842,16 +896,17 @@
842 ] 896 ]
843 }, 897 },
844 "locked": { 898 "locked": {
845 "lastModified": 1729391507, 899 "lastModified": 1764902447,
846 "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", 900 "narHash": "sha256-wNqkDBj+tjK619sTHPEA7uhjr7DHHEY8OsFou31dxy0=",
847 "owner": "oxalica", 901 "owner": "oxalica",
848 "repo": "rust-overlay", 902 "repo": "rust-overlay",
849 "rev": "784981a9feeba406de38c1c9a3decf966d853cca", 903 "rev": "d914a744a83098eeb28125d2848ad383b209223f",
850 "type": "github" 904 "type": "github"
851 }, 905 },
852 "original": { 906 "original": {
853 "owner": "oxalica", 907 "owner": "oxalica",
854 "repo": "rust-overlay", 908 "repo": "rust-overlay",
909 "rev": "d914a744a83098eeb28125d2848ad383b209223f",
855 "type": "github" 910 "type": "github"
856 } 911 }
857 }, 912 },
@@ -902,21 +957,6 @@
902 }, 957 },
903 "systems_4": { 958 "systems_4": {
904 "locked": { 959 "locked": {
905 "lastModified": 1689347949,
906 "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
907 "owner": "nix-systems",
908 "repo": "default-linux",
909 "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
910 "type": "github"
911 },
912 "original": {
913 "owner": "nix-systems",
914 "repo": "default-linux",
915 "type": "github"
916 }
917 },
918 "systems_5": {
919 "locked": {
920 "lastModified": 1681028828, 960 "lastModified": 1681028828,
921 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", 961 "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
922 "owner": "nix-systems", 962 "owner": "nix-systems",
@@ -930,7 +970,7 @@
930 "type": "github" 970 "type": "github"
931 } 971 }
932 }, 972 },
933 "systems_6": { 973 "systems_5": {
934 "locked": { 974 "locked": {
935 "lastModified": 1689347949, 975 "lastModified": 1689347949,
936 "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", 976 "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -951,20 +991,20 @@
951 "nixpkgs" 991 "nixpkgs"
952 ], 992 ],
953 "rust-overlay": "rust-overlay", 993 "rust-overlay": "rust-overlay",
954 "systems": "systems_6" 994 "systems": "systems_5"
955 }, 995 },
956 "locked": { 996 "locked": {
957 "lastModified": 1746003389, 997 "lastModified": 1761730811,
958 "narHash": "sha256-UZzEVcFPFlSp/2ppzoTEn5n+iDgUGY2ACtk/2Crxyu0=", 998 "narHash": "sha256-tGeBjGdhzwCRVJ+/bEghEzmF4dZn9GbG6wBhVVFfp4c=",
959 "owner": "danyspin97", 999 "owner": "danyspin97",
960 "repo": "wpaperd", 1000 "repo": "wpaperd",
961 "rev": "f891ed0d36d3b7a51897da59c3d6e213935afc93", 1001 "rev": "087a1edb5afd78434806f2f185755d0ced7f26ab",
962 "type": "github" 1002 "type": "github"
963 }, 1003 },
964 "original": { 1004 "original": {
965 "owner": "danyspin97", 1005 "owner": "danyspin97",
966 "repo": "wpaperd", 1006 "repo": "wpaperd",
967 "rev": "f891ed0d36d3b7a51897da59c3d6e213935afc93", 1007 "rev": "087a1edb5afd78434806f2f185755d0ced7f26ab",
968 "type": "github" 1008 "type": "github"
969 } 1009 }
970 }, 1010 },
@@ -996,11 +1036,11 @@
996 ] 1036 ]
997 }, 1037 },
998 "locked": { 1038 "locked": {
999 "lastModified": 1741934139, 1039 "lastModified": 1761431178,
1000 "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", 1040 "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
1001 "owner": "hyprwm", 1041 "owner": "hyprwm",
1002 "repo": "xdg-desktop-portal-hyprland", 1042 "repo": "xdg-desktop-portal-hyprland",
1003 "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", 1043 "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
1004 "type": "github" 1044 "type": "github"
1005 }, 1045 },
1006 "original": { 1046 "original": {
@@ -1019,17 +1059,17 @@
1019 ] 1059 ]
1020 }, 1060 },
1021 "locked": { 1061 "locked": {
1022 "lastModified": 1745079747, 1062 "lastModified": 1764350280,
1023 "narHash": "sha256-Xg1C41ynxxljEyGqGDyFJ5c3i6p6GTSKMuAZQB/W2rA=", 1063 "narHash": "sha256-H8VpXvqEHll38N3YIaZUtqn7BSrq3SRfCL8idWvVRLw=",
1024 "owner": "0xc000022070", 1064 "owner": "0xc000022070",
1025 "repo": "zen-browser-flake", 1065 "repo": "zen-browser-flake",
1026 "rev": "55681a87d6e094fa93d260993e8c154208e70a69", 1066 "rev": "504383097cbd6793aa62d1ec2d90d67ce7e4542e",
1027 "type": "github" 1067 "type": "github"
1028 }, 1068 },
1029 "original": { 1069 "original": {
1030 "owner": "0xc000022070", 1070 "owner": "0xc000022070",
1031 "repo": "zen-browser-flake", 1071 "repo": "zen-browser-flake",
1032 "rev": "55681a87d6e094fa93d260993e8c154208e70a69", 1072 "rev": "504383097cbd6793aa62d1ec2d90d67ce7e4542e",
1033 "type": "github" 1073 "type": "github"
1034 } 1074 }
1035 } 1075 }
diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix
index 588c9ca..35390b1 100644
--- a/home-config/nix-home-manager/flake.nix
+++ b/home-config/nix-home-manager/flake.nix
@@ -3,31 +3,32 @@
3 3
4 inputs = { 4 inputs = {
5 # Specify the source of Home Manager and Nixpkgs. 5 # Specify the source of Home Manager and Nixpkgs.
6 nixpkgs.url = "github:nixos/nixpkgs/2c8d3f48d33929642c1c12cd243df4cc7d2ce434"; 6 nixpkgs.url = "github:nixos/nixpkgs/2fad6eac6077f03fe109c4d4eb171cf96791faa4";
7 home-manager = { 7 home-manager = {
8 url = "github:nix-community/home-manager/579a71b948533667c6c65e603f18990bdffc8530"; 8 url = "github:nix-community/home-manager/780be8ef503a28939cf9dc7996b48ffb1a3e04c6";
9 inputs.nixpkgs.follows = "nixpkgs"; 9 inputs.nixpkgs.follows = "nixpkgs";
10 }; 10 };
11 hyprlock = { 11 hyprlock = {
12 url = "github:hyprwm/hyprlock/1ebbc35c55ba9e43d53c4f1038c897be7239c903"; 12 url = "github:hyprwm/hyprlock/98b86752fe4867bd14ef96a92ea788229af93130";
13 inputs.nixpkgs.follows = "nixpkgs"; 13 #inputs.nixpkgs.follows = "nixpkgs";
14 }; 14 };
15 hyprpicker-git = { 15 hyprpicker-git = {
16 url = "github:hyprwm/hyprpicker/c3777320b358bb28a0f2112441377fe452d77ea8"; 16 url = "github:hyprwm/hyprpicker/v0.4.5";
17 inputs.nixpkgs.follows = "nixpkgs"; 17 inputs.nixpkgs.follows = "nixpkgs";
18 }; 18 };
19 hyprland = { 19 hyprland = {
20 url = "github:hyprwm/hyprland/382f0f23f144e11bdccac6c5d3c1ed415b4b1855"; 20 url = "github:hyprwm/hyprland/v0.52.1";
21 inputs.nixpkgs.follows = "nixpkgs"; 21 inputs.nixpkgs.follows = "nixpkgs";
22 inputs.hyprutils.url = "github:hyprwm/hyprutils/v0.6.0"; 22 #inputs.hyprutils.url = "github:hyprwm/hyprutils/v0.6.0";
23 }; 23 };
24 nixgl = { 24 nixgl = {
25 url = "github:ryan77627/nixGL/3865170cbc23b32ec7cc8df1ec811fd44b6c2a58"; 25 url = "github:ryan77627/nixGL/3865170cbc23b32ec7cc8df1ec811fd44b6c2a58";
26 inputs.nixpkgs.follows = "nixpkgs"; 26 inputs.nixpkgs.follows = "nixpkgs";
27 }; 27 };
28 wpaperd = { 28 wpaperd = {
29 url = "github:danyspin97/wpaperd/f891ed0d36d3b7a51897da59c3d6e213935afc93"; 29 url = "github:danyspin97/wpaperd/087a1edb5afd78434806f2f185755d0ced7f26ab";
30 inputs.nixpkgs.follows = "nixpkgs"; 30 inputs.nixpkgs.follows = "nixpkgs";
31 inputs.rust-overlay.url = "github:oxalica/rust-overlay/d914a744a83098eeb28125d2848ad383b209223f";
31 }; 32 };
32 mozff = { 33 mozff = {
33 url = "github:nix-community/flake-firefox-nightly/3391372604cd3def19e6df88a51f1882aabcd59f"; 34 url = "github:nix-community/flake-firefox-nightly/3391372604cd3def19e6df88a51f1882aabcd59f";
@@ -38,12 +39,12 @@
38 inputs.nixpkgs.follows = "nixpkgs"; 39 inputs.nixpkgs.follows = "nixpkgs";
39 }; 40 };
40 hypr-dynamic-cursors = { 41 hypr-dynamic-cursors = {
41 url = "github:VirtCode/hypr-dynamic-cursors/07a9ca62466edf58a251a3d9d1470f8d502ffee0"; 42 url = "github:VirtCode/hypr-dynamic-cursors/85e6a93f311132d775538c4a016b637b366d2a44";
42 inputs.hyprland.follows = "hyprland"; 43 inputs.hyprland.follows = "hyprland";
43 inputs.nixpkgs.follows = "hyprland/nixpkgs"; 44 inputs.nixpkgs.follows = "hyprland/nixpkgs";
44 }; 45 };
45 zen-browser = { 46 zen-browser = {
46 url = "github:0xc000022070/zen-browser-flake/55681a87d6e094fa93d260993e8c154208e70a69"; 47 url = "github:0xc000022070/zen-browser-flake/504383097cbd6793aa62d1ec2d90d67ce7e4542e";
47 inputs.nixpkgs.follows = "nixpkgs"; 48 inputs.nixpkgs.follows = "nixpkgs";
48 inputs.home-manager.follows = "home-manager"; 49 inputs.home-manager.follows = "home-manager";
49 }; 50 };
diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix
index a88af0e..6ac9a1d 100644
--- a/home-config/nix-home-manager/home.nix
+++ b/home-config/nix-home-manager/home.nix
@@ -106,6 +106,7 @@
106 kubectl 106 kubectl
107 fluxcd 107 fluxcd
108 restic 108 restic
109 kdePackages.kdenlive
109 110
110 # Here until i can fix firefox's stupid devtools issue 111 # Here until i can fix firefox's stupid devtools issue
111 chromium 112 chromium
@@ -130,7 +131,7 @@
130 dejavu_fonts 131 dejavu_fonts
131 liberation_ttf 132 liberation_ttf
132 noto-fonts-cjk-sans 133 noto-fonts-cjk-sans
133 noto-fonts-emoji 134 noto-fonts-color-emoji
134 135
135 # # It is sometimes useful to fine-tune packages, for example, by applying 136 # # It is sometimes useful to fine-tune packages, for example, by applying
136 # # overrides. You can do that directly here, just don't forget the 137 # # overrides. You can do that directly here, just don't forget the
diff --git a/home-config/nvim/config/init.vim b/home-config/nvim/config/init.vim
index 6735d81..3fe7fc8 100644
--- a/home-config/nvim/config/init.vim
+++ b/home-config/nvim/config/init.vim
@@ -50,12 +50,6 @@ require("mason-lspconfig").setup {
50 50
51require('leap').add_default_mappings() 51require('leap').add_default_mappings()
52 52
53require("mason-lspconfig").setup_handlers {
54 function (server_name)
55 require("lspconfig")[server_name].setup {}
56 end,
57}
58
59require('nvim-treesitter.configs').setup { 53require('nvim-treesitter.configs').setup {
60 highlight = { 54 highlight = {
61 enable = true, 55 enable = true,
diff --git a/home-config/waybar/config b/home-config/waybar/config
index 375835e..abe0762 100644
--- a/home-config/waybar/config
+++ b/home-config/waybar/config
@@ -5,7 +5,7 @@
5 5
6 "modules-left": ["hyprland/workspaces", "hyprland/submap"], 6 "modules-left": ["hyprland/workspaces", "hyprland/submap"],
7 "modules-center": ["hyprland/window"], 7 "modules-center": ["hyprland/window"],
8 "modules-right": ["tray", "custom/spotify", "privacy", "custom/weather", "custom/mail", "custom/storage", "backlight", "bluetooth", "pulseaudio", "network", "idle_inhibitor", "battery", "clock"], 8 "modules-right": ["tray", "custom/spotify", "privacy", "custom/weather", "custom/mail", "custom/storage", "backlight", "bluetooth", "pulseaudio", "network", "idle_inhibitor", "battery", "battery#num2", "clock"],
9 "hyprland/submap": { 9 "hyprland/submap": {
10 "format": " {}" 10 "format": " {}"
11 }, 11 },
@@ -34,6 +34,19 @@
34 "critical": 10 34 "critical": 10
35 }, 35 },
36 "tooltip": false, 36 "tooltip": false,
37 "bat":"BAT0"
38 },
39 "battery#num2": {
40 "format": "{capacity}% {icon}",
41 "format-alt": "{time} {icon}",
42 "format-icons": ["", "", "", "", ""],
43 "format-charging": "{capacity}% ",
44 "interval": 30,
45 "states": {
46 "warning": 25,
47 "critical": 10
48 },
49 "tooltip": false,
37 "bat":"BAT1" 50 "bat":"BAT1"
38 }, 51 },
39 "bluetooth": { 52 "bluetooth": {
diff --git a/home-config/waybar/style.css b/home-config/waybar/style.css
index 548056f..682a14e 100644
--- a/home-config/waybar/style.css
+++ b/home-config/waybar/style.css
@@ -56,15 +56,15 @@ window#waybar.solo {
56 min-width: 140px; 56 min-width: 140px;
57} 57}
58 58
59#battery.warning { 59#battery.warning #battery.num2.warning {
60 color: rgba(255, 210, 4, 1); 60 color: rgba(255, 210, 4, 1);
61} 61}
62 62
63#battery.critical { 63#battery.critical #battery.bat2.critical {
64 color: rgba(238, 46, 36, 1); 64 color: rgba(238, 46, 36, 1);
65} 65}
66 66
67#battery.charging { 67#battery.charging #battery.bat2.charging {
68 color: rgba(217, 216, 216, 1); 68 color: rgba(217, 216, 216, 1);
69} 69}
70 70
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-13 06:53:39 +0000