From ca4ebc591fa160d59b306813e343c2b6226541b6 Mon Sep 17 00:00:00 2001 From: DeveloperDurp Date: Thu, 17 Jul 2025 06:47:25 -0500 Subject: [PATCH] update --- .../v1/focus_follows_cursor | 2 +- .../com.system76.CosmicTerm/v1/font_size | 2 +- .config/nvim/lazy-lock.json | 57 +++++++++---------- .config/nvim/lazyvim.json | 1 + .config/nvim/lua/plugins/codecomapnion.lua | 3 +- .config/nvim/lua/plugins/core.lua | 1 + .config/scripts/sessions.sh | 18 +++--- .config/shell/functions.zsh | 5 ++ .config/sway/config | 1 + .config/tmux/tmux.conf | 4 +- .config/yazi/theme.toml | 2 +- .config/yazi/yazi.toml | 2 +- .zshrc | 5 +- ansible/roles/packages/vars/Archlinux.yml | 6 +- 14 files changed, 59 insertions(+), 50 deletions(-) diff --git a/.config/cosmic/com.system76.CosmicComp/v1/focus_follows_cursor b/.config/cosmic/com.system76.CosmicComp/v1/focus_follows_cursor index f32a580..02e4a84 100644 --- a/.config/cosmic/com.system76.CosmicComp/v1/focus_follows_cursor +++ b/.config/cosmic/com.system76.CosmicComp/v1/focus_follows_cursor @@ -1 +1 @@ -true \ No newline at end of file +false \ No newline at end of file diff --git a/.config/cosmic/com.system76.CosmicTerm/v1/font_size b/.config/cosmic/com.system76.CosmicTerm/v1/font_size index 3f10ffe..da2d398 100644 --- a/.config/cosmic/com.system76.CosmicTerm/v1/font_size +++ b/.config/cosmic/com.system76.CosmicTerm/v1/font_size @@ -1 +1 @@ -15 \ No newline at end of file +14 \ No newline at end of file diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 964f6a0..2a1ab98 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,54 +1,51 @@ { - "LazyVim": { "branch": "main", "commit": "3f034d0a7f58031123300309f2efd3bb0356ee21" }, - "SchemaStore.nvim": { "branch": "main", "commit": "ea5687d7e8af3ce6678dd03d3a1bd109b5c618b7" }, - "blink.cmp": { "branch": "main", "commit": "4f38ce99a472932d5776337f08f7a8180f1f571a" }, + "LazyVim": { "branch": "main", "commit": "25abbf546d564dc484cf903804661ba12de45507" }, + "SchemaStore.nvim": { "branch": "main", "commit": "47af5f9bc7b344ad879405901a2ff5589d8561c8" }, + "blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "catppuccin": { "branch": "main", "commit": "1bf070129c0b6f77cc23f6a2212dcdc868308c52" }, - "codecompanion.nvim": { "branch": "main", "commit": "ed54d020ce16155e37f250529173101460d9daae" }, - "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" }, + "catppuccin": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" }, + "codecompanion.nvim": { "branch": "main", "commit": "118e1638232868ced2898098264bbed47015f10b" }, + "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "fzf-lua": { "branch": "main", "commit": "9a1f4b6f9e37d6fad6730301af58c29b00d363f8" }, - "gitsigns.nvim": { "branch": "main", "commit": "ab9e05d1cd5b372d4d443fa5c8e0e334232f2c77" }, - "gopher.nvim": { "branch": "main", "commit": "9db5931af1293ae52500921d92c02145d86df02c" }, - "grug-far.nvim": { "branch": "main", "commit": "6ff8a205a29db3a9b08e5debe09452b4d6fd6591" }, - "kulala.nvim": { "branch": "main", "commit": "d94ccc1e4bd6b45ebe775225446d9b384bae8deb" }, + "fzf-lua": { "branch": "main", "commit": "f8805989fc8f164ea3fab37bdec963add9576964" }, + "gitsigns.nvim": { "branch": "main", "commit": "7bbc674278f22376850576dfdddf43bbc17e62b5" }, + "grug-far.nvim": { "branch": "main", "commit": "b3f9412b1ed76f14cfc68e1ee899873544330c80" }, + "kulala.nvim": { "branch": "main", "commit": "9d3206dda077d24ef3e6a2e3578bc0c914b4944c" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, + "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, "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": "e139eb1101beb0250fea322f8c07a42f0f175688" }, - "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" }, - "mini.nvim": { "branch": "main", "commit": "473cdbff498ed120f1768c75ef65fa42859aa14f" }, - "mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" }, - "mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" }, - "neo-tree.nvim": { "branch": "main", "commit": "71bfdeddc90225e281ce34c378dc1b5914f5018d" }, + "mini.ai": { "branch": "main", "commit": "96cd250fdea1fec929a62c7432de73e0f59788cd" }, + "mini.icons": { "branch": "main", "commit": "94848dad1589a199f876539bd79befb0c5e3abf0" }, + "mini.pairs": { "branch": "main", "commit": "42407ccb80ec59c84e7c91d815f42ed90a8cc093" }, + "mini.surround": { "branch": "main", "commit": "1a2b59c77a0c4713a5bd8972da322f842f4821b1" }, + "neo-tree.nvim": { "branch": "main", "commit": "7c9c5b2fadcac4edd9f89f38cbff13ae838cc330" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, - "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, - "nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-dap": { "branch": "master", "commit": "cc77338e6e34c79f1c638f51ae4160dc9bfb05de" }, "nvim-dap-go": { "branch": "main", "commit": "605911fa0899882b05a8e4369ab12739620494af" }, - "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" }, - "nvim-lint": { "branch": "master", "commit": "9dfb77ef6c5092a19502883c02dc5a02ec648729" }, - "nvim-lspconfig": { "branch": "master", "commit": "4bc481b6f0c0cf3671fc894debd0e00347089a4e" }, + "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, + "nvim-lint": { "branch": "master", "commit": "3c5e34c24834a67b1cb37600ab7663eefd2b0390" }, + "nvim-lspconfig": { "branch": "master", "commit": "592916db3f4ecdf062962b3aa83583aebe3c4a14" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-treesitter": { "branch": "master", "commit": "94ea4f436d2b59c80f02e293466c374584f03b8c" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ed373482db797bbf71bdff37a15c7555a84dce47" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "ec1a2431f8872f650a85ed71c24f0715df2e49c2" }, "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "powershell.nvim": { "branch": "main", "commit": "2e37888fba1d4fb09b6993c9d26bb53a05bac801" }, - "render-markdown.nvim": { "branch": "main", "commit": "fa92c30f59afa980708e110824ff0933bc0954e5" }, + "powershell.nvim": { "branch": "main", "commit": "f62e3b8f7cc9075f6b3cfe918ad29fe05cb17f9e" }, + "render-markdown.nvim": { "branch": "main", "commit": "c3012098bd44381e3b96bbbbbcc21a54d45a286c" }, "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, - "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, + "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, "ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" }, - "vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" }, - "vim-tmux-navigator": { "branch": "master", "commit": "33afa80db65113561dc53fa732b7f5e53d5ecfd0" }, + "vim-tmux-navigator": { "branch": "master", "commit": "412c474e97468e7934b9c217064025ea7a69e05e" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }, "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" } } diff --git a/.config/nvim/lazyvim.json b/.config/nvim/lazyvim.json index bd29899..063c079 100644 --- a/.config/nvim/lazyvim.json +++ b/.config/nvim/lazyvim.json @@ -6,6 +6,7 @@ "lazyvim.plugins.extras.lang.go", "lazyvim.plugins.extras.lang.markdown", "lazyvim.plugins.extras.lang.omnisharp", + "lazyvim.plugins.extras.lang.tailwind", "lazyvim.plugins.extras.lang.yaml" ], "install_version": 7, diff --git a/.config/nvim/lua/plugins/codecomapnion.lua b/.config/nvim/lua/plugins/codecomapnion.lua index 76adec6..f0e516d 100644 --- a/.config/nvim/lua/plugins/codecomapnion.lua +++ b/.config/nvim/lua/plugins/codecomapnion.lua @@ -11,8 +11,7 @@ return { config = true, opts = { strategies = { - chat = { adapter = "ollama" }, - inline = { adapter = "ollama" }, + chat = { adapter = "ollama", model = "mistral:latest" }, }, adapters = { opts = { diff --git a/.config/nvim/lua/plugins/core.lua b/.config/nvim/lua/plugins/core.lua index b1953c5..fdb32c7 100644 --- a/.config/nvim/lua/plugins/core.lua +++ b/.config/nvim/lua/plugins/core.lua @@ -99,6 +99,7 @@ return { "terraform", "c_sharp", "bash", + "templ", }, }, }, diff --git a/.config/scripts/sessions.sh b/.config/scripts/sessions.sh index 08dccfd..b691b89 100755 --- a/.config/scripts/sessions.sh +++ b/.config/scripts/sessions.sh @@ -92,25 +92,29 @@ goland-new() { switch() { - tmux list-sessions -F '#{session_name}' | + session=$(tmux list-sessions -F '#{session_name}' | sed '/^popup/d' | sed '/^scratch/d' | sed '/^$/d' | - wofi -dmenu -i -p "Switch Sessions" --columns 1 | - xargs -r tmux switch-client -t + fzf --reverse --header 'Switch Session' --no-preview) + [ -z "$session" ] && return 1 + + tmux switch-client -t $session } delete() { - - tmux list-sessions -F '#{session_name}' | + session=$(tmux list-sessions -F '#{session_name}' | sed '/^popup/d' | sed '/^scratch/d' | sed '/^general/d' | sed '/^$/d' | - wofi -dmenu -i -p "Delete Session" --columns 1 | - xargs -r tmux kill-session -t + fzf --reverse --header 'Switch Session' --no-preview) + + [ -z "$session" ] && return 1 + + tmux kill-session -t $session } window() { diff --git a/.config/shell/functions.zsh b/.config/shell/functions.zsh index 143b821..6c5d462 100644 --- a/.config/shell/functions.zsh +++ b/.config/shell/functions.zsh @@ -63,3 +63,8 @@ decode-jwtheader(){ nvim-new () { ~/.config/scripts/nvim.sh $1 } + +ai () { + set-env + nvim +CodeCompanionChat -c only +} diff --git a/.config/sway/config b/.config/sway/config index 205a777..44c3023 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -4,6 +4,7 @@ exec_always { pkill kanshi pkill swayidle pkill swaync + pkill waybar } exec_always "sleep 1" diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index ff149d1..169a65e 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -95,8 +95,8 @@ unbind % bind c new-window -c "#{pane_current_path}" bind n run 'zsh -c ". $HOME/.config/scripts/sessions.sh new"' -bind s run 'zsh -c ". $HOME/.config/scripts/sessions.sh switch"' -bind d run 'zsh -c ". $HOME/.config/scripts/sessions.sh delete"' +bind s display-popup -E -w 50% -h 50% ". $HOME/.config/scripts/sessions.sh switch" +bind d display-popup -E -w 50% -h 50% ". $HOME/.config/scripts/sessions.sh delete" bind w display-popup -E -w 50% -h 50% ". $HOME/.config/scripts/sessions.sh window" bind g display-popup -E -w 80% -h 75% "lazygit" diff --git a/.config/yazi/theme.toml b/.config/yazi/theme.toml index 869c6d4..61a8335 100644 --- a/.config/yazi/theme.toml +++ b/.config/yazi/theme.toml @@ -1,4 +1,4 @@ -[manager] +[mgr] cwd = { fg = "#94e2d5" } hovered = { fg = "#1e1e2e", bg = "#89b4fa" } diff --git a/.config/yazi/yazi.toml b/.config/yazi/yazi.toml index e0c585e..7f1fde1 100644 --- a/.config/yazi/yazi.toml +++ b/.config/yazi/yazi.toml @@ -1,2 +1,2 @@ -[manager] +[mgr] show_hidden = true diff --git a/.zshrc b/.zshrc index b6c42e1..cf75140 100644 --- a/.zshrc +++ b/.zshrc @@ -92,10 +92,11 @@ bindkey -e bindkey '^p' history-search-backward bindkey '^n' history-search-forward bindkey '^[w' kill-region -bindkey "^[n" beginning-of-line -bindkey "^[." end-of-line +bindkey "^[[1~" beginning-of-line +bindkey "^[[4~" end-of-line bindkey "^[l" forward-word bindkey "^[h" backward-word +bindkey "^[[3~" delete-char # History HISTSIZE=5000 diff --git a/ansible/roles/packages/vars/Archlinux.yml b/ansible/roles/packages/vars/Archlinux.yml index 80a73e7..4286afc 100644 --- a/ansible/roles/packages/vars/Archlinux.yml +++ b/ansible/roles/packages/vars/Archlinux.yml @@ -111,13 +111,13 @@ required_packages_pacman: - python-adblock - linux-headers - traceroute + - networkmanager-openvpn - task flatpak_remote: - { name: "flathub", url: "https://dl.flathub.org/repo/flathub.flatpakrepo" } required_packages_flatpak: - - com.discordapp.Discord - org.gtk.Gtk3theme.Pop-dark - com.github.tchx84.Flatseal - com.vscodium.codium @@ -135,8 +135,8 @@ required_packages_flatpak: systemd_service: - cronie.service - #- cosmic-greeter.service - - ly.service + - cosmic-greeter.service + #- ly.service - libvirtd.service - com.system76.PowerDaemon.service - ufw.service