From b7ed2f7ec01eac2142ee08c44fcf99d285649493 Mon Sep 17 00:00:00 2001
From: Tim Schubert <dadada@dadada.li>
Date: Sun, 17 Nov 2024 00:50:21 +0100
Subject: [PATCH 1/3] feat(home): remove jujutsu from pkgs
---
home/pkgs.nix | 2 --
1 file changed, 2 deletions(-)
diff --git a/home/pkgs.nix b/home/pkgs.nix
index ec1deb5..3b1d6ec 100644
--- a/home/pkgs.nix
+++ b/home/pkgs.nix
@@ -61,8 +61,6 @@ with pkgs; [
jameica
jc # convert output to json
josm
- jujutsu
- jq
jq
#jupyter
kcachegrind
From 806da7a64630973ce7e532ff9ed7ddd5034da1d7 Mon Sep 17 00:00:00 2001
From: Tim Schubert <dadada@dadada.li>
Date: Sun, 24 Nov 2024 15:58:42 +0100
Subject: [PATCH 2/3] feat: add udev rules from libsigrok
---
nixos/gorgon/configuration.nix | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix
index fd61298..beadbc6 100644
--- a/nixos/gorgon/configuration.nix
+++ b/nixos/gorgon/configuration.nix
@@ -147,7 +147,12 @@ in
HibernateDelaySec=1h
'';
- services.udev.packages = [ xilinxJtag saleaeLogic keychron ]; #noMtpUdevRules ];
+ services.udev.packages = [
+ xilinxJtag
+ saleaeLogic
+ keychron
+ pkgs.libsigrok
+ ]; #noMtpUdevRules ];
virtualisation.libvirtd.enable = true;
From c70621ece1e90fdeb69e98e845f49271cf66c7c1 Mon Sep 17 00:00:00 2001
From: Tim Schubert <dadada@dadada.li>
Date: Sun, 24 Nov 2024 16:00:50 +0100
Subject: [PATCH 3/3] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Flake lock file updates:
• Updated input 'nixos-generators':
'github:nix-community/nixos-generators/06ffce1a8d95e95c06a4bcfa117dd960b14a7101' (2024-11-14)
→ 'github:nix-community/nixos-generators/3280fdde8c8f0276c9f5286ad5c0f433dfa5d56c' (2024-11-21)
• Updated input 'nixos-generators/nixlib':
'github:nix-community/nixpkgs.lib/e04234d263750db01c78a412690363dc2226e68a' (2024-11-10)
→ 'github:nix-community/nixpkgs.lib/b9f04e3cf71c23bea21d2768051e6b3068d44734' (2024-11-17)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/035d434d48f4375ac5d3a620954cf5fda7dd7c36' (2024-11-15)
→ 'github:NixOS/nixpkgs/df94f897ffe1af1bcd60cb68697c5d8e6431346e' (2024-11-22)
• Updated input 'nixpkgs-full':
'github:NixOS/nixpkgs/c21b77913ea840f8bcf9adf4c41cecc2abffd38d' (2024-11-15)
→ 'github:NixOS/nixpkgs/e8c38b73aeb218e27163376a2d617e61a2ad9b59' (2024-11-16)
• Updated input 'treefmt-nix':
'github:numtide/treefmt-nix/746901bb8dba96d154b66492a29f5db0693dbfcc' (2024-10-30)
→ 'github:numtide/treefmt-nix/705df92694af7093dfbb27109ce16d828a79155f' (2024-11-22)
---
flake.lock | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/flake.lock b/flake.lock
index a946b3d..21ec40c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -211,11 +211,11 @@
},
"nixlib": {
"locked": {
- "lastModified": 1731200463,
- "narHash": "sha256-qDaAweJjdFbVExqs8aG27urUgcgKufkIngHW3Rzustg=",
+ "lastModified": 1731805462,
+ "narHash": "sha256-yhEMW4MBi+IAyEJyiKbnFvY1uARyMKJpLUhkczI49wk=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
- "rev": "e04234d263750db01c78a412690363dc2226e68a",
+ "rev": "b9f04e3cf71c23bea21d2768051e6b3068d44734",
"type": "github"
},
"original": {
@@ -232,11 +232,11 @@
]
},
"locked": {
- "lastModified": 1731546190,
- "narHash": "sha256-kJix8nLyFIJ3EC7VtoXK/85C4ZN2dC5oWoS8+ErehqI=",
+ "lastModified": 1732151224,
+ "narHash": "sha256-5IgpueM8SGLOadzUJK6Gk37zEBXGd56BkNOtoWmnZos=",
"owner": "nix-community",
"repo": "nixos-generators",
- "rev": "06ffce1a8d95e95c06a4bcfa117dd960b14a7101",
+ "rev": "3280fdde8c8f0276c9f5286ad5c0f433dfa5d56c",
"type": "github"
},
"original": {
@@ -263,11 +263,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1731663789,
- "narHash": "sha256-x07g4NcqGP6mQn6AISXJaks9sQYDjZmTMBlKIvajvyc=",
+ "lastModified": 1732244845,
+ "narHash": "sha256-aspop5sCDNpDMS23BplGFtQDadwkSb/sOxpuC3lafvo=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "035d434d48f4375ac5d3a620954cf5fda7dd7c36",
+ "rev": "df94f897ffe1af1bcd60cb68697c5d8e6431346e",
"type": "github"
},
"original": {
@@ -279,11 +279,11 @@
},
"nixpkgs-full": {
"locked": {
- "lastModified": 1731652201,
- "narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=",
+ "lastModified": 1731797254,
+ "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d",
+ "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
"type": "github"
},
"original": {
@@ -332,11 +332,11 @@
]
},
"locked": {
- "lastModified": 1730321837,
- "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
+ "lastModified": 1732292307,
+ "narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
+ "rev": "705df92694af7093dfbb27109ce16d828a79155f",
"type": "github"
},
"original": {