feat: Change fonts and update

common/home.nix

@@ -68,6 +68,7 @@ in {
       pkg-config
       devenv
       sleek
+      openapi-tui
 
       # Misc
       qmk
@@ -89,8 +90,9 @@ in {
       dust
       cachix
       fzf
-      (nerdfonts.override {fonts = ["Hasklig"];})
+      (nerdfonts.override {fonts = ["FiraCode" "Hasklig" "NerdFontsSymbolsOnly"];})
       monaspace
+      hasklig
       pfetch-rs
       hotedit
       (pkgs.wrapMpv

common/kitty.nix

@@ -6,7 +6,8 @@
   programs.kitty = {
     enable = device.hasGui;
     font = {
-      name = "Hasklug Nerd Font Mono";
+      name = "FiraCode Nerd Font Mono";
+      # name = "Hasklug Nerd Font Mono";
       # name = "Monaspace Krypton Var Light";
       size = 13;
     };
@@ -15,8 +16,7 @@
       background = "#000000";
       shell = "${pkgs.fish}/bin/fish";
       hide_window_decorations = "yes";
-      # font_family = "Hasklug Nerd Font Mono";
+      symbol_map = "U+22c4 Symbols Nerd Font Mono";
-      # font_size = 13.0;
     };
     shellIntegration.enableFishIntegration = true;
     darwinLaunchOptions = [

flake.lock

@@ -284,11 +284,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711099426,
+        "lastModified": 1713532798,
-        "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=",
+        "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8",
+        "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
         "type": "github"
       },
       "original": {
@@ -367,6 +367,28 @@
         "type": "github"
       }
     },
+    "fenix_3": {
+      "inputs": {
+        "nixpkgs": [
+          "openapi-tui",
+          "nixpkgs"
+        ],
+        "rust-analyzer-src": "rust-analyzer-src"
+      },
+      "locked": {
+        "lastModified": 1710310970,
+        "narHash": "sha256-YREcSnbDH7Es6MDvhmzPBBF3exEg2EP4sd3QCiPyWyI=",
+        "owner": "nix-community",
+        "repo": "fenix",
+        "rev": "df74cae97f59a868ad355af6a703e7845d0ae648",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "fenix",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -605,11 +627,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709336216,
+        "lastModified": 1712014858,
-        "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
+        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
+        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
         "type": "github"
       },
       "original": {
@@ -721,11 +743,11 @@
         "systems": "systems_13"
       },
       "locked": {
-        "lastModified": 1701680307,
+        "lastModified": 1710146030,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -792,6 +814,24 @@
       "inputs": {
         "systems": "systems_18"
       },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_16": {
+      "inputs": {
+        "systems": "systems_20"
+      },
       "locked": {
         "lastModified": 1705309234,
         "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@@ -806,9 +846,9 @@
         "type": "github"
       }
     },
-    "flake-utils_16": {
+    "flake-utils_17": {
       "inputs": {
-        "systems": "systems_19"
+        "systems": "systems_21"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -824,9 +864,9 @@
         "type": "github"
       }
     },
-    "flake-utils_17": {
+    "flake-utils_18": {
       "inputs": {
-        "systems": "systems_20"
+        "systems": "systems_22"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -1052,6 +1092,22 @@
         "type": "github"
       }
     },
+    "gp-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1711465726,
+        "narHash": "sha256-nowrrgdRxxJ81xsmuUYKsbPNLTGVKO6KbSpU0U98lWE=",
+        "owner": "Robitx",
+        "repo": "gp.nvim",
+        "rev": "52938ffbd47b5e06d0f9b7c8b146f26d6021fbac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Robitx",
+        "repo": "gp.nvim",
+        "type": "github"
+      }
+    },
     "hercules-ci-effects": {
       "inputs": {
         "flake-parts": "flake-parts_6",
@@ -1062,11 +1118,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710478346,
+        "lastModified": 1713898448,
-        "narHash": "sha256-Xjf8BdnQG0tLhPMlqQdwCIjOp7Teox0DP3N/jjyiGM4=",
+        "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-effects",
-        "rev": "64e7763d72c1e4c1e5e6472640615b6ae2d40fbf",
+        "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc",
         "type": "github"
       },
       "original": {
@@ -1126,11 +1182,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712989663,
+        "lastModified": 1713732794,
-        "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=",
+        "narHash": "sha256-AYCofb8Zu4Mbc1lHDtju/uxeARawRijmOueAqEMEfMU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0",
+        "rev": "670d9ecc3e46a6e3265c203c2d136031a3d3548e",
         "type": "github"
       },
       "original": {
@@ -1295,6 +1351,23 @@
         "type": "github"
       }
     },
+    "neogit": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1713820126,
+        "narHash": "sha256-HornAbEtdpxSIQktJCHu8sLjXVjJJOdw4Kwa2T3NihE=",
+        "owner": "NeogitOrg",
+        "repo": "neogit",
+        "rev": "45dcbb677d3933b8671be13df872aca51fa9d0df",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NeogitOrg",
+        "ref": "nightly",
+        "repo": "neogit",
+        "type": "github"
+      }
+    },
     "neorg": {
       "flake": false,
       "locked": {
@@ -1315,11 +1388,11 @@
     "neorg-telescope": {
       "flake": false,
       "locked": {
-        "lastModified": 1712295829,
+        "lastModified": 1713548473,
-        "narHash": "sha256-Gfb/09JCp9v65CUD7ni+8x1Yqg0xnyfgycYVcVOHQvU=",
+        "narHash": "sha256-Ytm1Au9ir/31cL36hIlrDFFe1hSSPo9yTVeHysm1WW0=",
         "owner": "nvim-neorg",
         "repo": "neorg-telescope",
-        "rev": "a4fc4eb3cd5db6ccd52e99f2b49ce931c458e38f",
+        "rev": "92c1c6064429c74505de8e5d84a6dc8488a6f8e3",
         "type": "github"
       },
       "original": {
@@ -1330,6 +1403,8 @@
     },
     "neovim": {
       "inputs": {
+        "gp-nvim": "gp-nvim",
+        "neogit": "neogit",
         "neorg": "neorg",
         "neorg-telescope": "neorg-telescope",
         "nixpkgs": [
@@ -1338,12 +1413,13 @@
         "nixvim": "nixvim",
         "nnn": "nnn",
         "nvim-devdocs": "nvim-devdocs",
-        "systems": "systems_14",
+        "pets": "pets",
-        "pets": "pets"
+        "rest-nvim": "rest-nvim",
+        "systems": "systems_14"
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-kHALA9GxwOt9xU5V7p+kneaYUVUAejj3BwNqKHS+SqQ=",
+        "narHash": "sha256-ozI/5Xy1CxKxsaWwRzHW78S4lSE1kRiCbE1i30QC4Kg=",
         "path": "./neovim",
         "type": "path"
       },
@@ -1363,11 +1439,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1713224895,
+        "lastModified": 1713988022,
-        "narHash": "sha256-zu0iktDPgweB4KRRYc4Qmqi86u6UggJsctx2b+LObYo=",
+        "narHash": "sha256-yeEl4zvf6vyMjDbYYbukGCzXcf9n+2duj4YRYwdnET8=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "8c970d34034c874ab12b924a5e057997797868f4",
+        "rev": "7f084770c23855083776b0598f2f54bb59a06875",
         "type": "github"
       },
       "original": {
@@ -1434,11 +1510,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711763326,
+        "lastModified": 1713543876,
-        "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
+        "narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
+        "rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed",
         "type": "github"
       },
       "original": {
@@ -1618,6 +1694,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1714076141,
+        "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "7bb2ccd8cdc44c91edba16c48d2c8f331fb3d856",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -1632,15 +1724,16 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1713219346,
+        "lastModified": 1714124569,
-        "narHash": "sha256-ySJSrTRhNjQwA075o4Ar1dKbWcEgq5S+4dzXDmnqz38=",
+        "narHash": "sha256-v8DjUedj2WB0cyeOlZtM88Xm2sfrhlgcqqoEFFr8myc=",
-        "owner": "nix-community",
+        "owner": "GaetanLepage",
         "repo": "nixvim",
-        "rev": "4662a06f4e405987cff5c7745ea98c044daabf87",
+        "rev": "aa696d6fb70d7a68a010a18f844ded267cfcb80a",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "GaetanLepage",
+        "ref": "ast-grep",
         "repo": "nixvim",
         "type": "github"
       }
@@ -1658,15 +1751,16 @@
         "pre-commit-hooks": "pre-commit-hooks_2"
       },
       "locked": {
-        "lastModified": 1713817544,
+        "lastModified": 1714124569,
-        "narHash": "sha256-Qd0S5BKB8gPKeaDVOF+ogIAXaZOMps0+MqK9UD45oIU=",
+        "narHash": "sha256-v8DjUedj2WB0cyeOlZtM88Xm2sfrhlgcqqoEFFr8myc=",
-        "owner": "nix-community",
+        "owner": "GaetanLepage",
         "repo": "nixvim",
-        "rev": "84d7453e44730ec2b6bfb71d109e376d6590a818",
+        "rev": "aa696d6fb70d7a68a010a18f844ded267cfcb80a",
         "type": "github"
       },
       "original": {
-        "owner": "nix-community",
+        "owner": "GaetanLepage",
+        "ref": "ast-grep",
         "repo": "nixvim",
         "type": "github"
       }
@@ -1683,11 +1777,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713225809,
+        "lastModified": 1714003411,
-        "narHash": "sha256-sTQmsPydtcomXMgVf0ipvfgjt3XEBDjg8oDBjonc6tY=",
+        "narHash": "sha256-LLy6ze+tr3YtVKF5MkIzEbm9aCYKOgYC7Jbrm7VA6N0=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "20f618e5c0cf105e476fb813538ce054d914e5ee",
+        "rev": "6dce343877dcbc03b60744075f69f6445a66b6ee",
         "type": "github"
       },
       "original": {
@@ -1727,6 +1821,27 @@
         "type": "github"
       }
     },
+    "openapi-tui": {
+      "inputs": {
+        "fenix": "fenix_3",
+        "flake-utils": "flake-utils_15",
+        "nixpkgs": "nixpkgs_6",
+        "systems": "systems_19"
+      },
+      "locked": {
+        "lastModified": 1713130292,
+        "narHash": "sha256-BhlTe2L9pkL22qkZT+uzn1cwwHb4OXRzdvw5l0FlsD4=",
+        "owner": "zaghaghi",
+        "repo": "openapi-tui",
+        "rev": "a3b051170aa05f03aa61048a0c092b9c123a80a2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "zaghaghi",
+        "repo": "openapi-tui",
+        "type": "github"
+      }
+    },
     "pets": {
       "flake": false,
       "locked": {
@@ -1760,11 +1875,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712897695,
+        "lastModified": 1713775815,
-        "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
+        "narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
+        "rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4",
         "type": "github"
       },
       "original": {
@@ -1832,6 +1947,22 @@
         "type": "github"
       }
     },
+    "rest-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1713840796,
+        "narHash": "sha256-3ddK2lgn+ucS/xInjUAgrRYQD7ge6DE+xA1DI98D6zc=",
+        "owner": "rest-nvim",
+        "repo": "rest.nvim",
+        "rev": "60428cc313b8cb11fa8fb1b94f289b14d3121fa4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rest-nvim",
+        "repo": "rest.nvim",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "anyrun": "anyrun",
@@ -1852,11 +1983,29 @@
         "nixpkgs": "nixpkgs_5",
         "nixvim": "nixvim_2",
         "nur": "nur",
+        "openapi-tui": "openapi-tui",
         "rust-overlay": "rust-overlay_6",
         "subflakes": "subflakes",
         "zjstatus": "zjstatus"
       }
     },
+    "rust-analyzer-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1710248332,
+        "narHash": "sha256-5Ozfx1xSscOrdCQoTLvcJHTtxgQ15YrXpjqce4vdzkQ=",
+        "owner": "rust-lang",
+        "repo": "rust-analyzer",
+        "rev": "a2e274142f35d21fd28d28655f4af8e8531ab649",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rust-lang",
+        "ref": "nightly",
+        "repo": "rust-analyzer",
+        "type": "github"
+      }
+    },
     "rust-overlay": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -1971,7 +2120,7 @@
     },
     "rust-overlay_6": {
       "inputs": {
-        "flake-utils": "flake-utils_15",
+        "flake-utils": "flake-utils_16",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -2018,7 +2167,7 @@
     "subflakes": {
       "inputs": {
         "csshacks": "csshacks",
-        "flake-utils": "flake-utils_16",
+        "flake-utils": "flake-utils_17",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -2186,16 +2335,16 @@
     },
     "systems_19": {
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1689347949,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
         "type": "github"
       }
     },
@@ -2229,6 +2378,36 @@
         "type": "github"
       }
     },
+    "systems_21": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_22": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "systems_3": {
       "locked": {
         "lastModified": 1681028828,
@@ -2337,7 +2516,7 @@
     "zjstatus": {
       "inputs": {
         "crane": "crane_5",
-        "flake-utils": "flake-utils_17",
+        "flake-utils": "flake-utils_18",
         "nixpkgs": [
           "nixpkgs"
         ],

flake.nix

@@ -44,7 +44,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixvim = {
-      url = "github:nix-community/nixvim";
+      url = "github:GaetanLepage/nixvim/ast-grep";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-index-database.url = "github:Mic92/nix-index-database";
@@ -75,6 +75,10 @@
       url = "path:./neovim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    openapi-tui = {
+      url = "github:zaghaghi/openapi-tui";
+      flake = false;
+    };
   };
 
   outputs = {

neovim/flake.lock

@@ -9,11 +9,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711099426,
+        "lastModified": 1713532798,
-        "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=",
+        "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8",
+        "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
         "type": "github"
       },
       "original": {
@@ -119,11 +119,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1709336216,
+        "lastModified": 1712014858,
-        "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
+        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
+        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
         "type": "github"
       },
       "original": {
@@ -172,11 +172,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1701680307,
+        "lastModified": 1710146030,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -207,6 +207,22 @@
         "type": "github"
       }
     },
+    "gp-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1711465726,
+        "narHash": "sha256-nowrrgdRxxJ81xsmuUYKsbPNLTGVKO6KbSpU0U98lWE=",
+        "owner": "Robitx",
+        "repo": "gp.nvim",
+        "rev": "52938ffbd47b5e06d0f9b7c8b146f26d6021fbac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Robitx",
+        "repo": "gp.nvim",
+        "type": "github"
+      }
+    },
     "hercules-ci-effects": {
       "inputs": {
         "flake-parts": "flake-parts_3",
@@ -216,11 +232,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710478346,
+        "lastModified": 1713898448,
-        "narHash": "sha256-Xjf8BdnQG0tLhPMlqQdwCIjOp7Teox0DP3N/jjyiGM4=",
+        "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-effects",
-        "rev": "64e7763d72c1e4c1e5e6472640615b6ae2d40fbf",
+        "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc",
         "type": "github"
       },
       "original": {
@@ -237,11 +253,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712989663,
+        "lastModified": 1713732794,
-        "narHash": "sha256-r2X/DIAyKOLiHoncjcxUk1TENWDTTaigRBaY53Cts/w=",
+        "narHash": "sha256-AYCofb8Zu4Mbc1lHDtju/uxeARawRijmOueAqEMEfMU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "40ab43ae98cb3e6f07eaeaa3f3ed56d589da21b0",
+        "rev": "670d9ecc3e46a6e3265c203c2d136031a3d3548e",
         "type": "github"
       },
       "original": {
@@ -250,6 +266,23 @@
         "type": "github"
       }
     },
+    "neogit": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1713820126,
+        "narHash": "sha256-HornAbEtdpxSIQktJCHu8sLjXVjJJOdw4Kwa2T3NihE=",
+        "owner": "NeogitOrg",
+        "repo": "neogit",
+        "rev": "45dcbb677d3933b8671be13df872aca51fa9d0df",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NeogitOrg",
+        "ref": "nightly",
+        "repo": "neogit",
+        "type": "github"
+      }
+    },
     "neorg": {
       "flake": false,
       "locked": {
@@ -270,11 +303,11 @@
     "neorg-telescope": {
       "flake": false,
       "locked": {
-        "lastModified": 1712295829,
+        "lastModified": 1713548473,
-        "narHash": "sha256-Gfb/09JCp9v65CUD7ni+8x1Yqg0xnyfgycYVcVOHQvU=",
+        "narHash": "sha256-Ytm1Au9ir/31cL36hIlrDFFe1hSSPo9yTVeHysm1WW0=",
         "owner": "nvim-neorg",
         "repo": "neorg-telescope",
-        "rev": "a4fc4eb3cd5db6ccd52e99f2b49ce931c458e38f",
+        "rev": "92c1c6064429c74505de8e5d84a6dc8488a6f8e3",
         "type": "github"
       },
       "original": {
@@ -293,11 +326,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1713224895,
+        "lastModified": 1713988022,
-        "narHash": "sha256-zu0iktDPgweB4KRRYc4Qmqi86u6UggJsctx2b+LObYo=",
+        "narHash": "sha256-yeEl4zvf6vyMjDbYYbukGCzXcf9n+2duj4YRYwdnET8=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "8c970d34034c874ab12b924a5e057997797868f4",
+        "rev": "7f084770c23855083776b0598f2f54bb59a06875",
         "type": "github"
       },
       "original": {
@@ -315,11 +348,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1711763326,
+        "lastModified": 1713543876,
-        "narHash": "sha256-sXcesZWKXFlEQ8oyGHnfk4xc9f2Ip0X/+YZOq3sKviI=",
+        "narHash": "sha256-olEWxacm1xZhAtpq+ZkEyQgR4zgfE7ddpNtZNvubi3g=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "36524adc31566655f2f4d55ad6b875fb5c1a4083",
+        "rev": "9e7c20ffd056e406ddd0276ee9d89f09c5e5f4ed",
         "type": "github"
       },
       "original": {
@@ -330,11 +363,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712963716,
+        "lastModified": 1713895582,
-        "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
+        "narHash": "sha256-cfh1hi+6muQMbi9acOlju3V1gl8BEaZBXBR9jQfQi4U=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
+        "rev": "572af610f6151fd41c212f897c71f7056e3fb518",
         "type": "github"
       },
       "original": {
@@ -357,11 +390,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1713219346,
+        "lastModified": 1713939051,
-        "narHash": "sha256-ySJSrTRhNjQwA075o4Ar1dKbWcEgq5S+4dzXDmnqz38=",
+        "narHash": "sha256-EwDbsFjpXANXd2MIvRm4Bz2CDNWIhlV/659xOAxhEv0=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "4662a06f4e405987cff5c7745ea98c044daabf87",
+        "rev": "f2f97d844bb39559f3356e209b49c92900d860b8",
         "type": "github"
       },
       "original": {
@@ -381,11 +414,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713225809,
+        "lastModified": 1714003411,
-        "narHash": "sha256-sTQmsPydtcomXMgVf0ipvfgjt3XEBDjg8oDBjonc6tY=",
+        "narHash": "sha256-LLy6ze+tr3YtVKF5MkIzEbm9aCYKOgYC7Jbrm7VA6N0=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "20f618e5c0cf105e476fb813538ce054d914e5ee",
+        "rev": "6dce343877dcbc03b60744075f69f6445a66b6ee",
         "type": "github"
       },
       "original": {
@@ -410,6 +443,22 @@
         "type": "github"
       }
     },
+    "pets": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1704285662,
+        "narHash": "sha256-77+mDpI51L8jjyOGURzruDdXwkc855tc/Mv+CfnX2io=",
+        "owner": "giusgad",
+        "repo": "pets.nvim",
+        "rev": "747eb5e54fe8b10f4c7ce2881637d1c17b04f229",
+        "type": "github"
+      },
+      "original": {
+        "owner": "giusgad",
+        "repo": "pets.nvim",
+        "type": "github"
+      }
+    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -425,11 +474,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1712897695,
+        "lastModified": 1713775815,
-        "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
+        "narHash": "sha256-Wu9cdYTnGQQwtT20QQMg7jzkANKQjwBD9iccfGKkfls=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
+        "rev": "2ac4dcbf55ed43f3be0bae15e181f08a57af24a4",
         "type": "github"
       },
       "original": {
@@ -438,14 +487,34 @@
         "type": "github"
       }
     },
+    "rest-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1713840796,
+        "narHash": "sha256-3ddK2lgn+ucS/xInjUAgrRYQD7ge6DE+xA1DI98D6zc=",
+        "owner": "rest-nvim",
+        "repo": "rest.nvim",
+        "rev": "60428cc313b8cb11fa8fb1b94f289b14d3121fa4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rest-nvim",
+        "repo": "rest.nvim",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
+        "gp-nvim": "gp-nvim",
+        "neogit": "neogit",
         "neorg": "neorg",
         "neorg-telescope": "neorg-telescope",
         "nixpkgs": "nixpkgs",
         "nixvim": "nixvim",
         "nnn": "nnn",
         "nvim-devdocs": "nvim-devdocs",
+        "pets": "pets",
+        "rest-nvim": "rest-nvim",
         "systems": "systems_4"
       }
     },

neovim/flake.nix

@@ -3,7 +3,7 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     systems.url = "github:nix-systems/default";
     nixvim = {
-      url = "github:nix-community/nixvim";
+      url = "github:GaetanLepage/nixvim/ast-grep";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nnn = {
@@ -11,8 +11,8 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     pets = {
-        url = "github:giusgad/pets.nvim";
+      url = "github:giusgad/pets.nvim";
-        flake = false;
+      flake = false;
     };
     neorg = {
       url = "github:nvim-neorg/neorg/v7.0.0";
@@ -22,9 +22,22 @@
       url = "github:nvim-neorg/neorg-telescope";
       flake = false;
     };
-
+    rest-nvim = {
-    nvim-devdocs.url = "github:luckasRanarison/nvim-devdocs";
+      url = "github:rest-nvim/rest.nvim";
-    nvim-devdocs.flake = false;
+      flake = false;
+    };
+    gp-nvim = {
+      url = "github:Robitx/gp.nvim";
+      flake = false;
+    };
+    nvim-devdocs = {
+      url = "github:luckasRanarison/nvim-devdocs";
+      flake = false;
+    };
+    neogit = {
+      url = "github:NeogitOrg/neogit/nightly";
+      flake = false;
+    };
   };
 
   outputs = {

neovim/nvim.nix

@@ -124,11 +124,11 @@ in rec {
           defaults = {
             layout_strategy = "vertical";
             layout_config = {
-              preview_height = 0.7;
+              preview_height = 0.8;
               vertical = {
                 size = {
-                  width = "95%";
+                  width = "99%";
-                  height = "95%";
+                  height = "99%";
                 };
               };
             };
@@ -178,7 +178,7 @@ in rec {
             ''
               function(client, bufnr)
                   if client.server_capabilities.inlayHintProvider then
-                      vim.lsp.inlay_hint.enable(bufnr, true)
+                      vim.lsp.inlay_hint.enable(true)
                   end
               end
             '';
@@ -217,6 +217,7 @@ in rec {
           lua-ls.enable = true;
           jsonls.enable = true;
           html.enable = true;
+          ast-grep.enable = true;
           # pylyzer.enable = true;
           # rust-analyzer.enable = true;
         };
@@ -331,6 +332,12 @@ in rec {
         "<leader>ff" = "require'telescope.builtin'.find_files";
         "<leader>gg" = "require'telescope.builtin'.live_grep";
         "<leader>;" = "require'telescope.builtin'.buffers";
+
+        "<C-q><C-q>" = "[[g<Tab>]]";
+        "<C-q>c" = "[[<cmd>tabnew<cr>]]";
+        "<C-q>x" = "[[<cmd>tabclose<cr>]]";
+        "<C-q>n" = "[[<cmd>tabnext<cr>]]";
+        "<C-q>p" = "[[<cmd>tabprevious<cr>]]";
       };
       terminal = {
         "<C-\\>" = "require('FTerm').toggle";
@@ -402,6 +409,7 @@ in rec {
 
         catcher(require('rest-nvim').setup)
 
+        catcher(require('lspconfig').ast_grep.setup)
 
         -- require('telescope').load_extension("dap")
         -- require('telescope').load_extension("rest")
@@ -456,13 +464,15 @@ in rec {
             }
         }
 
-
         require('neorg').setup({
             load = load,
         })
 
-        require('chatgpt').setup({
+        -- require('chatgpt').setup({
-            api_key_cmd = "${pkgs.rbw}/bin/rbw get platform.openai.com",
+        --     api_key_cmd = "${pkgs.rbw}/bin/rbw get platform.openai.com",
+        -- })
+        require("gp").setup({
+            openai_api_key = { "${pkgs.rbw}/bin/rbw", "get", "platform.openai.com" },
         })
 
         require('octo').setup({
@@ -491,6 +501,9 @@ in rec {
                     tmux_show_only_in_active_window = true,
                 }
             }
+            require("pets").setup({
+              -- your options here
+            })
         else
             vim.o.guifont = "Monaspace Krypton:h13"
             -- vim.o.guifont = "Hasklug Nerd Font Mono:h13"
@@ -560,7 +573,7 @@ in rec {
               sh = {
                 -- Can be a table or a function that
                 -- returns a table (see below)
-                command = {"zsh"}
+                command = {"${pkgs.zsh}/bin/zsh"}
               },
               sql = {
                 command = function(meta)
@@ -572,7 +585,10 @@ in rec {
                     end
 
                 end
-              }
+              },
+              rust = {
+                command = {"${pkgs.evcxr}/bin/evcxr"}
+              },
             },
             -- How the repl window will be displayed
             -- See below for more information
@@ -602,11 +618,6 @@ in rec {
           },
           ignore_blank_lines = true, -- ignore blank lines when sending visual select lines
         })
-
-        require("pets").setup({
-          -- your options here
-        })
-
       '';
     package = pkgs.neovim-nightly;
     opts = {
@@ -636,7 +647,8 @@ in rec {
 
       # Wut
       image-nvim
-      ChatGPT-nvim
+      # ChatGPT-nvim
+      gp-nvim
       pets-nvim
 
       # UI and UX

neovim/overlays.nix

@@ -3,16 +3,25 @@
     vimPlugins =
       prev.vimPlugins
       // {
-        comfortable-motion = final.pkgs.vimUtils.buildVimPlugin {
+        gp-nvim = final.pkgs.vimUtils.buildVimPlugin {
-          name = "comfortable-motion";
+          name = "gp.nvim";
-          # TODO: Move to subflake
+          src = inputs.gp-nvim;
-          src = final.pkgs.fetchFromGitHub {
-            owner = "yuttie";
-            repo = "comfortable-motion.vim";
-            rev = "master";
-            sha256 = "sha256-S1LJXmShhpCJIg/FEPx3jFbmPpS/1U4MAQN2RY/nkI0";
-          };
         };
+        neogit = final.pkgs.vimUtils.buildVimPlugin {
+          name = "neogit";
+          src = inputs.neogit;
+          dependencies = [final.vimPlugins.plenary-nvim];
+        };
+        # comfortable-motion = final.pkgs.vimUtils.buildVimPlugin {
+        #   name = "comfortable-motion";
+        #   # TODO: Move to subflake
+        #   src = final.pkgs.fetchFromGitHub {
+        #     owner = "yuttie";
+        #     repo = "comfortable-motion.vim";
+        #     rev = "master";
+        #     sha256 = "sha256-S1LJXmShhpCJIg/FEPx3jFbmPpS/1U4MAQN2RY/nkI0";
+        #   };
+        # };
         nvim-dap-rr = final.pkgs.vimUtils.buildVimPlugin {
           name = "nvim-dap-rr";
           # TODO: Move to subflake
@@ -98,30 +107,45 @@
       };
   };
   rest-nvim-overlay = final: prev: let
-    # TODO: Move to subflake
+    rest-nvim-src = inputs.rest-nvim;
-    rest-nvim-src = final.pkgs.fetchFromGitHub {
+    rest-nvim-luaPackage-override = luaself: luaprev: {
-      owner = "rest-nvim";
+      rest-nvim = luaself.callPackage (
-      repo = "rest.nvim";
+        {
-      # rev = "64175b161b61b6807b4c6f3f18dd884325cf04e0";
+          luaOlder,
-      # Before v2 release
+          buildLuarocksPackage,
-      rev = "v1.0.0";
+          lua,
-      # sha256 = "sha256-3EC0j/hEbdQ8nJU0I+LGmE/zNnglO/FrP/6POer0338";
+          nvim-nio,
-      # sha256 = "sha256-3EC0j/hEbdQ8nJU0I+LGmE/zNnglO/FrP/6POer0339";
+          luarocks-nix,
-      sha256 = "sha256-jSY5WXx5tQAD0ZefPbg2luHywGAMcB9wdUTy6Av3xnY";
+          lua-curl,
+          mimetypes,
+          xml2lua,
+        }:
+          buildLuarocksPackage {
+            pname = "rest.nvim";
+            version = "scm-1";
+            knownRockspec = "${rest-nvim-src}/rest.nvim-scm-1.rockspec";
+            src = rest-nvim-src;
+            propagatedBuildInputs = [lua luarocks-nix nvim-nio lua-curl mimetypes xml2lua];
+            disable = luaOlder "5.1";
+          }
+      ) {};
     };
+    lua5_1 = prev.lua5_1.override {
+      packageOverrides = rest-nvim-luaPackage-override;
+    };
+    lua51Packages = final.lua5_1.pkgs;
   in {
-    vimPlugins =
+    inherit lua5_1 lua51Packages;
-      prev.vimPlugins
+    # vimPlugins =
-      // {
+    #   prev.vimPlugins
-        rest-nvim = final.vimUtils.buildVimPlugin {
+    #   // {
-          pname = "rest.nvim";
+    #     rest-nvim = final.neovimUtils.buildNeovimPlugin {
-          version = "1.0.0";
+    #       pname = "rest.nvim";
-          src = rest-nvim-src;
+    #       version = "scm-1";
-          # version = "scm-1";
+    #       src = rest-nvim-src;
-          # rockspecVersion = "0.2-1";
+    #     };
-          # buildInputs = with final.pkgs.lua51Packages; [lua lua-curl mimetypes nvim-nio xml2lua];
+    #   };
-        };
+    # rest-nvim = final.vimPlugins.rest-nvim;
-      };
   };
 in [
   inputs.nnn.overlay

nixos/configuration.nix

@@ -218,7 +218,7 @@
         {})
       gnumake
       python3
-      (nerdfonts.override {fonts = ["FiraCode" "Hasklig"];})
+      (nerdfonts.override {fonts = ["FiraCode" "Hasklig" "Symbols"];})
       monaspace
     ];
     sessionVariables = {

overlays.nix

@@ -54,6 +54,22 @@
           cp $src/subcommands/cover/davis-cover $out/bin
         '';
       };
+
+    openapi-tui = let
+      cargoToml = builtins.fromTOML (builtins.readFile "${inputs.openapi-tui}/Cargo.toml");
+    in
+      final.rustPlatform.buildRustPackage {
+        pname = cargoToml.package.name;
+        version = cargoToml.package.version;
+        src = inputs.openapi-tui;
+        cargoLock = {lockFile = "${inputs.openapi-tui}/Cargo.lock";};
+        buildInputs = with final;
+          pkgs.lib.optionals pkgs.stdenv.isDarwin [
+            pkgs.darwin.apple_sdk.frameworks.SystemConfiguration
+            pkgs.darwin.apple_sdk.frameworks.Security
+            pkgs.darwin.apple_sdk.frameworks.CoreFoundation
+          ];
+      };
     picat = let
       # https://github.com/SimonPersson/picat
       # TODO: Move to subflake