mirror of
https://github.com/Theaninova/TheaninovOS.git
synced 2025-12-10 18:46:30 +00:00
update system
This commit is contained in:
10
flake.lock
generated
10
flake.lock
generated
@@ -144,15 +144,15 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1751240025,
|
||||
"narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=",
|
||||
"rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02",
|
||||
"lastModified": 1753282722,
|
||||
"narHash": "sha256-KYMUrTV7H/RR5/HRnjV5R3rRIuBXMemyJzTLi50NFTs=",
|
||||
"rev": "46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873",
|
||||
"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": {
|
||||
"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": {
|
||||
|
||||
10
flake.nix
10
flake.nix
@@ -2,7 +2,7 @@
|
||||
inputs = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
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";
|
||||
};
|
||||
home-manager = {
|
||||
@@ -53,11 +53,9 @@
|
||||
usb-sniffer = prev.callPackage ./overlays/usb-sniffer { };
|
||||
wireshark = prev.wireshark.overrideAttrs (
|
||||
finalAttrs: prevAttrs: {
|
||||
postInstall =
|
||||
prevAttrs.postInstall
|
||||
+ ''
|
||||
ln -s ${final.usb-sniffer}/bin/usb_sniffer $out/lib/wireshark/extcap/usb_sniffer
|
||||
'';
|
||||
postInstall = prevAttrs.postInstall + ''
|
||||
ln -s ${final.usb-sniffer}/bin/usb_sniffer $out/lib/wireshark/extcap/usb_sniffer
|
||||
'';
|
||||
}
|
||||
);
|
||||
plymouth = prev.plymouth.overrideAttrs (
|
||||
|
||||
@@ -135,6 +135,7 @@
|
||||
enable = true;
|
||||
default = true;
|
||||
};
|
||||
open-dyslexic.enable = true;
|
||||
nerd-fonts.enable = true;
|
||||
};
|
||||
|
||||
|
||||
@@ -120,11 +120,9 @@
|
||||
};
|
||||
|
||||
fonts = {
|
||||
fira-code = {
|
||||
enable = true;
|
||||
default = true;
|
||||
};
|
||||
noto-sans = {
|
||||
fira-code.enable = true;
|
||||
noto-sans.enable = true;
|
||||
open-dyslexic = {
|
||||
enable = true;
|
||||
default = true;
|
||||
};
|
||||
|
||||
@@ -89,7 +89,10 @@ in
|
||||
xorg.xrandr
|
||||
];
|
||||
|
||||
gtk.enable = true;
|
||||
gtk = {
|
||||
enable = true;
|
||||
font.name = builtins.elemAt osConfig.fonts.fontconfig.defaultFonts.sansSerif 0;
|
||||
};
|
||||
qt.enable = true;
|
||||
|
||||
home.pointerCursor = {
|
||||
|
||||
@@ -8,6 +8,7 @@
|
||||
./fonts/fira-code.nix
|
||||
./fonts/noto-sans.nix
|
||||
./fonts/nerd-fonts.nix
|
||||
./fonts/open-dyslexic.nix
|
||||
|
||||
./hardware/hid-fanatecff.nix
|
||||
./hardware/astro-a50.nix
|
||||
|
||||
40
modules/nixos/fonts/open-dyslexic.nix
Normal file
40
modules/nixos/fonts/open-dyslexic.nix
Normal 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")
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -35,7 +35,6 @@ in
|
||||
pkgs: with pkgs; [
|
||||
libgudev
|
||||
libvdpau
|
||||
libsoup_2_4
|
||||
];
|
||||
})
|
||||
rpcs3
|
||||
|
||||
Reference in New Issue
Block a user