summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--flake.lock18
-rw-r--r--host/Rory-desktop/configuration.nix13
-rwxr-xr-xmodules/base.nix1
-rwxr-xr-xmodules/users/Rory.nix2
4 files changed, 24 insertions, 10 deletions
diff --git a/flake.lock b/flake.lock
index 308aae8..d3bcd4f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -164,11 +164,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1703795120,
-        "narHash": "sha256-Scr4fwfGn03zwFgM7IltT8hqbFDkHvymnF5AaR4eDAg=",
+        "lastModified": 1703838268,
+        "narHash": "sha256-SRg5nXcdPnrsQR2MTAp7en0NyJnQ2wB1ivmsgEbvN+o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ba6b75011b44e85b1b755b6c423f85d0817645f7",
+        "rev": "2aff324cf65f5f98f89d878c056b779466b17db8",
         "type": "github"
       },
       "original": {
@@ -219,11 +219,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1703646364,
-        "narHash": "sha256-uCj41nq4hnw5aItXJg4DUNpqLSCNRM3xHZbGo8dwoXs=",
+        "lastModified": 1703991017,
+        "narHash": "sha256-5wlJYAktFeHJlQt9VubO0FjaLe+96A/N3Die5Ym5Y/E=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "d72abaf29c40d8f6f9f527815c6dd24f76a50bd4",
+        "rev": "c1c843e5059d942092d9bb9dc93768e5d2d79bdc",
         "type": "github"
       },
       "original": {
@@ -314,11 +314,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1703438236,
-        "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=",
+        "lastModified": 1703637592,
+        "narHash": "sha256-8MXjxU0RfFfzl57Zy3OfXCITS0qWDNLzlBAdwxGZwfY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b",
+        "rev": "cfc3698c31b1fb9cdcf10f36c9643460264d0ca8",
         "type": "github"
       },
       "original": {
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index 5491ae0..c0cd5f1 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -26,6 +26,19 @@
     #readOnlyNixStore = false;
   };
 
+  services.udev.extraRules = ''
+    #SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0664", GROUP="users"
+    # SDP protocol
+    KERNEL=="hidraw*", ATTRS{idVendor}=="1fc9", MODE="0666"
+    ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="1fc9", MODE="0666"
+    ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0d28", MODE="0666"
+    # Flashloader
+    KERNEL=="hidraw*", ATTRS{idVendor}=="15a2", MODE="0666"
+    # Controller
+    KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="18d1", MODE="0666"
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="18d1", ATTRS{idProduct}=="9400", MODE="0660", TAG+="uaccess"
+  '';
+
   networking = {
     hostName = "Rory-desktop";
     networkmanager.enable = true;
diff --git a/modules/base.nix b/modules/base.nix
index fb1e8d6..e7a1f9f 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -118,6 +118,7 @@
     settings = {
       experimental-features = [ "nix-command" "flakes" ];
       auto-optimise-store = true;
+      trusted-users = [ "@wheel" ];
     };
   };
   nixpkgs = {
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index 6a54fe5..5fbf2c6 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -40,7 +40,7 @@
 
   home-manager.users.Rory = {
     #services.gnome-keyring.enable = true;
-    dconf.settings = {
+    dconf.settings = lib.mkIf config.programs.dconf.enable {
       "org/virt-manager/virt-manager/connections" = {
         autoconnect = ["qemu:///system"];
         uris = ["qemu:///system"];