From 8eec63e5f383465a26226e265c86681daf0b8bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= <dev@theaninova.de>
Date: Mon, 1 Jul 2024 15:01:37 +0200
Subject: [PATCH] feat: stuff

---
 flake.nix                                     |  5 +++
 kitty.patch                                   | 35 +++++++++++++++++++
 modules/home-manager/packages/default.nix     |  1 +
 .../home-manager/programs/nixvim/default.nix  |  1 +
 .../programs/nixvim/presets/default.nix       |  1 +
 .../nixvim/presets/languages/dart.nix         | 16 +++++++++
 .../nixos/usecases/development/android.nix    |  1 -
 7 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 kitty.patch
 create mode 100644 modules/home-manager/programs/nixvim/presets/languages/dart.nix

diff --git a/flake.nix b/flake.nix
index 20d7a08..7f68635 100644
--- a/flake.nix
+++ b/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 ];
+                });
+              */
             })
           ];
         }
diff --git a/kitty.patch b/kitty.patch
new file mode 100644
index 0000000..d623654
--- /dev/null
+++ b/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);
diff --git a/modules/home-manager/packages/default.nix b/modules/home-manager/packages/default.nix
index 5f2186b..b999bfd 100644
--- a/modules/home-manager/packages/default.nix
+++ b/modules/home-manager/packages/default.nix
@@ -28,6 +28,7 @@
     vesktop
     discord
     element-desktop
+    cinny-desktop
 
     # office
     libreoffice
diff --git a/modules/home-manager/programs/nixvim/default.nix b/modules/home-manager/programs/nixvim/default.nix
index e4688fd..0231f9b 100644
--- a/modules/home-manager/programs/nixvim/default.nix
+++ b/modules/home-manager/programs/nixvim/default.nix
@@ -57,6 +57,7 @@
         enable = true;
         stylelint = true;
       };
+      dart.enable = true;
       js = {
         enable = true;
         eslint = true;
diff --git a/modules/home-manager/programs/nixvim/presets/default.nix b/modules/home-manager/programs/nixvim/presets/default.nix
index d563358..4ba6784 100644
--- a/modules/home-manager/programs/nixvim/presets/default.nix
+++ b/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
diff --git a/modules/home-manager/programs/nixvim/presets/languages/dart.nix b/modules/home-manager/programs/nixvim/presets/languages/dart.nix
new file mode 100644
index 0000000..6be57b4
--- /dev/null
+++ b/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;
+    };
+  };
+}
diff --git a/modules/nixos/usecases/development/android.nix b/modules/nixos/usecases/development/android.nix
index 5e5c629..41adc78 100644
--- a/modules/nixos/usecases/development/android.nix
+++ b/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 ];
   };