update system

flake.lock

@@ -103,11 +103,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717285511,
+        "lastModified": 1719745305,
-        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+        "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
+        "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9",
         "type": "github"
       },
       "original": {
@@ -148,11 +148,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717664902,
+        "lastModified": 1719259945,
-        "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
+        "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
+        "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
         "type": "github"
       },
       "original": {
@@ -190,11 +190,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718788307,
+        "lastModified": 1719827439,
-        "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=",
+        "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca",
+        "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
         "type": "github"
       },
       "original": {
@@ -211,11 +211,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718526747,
+        "lastModified": 1719677234,
-        "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=",
+        "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792",
+        "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d",
         "type": "github"
       },
       "original": {
@@ -252,11 +252,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718662658,
+        "lastModified": 1719128254,
-        "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=",
+        "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf",
+        "rev": "50581970f37f06a4719001735828519925ef8310",
         "type": "github"
       },
       "original": {
@@ -283,11 +283,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1718530797,
+        "lastModified": 1719690277,
-        "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=",
+        "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b60ebf54c15553b393d144357375ea956f89e9a9",
+        "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
         "type": "github"
       },
       "original": {
@@ -311,11 +311,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1718739916,
+        "lastModified": 1719835160,
-        "narHash": "sha256-VgRcAEeS8/ZSZgcwg1hYltavagEo47ZsmR7cRZ6VbRY=",
+        "narHash": "sha256-AyZJM2la6+CAdKKSC3y80sbneW8dH/2lb+OxKzi2cAw=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "0e93a59567d0850e54cea26b1b5c541a7182c7cf",
+        "rev": "7cc1685eafdcf04cf1058949647ea2c7560f2d65",
         "type": "github"
       },
       "original": {
@@ -326,11 +326,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1718792827,
+        "lastModified": 1719837916,
-        "narHash": "sha256-+52UqTGC6RBvt7mUBPX0EEFN8LVrptxnIzbGY61lqYQ=",
+        "narHash": "sha256-dV1URYa5SezYyz/1IDb1BHmIZ4tM0WtpPfVkFGH8xfY=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "f3411df07774dedfe08226e1d280f0109235e04d",
+        "rev": "0575d7fb334ea662a0a03620780c87df0612eb9a",
         "type": "github"
       },
       "original": {
@@ -402,11 +402,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718522839,
+        "lastModified": 1719749022,
-        "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=",
+        "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81",
+        "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd",
         "type": "github"
       },
       "original": {

flake.nix

@@ -48,6 +48,11 @@
               lpc21isp = prev.callPackage ./overlays/lpc21isp { };
               rquickshare = prev.callPackage ./overlays/rquickshare { };
               cura = prev.callPackage ./overlays/cura { };
+              /*
+                kitty = prev.kitty.overrideAttrs (prev: {
+                  patches = prev.patches ++ [ ./kitty.patch ];
+                });
+              */
             })
           ];
         }

kitty.patch

@@ -0,0 +1,35 @@
+diff --git a/kitty/cell_fragment.glsl b/kitty/cell_fragment.glsl
+index ac310dd1f..dfab7e30a 100644
+--- a/kitty/cell_fragment.glsl
++++ b/kitty/cell_fragment.glsl
+@@ -169,7 +169,7 @@ void main() {
+     vec4 text_fg_premul = calculate_premul_foreground_from_sprites(text_fg);
+ #ifdef TRANSPARENT
+     final_color = alpha_blend_premul(text_fg_premul, vec4_premul(background, bg_alpha));
+-    final_color.a = adjust_alpha_for_incorrect_blending_by_compositor(text_fg_premul.a, final_color.a);
++    // final_color.a = adjust_alpha_for_incorrect_blending_by_compositor(text_fg_premul.a, final_color.a);
+ #else
+     final_color = alpha_blend_premul(text_fg_premul, background);
+ #endif
+@@ -197,7 +197,7 @@ void main() {
+     vec4 text_fg_premul = calculate_premul_foreground_from_sprites(text_fg);
+     final_color = text_fg_premul;
+ #ifdef TRANSPARENT
+-    final_color.a = adjust_alpha_for_incorrect_blending_by_compositor(text_fg_premul.a, final_color.a);
++    // final_color.a = adjust_alpha_for_incorrect_blending_by_compositor(text_fg_premul.a, final_color.a);
+ #endif
+ #endif
+ 
+diff --git a/kitty/shaders.c b/kitty/shaders.c
+index bcda16822..4f38c4388 100644
+--- a/kitty/shaders.c
++++ b/kitty/shaders.c
+@@ -914,7 +914,7 @@ draw_cells_interleaved_premult(ssize_t vao_idx, Screen *screen, OSWindow *os_win
+ void
+ blank_canvas(float background_opacity, color_type color) {
+     // See https://github.com/glfw/glfw/issues/1538 for why we use pre-multiplied alpha
+-#define C(shift) srgb_color((color >> shift) & 0xFF)
++#define C(shift) srgb_color((color >> shift) & 0xFF) * background_opacity
+     glClearColor(C(16), C(8), C(0), background_opacity);
+ #undef C
+     glClear(GL_COLOR_BUFFER_BIT);

modules/home-manager/packages/default.nix

@@ -28,6 +28,7 @@
     vesktop
     discord
     element-desktop
+    cinny-desktop
 
     # office
     libreoffice

modules/home-manager/programs/nixvim/default.nix

@@ -57,6 +57,7 @@
         enable = true;
         stylelint = true;
       };
+      dart.enable = true;
       js = {
         enable = true;
         eslint = true;

modules/home-manager/programs/nixvim/presets/default.nix

@@ -24,6 +24,7 @@
           ./languages/angular.nix
           ./languages/c.nix
           ./languages/css.nix
+          ./languages/dart.nix
           ./languages/js.nix
           ./languages/lua.nix
           ./languages/nix.nix

modules/home-manager/programs/nixvim/presets/languages/dart.nix

@@ -0,0 +1,16 @@
+{ lib, config, ... }:
+let
+  cfg = config.presets.languages.dart;
+in
+{
+  options.presets.languages.dart = {
+    enable = lib.mkEnableOption "Dart";
+  };
+
+  config = lib.mkIf cfg.enable {
+    plugins = {
+      conform-nvim.formattersByFt.dart = [ "dart_format" ];
+      lsp.servers.dartls.enable = true;
+    };
+  };
+}

modules/nixos/hardware/amdgpu.nix

@@ -15,10 +15,9 @@ in
   };
 
   config = mkIf cfg.enable {
-    hardware.opengl = {
+    hardware.graphics = {
       enable = true;
-      driSupport = true;
+      enable32Bit = true;
-      driSupport32Bit = true;
       extraPackages = with pkgs; [ rocmPackages.clr.icd ];
     };
 

modules/nixos/hardware/nvidia-nouveau.nix

@@ -15,10 +15,9 @@ in
   };
 
   config = mkIf cfg.enable {
-    hardware.opengl = {
+    hardware.graphics = {
       enable = true;
-      driSupport = true;
+      enable32Bit = true;
-      driSupport32Bit = true;
     };
 
     boot = {

modules/nixos/hardware/nvidia-proprietary.nix

@@ -15,10 +15,9 @@ in
   };
 
   config = mkIf cfg.enable {
-    hardware.opengl = {
+    hardware.graphics = {
       enable = true;
-      driSupport = true;
+      enable32Bit = true;
-      driSupport32Bit = true;
       extraPackages = with pkgs; [
         libvdpau-va-gl
         nvidia-vaapi-driver

modules/nixos/usecases/development/android.nix

@@ -16,7 +16,6 @@ in
   };
 
   config = mkIf cfg.enable {
-    programs.adb.enable = true;
     users.users.${username}.extraGroups = [ "adbusers" ];
     networking.firewall.allowedTCPPorts = [ 5037 ];
   };