From 2189997f72d2e07ec71a357958203ac11acab686 Mon Sep 17 00:00:00 2001 From: Aria Nolan Date: Fri, 8 Dec 2023 19:27:35 -0500 Subject: [PATCH] added udev rule for pyocd, updated flake --- flake.lock | 79 +++++++++++-------------------- hosts/JWST/configuration.nix | 5 ++ users/tacocat/home.nix | 1 + users/tacocat/programs/vscode.nix | 2 +- 4 files changed, 34 insertions(+), 53 deletions(-) diff --git a/flake.lock b/flake.lock index 56eb4d7..cc92773 100644 --- a/flake.lock +++ b/flake.lock @@ -2,26 +2,17 @@ "nodes": { "crane": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": [ - "helix", - "flake-utils" - ], "nixpkgs": [ "helix", "nixpkgs" - ], - "rust-overlay": [ - "helix", - "rust-overlay" ] }, "locked": { - "lastModified": 1688772518, - "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", + "lastModified": 1701025348, + "narHash": "sha256-42GHmYH+GF7VjwGSt+fVT1CQuNpGanJbNgVHTAZppUM=", "owner": "ipetkov", "repo": "crane", - "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", + "rev": "42afaeb1a0325194a7cdb526332d2cb92fddd07b", "type": "github" }, "original": { @@ -30,32 +21,16 @@ "type": "github" } }, - "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -72,11 +47,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1701407251, - "narHash": "sha256-HO4T2BqUpWR7GiiJHgMqI3vv0IBYABi+l85chaQ4SP8=", + "lastModified": 1701746912, + "narHash": "sha256-AaJ84umYoUNewIYpCB/F7XE2oTDaJ+VyORWh6H/SuDM=", "owner": "helix-editor", "repo": "helix", - "rev": "86023cf1e6c9ab12446061e40c838335c5790979", + "rev": "4c2bd4905e8cf1c3be8b80ee1095ab0ece61ef1b", "type": "github" }, "original": { @@ -93,11 +68,11 @@ ] }, "locked": { - "lastModified": 1701433070, - "narHash": "sha256-Gf9JStfENaUQ7YWFz3V7x/srIwr4nlnVteqaAxtwpgM=", + "lastModified": 1701728041, + "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "4a8545f5e737a6338814a4676dc8e18c7f43fc57", + "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf", "type": "github" }, "original": { @@ -108,11 +83,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1701250978, - "narHash": "sha256-ohu3cz4edjpGxs2qUTgbs0WrnewOX4crnUJNEB6Jox4=", + "lastModified": 1701656485, + "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=", "owner": "NixOs", "repo": "nixos-hardware", - "rev": "8772491ed75f150f02552c60694e1beff9f46013", + "rev": "fa194fc484fd7270ab324bb985593f71102e84d1", "type": "github" }, "original": { @@ -124,11 +99,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1690272529, - "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", + "lastModified": 1700794826, + "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", + "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8", "type": "github" }, "original": { @@ -140,11 +115,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1701253981, - "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", + "lastModified": 1701436327, + "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", + "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a", "type": "github" }, "original": { @@ -156,11 +131,11 @@ }, "nur": { "locked": { - "lastModified": 1701481147, - "narHash": "sha256-i9g1rAJaOHrItYljz1UFITzpaTesndHWO1xaKIzBklo=", + "lastModified": 1701751086, + "narHash": "sha256-W6xZpsEbS7lUwEgmYni6C/v9/4WRjqidK2awqsJbOyg=", "owner": "nix-community", "repo": "nur", - "rev": "8eaf6595fc3c0681509a33ed08f74cbf1438e8ae", + "rev": "66ea2223edebf6231874bcdeb1cd8499e58d6bbc", "type": "github" }, "original": { @@ -190,11 +165,11 @@ ] }, "locked": { - "lastModified": 1690424156, - "narHash": "sha256-Bpml+L280tHTQpwpC5/BJbU4HSvEzMvW8IZ4gAXimhE=", + "lastModified": 1701137803, + "narHash": "sha256-0LcPAdql5IhQSUXJx3Zna0dYTgdIoYO7zUrsKgiBd04=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f335a0213504c7e6481c359dc1009be9cf34432c", + "rev": "9dd940c967502f844eacea52a61e9596268d4f70", "type": "github" }, "original": { diff --git a/hosts/JWST/configuration.nix b/hosts/JWST/configuration.nix index 2e263d2..499d314 100644 --- a/hosts/JWST/configuration.nix +++ b/hosts/JWST/configuration.nix @@ -61,6 +61,11 @@ services.geoclue2.enable = true; security.rtkit.enable = true; + services.udev.extraRules = '' + # 0d28:0204 DAPLink + SUBSYSTEM=="usb", ATTR{idVendor}=="0d28", ATTR{idProduct}=="0204", MODE:="666" + ''; + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It's perfectly fine and recommended to leave diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix index fd1c9a8..a4a2cde 100644 --- a/users/tacocat/home.nix +++ b/users/tacocat/home.nix @@ -46,6 +46,7 @@ pdftk git lua + python3 pamixer networkmanagerapplet htop diff --git a/users/tacocat/programs/vscode.nix b/users/tacocat/programs/vscode.nix index 0783102..bb22687 100644 --- a/users/tacocat/programs/vscode.nix +++ b/users/tacocat/programs/vscode.nix @@ -1,7 +1,7 @@ {pkgs, ...}: { programs.vscode = { enable = true; - package = pkgs.vscodium; + package = pkgs.vscodium-fhs; enableExtensionUpdateCheck = false; enableUpdateCheck = false; extensions = with pkgs.vscode-extensions; [