summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Schanzenbacher <ryan@rschanz.org>2026-08-23 11:56:58 -0400
committerRyan Schanzenbacher <ryan@rschanz.org>2026-08-23 11:59:01 -0400
commit7108fc28e06a6326f7a04251cc95bbe50ced6133 (patch)
tree20c3dce5c279003232f13245c66de427cc5ad70a
parent63e15655ee66d63088bc907072616b988fee4351 (diff)
bump flake.lock for things and remove some comments
-rw-r--r--flake.lock58
-rw-r--r--flake.nix7
2 files changed, 59 insertions, 6 deletions
diff --git a/flake.lock b/flake.lock
index c225dc2..1a14c7f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,6 +17,26 @@
17 "type": "github" 17 "type": "github"
18 } 18 }
19 }, 19 },
20 "clipboard-sync": {
21 "inputs": {
22 "nixpkgs": [
23 "nixpkgs"
24 ]
25 },
26 "locked": {
27 "lastModified": 1759253700,
28 "narHash": "sha256-pDsDzWEBaZlT9lHsBZMGm8aBJGncMxqerKwkzjEM/EI=",
29 "owner": "dnut",
30 "repo": "clipboard-sync",
31 "rev": "138a59b8f3044dd9e7dcccd9607bbbb48c14bae6",
32 "type": "github"
33 },
34 "original": {
35 "owner": "dnut",
36 "repo": "clipboard-sync",
37 "type": "github"
38 }
39 },
20 "darwin": { 40 "darwin": {
21 "inputs": { 41 "inputs": {
22 "nixpkgs": [ 42 "nixpkgs": [
@@ -38,6 +58,21 @@
38 "type": "github" 58 "type": "github"
39 } 59 }
40 }, 60 },
61 "flake-utils": {
62 "locked": {
63 "lastModified": 1659877975,
64 "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
65 "owner": "numtide",
66 "repo": "flake-utils",
67 "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
68 "type": "github"
69 },
70 "original": {
71 "owner": "numtide",
72 "repo": "flake-utils",
73 "type": "github"
74 }
75 },
41 "home-manager": { 76 "home-manager": {
42 "inputs": { 77 "inputs": {
43 "nixpkgs": [ 78 "nixpkgs": [
@@ -160,6 +195,27 @@
160 "type": "github" 195 "type": "github"
161 } 196 }
162 }, 197 },
198 "nixgl": {
199 "inputs": {
200 "flake-utils": "flake-utils",
201 "nixpkgs": [
202 "nixpkgs"
203 ]
204 },
205 "locked": {
206 "lastModified": 1736159088,
207 "narHash": "sha256-WDBc35XdHCdmgVYbPOtd2IeUtUHCYwNyEpIr5vLZMng=",
208 "owner": "ryan77627",
209 "repo": "nixGL",
210 "rev": "3865170cbc23b32ec7cc8df1ec811fd44b6c2a58",
211 "type": "github"
212 },
213 "original": {
214 "owner": "ryan77627",
215 "repo": "nixGL",
216 "type": "github"
217 }
218 },
163 "nixpkgs": { 219 "nixpkgs": {
164 "locked": { 220 "locked": {
165 "lastModified": 1785542685, 221 "lastModified": 1785542685,
@@ -194,6 +250,7 @@
194 }, 250 },
195 "root": { 251 "root": {
196 "inputs": { 252 "inputs": {
253 "clipboard-sync": "clipboard-sync",
197 "darwin": "darwin", 254 "darwin": "darwin",
198 "home-manager": "home-manager", 255 "home-manager": "home-manager",
199 "homebrew-cask": "homebrew-cask", 256 "homebrew-cask": "homebrew-cask",
@@ -202,6 +259,7 @@
202 "homebrew-netbird": "homebrew-netbird", 259 "homebrew-netbird": "homebrew-netbird",
203 "netbird-tui": "netbird-tui", 260 "netbird-tui": "netbird-tui",
204 "nix-homebrew": "nix-homebrew", 261 "nix-homebrew": "nix-homebrew",
262 "nixgl": "nixgl",
205 "nixpkgs": "nixpkgs", 263 "nixpkgs": "nixpkgs",
206 "virby": "virby", 264 "virby": "virby",
207 "zen-browser": "zen-browser" 265 "zen-browser": "zen-browser"
diff --git a/flake.nix b/flake.nix
index c5f593f..1fb7bff 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,5 @@
1{ 1{
2 description = "Combined nix flake: darwin system (RyanMac) + standalone home-manager for Guix (ryan@linux)"; 2 description = "My main dotfiles flake";
3 3
4 inputs = { 4 inputs = {
5 nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; 5 nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
@@ -46,12 +46,7 @@
46 flake = false; 46 flake = false;
47 }; 47 };
48 48
49 # Linux-only. hyprland/hyprlock/hypridle/hyprpicker/wpaperd/kanshi/pyprland
50 # all now ship in nixpkgs itself, so only the pieces nixpkgs doesn't carry
51 # need their own flake input:
52 nixgl = { 49 nixgl = {
53 # Ryan's fork exists to patch Guix's mesa/OpenGL mismatch, unrelated to
54 # nixpkgs version - keep tracking it regardless of the nixpkgs bump.
55 url = "github:ryan77627/nixGL"; 50 url = "github:ryan77627/nixGL";
56 inputs.nixpkgs.follows = "nixpkgs"; 51 inputs.nixpkgs.follows = "nixpkgs";
57 }; 52 };