From 8198e46252f2c9e310be7dbbf46635017c119457 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Fri, 19 Sep 2025 13:20:35 +0200 Subject: [PATCH] update system --- modules/home-manager/packages/default.nix | 2 +- modules/home-manager/programs/nixvim.nix | 26 +++----------------- modules/home-manager/theme/md3-evo.nix | 2 +- modules/nixos/desktops/hyprland.nix | 1 - modules/nixos/hardware/fv43u.nix | 30 ++++++----------------- 5 files changed, 13 insertions(+), 48 deletions(-) diff --git a/modules/home-manager/packages/default.nix b/modules/home-manager/packages/default.nix index 9740420..3791863 100644 --- a/modules/home-manager/packages/default.nix +++ b/modules/home-manager/packages/default.nix @@ -7,6 +7,7 @@ sha256 = "0lghiiiphbkqgiprqirxifldvix0j4k04jh1z9f911shrzjgqq4s"; } ]; + programs.mpv.enable = true; home.packages = with pkgs; [ # nix cachix @@ -21,7 +22,6 @@ # media yt-dlp f3d - mpv jellyfin-mpv-shim makemkv libfaketime diff --git a/modules/home-manager/programs/nixvim.nix b/modules/home-manager/programs/nixvim.nix index b97d77b..c2dd28e 100644 --- a/modules/home-manager/programs/nixvim.nix +++ b/modules/home-manager/programs/nixvim.nix @@ -34,10 +34,8 @@ presets = { auto-save.enable = true; auto-format.enable = true; - harpoon.enable = false; lazygit.enable = true; mergetool.enable = true; - trouble.enable = false; undotree.enable = true; aerial.enable = true; base = { @@ -46,7 +44,7 @@ copilot = true; }; diagnostics.enable = true; - coverage.enable = true; + coverage.enable = false; find.enable = true; formatting = { enable = true; @@ -59,9 +57,7 @@ }; languages = { angular.enable = true; - c = { - enable = true; - }; + c.enable = true; css = { enable = true; stylelint = true; @@ -90,28 +86,12 @@ plugins = { which-key.enable = true; schemastore.enable = true; - comment.enable = true; - debugprint.enable = true; todo-comments.enable = true; origami.enable = false; nvim-surround.enable = true; - hardtime = { - enable = true; - settings = { - disable_mouse = false; - disabled_keys = { - "".__raw = "false"; - "".__raw = "false"; - "".__raw = "false"; - "".__raw = "false"; - }; - }; - }; treesitter-context = { enable = false; # TODO: looks weird with Neovide - settings = { - line_numbers = false; - }; + settings.line_numbers = false; }; lsp.servers = { diff --git a/modules/home-manager/theme/md3-evo.nix b/modules/home-manager/theme/md3-evo.nix index 94a8d78..51b1b1c 100644 --- a/modules/home-manager/theme/md3-evo.nix +++ b/modules/home-manager/theme/md3-evo.nix @@ -41,7 +41,7 @@ in }; transparency = lib.mkOption { type = lib.types.numbers.between 0 1; - default = 0.8; + default = 0.9; description = "The transparency of apps"; }; radius = lib.mkOption { diff --git a/modules/nixos/desktops/hyprland.nix b/modules/nixos/desktops/hyprland.nix index 1a586fb..4a2a6c7 100644 --- a/modules/nixos/desktops/hyprland.nix +++ b/modules/nixos/desktops/hyprland.nix @@ -40,7 +40,6 @@ in QT_QPA_PLATFORM = "wayland;xcb"; QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; SDL_VIDEODRIVER = "wayland"; - CLUTTER_BACKEND = "wayland"; # https://github.com/swaywm/sway/issues/6272 _JAVA_AWT_WM_NONREPARENTING = "1"; }; diff --git a/modules/nixos/hardware/fv43u.nix b/modules/nixos/hardware/fv43u.nix index de1504d..77bb100 100644 --- a/modules/nixos/hardware/fv43u.nix +++ b/modules/nixos/hardware/fv43u.nix @@ -15,31 +15,15 @@ in enable = mkEnableOption "Enable optimisations for the Gigabyte FV43U monitor"; hdr = mkOption { type = types.bool; - default = false; + default = true; description = "Enable HDR support for the Gigabyte FV43U monitor."; }; }; config = mkIf cfg.enable { fonts.fontconfig.subpixel.rgba = "bgr"; - hardware = { - gbmonctl.enable = true; - firmware = [ - (pkgs.runCommandNoCC "fv43u_edid" { } '' - mkdir -p $out/lib/firmware/edid - cp ${./fv43u_edid.bin} $out/lib/firmware/edid/fv43u.bin - '') - ]; - }; - boot = { - kernelParams = [ - "drm.edid_firmware=DP-3:edid/fv43u.bin" - "video=DP-3:3840x2160-30@144" - ]; - initrd.extraFiles."lib/firmware/edid/fv43u.bin".source = - pkgs.runCommandLocal "fv43u_edid" { } - "cp ${./fv43u_edid.bin} $out"; - }; + hardware.gbmonctl.enable = true; + boot.kernelParams = [ "video=DP-3:3840x2160-30@144" ]; services.colord.enable = true; environment.systemPackages = [ (pkgs.runCommandNoCC "fv43u_icc" { } '' @@ -53,9 +37,11 @@ in monitorline = "DP-3,3840x2160@144,0x0,1,bitdepth,10,cm,${if cfg.hdr then "hdr" else "srgb"}"; in { - home.sessionVariables = { - ENABLE_HDR_WSI = "1"; - DXVK_HDR = "1"; + programs.mpv.config = { + vo = "gpu-next"; + gpu-api = "vulkan"; + gpu-context = "waylandvk"; + target-colorspace-hint = "auto"; }; wayland.windowManager.hyprland.settings = { general.layout = "master";