diff --git a/flake.lock b/flake.lock index 36a0793..ed8cc65 100644 --- a/flake.lock +++ b/flake.lock @@ -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": { diff --git a/flake.nix b/flake.nix index 682dd1e..95415a8 100644 --- a/flake.nix +++ b/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 ( diff --git a/hosts/MONSTER/default.nix b/hosts/MONSTER/default.nix index cb68312..6246870 100644 --- a/hosts/MONSTER/default.nix +++ b/hosts/MONSTER/default.nix @@ -135,6 +135,7 @@ enable = true; default = true; }; + open-dyslexic.enable = true; nerd-fonts.enable = true; }; diff --git a/hosts/aero/default.nix b/hosts/aero/default.nix index a967fb4..0645bec 100644 --- a/hosts/aero/default.nix +++ b/hosts/aero/default.nix @@ -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; }; diff --git a/modules/home-manager/desktops/hyprland/default.nix b/modules/home-manager/desktops/hyprland/default.nix index 582b7f2..d103056 100644 --- a/modules/home-manager/desktops/hyprland/default.nix +++ b/modules/home-manager/desktops/hyprland/default.nix @@ -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 = { diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index c3884fc..0bc75e6 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -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 diff --git a/modules/nixos/fonts/open-dyslexic.nix b/modules/nixos/fonts/open-dyslexic.nix new file mode 100644 index 0000000..9e337bf --- /dev/null +++ b/modules/nixos/fonts/open-dyslexic.nix @@ -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") + ]; + }; + }; + }; +} diff --git a/modules/nixos/usecases/gaming.nix b/modules/nixos/usecases/gaming.nix index 2afd297..64f81dc 100644 --- a/modules/nixos/usecases/gaming.nix +++ b/modules/nixos/usecases/gaming.nix @@ -35,7 +35,6 @@ in pkgs: with pkgs; [ libgudev libvdpau - libsoup_2_4 ]; }) rpcs3