update system

This commit is contained in:
2025-07-28 20:33:33 +02:00
parent 3fd867084a
commit e414e3ac7b
8 changed files with 58 additions and 18 deletions

10
flake.lock generated
View File

@@ -144,15 +144,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751240025, "lastModified": 1753282722,
"narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=", "narHash": "sha256-KYMUrTV7H/RR5/HRnjV5R3rRIuBXMemyJzTLi50NFTs=",
"rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02", "rev": "46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz?rev=8b1094356f4723d6e89d3f8a95b333ee16d9ab02" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873.tar.gz?rev=46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-1.tar.gz"
} }
}, },
"matugen": { "matugen": {

View File

@@ -2,7 +2,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-1.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager = { home-manager = {
@@ -53,9 +53,7 @@
usb-sniffer = prev.callPackage ./overlays/usb-sniffer { }; usb-sniffer = prev.callPackage ./overlays/usb-sniffer { };
wireshark = prev.wireshark.overrideAttrs ( wireshark = prev.wireshark.overrideAttrs (
finalAttrs: prevAttrs: { finalAttrs: prevAttrs: {
postInstall = postInstall = prevAttrs.postInstall + ''
prevAttrs.postInstall
+ ''
ln -s ${final.usb-sniffer}/bin/usb_sniffer $out/lib/wireshark/extcap/usb_sniffer ln -s ${final.usb-sniffer}/bin/usb_sniffer $out/lib/wireshark/extcap/usb_sniffer
''; '';
} }

View File

@@ -135,6 +135,7 @@
enable = true; enable = true;
default = true; default = true;
}; };
open-dyslexic.enable = true;
nerd-fonts.enable = true; nerd-fonts.enable = true;
}; };

View File

@@ -120,11 +120,9 @@
}; };
fonts = { fonts = {
fira-code = { fira-code.enable = true;
enable = true; noto-sans.enable = true;
default = true; open-dyslexic = {
};
noto-sans = {
enable = true; enable = true;
default = true; default = true;
}; };

View File

@@ -89,7 +89,10 @@ in
xorg.xrandr xorg.xrandr
]; ];
gtk.enable = true; gtk = {
enable = true;
font.name = builtins.elemAt osConfig.fonts.fontconfig.defaultFonts.sansSerif 0;
};
qt.enable = true; qt.enable = true;
home.pointerCursor = { home.pointerCursor = {

View File

@@ -8,6 +8,7 @@
./fonts/fira-code.nix ./fonts/fira-code.nix
./fonts/noto-sans.nix ./fonts/noto-sans.nix
./fonts/nerd-fonts.nix ./fonts/nerd-fonts.nix
./fonts/open-dyslexic.nix
./hardware/hid-fanatecff.nix ./hardware/hid-fanatecff.nix
./hardware/astro-a50.nix ./hardware/astro-a50.nix

View File

@@ -0,0 +1,40 @@
{
pkgs,
lib,
config,
...
}:
with lib;
let
cfg = config.fonts.open-dyslexic;
in
{
options.fonts.open-dyslexic = {
enable = mkEnableOption "Enable the OpenDyslexic font";
default = mkOption {
type = types.bool;
description = "Make Noto Sans the default sans-serif font";
default = false;
};
};
config = mkIf cfg.enable {
fonts = {
packages =
with pkgs;
[
open-dyslexic
]
++ (if (config.fonts.nerd-fonts.enable) then [ nerd-fonts.open-dyslexic ] else [ ]);
fontconfig.defaultFonts = {
sansSerif = mkIf cfg.default [
(if (config.fonts.nerd-fonts.enable) then "OpenDyslexic Nerd Font" else "OpenDyslexic")
];
monospace = mkIf cfg.default [
(if (config.fonts.nerd-fonts.enable) then "OpenDyslexicM Nerd Font" else "OpenDyslexicM")
];
};
};
};
}

View File

@@ -35,7 +35,6 @@ in
pkgs: with pkgs; [ pkgs: with pkgs; [
libgudev libgudev
libvdpau libvdpau
libsoup_2_4
]; ];
}) })
rpcs3 rpcs3