From 6e76727c3f579fc2c05259bccaaa38a38542c8f7 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Mon, 22 Apr 2024 19:29:39 +0000 Subject: [PATCH] starlight: Add ultimate hacking keyboard agent --- externals/rules/uhk.nix | 7 ---- flake.lock | 70 ++++++++++++++++++------------------ sets/base.nix | 2 ++ sets/workstation.nix | 1 - system/starlight/default.nix | 3 ++ 5 files changed, 40 insertions(+), 43 deletions(-) delete mode 100644 externals/rules/uhk.nix diff --git a/externals/rules/uhk.nix b/externals/rules/uhk.nix deleted file mode 100644 index 2e17dc2..0000000 --- a/externals/rules/uhk.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ writeTextFile }: - -writeTextFile { - name = "uhk-udev-rules"; - text = builtins.readFile ./uhk.rules; - destination = "/etc/udev/rules.d/69-uhk.rules"; -} diff --git a/flake.lock b/flake.lock index f37e1e6..b13da02 100644 --- a/flake.lock +++ b/flake.lock @@ -63,11 +63,11 @@ ] }, "locked": { - "lastModified": 1711763326, - "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=", + "lastModified": 1713543876, + "narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083", + "rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed", "type": "github" }, "original": { @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1711099426, - "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=", + "lastModified": 1713532798, + "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=", "owner": "numtide", "repo": "devshell", - "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8", + "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40", "type": "github" }, "original": { @@ -329,11 +329,11 @@ ] }, "locked": { - "lastModified": 1713294767, - "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=", + "lastModified": 1713809191, + "narHash": "sha256-9Tb5JKcacjxNF1f7gsu/4l4Gxa2qflq9x1hhdl10iwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7", + "rev": "e866aae5bbbcfe6798ca05d3004a4e62f1828954", "type": "github" }, "original": { @@ -350,11 +350,11 @@ ] }, "locked": { - "lastModified": 1712909442, - "narHash": "sha256-D+VrmsPLkEbxNcI7lp9rGFR33RumbQIyhhjJ4PooWBs=", + "lastModified": 1713763883, + "narHash": "sha256-/3aEYe0LEoUy5/1cs9EhcFhT4r8RnbHBziuI40vmK6E=", "owner": "jovian-experiments", "repo": "jovian-nixos", - "rev": "8886e3da78fcefb11935ea85da3d1572bf444c55", + "rev": "9bb2ac68cab837aa063b8da40991cecc37de75a1", "type": "github" }, "original": { @@ -395,11 +395,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1713245621, - "narHash": "sha256-rU8uKlQxz0Z0fpkqz+G96jdidrz/fEkqzKo+VkH44N8=", + "lastModified": 1713713879, + "narHash": "sha256-7B3CVSSM8kyDsAJ8wlxL6Rf3StpBTlryiMLXPQlh4nQ=", "ref": "refs/heads/main", - "rev": "e1b9869ada503d9d471957a3e850cfa6e2bfe549", - "revCount": 15405, + "rev": "4206635f9140a12ae2e3f1d49714ddfcf44fd2f8", + "revCount": 15414, "type": "git", "url": "ssh://git@lix.systems/lix-project/lix" }, @@ -423,11 +423,11 @@ ] }, "locked": { - "lastModified": 1713260030, - "narHash": "sha256-BTgtmwRMbohAGGo+zBI1uEdXvV+gFsbWkrSJJkkGrvE=", + "lastModified": 1713758264, + "narHash": "sha256-x7uHPs9qI9hhWW4BJnJaTSX2KO1CGq/ltUR8XlUpYoQ=", "ref": "refs/heads/main", - "rev": "a3b8ac241496c855bbe7bb7517f04692ebce92da", - "revCount": 47, + "rev": "71f268f215dbd6d8755813d9674a4cd588f10552", + "revCount": 51, "type": "git", "url": "ssh://git@lix.systems/lix-project/nixos-module" }, @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1713067146, - "narHash": "sha256-9D20xjblGKEVRVCnM3qWhiizEa9i6OpK6xQJajwcwOQ=", + "lastModified": 1713668931, + "narHash": "sha256-rVlwWQlgFGGK3aPVcKmtYqWgjYnPah5FOIsYAqrMN2w=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "93aed67288be60c9ef6133ba2f8de128f4ef265c", + "rev": "07ece11b22217b8459df589f858e92212b74f1a1", "type": "github" }, "original": { @@ -458,11 +458,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1712909959, - "narHash": "sha256-7/5ubuwdEbQ7Z+Vqd4u0mM5L2VMNDsBh54visp27CtQ=", + "lastModified": 1713521961, + "narHash": "sha256-EwR8wW9AqJhSIY+0oxWRybUZ32BVKuZ9bjlRh8SJvQ8=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "f58b25254be441cd2a9b4b444ed83f1e51244f1f", + "rev": "5d48925b815fd202781bfae8fb6f45c07112fdb2", "type": "github" }, "original": { @@ -473,11 +473,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1713248628, - "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", + "lastModified": 1713714899, + "narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", + "rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "type": "github" }, "original": { @@ -520,11 +520,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1713294906, - "narHash": "sha256-xJJZdCBzVFpVppaYyUK4lTTNOnbAxrjhodoJL3Oi91E=", + "lastModified": 1713812755, + "narHash": "sha256-L6z7NY0UMbO5DKFFjUleIGcuAt8XwOvD0YUVUqSeGBw=", "owner": "nix-community", "repo": "nixvim", - "rev": "514a51877df9fe41ffc38c5237e3c4e5327e7607", + "rev": "6ebd538ede5a0de49253620828ba28dc57988305", "type": "github" }, "original": { @@ -548,11 +548,11 @@ ] }, "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", + "lastModified": 1713775815, + "narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", + "rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4", "type": "github" }, "original": { diff --git a/sets/base.nix b/sets/base.nix index 564c92a..2ee5aed 100644 --- a/sets/base.nix +++ b/sets/base.nix @@ -54,6 +54,8 @@ "steam-original" "steam-run" "steamdeck-hw-theme" + "uhk-agent" + "uhk-udev-rules" "unrar" ]); }; diff --git a/sets/workstation.nix b/sets/workstation.nix index ff3be40..4418f07 100644 --- a/sets/workstation.nix +++ b/sets/workstation.nix @@ -49,7 +49,6 @@ flatpak.enable = true; pcscd.enable = true; printing.enable = true; - udev.packages = [ (pkgs.callPackage ../externals/rules/uhk.nix { }) ]; }; programs.ssh.startAgent = true; diff --git a/system/starlight/default.nix b/system/starlight/default.nix index 724791a..76037be 100644 --- a/system/starlight/default.nix +++ b/system/starlight/default.nix @@ -105,8 +105,11 @@ environment.systemPackages = with pkgs; [ amdgpu_top ryujinx + uhk-agent ]; + services.udev.packages = with pkgs; [ uhk-udev-rules ]; + # Home home-manager.users.artemis = { programs.git.signing.key = lib.mkForce "3D2BB230F9FAF0C5183246DD4FDC96F161E7BA8A";