lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fprintd fixes?

Browse source
This commit is contained in:
Daniel Flanagan 2024-03-24 14:34:44 -05:00
parent 409f228586
commit a7dda92091
4 changed files with 45 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.envrc
View file

@ -1 +1,2 @@
nix_direnv_manual_reload
use flake

60
flake.lock
View file

@ -48,11 +48,11 @@
]
},
"locked": {
"lastModified": 1711006105,
"narHash": "sha256-pvjqjx4L2Hx/NP3RWcwLjk+ABtMODAJ9+rgreU6fP6I=",
"lastModified": 1711261295,
"narHash": "sha256-5DUNQl9BSmLxgGLbF05G7hi/UTk9DyZq8AuEszhQA7Q=",
"owner": "nix-community",
"repo": "disko",
"rev": "a8c966ee117c278a5aabc6f00b00ef62eb7e28f6",
"rev": "5d2d3e421ade554b19b4dbb0d11a04023378a330",
"type": "github"
},
"original": {
@ -137,11 +137,11 @@
},
"hardware": {
"locked": {
"lastModified": 1710783728,
"narHash": "sha256-eIsfu3c9JUBgm3cURSKTXLEI9Dlk1azo+MWKZVqrmkc=",
"lastModified": 1711274671,
"narHash": "sha256-19KQXya5VERUXOdeEJJN+zOqtvuE6MV3qTk9Gr4J9Uo=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "1e679b9a9970780cd5d4dfe755a74a8f96d33388",
"rev": "7559df1e4af972d5f1de87975b5ef6a8d7559db2",
"type": "github"
},
"original": {
@ -158,11 +158,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1711058867,
"narHash": "sha256-iIaFlLZeP1rwichN+kHVrxUQNT8uMLldBXmKO3KNa30=",
"lastModified": 1711263746,
"narHash": "sha256-RzcNVnCcrbkwZinxrgKJ89YBd7INl9UHr8A1e/EIqIQ=",
"owner": "helix-editor",
"repo": "helix",
"rev": "be307a420480178c1bc443992c8336f6471b8b7b",
"rev": "47995bfb0cf3b0bc232a87340c7a01ff26d45bbc",
"type": "github"
},
"original": {
@ -179,11 +179,11 @@
]
},
"locked": {
"lastModified": 1710974515,
"narHash": "sha256-jZpdsypecYTOO9l12Vy77otGmh9uz8tGzcguifA30Vs=",
"lastModified": 1711133180,
"narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "1c2acec99933f9835cc7ad47e35303de92d923a4",
"rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
"type": "github"
},
"original": {
@ -206,11 +206,11 @@
]
},
"locked": {
"lastModified": 1710257359,
"narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=",
"lastModified": 1711035742,
"narHash": "sha256-5vvhCSUGG9TA2G1eIRgokuYizhRnZu0ZbcU1MXfHsUE=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974",
"rev": "6a92473237f430399a417e1c2da9d7fcd4970086",
"type": "github"
},
"original": {
@ -232,11 +232,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1711070930,
"narHash": "sha256-jKOAO/NlfaTC/OcZkPoT87gsfVqt/+Ye+KcaIv6e2mU=",
"lastModified": 1711300775,
"narHash": "sha256-KbhSmTXmWUKqNLO061Et0uZiDly2AxvUR6nTlDsnk+o=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "9bad62b85f179ad2c95c6e7f734768ef060a604b",
"rev": "1e82d5a04d0ab75ea1d9aa763d28c1767d58e898",
"type": "github"
},
"original": {
@ -305,11 +305,11 @@
]
},
"locked": {
"lastModified": 1709914708,
"narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
"lastModified": 1710960526,
"narHash": "sha256-tt0UgVKWeLQ+tFzvqrm4uAZbzONwdGshpfiLHAQ1P2c=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
"rev": "a2f39421144d42541c057be235154ce21b76c0f6",
"type": "github"
},
"original": {
@ -336,11 +336,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1710951922,
"narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=",
"lastModified": 1711124224,
"narHash": "sha256-l0zlN/3CiodvWDtfBOVxeTwYSRz93muVbXWSpaMjXxM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f091af045dff8347d66d186a62d42aceff159456",
"rev": "56528ee42526794d413d6f244648aaee4a7b56c0",
"type": "github"
},
"original": {
@ -384,11 +384,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1711001935,
"narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=",
"lastModified": 1711163522,
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "20f77aa09916374aa3141cbc605c955626762c9a",
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"type": "github"
},
"original": {
@ -489,11 +489,11 @@
]
},
"locked": {
"lastModified": 1710644594,
"narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=",
"lastModified": 1711249319,
"narHash": "sha256-N+Pp3/8H+rd7cO71VNV/ovV/Kwt+XNeUHNhsmyTabdM=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616",
"rev": "405987a66cce9a4a82f321f11b205982a7127c88",
"type": "github"
},
"original": {

9
nixos/foxtrot.nix
View file

@ -1,5 +1,5 @@
{
lib,
# lib,
inputs,
outputs,
pkgs,
@ -10,6 +10,11 @@ in {
networking.hostName = "foxtrot";
imports = with outputs.nixosModules; [
{
nixpkgs.overlays = [
outputs.overlays.modifications
];
}
outputs.diskoConfigurations.standard
inputs.hardware.nixosModules.framework-13-7040-amd
desktop-usage
@ -100,8 +105,6 @@ in {
};
};
services.mako.enable = lib.mkForce false; # don't use mako when using plasma
wayland.windowManager.hyprland = {
settings = {
# See https://wiki.hyprland.org/Configuring/Keywords/ for more

9
overlays/default.nix
View file

@ -6,7 +6,6 @@
# This one brings our custom packages from the 'pkgs' directory
additions = final: _prev:
import ../pkgs {
pkgs = final;
pkgsForIosevka = nixpkgsForIosevka.legacyPackages.${final.system};
};
@ -14,6 +13,14 @@
# You can change versions, add patches, set compilation flags, anything really.
# https://nixos.wiki/wiki/Overlays
modifications = final: prev: {
final.fprintd = prev.fprintd.overrideAttrs {
# Source: https://github.com/NixOS/nixpkgs/commit/87ca2dc071581aea0e691c730d6844f1beb07c9f
mesonCheckFlags = [
# PAM related checks are timing out
"--no-suite"
"fprintd:TestPamFprintd"
];
};
pythonPackagesExtensions =
prev.pythonPackagesExtensions
++ [