diff --git a/common/_containers/librechat.nix b/common/_containers/librechat.nix index e33cd35..ca3d470 100644 --- a/common/_containers/librechat.nix +++ b/common/_containers/librechat.nix @@ -61,6 +61,8 @@ in MONGO_URI = "mongodb://librechat_mongodb:27017/LibreChat"; SEARCH = "true"; MEILI_HOST = "http://librechat_meilisearch:7700"; + MEILI_NO_ANALYTICS = "true"; + MEILI_MASTER_KEY = "ringofstormsLibreChat"; RAG_PORT = toString cfg.ragPort; RAG_API_URL = "http://librechat_rag_api:${toString cfg.ragPort}"; # DEBUG_CONSOLE = "true"; @@ -95,13 +97,14 @@ in librechat_meilisearch = { user = "root"; - image = "getmeili/meilisearch:v1.13"; + image = "getmeili/meilisearch:v1.12.3"; environment = { MEILI_HOST = "http://librechat_meilisearch:7700"; MEILI_NO_ANALYTICS = "true"; + MEILI_MASTER_KEY = "ringofstormsLibreChat"; }; volumes = [ - "${cfg.dataDir}/meili_data_v1.13:/meili_data" + "${cfg.dataDir}/meili_data_v1.12:/meili_data" ]; extraOptions = [ "--network=librechat-network" ]; }; diff --git a/common/general/shell/common.sh b/common/general/shell/common.sh index 8b8d9c7..9b94acf 100644 --- a/common/general/shell/common.sh +++ b/common/general/shell/common.sh @@ -184,5 +184,5 @@ alias gintentnix_undo="gintent_undo .envrc flake.lock flake.nix" # Aider aider () { - http_proxy="" all_proxy="" https_proxy="" AZURE_API_BASE=http://100.64.0.8 AZURE_API_VERSION=2024-02-15-preview AZURE_API_KEY=1 nix run "nixpkgs#aider-chat" -- aider --dark-mode --no-gitignore --no-check-update --no-auto-commits --model azure/gpt-4o-2024-05-13 $@ + http_proxy="" all_proxy="" https_proxy="" AZURE_API_BASE=http://100.64.0.8 AZURE_API_VERSION=2025-01-01-preview AZURE_API_KEY=1 nix run "nixpkgs#aider-chat-full" -- aider --dark-mode --no-gitignore --no-check-update --no-auto-commits --model azure/gpt-4.1-2025-04-14 $@ } diff --git a/hosts/lio/flake.lock b/hosts/lio/flake.lock index 0ac338c..b6ad52d 100644 --- a/hosts/lio/flake.lock +++ b/hosts/lio/flake.lock @@ -28,22 +28,17 @@ "common": { "inputs": { "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", "ragenix": "ragenix" }, "locked": { - "lastModified": 1749252658, - "narHash": "sha256-/Zkbq7RkMvGSj6w+JBCVHPTS+csbbBAM1XvAgh09e0c=", - "ref": "refs/heads/master", - "rev": "e46716582fd975ca9ce05baecd12c5ef73f5b125", - "revCount": 463, - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" + "path": "../../common", + "type": "path" }, "original": { - "type": "git", - "url": "https://git.joshuabell.xyz/ringofstorms/dotfiles" - } + "path": "../../common", + "type": "path" + }, + "parent": [] }, "crane": { "locked": { @@ -107,16 +102,16 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1748487945, + "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=", "owner": "rycee", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -146,37 +141,21 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746055187, - "narHash": "sha256-3dqArYSMP9hM7Qpy5YWhnSjiqniSaT2uc5h2Po7tmg0=", + "lastModified": 1748302896, + "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3e362ce63e16b9572d8c2297c04f7c19ab6725a5", + "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { - "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1741379970, "narHash": "sha256-Wh7esNh7G24qYleLvgOSY/7HlDUzWaL/n4qzlBePpiw=", @@ -192,7 +171,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1748302896, "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=", @@ -208,13 +187,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1748389978, - "narHash": "sha256-0fB6DyQSHEO04ng1J3MDrwxVkiN4agT5MTy/B7Ba5TI=", + "lastModified": 1749553941, + "narHash": "sha256-FBEOaw/L33Ld39Q5I7ENVlT0qqH1CSU1q/zlZKrJKs0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "beed2c8e29b049e79bc87945f90c6ed13bdea9be", + "rev": "150e5130886f2368f9b303bc8a312a48ab7b0ead", "type": "github" }, "original": { @@ -274,11 +253,11 @@ "nvim_plugin-L3MON4D3/LuaSnip": { "flake": false, "locked": { - "lastModified": 1747860236, - "narHash": "sha256-4dKxI3VzuHpneaQwFNH8VyY441fTHuQ3gOcTbVzlpaE=", + "lastModified": 1749127971, + "narHash": "sha256-x3WRiZnF2JhurxgN8N2xAG4gWi2VcDZz8QUBoqmmghE=", "owner": "L3MON4D3", "repo": "LuaSnip", - "rev": "faf3c94a44508cec1b961406d36cc65113ff3b98", + "rev": "5271933f7cea9f6b1c7de953379469010ed4553a", "type": "github" }, "original": { @@ -290,11 +269,11 @@ "nvim_plugin-MeanderingProgrammer/render-markdown.nvim": { "flake": false, "locked": { - "lastModified": 1748376831, - "narHash": "sha256-OOl0Qmaq/sGmxzb/aiHqjaHuLJW1n3uQJob866SqWkg=", + "lastModified": 1749074056, + "narHash": "sha256-sGdT9KvBwK1alV4ocapnhRwJhNT7KfzrNJnqzpMJCJc=", "owner": "MeanderingProgrammer", "repo": "render-markdown.nvim", - "rev": "4a39681990fb515d00dd898de3d7bf2973805f1a", + "rev": "6f5a4c36d9383b2a916facaa63dcd573afa11ee8", "type": "github" }, "original": { @@ -306,11 +285,11 @@ "nvim_plugin-MunifTanjim/nui.nvim": { "flake": false, "locked": { - "lastModified": 1748258625, - "narHash": "sha256-onUTKd8HZXOGZI2/NiIDY2G5BUZuHs/BrF8qlKjGhnY=", + "lastModified": 1749392788, + "narHash": "sha256-41slmnvt1z7sCxvpiVuFmQ9g7eCaxQi1dDCL3AxSL1A=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "7cd18e73cfbd70e1546931b7268b3eebaeff9391", + "rev": "de740991c12411b663994b2860f1a4fd0937c130", "type": "github" }, "original": { @@ -338,11 +317,11 @@ "nvim_plugin-Saecki/crates.nvim": { "flake": false, "locked": { - "lastModified": 1748380727, - "narHash": "sha256-2KD1hzUf5ERMkjwqMCvni2jAzZMxGvSObonZ97FWH18=", + "lastModified": 1748637634, + "narHash": "sha256-sDjG6fjnQsyYtdf7xpmOW193e7USh6ghrFzo6NoLyP8=", "owner": "Saecki", "repo": "crates.nvim", - "rev": "76278e722df9b5ce622d30655f2bda5f326b8dac", + "rev": "5d8b1bef686db0fabe5f1bb593744b617e8f1405", "type": "github" }, "original": { @@ -370,11 +349,11 @@ "nvim_plugin-b0o/schemastore.nvim": { "flake": false, "locked": { - "lastModified": 1748365238, - "narHash": "sha256-cPZ59qRc+j+ogzqKK3gql8uHkIjPtHiveQrIVq3vCLo=", + "lastModified": 1749502840, + "narHash": "sha256-3Tn4xIgjE+subR8nEp8yB01mMPExsO8UaRWYud5tLYo=", "owner": "b0o", "repo": "schemastore.nvim", - "rev": "a9ba109549de51e3b4594d39a1c07f14b9d0cfa5", + "rev": "98543263f95dd191fd6d3b08500680d18bebe214", "type": "github" }, "original": { @@ -386,11 +365,11 @@ "nvim_plugin-catppuccin/nvim": { "flake": false, "locked": { - "lastModified": 1748270776, - "narHash": "sha256-KxQ6CY7wtb/1XouRxuauUGiTrrdnsHdhLTeG2rWlWSA=", + "lastModified": 1749271780, + "narHash": "sha256-wt/Ybjgr4N80B+QsyANs1QezM7PpFceUWSweRFgkhl0=", "owner": "catppuccin", "repo": "nvim", - "rev": "56a9dfd1e05868cf3189369aad87242941396563", + "rev": "fa42eb5e26819ef58884257d5ae95dd0552b9a66", "type": "github" }, "original": { @@ -578,11 +557,11 @@ "nvim_plugin-lewis6991/gitsigns.nvim": { "flake": false, "locked": { - "lastModified": 1747829807, - "narHash": "sha256-sebcUEiX2f8dWId/5z2dgRXSDaJQ6eycR5SYrOcmTxk=", + "lastModified": 1748967690, + "narHash": "sha256-L2ccr8gquqGBVP/KDfbSjV2AKAEG/x+go6cjHRqxrbA=", "owner": "lewis6991", "repo": "gitsigns.nvim", - "rev": "8b729e489f1475615dc6c9737da917b3bc163605", + "rev": "d0f90ef51d4be86b824b012ec52ed715b5622e51", "type": "github" }, "original": { @@ -626,11 +605,11 @@ "nvim_plugin-m4xshen/hardtime.nvim": { "flake": false, "locked": { - "lastModified": 1748004396, - "narHash": "sha256-7YSEvb67PJ7LOVlZveFDI99HUE4IkVyiRvpohPFk4LY=", + "lastModified": 1748532608, + "narHash": "sha256-1bUp5YPXJ4Smc2unn7IN5tNv7UVFZvKPcxd5wnDt3Ig=", "owner": "m4xshen", "repo": "hardtime.nvim", - "rev": "1a3648a53002c2911ccb88e9c9f876cdc6c43ad6", + "rev": "145b930954a3146cfb5b8a73cdcad42eb7d2740c", "type": "github" }, "original": { @@ -658,11 +637,11 @@ "nvim_plugin-mfussenegger/nvim-lint": { "flake": false, "locked": { - "lastModified": 1747924806, - "narHash": "sha256-SN9b0x9Va19rGvSl4+3CthvNp5jRa1yt2Q6li4reRjM=", + "lastModified": 1749125183, + "narHash": "sha256-+Ma1QG4CcAxHhXuBwIpFhv+uFC8hY0azTOfzj/jDV0s=", "owner": "mfussenegger", "repo": "nvim-lint", - "rev": "b47cbb249351873e3a571751c3fb66ed6369852f", + "rev": "cc26ae6a620298bb3f33b0e0681f99a10ae57781", "type": "github" }, "original": { @@ -674,11 +653,11 @@ "nvim_plugin-mrcjkb/rustaceanvim": { "flake": false, "locked": { - "lastModified": 1748287881, - "narHash": "sha256-B1L3HAMqz1rsk7+MockTl1qDTMmOC/RPfGQi0qyRd3I=", + "lastModified": 1748737685, + "narHash": "sha256-ndndReTxl8qZYgIXA++XWC9JA+JSNjfkTBXZQNXFw8g=", "owner": "mrcjkb", "repo": "rustaceanvim", - "rev": "eaa8d3dc22026da53fbb1b63f504541c70de44f4", + "rev": "a0c8e9698ef90bcfdf42806a38bf55b612b65b18", "type": "github" }, "original": { @@ -690,11 +669,11 @@ "nvim_plugin-neovim/nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1748350935, - "narHash": "sha256-nFS6O8/zBAkot2eCvmYPSJWMFAezwB4LbofDch93VNE=", + "lastModified": 1749345812, + "narHash": "sha256-gO7QDAYmU6ez1TAYuS2VCf9V3C2AYIj6yynQNGNa9Jw=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9", + "rev": "a182334ba933e58240c2c45e6ae2d9c7ae313e00", "type": "github" }, "original": { @@ -706,11 +685,11 @@ "nvim_plugin-nosduco/remote-sshfs.nvim": { "flake": false, "locked": { - "lastModified": 1747719337, - "narHash": "sha256-sVg7iWDpsJfN9PuHaE0IHMuOabfPF7vYpNGr/SdZqbM=", + "lastModified": 1748880705, + "narHash": "sha256-eTnVFOR7FHlkU9kwrk3q3pNo/U8OR2gJrnrMUQKGi2A=", "owner": "nosduco", "repo": "remote-sshfs.nvim", - "rev": "01b89636d18a65f8bbd77749aecf4fc124e051aa", + "rev": "6e893c32ff7c5b8d0d501b748c525fa53963fb35", "type": "github" }, "original": { @@ -754,11 +733,11 @@ "nvim_plugin-nvim-lualine/lualine.nvim": { "flake": false, "locked": { - "lastModified": 1747786963, - "narHash": "sha256-Z6efNmO6nvaNASYS9d0WcazJm7OJyp/kbgREEI/JHIc=", + "lastModified": 1749383457, + "narHash": "sha256-2aPgA7riA/FubQpTkqsxLKl7OZ8L6FkucNHc2QEx2HQ=", "owner": "nvim-lualine", "repo": "lualine.nvim", - "rev": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af", + "rev": "a94fc68960665e54408fe37dcf573193c4ce82c9", "type": "github" }, "original": { @@ -834,11 +813,11 @@ "nvim_plugin-nvim-tree/nvim-tree.lua": { "flake": false, "locked": { - "lastModified": 1748230341, - "narHash": "sha256-b2unFvStI2hqurymRP5inrHZL8HSR6s7Bk/YK/vgPvQ=", + "lastModified": 1748820067, + "narHash": "sha256-iCtFRqBhgpjHnTPNN3jagfm+qAGkb3glMxqRHJb+Iqk=", "owner": "nvim-tree", "repo": "nvim-tree.lua", - "rev": "ebcaccda1c575fa19a8087445276e6671e2b9b37", + "rev": "1c733e8c1957dc67f47580fe9c458a13b5612d5b", "type": "github" }, "original": { @@ -866,11 +845,11 @@ "nvim_plugin-nvim-treesitter/nvim-treesitter-context": { "flake": false, "locked": { - "lastModified": 1748354888, - "narHash": "sha256-Z7W8voY3Qt4QsTitbaVksjtekPtwNjynUUrDvUVFWfw=", + "lastModified": 1748856318, + "narHash": "sha256-GPaujTCGmVWF15YhzzVouf+XkzrIfJky3ILhN6mhFOE=", "owner": "nvim-treesitter", "repo": "nvim-treesitter-context", - "rev": "33b3f5a06ded3f3dcbf5de433d1ea35caa9b14d3", + "rev": "464a443b5a6657f39772b20baa95d02ffe97b268", "type": "github" }, "original": { @@ -978,11 +957,11 @@ "nvim_plugin-stevearc/conform.nvim": { "flake": false, "locked": { - "lastModified": 1747884293, - "narHash": "sha256-jPc91Lar3X58DkxV4I3nWMtTfNhTf+fXUBIfsQLa0u0=", + "lastModified": 1749498876, + "narHash": "sha256-n1IPUNwD14WlDU4zbgfJuhXQcVMt8oc4wCuUJBPJ+y4=", "owner": "stevearc", "repo": "conform.nvim", - "rev": "6feb2f28f9a9385e401857b21eeac3c1b66dd628", + "rev": "8132ec733eed3bf415b97b76797ca41b59f51d7d", "type": "github" }, "original": { @@ -1071,22 +1050,6 @@ "type": "github" } }, - "nvim_plugin-yetone/avante.nvim": { - "flake": false, - "locked": { - "lastModified": 1748339096, - "narHash": "sha256-E6B4JyeB+6Ann6QhcXEUjhyl2B9nhhw1Op6CV7ioIAA=", - "owner": "yetone", - "repo": "avante.nvim", - "rev": "697384f1cbb03899ecf1fab7725d69d398467ec9", - "type": "github" - }, - "original": { - "owner": "yetone", - "repo": "avante.nvim", - "type": "github" - } - }, "nvim_plugin-zbirenbaum/copilot-cmp": { "flake": false, "locked": { @@ -1106,11 +1069,11 @@ "nvim_plugin-zbirenbaum/copilot.lua": { "flake": false, "locked": { - "lastModified": 1748023521, - "narHash": "sha256-XxkHZNHInzyCcvB+R/6zRR4pKyjYGvdaNhK34iyef1g=", + "lastModified": 1749137204, + "narHash": "sha256-qxHpIsFFLDG/jtk6e1hkOZgDSRA5Q0+DMxxAxckNhIc=", "owner": "zbirenbaum", "repo": "copilot.lua", - "rev": "a620a5a97b73faba009a8160bab2885316e1451c", + "rev": "c1bb86abbed1a52a11ab3944ef00c8410520543d", "type": "github" }, "original": { @@ -1124,7 +1087,7 @@ "agenix": "agenix", "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -1144,13 +1107,13 @@ "root": { "inputs": { "common": "common", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "ros_neovim": "ros_neovim" } }, "ros_neovim": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim": "nvim_plugin-CopilotC-Nvim/CopilotChat.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", @@ -1204,17 +1167,16 @@ "nvim_plugin-tpope/vim-surround": "nvim_plugin-tpope/vim-surround", "nvim_plugin-uga-rosa/ccc.nvim": "nvim_plugin-uga-rosa/ccc.nvim", "nvim_plugin-windwp/nvim-ts-autotag": "nvim_plugin-windwp/nvim-ts-autotag", - "nvim_plugin-yetone/avante.nvim": "nvim_plugin-yetone/avante.nvim", "nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp", "nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1749227663, - "narHash": "sha256-0Jyh6aeouZuqyOArBi9rxUMCsas1hwYdyg854r4vxxA=", + "lastModified": 1749560624, + "narHash": "sha256-y5stOzkG/FB0UQGXX8IO38ev4Zm1jxpoJ5RHerVnzJU=", "ref": "refs/heads/master", - "rev": "56252ddbb09ea0395b857424edf1e745ace7653b", - "revCount": 282, + "rev": "47104ea033551412d7c8c76facd03d6f3bffe998", + "revCount": 285, "type": "git", "url": "https://git.joshuabell.xyz/ringofstorms/nvim" }, @@ -1253,11 +1215,11 @@ ] }, "locked": { - "lastModified": 1748313401, - "narHash": "sha256-x5UuDKP2Ui/TresAngUo9U4Ss9xfOmN8dAXU8OrkZmA=", + "lastModified": 1749523120, + "narHash": "sha256-lEhEK8qE8xto2Wnj4f7R+VRSg7M6tgTTkJVTZ2QxXOI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9c8ea175cf9af29edbcff121512e44092a8f37e4", + "rev": "d0727dbab79c5a28289f3c03e4fac7d5b95bafb3", "type": "github" }, "original": { diff --git a/hosts/lio/flake.nix b/hosts/lio/flake.nix index c5d862d..c482ad0 100644 --- a/hosts/lio/flake.nix +++ b/hosts/lio/flake.nix @@ -4,8 +4,8 @@ # nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use relative to get current version for testing - # common.url = "path:../../common"; - common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; + common.url = "path:../../common"; + # common.url = "git+https://git.joshuabell.xyz/ringofstorms/dotfiles"; ros_neovim.url = "git+https://git.joshuabell.xyz/ringofstorms/nvim"; };