many changes and more modularizing

hosts/nb/modules/nvim/chatgpt.nix

@@ -0,0 +1,13 @@
+self: super: {
+  vimPlugins = super.vimPlugins // {
+    chatgpt-nvim = super.vimUtils.buildVimPlugin {
+      pname = "chatgpt-nvim";
+      version = "1.0.0";
+      src = super.fetchgit {
+        url = "https://git.cloonar.com/Cloonar/chatgpt.vim.git";
+        rev = "9a9868c991d2c9d0d2f5bc4c065a839f79c8daa1";
+        sha256 = "sha256-ip+VFMJJWNaoSOyY2nLNVLEb3h37akUdk0du5u81dvc=";
+      };
+    };
+  };
+}

hosts/nb/modules/nvim/default.nix

@@ -1,6 +1,9 @@
 { pkgs, ... }:
 {
   environment.variables = { EDITOR = "vim"; };
+  nixpkgs.overlays = [
+      (import ./chatgpt.nix)
+  ];
 
   environment.systemPackages = with pkgs; [
     nodePackages.typescript-language-server
@@ -11,6 +14,8 @@
     gopls
     lazygit
     ripgrep
+    lua
+    luaPackages.lyaml
     (neovim.override {
       vimAlias = true;
       configure = {
@@ -19,6 +24,7 @@
             bigfile-nvim
             bufferline-nvim
             catppuccin-nvim
+            chatgpt-nvim
             cmp-buffer
             cmp-nvim-lsp
             cmp-path
@@ -66,6 +72,7 @@
           luaConfig = builtins.concatStringsSep "\n" (map luaRequire [
             "init"
             "keymappings"
+            "chatgpt"
             "copilot"
             "icons"
             "lspconfig"
@@ -86,6 +93,7 @@
           EOF
         '';
       };
+      extraLuaPackages = luaPackages: [ luaPackages.lyaml ];
     }
   )];
 }

hosts/nb/modules/nvim/nvim.nix

@@ -0,0 +1,7 @@
+self: super: {
+  neovim = super.neovim.override {
+    luaPackages = super.luaPackages // {
+      lyaml = super.luaPackages.lyaml;
+    };
+  };
+}

hosts/nb/modules/sway/sway.conf

@@ -6,6 +6,7 @@
 
 # font for window titles and bar
 font pango:Source Sans Pro 14
+seat * xcursor_theme Adwaita 24
 
 # use win key
 set $mod Mod4
@@ -311,7 +312,7 @@ exec mako --default-timeout=5000
 
 # wallpaper
 # output eDP-1 scale 2 scale_filter linear
-output eDP-1 mode 1680x1050
+output eDP-1 mode 2880x1920 scale 2
 output eDP-1 bg #282a36 solid_color
 output eDP-1 bg ~/.wallpaper.png center
 output DP-4 bg #282a36 solid_color

hosts/nb/modules/sway/sway.nix

@@ -43,6 +43,8 @@ in {
     ./thunderbird.nix
   ];
 
+  environment.variables.XCURSOR_SIZE = "24";
+
   hardware.opengl.extraPackages = [ pkgs.amdvlk ];
   environment.variables.VK_ICD_FILENAMES = "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json";
 

hosts/nb/modules/sway/thunderbird.nix

@@ -15,25 +15,8 @@ let
   };
 in
 {
-
-  # nixpkgs.overlays = [
-  #   (self: super:
-  #     {
-  #       thunderbird-bin-unwrapped = super.thunderbird-bin-unwrapped.overrideAttrs ( old: rec {
-  #         version = "112.0b7";
-  #         name = "thunderbird-bin";
-  #         src = super.fetchurl {
-  #              url = "https://download-installer.cdn.mozilla.net/pub/thunderbird/releases/${version}/linux-x86_64/en-US/thunderbird-${version}.tar.bz2";
-  #              sha256 = "30d23df34834096a79261439d5ea6d78d44921f0218893f100596ee6296cd806";
-  #         };
-  #       });
-  #     }
-  #   )
-  # ];
   environment.systemPackages = [ 
-    # (import ../../pkgs/thunderbird.nix)
     pkgs.thunderbird
-    # pkgs.thunderbird-bin-unwrapped
     thunderbirdWorkDesktopItem
     thunderbirdCloonarDesktopItem
   ];