From 7ee949ac6c6e3559fd0b2329972ef755bc93a96b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Tue, 30 Jul 2024 13:36:16 +0200 Subject: [PATCH] Tue 30 Jul 13:36:16 CEST 2024 --- flake.lock | 62 ++++++++++++------------- home/nvim/files/lua/plugins/codegen.lua | 22 --------- home/nvim/files/lua/plugins/ogpt.lua | 18 +++++++ home/zsh/default.nix | 2 +- hosts/Aloria/default.nix | 4 ++ 5 files changed, 54 insertions(+), 54 deletions(-) delete mode 100644 home/nvim/files/lua/plugins/codegen.lua create mode 100644 home/nvim/files/lua/plugins/ogpt.lua diff --git a/flake.lock b/flake.lock index 72abd4b..d5162fc 100644 --- a/flake.lock +++ b/flake.lock @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1721853718, - "narHash": "sha256-QEkCryhEMBW8maWEbwN0LoJIjdt640FviwMeJpghJXM=", + "lastModified": 1722100913, + "narHash": "sha256-75Hcx5Zu0f+BeCkZxN1frkYacjbkwgCq+z3doVgr4Hw=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "353dc1b7299d43f08de44276b93ae32726ff9d70", + "rev": "4918e57979bbdbd05aabb20f63e1cb5dc289bcbd", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1721852138, - "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=", + "lastModified": 1722321190, + "narHash": "sha256-WeVWVRqkgrbLzmk6FfJoloJ7Xe7HWD27Pv950IUG2kI=", "owner": "nix-community", "repo": "home-manager", - "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e", + "rev": "4fcd54df7cbb1d79cbe81209909ee8514d6b17a4", "type": "github" }, "original": { @@ -134,11 +134,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1721909528, - "narHash": "sha256-e+Bd9axZaiVjml/OxZg0sP/zODQWn4eslKjJP1gwEz0=", + "lastModified": 1722274148, + "narHash": "sha256-Hw4QoNWBI1aMbohZOt7azFgDnk7QCRj6YS25M+fLJpM=", "ref": "refs/heads/main", - "rev": "a0d15a0b7b066cbb1b08ac54cf882c2c55467e4a", - "revCount": 4983, + "rev": "e67322034037fef22079c8e480be38c1d04b5a4a", + "revCount": 5019, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1718746314, - "narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=", + "lastModified": 1721326555, + "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "1b61f0093afff20ab44d88ad707aed8bf2215290", + "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", "type": "github" }, "original": { @@ -217,11 +217,11 @@ ] }, "locked": { - "lastModified": 1721324102, - "narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=", + "lastModified": 1722098849, + "narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "962582a090bc233c4de9d9897f46794280288989", + "rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f", "type": "github" }, "original": { @@ -288,11 +288,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1721379653, - "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", + "lastModified": 1721924956, + "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", + "rev": "5ad6a14c6bf098e98800b091668718c336effc95", "type": "github" }, "original": { @@ -304,11 +304,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1721562059, - "narHash": "sha256-Tybxt65eyOARf285hMHIJ2uul8SULjFZbT9ZaEeUnP8=", + "lastModified": 1722062969, + "narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "68c9ed8bbed9dfce253cc91560bf9043297ef2fe", + "rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3", "type": "github" }, "original": { @@ -336,11 +336,11 @@ }, "nur": { "locked": { - "lastModified": 1721914019, - "narHash": "sha256-GxUnSVtfPCLHIJJ6OiwQUaFIPL0xMaH0wf+TuxS6Cwg=", + "lastModified": 1722328047, + "narHash": "sha256-bG6cydVHbR3FoB25n70qFUr4RBWL98+4hK82GIN3SXI=", "owner": "nix-community", "repo": "NUR", - "rev": "a6a34c95c22e8cddd6049a470fb843989d08ee86", + "rev": "d80d03bfbf325e92e478c5468e4ba27bcb51dfb1", "type": "github" }, "original": { @@ -418,11 +418,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1721894229, - "narHash": "sha256-yuP04h2O+jJF79s7yP27nv3DyqZCLM/KqGMPE9meyJ0=", + "lastModified": 1722266822, + "narHash": "sha256-oHWlLJVqEA6sPFZfppaa3WPf0fItTdF/9TcKpt3G/ns=", "owner": "abenz1267", "repo": "walker", - "rev": "f57c7562f714ceb6761f57bda3e6b839ebc1ad1c", + "rev": "bcd6be6e49f445fbb2974d478495fd7fb008b817", "type": "github" }, "original": { @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1721648131, - "narHash": "sha256-cyyxu/oj4QEFp3CVx2WeXa9T4OAUyynuBJHGkBZSxJI=", + "lastModified": 1722181019, + "narHash": "sha256-Lj/g1UzrsTZUixtveQix6eB3pon2j23qv5/5pzTx0LQ=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "663be9cad424b170b28b9fa8a61042d721007f3b", + "rev": "0e2f3b9c85f7bab3983098a01366876d34daf383", "type": "github" }, "original": { diff --git a/home/nvim/files/lua/plugins/codegen.lua b/home/nvim/files/lua/plugins/codegen.lua deleted file mode 100644 index a8a565f..0000000 --- a/home/nvim/files/lua/plugins/codegen.lua +++ /dev/null @@ -1,22 +0,0 @@ -return { - "David-Kunz/gen.nvim", - opts = { - model = "mistral", -- The default model to use. - host = "localhost", -- The host running the Ollama service. - port = "11434", -- The port on which the Ollama service is listening. - display_mode = "float", -- The display mode. Can be "float" or "split". - show_prompt = false, -- Shows the Prompt submitted to Ollama. - show_model = false, -- Displays which model you are using at the beginning of your chat session. - quit_map = "q", -- set keymap for quit - no_auto_close = false, -- Never closes the window automatically. - command = function(options) - return "curl --silent --no-buffer -X POST http://" .. options.host .. ":" .. options.port .. "/api/chat -d $body" - end, - -- The command for the Ollama service. You can use placeholders $prompt, $model and $body (shellescaped). - -- This can also be a command string. - -- The executed command must return a JSON object with { response, context } - -- (context property is optional). - -- list_models = '', -- Retrieves a list of model names - debug = false -- Prints errors and the command which is run. - } -} diff --git a/home/nvim/files/lua/plugins/ogpt.lua b/home/nvim/files/lua/plugins/ogpt.lua new file mode 100644 index 0000000..be74211 --- /dev/null +++ b/home/nvim/files/lua/plugins/ogpt.lua @@ -0,0 +1,18 @@ +return { + "huynle/ogpt.nvim", + event = "VeryLazy", + opts = { + default_provider = "ollama", + providers = { + ollama = { + api_host = os.getenv("OLLAMA_API_HOST") or "http://localhost:11434", + api_key = os.getenv("OLLAMA_API_KEY") or "", + } + } + }, + dependencies = { + "MunifTanjim/nui.nvim", + "nvim-lua/plenary.nvim", + "nvim-telescope/telescope.nvim" + } +} diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 9d9cb4e..34d45f9 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -85,7 +85,7 @@ eval "$(direnv hook zsh)" } function run() { - nix run "nixpkgs#$1" -- "''${@:2}" + NIXPKGS_ALLOW_UNFREE=1 nix run --impure "nixpkgs#$1" -- "''${@:2}" } function o() { ${pkgs.handlr-regex}/bin/handlr open $@ < /dev/null &> /dev/null & disown diff --git a/hosts/Aloria/default.nix b/hosts/Aloria/default.nix index a0b58ce..ecc90f1 100644 --- a/hosts/Aloria/default.nix +++ b/hosts/Aloria/default.nix @@ -12,6 +12,10 @@ zramSwap.enable = true; services.logind.extraConfig = ''HandlePowerKey=ignore''; + services.ollama = { + enable = true; + acceleration = "cuda"; + }; networking.wg-quick.interfaces = { Tunnel = {