rework pkgs, install playerctl/brightnessctl

2026-02-15 12:23:23 +01:00 · 2026-02-15 12:23:23 +01:00 · ad3ded339f
commit ad3ded339f
parent 4f36c42b22
11 changed files with 103 additions and 73 deletions
--- a/flake.lock
+++ b/flake.lock
@ -1122,11 +1122,11 @@
    },
    "nixpkgs_11": {
      "locked": {
-        "lastModified": 1768845192,
-        "narHash": "sha256-TQH6ERJGCGEoYBALwU8hP0IhghsOoTtp+xFC9E54S3M=",
+        "lastModified": 1771067046,
+        "narHash": "sha256-fYZMOngn9UX4dyhKcMEqqLjjw3x8T3v3hlYnnbEZh2E=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "2e606f2c977dd1f6b607eccfdb57fc249ddedc23",
+        "rev": "75c4807ebe5f9cad5622862f4f26ca73c069be06",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -80,21 +80,10 @@
      sops-nix,
      vpn-confinement,
      home-manager,
-      mapf,
-      nixvim,
-      t,
-      dumpasm,
-      jujutsu,
-      pipethon,
-      niri,
-      niri-unstable,
-      matugen,
-      noctalia,
-      firefox-addons,
-      raw-data,
      ...
    }@inputs:
    let
+      custom = pkgs: import ./pkgs/custom.nix (inputs // { inherit pkgs; });
      pkgsForSystem =
        system:
        import nixpkgs {
@ -102,16 +91,7 @@
          config.allowUnfree = true;
          overlays = [
            (pkgs: _: {
-              custom = {
-                t = t.packages.${system}.default;
-                inherit (dumpasm.packages.${system}) dumpasm;
-                inherit (jujutsu.packages.${system}) jujutsu;
-                pipethon = pipethon.packages.${system}.python;
-                niri = niri-unstable.packages.${system}.niri;
-                raw-data = raw-data.packages.${system}.default;
-                maple-mono = pkgs.maple-mono;
-              };
-              p1n3appl3 = inputs.p1n3appl3.packages.${system};
+              custom = custom pkgs;
            })
          ];
        };
@ -126,10 +106,11 @@
          in
          {
            nixpkgs = pkgsForSystem system;
-
-            specialArgs.flakes = inputs;
-            specialArgs.inputs = inputs;
-            specialArgs.secrets = inputs.secrets.packages.${system}.secrets;
+            specialArgs = {
+              flakes = inputs;
+              inherit inputs;
+              inherit (inputs.secrets.packages.${system}) secrets;
+            };
          };

        fili = {
@ -188,7 +169,7 @@
          ];
          shellHook = "exec $NIX_BUILD_SHELL";
        };
-
+        packages = custom pkgs;
        formatter = pkgs.nixfmt;
      }
    );
--- a/hosts/kili/configuration.nix
+++ b/hosts/kili/configuration.nix
@ -108,11 +108,15 @@
    "nvidia"
  ];

-  hardware.graphics.enable = true;
-  hardware.graphics.extraPackages = with pkgs; [
-    libva-vdpau-driver
-    intel-media-driver
-  ];
+  hardware.graphics = {
+    enable = true;
+    extraPackages = with pkgs; [
+      libva-vdpau-driver
+      intel-media-driver
+      intel-vaapi-driver
+    ];
+  };
+
  environment.sessionVariables = {
    LIBVA_DRIVER_NAME = "iHD";
  };
--- a/1
+++ b/1
@ -0,0 +1 @@
+Ptmux;_Gq=2,a=d,d=a\\
--- a/pkgs/custom.nix
+++ b/pkgs/custom.nix
@ -0,0 +1,24 @@
+{
+  t,
+  dumpasm,
+  jujutsu,
+  pipethon,
+  niri-unstable,
+  raw-data,
+  p1n3appl3,
+  pkgs,
+  ...
+}@inputs:
+let
+  inherit (pkgs) system;
+in
+{
+  t = t.packages.${system}.default;
+  inherit (dumpasm.packages.${system}) dumpasm;
+  inherit (jujutsu.packages.${system}) jujutsu;
+  inherit (niri-unstable.packages.${system}) niri;
+  pipethon = pipethon.packages.${system}.python;
+  raw-data = raw-data.packages.${system}.default;
+  p1n3appl3 = p1n3appl3.packages.${system};
+}
+// (import ./maple.nix inputs)
--- a/pkgs/maple.nix
+++ b/pkgs/maple.nix
@ -0,0 +1,29 @@
+{ pkgs, ... }:
+let
+  hashes = {
+    "MapleMono-TTF" = "sha256-xKGw8fYpcBj0PNqEqz0VKIFebQc9QcIXmLtiVessHtM=";
+    "MapleMono-NF-unhinted" = "sha256-1H7w/Ky10TG3rAS7tNAnpWy30xYlhT7MdxLNCQraiTg=";
+    "MapleMono-NF-CN-unhinted" = "sha256-Zp4C8JJrCjGLGa1Il1J5RaqpFwu7hO0AETU6IDqoSX8=";
+  };
+in
+rec {
+  maple-mono = pkgs.lib.mapAttrs (
+    _: maple-pkg:
+    maple-pkg.overrideAttrs (
+      prev: _: {
+        version = "1.0.1+custom";
+        src = pkgs.fetchurl {
+          url = "https://github.com/jdonszelmann/Maple-font/releases/download/v1.0.1/${prev.pname}.zip";
+          hash = hashes.${prev.pname};
+        };
+      }
+    )
+  ) pkgs.maple-mono;
+  maple-fonts-pack = [
+    maple-mono.truetype
+    # Maple Mono NF (Ligature unhinted)
+    maple-mono.NF-unhinted
+    # Maple Mono NF CN (Ligature unhinted)
+    maple-mono.NF-CN-unhinted
+  ];
+}
--- a/programs/default.nix
+++ b/programs/default.nix
@ -151,7 +151,7 @@ _: {
      { pkgs, ... }:
      {
        home.packages = with pkgs; [
-          p1n3appl3.tab
+          custom.p1n3appl3.tab
          prismlauncher
        ];
      };
@ -195,6 +195,7 @@ _: {
          tokei
          just
          uv
+          llvmPackages.bintools

          (writeShellScriptBin "nas" ''
            mkdir -p ~/Documents/nas
--- a/programs/kitty/default.nix
+++ b/programs/kitty/default.nix
@ -3,14 +3,7 @@ _: {
  custom.program.kitty.home-config =
    { pkgs, flakes, ... }:
    {
-      home.packages = with pkgs; [
-        # Maple Mono (Ligature TTF unhinted)
-        custom.maple-mono.truetype
-        # Maple Mono NF (Ligature unhinted)
-        custom.maple-mono.NF-unhinted
-        # Maple Mono NF CN (Ligature unhinted)
-        custom.maple-mono.NF-CN-unhinted
-      ];
+      home.packages = pkgs.custom.maple-fonts-pack;

      programs.kitty = {
        enable = true;
--- a/programs/niri/default.nix
+++ b/programs/niri/default.nix
@ -28,29 +28,30 @@ _: {
        flakes.noctalia.homeModules.default
      ];

-      home.packages = with pkgs; [
-        matugen
-        glib
-        dconf
-        gsettings-desktop-schemas
-        xwayland-satellite
-        # gtk
-        nwg-look
-        # qt config tool
-        kdePackages.qt6ct
+      home.packages =
+        with pkgs;
+        [
+          matugen
+          glib
+          dconf
+          gsettings-desktop-schemas
+          xwayland-satellite
+          # gtk
+          nwg-look
+          # qt config tool
+          kdePackages.qt6ct

-        fira
-        jetbrains-mono
-        fira-mono
-        noto-fonts
+          # media control
+          playerctl
+          # brightness control
+          brightnessctl

-        # Maple Mono (Ligature TTF unhinted)
-        custom.maple-mono.truetype
-        # Maple Mono NF (Ligature unhinted)
-        custom.maple-mono.NF-unhinted
-        # Maple Mono NF CN (Ligature unhinted)
-        custom.maple-mono.NF-CN-unhinted
-      ];
+          fira
+          jetbrains-mono
+          fira-mono
+          noto-fonts
+        ]
+        ++ custom.maple-fonts-pack;

      programs.niri.settings = {
        # main laptop screen
@ -127,6 +128,7 @@ _: {
        layout = {
          gaps = 5;
          center-focused-column = "never";
+          always-center-single-column = true;

          preset-column-widths = [
            { proportion = 0.33333; }
--- a/programs/nvim/plugins.nix
+++ b/programs/nvim/plugins.nix
@ -22,6 +22,8 @@ in
 {
  programs.nixvim = {
    plugins = {
+      ansiesc.enable = true;
+
      treesitter-textobjects = {
        enable = false;
        settings = {
--- a/programs/zed/default.nix
+++ b/programs/zed/default.nix
@ -3,14 +3,7 @@ _: {
  custom.program.zed.home-config =
    { pkgs, ... }:
    {
-      home.packages = with pkgs; [
-        # Maple Mono (Ligature TTF unhinted)
-        custom.maple-mono.truetype
-        # Maple Mono NF (Ligature unhinted)
-        custom.maple-mono.NF-unhinted
-        # Maple Mono NF CN (Ligature unhinted)
-        custom.maple-mono.NF-CN-unhinted
-      ];
+      home.packages = pkgs.custom.maple-fonts-pack;

      programs.zed-editor = {
        enable = true;