diff --git a/flake.lock b/flake.lock index 08060de..b68c63f 100644 --- a/flake.lock +++ b/flake.lock @@ -1293,15 +1293,15 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1748247366, - "narHash": "sha256-+uQh9e8F8KjC5HzHCztvDvW4xZdI4TZVxNFjaesL338=", - "owner": "liff", + "lastModified": 1754755317, + "narHash": "sha256-LE/xfuCIVWNsU7sutvAMybSFTv98LgQi966hXVl8wSQ=", + "owner": "ktemkin", "repo": "waveforms-flake", - "rev": "7b5dc468bfb2a284f97d29b91f9a9fe5acd5a673", + "rev": "01cf86d6f945f12800d252d4c040f16670de5962", "type": "github" }, "original": { - "owner": "liff", + "owner": "ktemkin", "repo": "waveforms-flake", "type": "github" } diff --git a/flake.nix b/flake.nix index 04ac825..dbfe80c 100644 --- a/flake.nix +++ b/flake.nix @@ -52,7 +52,7 @@ agenix.url = "github:ryantm/agenix"; openxc7.url = "github:openXC7/toolchain-nix"; niri.url = "github:sodiboo/niri-flake"; - waveforms.url = "github:liff/waveforms-flake"; + waveforms.url = "github:ktemkin/waveforms-flake"; esp-dev.url = "github:mirrexagon/nixpkgs-esp-dev"; # Flatpack support @@ -95,9 +95,9 @@ ... }: - # - # Include our package repository. - # + # + # Include our package repository. + # (import ./packages) { inherit flake-utils nixpkgs; deprekages = self.outputs.packages; @@ -171,7 +171,7 @@ ./nixos/overlays/fixup-nheko ./nixos/overlays/fixup-signal ./nixos/overlays/fixup-imhex.nix -#./nixos/overlays/customize-gajim + #./nixos/overlays/customize-gajim ./nixos/overlays/sddm-no-vnc.nix ./nixos/overlays/fixup-armcord.nix ./nixos/overlays/jd-gui-wayland.nix @@ -278,7 +278,7 @@ }; # Chrysalis (powerful Framework 13 laptop). - nixosConfigurations.chrysalis = nixpkgs.lib.nixosSystem rec { + nixosConfigurations.chrysalis = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; specialArgs = mkSpecialArgs system; @@ -289,7 +289,6 @@ ]; }; - # Miko (mid-tier t2+x64 laptop that's nice and smol). nixosConfigurations.miko = nixpkgs.lib.nixosSystem rec { system = "x86_64-linux"; @@ -419,7 +418,6 @@ config.permittedInsecurePackages = [ "olm-3.2.16" ]; }; - extraSpecialArgs = mkSpecialArgsDroid "aarch64-linux" pkgs; modules = [ diff --git a/nixos/configs/virt-host.nix b/nixos/configs/virt-host.nix index 21cb07d..d77b45c 100644 --- a/nixos/configs/virt-host.nix +++ b/nixos/configs/virt-host.nix @@ -15,6 +15,7 @@ virtiofsd virt-manager spice-gtk + gnome-boxes ]; boot.kernelModules = [ diff --git a/nixos/packages/gui.pkgs.nix b/nixos/packages/gui.pkgs.nix index eb5ab15..f48e0dc 100644 --- a/nixos/packages/gui.pkgs.nix +++ b/nixos/packages/gui.pkgs.nix @@ -63,6 +63,7 @@ with pkgs; xournalpp kdePackages.itinerary #deprekages.notion-app + saber # PDFs. (zathuraPkgs.override { useMupdf = false; }).zathuraWrapper diff --git a/packages/pleiades-udev-rules/pleiades.rules b/packages/pleiades-udev-rules/pleiades.rules index 9c0a596..172b1fb 100644 --- a/packages/pleiades-udev-rules/pleiades.rules +++ b/packages/pleiades-udev-rules/pleiades.rules @@ -1,9 +1,9 @@ # LUNA devices -SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0001", SYMLINK+="luna-test1-%k", TAG+="uaccess" -SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0002", SYMLINK+="luna-test2-%k", TAG+="uaccess" -SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0003", SYMLINK+="luna-test3-%k", TAG+="uaccess" -SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0004", SYMLINK+="luna-test4-%k", TAG+="uaccess" -SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0005", SYMLINK+="luna-test5-%k", TAG+="uaccess" +SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0001", SYMLINK+="luna-test1-%k", TAG+="uaccess", GROUP="plugdev" +SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0002", SYMLINK+="luna-test2-%k", TAG+="uaccess", GROUP="plugdev" +SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0003", SYMLINK+="luna-test3-%k", TAG+="uaccess", GROUP="plugdev" +SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0004", SYMLINK+="luna-test4-%k", TAG+="uaccess", GROUP="plugdev" +SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="0005", SYMLINK+="luna-test5-%k", TAG+="uaccess", GROUP="plugdev" # Apollo programmers. -SUBSYSTEM=="usb", ATTR{idVendor}=="1d50", ATTR{idProduct}=="615c", SYMLINK+="apollo-%k", TAG+="uaccess" +SUBSYSTEM=="usb", ATTR{idVendor}=="1d50", ATTR{idProduct}=="615c", SYMLINK+="apollo-%k", TAG+="uaccess", GROUP="plugdev"