From 229528eb7577f928b5c67427ab8a5391dcdd2733 Mon Sep 17 00:00:00 2001 From: DeveloperDurp Date: Fri, 6 Mar 2026 05:30:26 -0600 Subject: [PATCH] update --- .config/nvim/lazy-lock.json | 50 ++-- .config/nvim/lua/plugins/codecomapnion.lua | 236 +++++++++++++----- .config/qt5ct/qt5ct.conf | 6 + .config/scripts/sessions.sh | 2 +- .config/shell/alias.zsh | 1 + .nixpkgs/config.nix | 4 + .ssh/config | 22 +- ansible/roles/packages/vars/Pop!_OS-24.04.yml | 7 +- ansible/roles/update/tasks/main.yml | 2 +- 9 files changed, 212 insertions(+), 118 deletions(-) create mode 100644 .config/qt5ct/qt5ct.conf diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index c370f85..4a9a092 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,51 +1,51 @@ { "LazyVim": { "branch": "main", "commit": "28db03f958d58dfff3c647ce28fdc1cb88ac158d" }, - "SchemaStore.nvim": { "branch": "main", "commit": "21645280ad06fce01ef109e82d76302dcbe62756" }, - "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" }, + "SchemaStore.nvim": { "branch": "main", "commit": "75b5210976cf6e5666ae566418f4f81cab26019e" }, + "blink.cmp": { "branch": "main", "commit": "4b18c32adef2898f95cdef6192cbd5796c1a332d" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "catppuccin": { "branch": "main", "commit": "ce4a8e0d5267e67056f9f4dcf6cb1d0933c8ca00" }, - "codecompanion.nvim": { "branch": "main", "commit": "8ad65eef735b31bb47d76f59d878ee1bac4bdc85" }, - "conform.nvim": { "branch": "master", "commit": "ffe26e8df8115c9665d24231f8a49fadb2d611ce" }, + "catppuccin": { "branch": "main", "commit": "0a5de4da015a175f416d6ef1eda84661623e0500" }, + "codecompanion.nvim": { "branch": "main", "commit": "558518f8d78a44198cd428f6bf8bf48bfa38d76d" }, + "conform.nvim": { "branch": "master", "commit": "e969e302bced7ffb9a0a0323629f31feb0ca35a6" }, "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" }, - "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "fzf-lua": { "branch": "main", "commit": "0284d640fd88c56f100a43f41103c5b564699e15" }, - "gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" }, - "grug-far.nvim": { "branch": "main", "commit": "b58b2d65863f4ebad88b10a1ddd519e5380466e0" }, - "kulala.nvim": { "branch": "main", "commit": "5d3916195a97928b8f9b79d96029f37d19ba866d" }, + "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, + "fzf-lua": { "branch": "main", "commit": "72ec224172eea757eab6b349775ad5bada7521d7" }, + "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" }, + "grug-far.nvim": { "branch": "main", "commit": "275dbedc96e61a6b8d1dfb28ba51586ddd233dcf" }, + "kulala.nvim": { "branch": "main", "commit": "6656c9d332735ca6a27725e0fb45a1715c4372d9" }, "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" }, "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" }, - "mini.ai": { "branch": "main", "commit": "bfb26d9072670c3aaefab0f53024b2f3729c8083" }, - "mini.icons": { "branch": "main", "commit": "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428" }, - "mini.pairs": { "branch": "main", "commit": "472ec50092a3314ec285d2db2baa48602d71fe93" }, - "mini.surround": { "branch": "main", "commit": "88c52297ed3e69ecf9f8652837888ecc727a28ee" }, - "neo-tree.nvim": { "branch": "main", "commit": "a981ef287503c668434bffa78071d5b9ff92c12f" }, + "mini.ai": { "branch": "main", "commit": "4b0a6207341d895b6cfe9bcb1e4d3e8607bfe4f4" }, + "mini.icons": { "branch": "main", "commit": "5b9076dae1bfbe47ba4a14bc8b967cde0ab5d77e" }, + "mini.pairs": { "branch": "main", "commit": "b7fde3719340946feb75017ef9d75edebdeb0566" }, + "mini.surround": { "branch": "main", "commit": "d205d1741d1fcc1f3117b4e839bf00f74ad72fa2" }, + "neo-tree.nvim": { "branch": "main", "commit": "f4102f547165e7f8ad00f12c3c8e2e89f19a209d" }, "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-dap": { "branch": "master", "commit": "5860c7c501eb428d3137ee22c522828d20cca0b3" }, + "nvim-dap": { "branch": "master", "commit": "7b11f48753ea6a82f09485dadd08016e2a318cf6" }, "nvim-dap-go": { "branch": "main", "commit": "605911fa0899882b05a8e4369ab12739620494af" }, "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, - "nvim-lint": { "branch": "master", "commit": "ebe535956106c60405b02220246e135910f6853d" }, - "nvim-lspconfig": { "branch": "master", "commit": "9c923997123ff9071198ea3b594d4c1931fab169" }, + "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" }, + "nvim-lspconfig": { "branch": "master", "commit": "ab5139c99df944479e5a26495a37840fcbb1d512" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-treesitter": { "branch": "main", "commit": "17885756e63df73ed90db62e4630f744ceda6514" }, - "nvim-treesitter-textobjects": { "branch": "main", "commit": "76deedf0f1cec4496ef8d49b6d1f020f6d0c6ec9" }, - "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, + "nvim-treesitter": { "branch": "main", "commit": "d660b7c002f3922b6bb3da47206645488a698426" }, + "nvim-treesitter-textobjects": { "branch": "main", "commit": "a0e182ae21fda68c59d1f36c9ed45600aef50311" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" }, "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "a47388e5417e7f1cfa6962cc441a23c4c5fb2151" }, "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "powershell.nvim": { "branch": "main", "commit": "f7a45f9c0b16e22e938b85a6729dc41165d87c95" }, - "render-markdown.nvim": { "branch": "main", "commit": "b2b135347e299ffbf7f4123fb7811899b0c9f4b8" }, + "powershell.nvim": { "branch": "main", "commit": "0e51d5fdea86183f9b868d0f0a0c6ffd766751c0" }, + "render-markdown.nvim": { "branch": "main", "commit": "1c958131c083c8557ea499fdb08c88b8afb05c4e" }, "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, - "telescope.nvim": { "branch": "master", "commit": "e69b434b968a33815e2f02a5c7bd7b8dd4c7d4b2" }, + "telescope.nvim": { "branch": "master", "commit": "5255aa27c422de944791318024167ad5d40aad20" }, "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" }, "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" }, - "vim-tmux-navigator": { "branch": "master", "commit": "c45243dc1f32ac6bcf6068e5300f3b2b237e576a" }, + "vim-tmux-navigator": { "branch": "master", "commit": "e41c431a0c7b7388ae7ba341f01a0d217eb3a432" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }, "zen-mode.nvim": { "branch": "main", "commit": "8564ce6d29ec7554eb9df578efa882d33b3c23a7" } } diff --git a/.config/nvim/lua/plugins/codecomapnion.lua b/.config/nvim/lua/plugins/codecomapnion.lua index d18cdab..53c4bec 100644 --- a/.config/nvim/lua/plugins/codecomapnion.lua +++ b/.config/nvim/lua/plugins/codecomapnion.lua @@ -11,76 +11,180 @@ return { }, config = true, opts = { - strategies = { - chat = { adapter = "ollama", model = "mistral:latest" }, + interactions = { + chat = { + adapter = { + name = "ollama", + model = "llama3.1:8b", + }, + }, + inline = { + adapter = { + name = "ollama", + model = "llama3.1:8b", + }, + }, + cmd = { + adapter = { + name = "ollama", + model = "llama3.1:8b", + }, + }, }, adapters = { - opts = { - show_defaults = false, - }, - gemini = function() - return require("codecompanion.adapters").extend("gemini", { - name = "gemini", - schema = { - model = { - default = "gemini-2.0-flash", - }, - }, - env = { - api_key = GEMINI_TOKEN, - }, - }) - end, - anthropic = function() - return require("codecompanion.adapters").extend( - "anthropic", - { - name = "anthropic", - schema = { - model = { - default = "claude-3-haiku-20240307", + http = { + ollama = function() + return require("codecompanion.adapters").extend( + "ollama", + { + env = { + url = "https://ollama.durp.info", }, - }, - env = { - api_key = ANTHROPIC_TOKEN, - }, - } - ) - end, - openai = function() - return require("codecompanion.adapters").extend("openai", { - name = "openai", - schema = { - model = { - default = "gpt-4o-mini", - }, - }, - env = { - api_key = OPENAI_TOKEN, - }, - }) - end, - ollama = function() - return require("codecompanion.adapters").extend("ollama", { - name = "ollama", - schema = { - model = { - default = "llama3.1:8b", - }, - }, - env = { - url = "https://ollama.durp.info", - }, - headers = { - ["Content-Type"] = "application/json", - ["Authorization"] = OLLAMA_TOKEN, - }, - parameters = { - sync = true, - }, - }) - end, + headers = { + ["Content-Type"] = "application/json", + ["Authorization"] = OLLAMA_TOKEN, + }, + parameters = { + sync = true, + }, + } + ) + end, + anthropic = function() + return require("codecompanion.adapters").extend( + "anthropic", + { + --schema = { + -- model = { + -- default = "claude-3-5-haiku", + -- }, + --}, + env = { + api_key = "ANTHROPIC_TOKEN", + }, + } + ) + end, + gemini = function() + return require("codecompanion.adapters").extend( + "gemini", + { + --schema = { + -- model = { + -- default = "claude-3-5-haiku", + -- }, + --}, + env = { + api_key = "GEMINI_TOKEN", + }, + } + ) + end, + openai = function() + return require("codecompanion.adapters").extend( + "openai", + { + --schema = { + -- model = { + -- default = "claude-3-5-haiku", + -- }, + --}, + env = { + api_key = "OPENAI_TOKEN", + }, + } + ) + end, + }, }, }, }, } + +--adapters = { +-- http = { +-- ollama = function() +-- return require("codecompanion.adapters").extend("ollama", { +-- env = { +-- url = "https://ollama.durp.info", +-- api_key = "OLLAMA_TOKEN", +-- }, +-- headers = { +-- ["Content-Type"] = "application/json", +-- ["Authorization"] = "Bearer ${api_key}", +-- }, +-- parameters = { +-- sync = true, +-- }, +-- }) +-- end, +-- }, +-- }, +--opts = { +-- show_defaults = false, +--}, +--strategies = { +-- chat = { adapter = "ollama", model = "mistral:latest" }, +--}, +--gemini = function() +-- return require("codecompanion.adapters").extend("gemini", { +-- name = "gemini", +-- schema = { +-- model = { +-- default = "gemini-2.0-flash", +-- }, +-- }, +-- env = { +-- api_key = GEMINI_TOKEN, +-- }, +-- }) +--end, +--anthropic = function() +-- return require("codecompanion.adapters").extend( +-- "anthropic", +-- { +-- name = "anthropic", +-- schema = { +-- model = { +-- default = "claude-3-haiku-20240307", +-- }, +-- }, +-- env = { +-- api_key = ANTHROPIC_TOKEN, +-- }, +-- } +-- ) +--end, +--openai = function() +-- return require("codecompanion.adapters").extend("openai", { +-- name = "openai", +-- schema = { +-- model = { +-- default = "gpt-4o-mini", +-- }, +-- }, +-- env = { +-- api_key = OPENAI_TOKEN, +-- }, +-- }) +--end, +--ollama = function() +-- return require("codecompanion.adapters").extend("ollama", { +-- name = "ollama", +-- schema = { +-- model = { +-- default = "llama3.1:8b", +-- }, +-- }, +-- env = { +-- url = "https://ollama.durp.info", +-- }, +-- headers = { +-- ["Content-Type"] = "application/json", +-- ["Authorization"] = OLLAMA_TOKEN, +-- }, +-- parameters = { +-- sync = true, +-- }, +-- }) +--end, diff --git a/.config/qt5ct/qt5ct.conf b/.config/qt5ct/qt5ct.conf new file mode 100644 index 0000000..5beca83 --- /dev/null +++ b/.config/qt5ct/qt5ct.conf @@ -0,0 +1,6 @@ +[Appearance] +cosmic_qt_version=1 +custom_palette=true +icon_theme=breeze-dark +standard_dialogs=xdgdesktopportal +color_scheme_path=/home/user/.local/share/color-schemes/CosmicDark.colors diff --git a/.config/scripts/sessions.sh b/.config/scripts/sessions.sh index fe83191..511cbc8 100755 --- a/.config/scripts/sessions.sh +++ b/.config/scripts/sessions.sh @@ -98,7 +98,7 @@ goland-new() { return } - tmux new-session -d -s "$name" -c "$dir" + tmux new-session -s "$name" -c "$dir" } switch() { diff --git a/.config/shell/alias.zsh b/.config/shell/alias.zsh index 2a77232..31dd6ef 100644 --- a/.config/shell/alias.zsh +++ b/.config/shell/alias.zsh @@ -21,3 +21,4 @@ alias gd='git diff' alias gp='git push' alias bw='NODE_OPTIONS="" bw' alias devpod='flatpak run --arch=x86_64 --command=devpod-cli sh.loft.devpod' +alias files='cosmic-files' diff --git a/.nixpkgs/config.nix b/.nixpkgs/config.nix index bf90b0f..cd64aa4 100644 --- a/.nixpkgs/config.nix +++ b/.nixpkgs/config.nix @@ -39,6 +39,10 @@ golangci-lint caffeine-ng fastfetch + timeshift + sqlite + btop + argocd ]; }; }; diff --git a/.ssh/config b/.ssh/config index 6462adf..ae7dbc8 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,23 +1,3 @@ -# DevPod Start durpapi.devpod -Host durpapi.devpod - ForwardAgent yes - LogLevel error - StrictHostKeyChecking no - UserKnownHostsFile /dev/null - HostKeyAlgorithms rsa-sha2-256,rsa-sha2-512,ssh-rsa - ProxyCommand "/home/user/.var/app/sh.loft.devpod/data/devpod-cli" ssh --stdio --context default --user vscode durpapi - User vscode -# DevPod End durpapi.devpod -# DevPod Start devpod-example-go.devpod -Host devpod-example-go.devpod - ForwardAgent yes - LogLevel error - StrictHostKeyChecking no - UserKnownHostsFile /dev/null - HostKeyAlgorithms rsa-sha2-256,rsa-sha2-512,ssh-rsa - ProxyCommand "/home/user/.var/app/sh.loft.devpod/data/devpod-cli" ssh --stdio --context default --user vscode devpod-example-go - User vscode -# DevPod End devpod-example-go.devpod Host * IdentityAgent none IdentitiesOnly yes @@ -25,7 +5,7 @@ Host * #Host * # ForwardAgent yes -host 192.168.20.253 +host 192.168.30.200 SetEnv TERM=xterm-256color Host gitlab.durp.info diff --git a/ansible/roles/packages/vars/Pop!_OS-24.04.yml b/ansible/roles/packages/vars/Pop!_OS-24.04.yml index 4344a55..f41a040 100644 --- a/ansible/roles/packages/vars/Pop!_OS-24.04.yml +++ b/ansible/roles/packages/vars/Pop!_OS-24.04.yml @@ -24,12 +24,10 @@ required_packages_apt: - libpam-yubico - yubikey-personalization - yubikey-manager - - distrobox - unattended-upgrades - - timeshift - - sqlite3 - - btop - libc++-dev + - btrfs-progs + - steam #apt_keys: # - https://packages.microsoft.com/keys/microsoft.asc @@ -57,6 +55,7 @@ required_packages_flatpak: - com.yubico.yubioath - io.gitlab.librewolf-community - com.brave.Browser + - com.moonlight_stream.Moonlight go_apps: - github.com/charmbracelet/vhs@latest diff --git a/ansible/roles/update/tasks/main.yml b/ansible/roles/update/tasks/main.yml index 5420890..767ec5b 100644 --- a/ansible/roles/update/tasks/main.yml +++ b/ansible/roles/update/tasks/main.yml @@ -14,7 +14,7 @@ - name: Update Nix Packages become_user: user shell: - cmd: nix-env -iA nixpkgs.myPackages + cmd: nix-env --upgrade - name: Update Homebrew and Apps become_user: user