From 3f1c7caa5091c24262bcacea43bbf98077a9e3bb Mon Sep 17 00:00:00 2001 From: Kate Adkins Date: Fri, 30 May 2025 12:36:56 +0200 Subject: [PATCH] multitweak~ --- flake.nix | 1 + nixos/configs/nix.nix | 2 +- nixos/hosts/hinata.nix | 10 ++++++++++ nixos/hosts/kanbaru.nix | 30 +++++++++++++++++++++++++++--- nixos/packages/default.pkgs.nix | 1 + nixos/packages/gui.pkgs.nix | 3 +++ 6 files changed, 43 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 04596af..6915365 100644 --- a/flake.nix +++ b/flake.nix @@ -286,6 +286,7 @@ modules = linuxOfflineGuiModules [ ./nixos/hosts/kanbaru.nix ./nixos/configs/steam.nix + ./nixos/configs/virtualbox.nix ./nixos/configs/power-saving.nix ]; }; diff --git a/nixos/configs/nix.nix b/nixos/configs/nix.nix index 3c50477..07ed08b 100644 --- a/nixos/configs/nix.nix +++ b/nixos/configs/nix.nix @@ -37,7 +37,7 @@ protocol = "ssh"; #hostName = "trailblazer.kate.tailnet.polytheon.org"; - hostName = "100.64.0.12"; + hostName = "100.64.0.32"; sshUser = "deprekated"; sshKey = "/home/deprekated/.ssh/id_ed25519"; diff --git a/nixos/hosts/hinata.nix b/nixos/hosts/hinata.nix index 8addf78..ee633bb 100644 --- a/nixos/hosts/hinata.nix +++ b/nixos/hosts/hinata.nix @@ -32,7 +32,17 @@ let installCheckPhase = ""; + }).overrideAttrs (prev: rec { + version = "1.94.4"; + src = pkgs.fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "libfprint"; + repo = "fprintd"; + rev = "refs/tags/v${version}"; + hash = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU="; + }; }); + in { system.stateVersion = "23.11"; diff --git a/nixos/hosts/kanbaru.nix b/nixos/hosts/kanbaru.nix index 6a30555..a96e4b9 100644 --- a/nixos/hosts/kanbaru.nix +++ b/nixos/hosts/kanbaru.nix @@ -37,6 +37,9 @@ # home-manager.users.deprekated.programs.niri.settings = { outputs."eDP-1".scale = 1.5; + input.touchpad = { + tap = lib.mkForce true; + }; }; # Override stylix font sizes. @@ -90,7 +93,7 @@ # Enable fingerprint reader... services.fprintd = { - enable = true; + enable = false; # ... and use a weird Goodix-ized fork of libfprintd. package = pkgs.fprintd.override { @@ -102,16 +105,19 @@ ++ (with pkgs; [ cmake openssl + nss ]); # ... and retarget the package to the fork. src = pkgs.fetchFromGitHub { owner = "infinytum"; repo = "libfprint"; - rev = "de5990838c2ef8813388a48811fbccc11088475b"; - hash = "sha256-XQ4jsgILvwc/HqT2ZmnIMpTezu5VedJ1RjuY0B6gcSk="; + rev = "5e14af7f136265383ca27756455f00954eef5db1"; + hash = "sha256-MFhPsTF0oLUMJ9BIRZnSHj9VRwtHJxvWv0WT5zz7vDY="; }; + env.CFLAGS = "-Wno-unused-function"; + # Manually null out the installCheckPhase. installCheckPhase = ""; @@ -119,6 +125,24 @@ }; }; + # Buetooth, whee. + hardware.bluetooth = { + enable = true; + powerOnBoot = false; + + settings = { + General = { + + # Support A2DP. + Enable = "Source,Sink,Media,Socket"; + + # Enable experimental featurees, like reading device battery levels. + Experimental = true; + }; + + }; + }; + # # Hardware config. # diff --git a/nixos/packages/default.pkgs.nix b/nixos/packages/default.pkgs.nix index 44840de..59719ff 100644 --- a/nixos/packages/default.pkgs.nix +++ b/nixos/packages/default.pkgs.nix @@ -171,6 +171,7 @@ with pkgs; maven xxd hugo + basedpyright # Typesetting. typst diff --git a/nixos/packages/gui.pkgs.nix b/nixos/packages/gui.pkgs.nix index 805a609..483bb15 100644 --- a/nixos/packages/gui.pkgs.nix +++ b/nixos/packages/gui.pkgs.nix @@ -86,6 +86,9 @@ with pkgs; # Learning anki + + # Mapping + qmapshack ] # Linux-only packages.