From c44899af6f81ee209b48a5f5bd9044f8e1f3cf9b Mon Sep 17 00:00:00 2001 From: Anish L Date: Sun, 17 Jul 2022 01:09:05 +1000 Subject: [PATCH] idrk --- flake.lock | 14 +++++++------- hosts/curve/default.nix | 7 ++++--- overlays/overrides.nix | 2 ++ profiles/desktop/default.nix | 2 +- profiles/dhyan/default.nix | 1 + 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index b6e04f10..a5302a73 100644 --- a/flake.lock +++ b/flake.lock @@ -367,11 +367,11 @@ }, "latest_2": { "locked": { - "lastModified": 1651726670, - "narHash": "sha256-dSGdzB49SEvdOJvrQWfQYkAefewXraHIV08Vz6iDXWQ=", + "lastModified": 1657802959, + "narHash": "sha256-9+JWARSdlL8KiH3ymnKDXltE1vM+/WEJ78F5B1kjXys=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c777cdf5c564015d5f63b09cc93bef4178b19b01", + "rev": "4a01ca36d6bfc133bc617e661916a81327c9bbc8", "type": "github" }, "original": { @@ -596,11 +596,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1657702810, - "narHash": "sha256-egxF1AmPUE3Iu0n2cBIxTDA+JMxDB15U5xqpXdfgwjo=", + "lastModified": 1657780879, + "narHash": "sha256-b/vHUF7zkeMBOAO/mZ2kpTDytclpxzNQ8bK/yUOPHZQ=", "ref": "main", - "rev": "99f004ceb98a01885340c5fb315f89dc7bc2e238", - "revCount": 345, + "rev": "07e3f9f5fa4b8f0adb664e84b787c9f8213a2be1", + "revCount": 346, "type": "git", "url": "ssh://gitea@git.sealight.xyz/aynish/kitaab" }, diff --git a/hosts/curve/default.nix b/hosts/curve/default.nix index 26489b9c..e36ab7e4 100644 --- a/hosts/curve/default.nix +++ b/hosts/curve/default.nix @@ -47,6 +47,10 @@ # TODO move this (it's for KaiOS WebIDE devShell?) programs.adb.enable = true; #virtualisation.docker.enable = true; + boot.blacklistedKernelModules = [ "qcserial" ]; + users.users.anish.extraGroups = [ "adbusers" "wheel" "plugdev" ]; + virtualisation.libvirtd.enable = true; + hardware.keyboard.zsa.enable = true; services.udev.extraRules = '' # Qualcomm EDL SUBSYSTEMS=="usb", ATTRS{idVendor}=="05c6", ATTRS{idProduct}=="9008", MODE="0666", GROUP="plugdev" @@ -129,9 +133,6 @@ ## PJRC's HalfKay SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="0478", TAG+="uaccess" ''; - boot.blacklistedKernelModules = [ "qcserial" ]; - users.users.anish.extraGroups = [ "adbusers" "wheel" "plugdev" ]; - hardware.keyboard.zsa.enable = true; # enable wireguard tunnel # privKey = "/run/secrets/curve-wg"; -> local config diff --git a/overlays/overrides.nix b/overlays/overrides.nix index b02a4602..5c3ebd53 100644 --- a/overlays/overrides.nix +++ b/overlays/overrides.nix @@ -12,6 +12,8 @@ channels: final: prev: { qutebrowser nheko signal-desktop + tootle + sublime-music starship; diff --git a/profiles/desktop/default.nix b/profiles/desktop/default.nix index 90093f7c..5f684546 100644 --- a/profiles/desktop/default.nix +++ b/profiles/desktop/default.nix @@ -40,7 +40,6 @@ in ]; environment.systemPackages = with pkgs; [ - # TODO move somewhere meaningful signal-desktop # bridge to sealight? scrot ripcord @@ -69,6 +68,7 @@ in papirus-icon-theme calendar-cli wyrd + tootle ]; diff --git a/profiles/dhyan/default.nix b/profiles/dhyan/default.nix index 720262fd..111f9a89 100644 --- a/profiles/dhyan/default.nix +++ b/profiles/dhyan/default.nix @@ -11,6 +11,7 @@ path = [ pkgs.babashka pkgs.git + pkgs.jdk11 pkgs.curl ]; startAt = "*08:00:00";