deprekated/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updates for hinata

Browse source
This commit is contained in:
Kate 2025-05-03 06:46:07 +02:00
parent 5d19e7547c
commit 7c1ab72e61
4 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/configuration.linux.nix
View file

@ -78,6 +78,13 @@
programs.xonsh = { programs.xonsh = {
enable = true; enable = true;
package = deprekages.xonsh-with-xontribs; package = deprekages.xonsh-with-xontribs;
# Unfortunately, repeating this here is temporarily necessary due to NixOS module wonk.
extraPackages = [
deprekages.xontrib-whole-word-jumping
deprekages.xontrib-term-integrations
deprekages.xontrib-sh
];
}; };
# #

21
nixos/hosts/hinata.nix
View file

@ -19,15 +19,19 @@ let
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "ericlinagora"; owner = "ericlinagora";
repo = "libfprint-CS9711"; repo = "libfprint-CS9711";
rev = "c242a40fcc51aec5b57d877bdf3edfe8cb4883fd"; rev = "03ace5b20146eb01c77fb3ea63e1909984d6d377";
sha256 = "sha256-WFq8sNitwhOOS3eO8V35EMs+FA73pbILRP0JoW/UR80="; sha256 = "sha256-gr3UvFB6D04he/9zawvQIuwfv0B7fEZb6BGiNAbLids=";
}; };
nativeBuildInputs = prev.nativeBuildInputs ++ (with pkgs; [ nativeBuildInputs = prev.nativeBuildInputs ++ (with pkgs; [
opencv opencv
cmake cmake
doctest doctest
nss
]); ]);
installCheckPhase = "";
}); });
in in
{ {
@ -73,7 +77,18 @@ in
# Fingerprint reader support. # Fingerprint reader support.
services.fprintd = { services.fprintd = {
enable = true; enable = true;
package = pkgs.fprintd.override { libfprint = libfprint-gpd; }; package = (pkgs.fprintd.override {
libfprint = libfprint-gpd;
}).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=";
};
});
}; };

10
packages/default.nix
View file

@ -118,11 +118,15 @@ flake-utils.lib.eachDefaultSystem (
esp-env = esp-dev.${system}.esp-idf-full; esp-env = esp-dev.${system}.esp-idf-full;
# xonsh and xontribs # xonsh and xontribs
xontrib-whole-word-jumping = callPackage ./xontrib-whole-word-jumping.nix {};
xontrib-term-integrations = callPackage ./xontrib-term-integrations.nix {};
xontrib-sh = callPackage ./xontrib-sh.nix {};
xonsh-with-xontribs = pkgs.xonsh.override { xonsh-with-xontribs = pkgs.xonsh.override {
extraPackages = pythonPackages: [ extraPackages = pythonPackages: [
(callPackage ./xontrib-whole-word-jumping.nix { }) xontrib-whole-word-jumping
(callPackage ./xontrib-term-integrations.nix { }) xontrib-term-integrations
(callPackage ./xontrib-sh.nix { }) xontrib-sh
]; ];
}; };
}; };

5
xonsh/rc.xsh
View file

@ -83,8 +83,11 @@ PATH_ADDS = []
try_source(socket.gethostname().split('.')[0]) try_source(socket.gethostname().split('.')[0])
try_source(sys.platform) try_source(sys.platform)
if not 'XONSH_HAS_NIXOS' in ${...}:
$XONSH_HAS_NIXOS = False;
if not $XONSH_HAS_NIXOS: if not $XONSH_HAS_NIXOS:
if $(grep "DISTRIB_ID=nixos" /etc/lsb-release 2>&1).returncode == 0: if !(grep -q "DISTRIB_ID=nixos" /etc/lsb-release).returncode == 0:
if XONSHRC_VERBOSE: if XONSHRC_VERBOSE:
print("Found a NixOS machine; automatically loading the NixOS extensions.") print("Found a NixOS machine; automatically loading the NixOS extensions.")
try_source("includes/nixos") try_source("includes/nixos")