From fee8fd0b0cb3aa41b70c3c0d037156c6c528ef50 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Thu, 19 Jun 2025 13:31:57 +0530 Subject: [PATCH] fix: Slack overlay for wayland issues --- home/apps/slack.nix | 13 ++++++++++++- home/programs/aichat.nix | 6 ++++-- home/programs/default.nix | 2 +- modules/aichat.nix | 4 ++-- neovim/default.nix | 2 +- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/home/apps/slack.nix b/home/apps/slack.nix index 1e38d1de..f3aea8a9 100644 --- a/home/apps/slack.nix +++ b/home/apps/slack.nix @@ -4,6 +4,17 @@ ... }: { home.packages = lib.optionals pkgs.stdenv.isLinux [ - pkgs.slack + (pkgs.slack.overrideAttrs (old: { + installPhase = + old.installPhase + + '' + rm $out/bin/slack + + makeWrapper $out/lib/slack/slack $out/bin/slack \ + --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \ + --prefix PATH : ${lib.makeBinPath [pkgs.xdg-utils]} \ + --add-flags "--enable-features=WebRTCPipeWireCapturer %U" + ''; + })) ]; } diff --git a/home/programs/aichat.nix b/home/programs/aichat.nix index 05b64d33..41f8dcc3 100644 --- a/home/programs/aichat.nix +++ b/home/programs/aichat.nix @@ -5,8 +5,10 @@ secrets."openrouter/api_key" = {}; secrets."gemini/api_key" = {}; }; - imports = [../../modules/aichat.nix]; - programs.aichat = { + imports = [ + ../../modules/aichat.nix + ]; + programs.mayichat = { enable = true; enableFishIntegration = true; enableNushellIntegration = false; diff --git a/home/programs/default.nix b/home/programs/default.nix index ac2ca668..6dae2e19 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -5,7 +5,7 @@ }: { imports = [ ../../modules - # ./aichat.nix + ./aichat.nix ./atuin.nix ./bat.nix ./carapace.nix diff --git a/modules/aichat.nix b/modules/aichat.nix index cc247057..47bd6012 100644 --- a/modules/aichat.nix +++ b/modules/aichat.nix @@ -5,7 +5,7 @@ ... }: with lib; let - cfg = config.programs.aichat; + cfg = config.programs.mayichat; yamlFormat = pkgs.formats.yaml {}; fishIntegration = '' function _aichat_fish @@ -64,7 +64,7 @@ with lib; let ''; in { options = { - programs.aichat = { + programs.mayichat = { enable = mkEnableOption "aichat"; package = mkPackageOption pkgs "aichat" {}; diff --git a/neovim/default.nix b/neovim/default.nix index 2564b293..7a0bae1a 100644 --- a/neovim/default.nix +++ b/neovim/default.nix @@ -505,7 +505,7 @@ in { settings = { sources = { cmdline = []; - default = ["dictionary" "path" "lsp" "buffer"]; + default = ["lsp" "dictionary" "snippets" "path" "buffer"]; providers = { buffer = { score_offset = -7;