From 4104f13f25e8c91f1e35d14e072d0e761f201b96 Mon Sep 17 00:00:00 2001 From: DeveloperDurp Date: Fri, 28 Mar 2025 14:47:40 -0500 Subject: [PATCH] update --- .config/autostart/swayidle.desktop | 20 +++++++++---------- .../v1/cursor_follows_focus | 1 + .../com.system76.CosmicPanel/v1/entries | 1 - .../v1/active-page | 2 +- .config/gtk-3.0/settings.ini | 2 +- .config/gtk-4.0/settings.ini | 2 +- .config/nvim/lua/plugins/codecomapnion.lua | 20 +++++++++++++++++-- .config/shell/export.zsh | 1 + .config/shell/functions.zsh | 16 +++++++++++++++ .config/tmux/tmux.conf | 20 ++++++++++++++----- .ideavimrc | 8 ++++++-- DesktopAnsible | 2 +- 12 files changed, 71 insertions(+), 24 deletions(-) create mode 100644 .config/cosmic/com.system76.CosmicComp/v1/cursor_follows_focus diff --git a/.config/autostart/swayidle.desktop b/.config/autostart/swayidle.desktop index 0780b66..ae80dff 100644 --- a/.config/autostart/swayidle.desktop +++ b/.config/autostart/swayidle.desktop @@ -1,10 +1,10 @@ -[Desktop Entry] -Type=Application -Exec=swayidle -w timeout 300 'swaylock -f' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f' -Hidden=false -NoDisplay=false -X-GNOME-Autostart-enabled=false -Name[en_US]=swaylock -Name=swaylock -Comment[en_US]= -Comment= +#[Desktop Entry] +#Type=Application +#Exec=swayidle -w timeout 300 'swaylock -f' timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f' +#Hidden=false +#NoDisplay=false +#X-GNOME-Autostart-enabled=false +#Name[en_US]=swaylock +#Name=swaylock +#Comment[en_US]= +#Comment= diff --git a/.config/cosmic/com.system76.CosmicComp/v1/cursor_follows_focus b/.config/cosmic/com.system76.CosmicComp/v1/cursor_follows_focus new file mode 100644 index 0000000..02e4a84 --- /dev/null +++ b/.config/cosmic/com.system76.CosmicComp/v1/cursor_follows_focus @@ -0,0 +1 @@ +false \ No newline at end of file diff --git a/.config/cosmic/com.system76.CosmicPanel/v1/entries b/.config/cosmic/com.system76.CosmicPanel/v1/entries index a66b307..06a7752 100644 --- a/.config/cosmic/com.system76.CosmicPanel/v1/entries +++ b/.config/cosmic/com.system76.CosmicPanel/v1/entries @@ -1,4 +1,3 @@ [ "Panel", - "Dock", ] \ No newline at end of file diff --git a/.config/cosmic/com.system76.CosmicSettings/v1/active-page b/.config/cosmic/com.system76.CosmicSettings/v1/active-page index a8164e7..f280624 100644 --- a/.config/cosmic/com.system76.CosmicSettings/v1/active-page +++ b/.config/cosmic/com.system76.CosmicSettings/v1/active-page @@ -1 +1 @@ -"display" \ No newline at end of file +"wired" \ No newline at end of file diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index 655ffc4..361db7a 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -3,7 +3,7 @@ gtk-theme-name=catppuccin-mocha-mauve-standard+default gtk-icon-theme-name=Adwaita gtk-font-name=Cantarell 11 gtk-cursor-theme-name=Pop -gtk-cursor-theme-size=8 +gtk-cursor-theme-size=24 gtk-toolbar-style=GTK_TOOLBAR_BOTH gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR gtk-button-images=1 diff --git a/.config/gtk-4.0/settings.ini b/.config/gtk-4.0/settings.ini index 985e47e..ec398a0 100644 --- a/.config/gtk-4.0/settings.ini +++ b/.config/gtk-4.0/settings.ini @@ -1,3 +1,3 @@ [Settings] gtk-application-prefer-dark-theme=0 -XCURSOR_SIZE=24 +gtk-cursor-theme-size=24 diff --git a/.config/nvim/lua/plugins/codecomapnion.lua b/.config/nvim/lua/plugins/codecomapnion.lua index 66630ea..07db4cc 100644 --- a/.config/nvim/lua/plugins/codecomapnion.lua +++ b/.config/nvim/lua/plugins/codecomapnion.lua @@ -9,10 +9,26 @@ return { config = true, opts = { strategies = { - chat = { adapter = "ollama" }, + chat = { adapter = "openai" }, inline = { adapter = "ollama" }, }, adapters = { + opts = { + show_defaults = false, + }, + openai = function() + return require("codecompanion.adapters").extend("openai", { + schema = { + model = { + default = "gpt-4o-mini", + }, + }, + url = "https://litellm.durp.info", + env = { + api_key = "sk-8lkQVLNLOMYeblJhaqcaCw", + }, + }) + end, ollama = function() return require("codecompanion.adapters").extend("ollama", { name = "ollama", @@ -22,7 +38,7 @@ return { }, }, env = { - url = "https://ollama.durp.info", + url = "https://litellm.durp.info", }, headers = { ["Content-Type"] = "application/json", diff --git a/.config/shell/export.zsh b/.config/shell/export.zsh index d5613e6..46d91f6 100644 --- a/.config/shell/export.zsh +++ b/.config/shell/export.zsh @@ -14,5 +14,6 @@ export GEM_HOME="$HOME/gems" export XCURSOR_SIZE=24 export PATH="$HOME/.local/bin:$HOME/gems/bin:/usr/local/go/bin:$HOME/go/bin:/home/linuxbrew/.linuxbrew/bin:$PATH" +export PATH="$HOME/.local/bin/DSC:$PATH" source $(brew --prefix)/share/zsh-history-substring-search/zsh-history-substring-search.zsh diff --git a/.config/shell/functions.zsh b/.config/shell/functions.zsh index 94d5e62..7bd8bf3 100644 --- a/.config/shell/functions.zsh +++ b/.config/shell/functions.zsh @@ -64,3 +64,19 @@ tmux-new () { load-profile () { ansible-playbook /home/user/.dotfiles/ansible/.config/ansible/local.yml -K } + +decode_base64_url() { + local len=$((${#1} % 4)) + local result="$1" + if [ $len -eq 2 ]; then result="$1"'==' + elif [ $len -eq 3 ]; then result="$1"'=' + fi + echo "$result" | tr '_-' '/+' | openssl enc -d -base64 +} + +decode-jwtpayload(){ + decode_base64_url $(echo -n $1 | cut -d "." -f '2') | jq . +} +decode-jwtheader(){ + decode_base64_url $(echo -n $1 | cut -d "." -f '1') | jq . +} diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 1065317..4d0f4b0 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -1,16 +1,25 @@ -#set-option -sa terminal-overrides ",xterm*:Tc" set -g terminal-overrides 'xterm*:smcup@:rmcup@' +#set-option -sa terminal-overrides ",xterm*:Tc" set -g mouse on +bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'copy-mode -e'" +setw -g mode-keys vi +bind -T copy-mode-vi WheelUpPane send -X scroll-up +bind -T copy-mode-vi WheelDownPane send -X scroll-down +#set-option -g aggressive-resize off +bind r source-file ~/.config/tmux/tmux.conf + set -g set-clipboard on set -g @yank_selection_mouse 'clipboard' set -g @yank_selection 'clipboard' + unbind C-b set -g prefix C-Space bind C-Space send-prefix set -g allow-passthrough on -set -ga update-environment TERM -set -ga update-environment TERM_PROGRAM +#set -g default-terminal "screen-256color" +#set -ga update-environment TERM +#set -ga update-environment TERM_PROGRAM # Vim style pane selection bind h select-pane -L @@ -39,8 +48,8 @@ bind -n S-Left previous-window bind -n S-Right next-window # Shift Alt vim keys to switch windows -#bind -n M-H previous-window -#bind -n M-L next-window +bind -n M-H previous-window +bind -n M-L next-window set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' @@ -51,6 +60,7 @@ set -g @plugin 'pschmitt/tmux-ssh-split' set -g @plugin 'nhdaly/tmux-better-mouse-mode' set -g @catppuccin_flavor 'mocha' + # set vi-mode set-window-option -g mode-keys vi # keybindings diff --git a/.ideavimrc b/.ideavimrc index 06b2a6c..44a7bfa 100644 --- a/.ideavimrc +++ b/.ideavimrc @@ -76,8 +76,12 @@ map " (SplitHorizontally) " Buffers let g:WhichKeyDesc_Buffer = "b Buffers" -let g:WhichKeyDesc_BufferDelete = "x Buffer Delete" -map bx (CloseContent) +let g:WhichKeyDesc_BufferDelete = "bd Delete Buffer" +let g:WhichKeyDesc_BufferDelete = "bo Delete Other Buffers" +let g:WhichKeyDesc_BufferDelete = "bp Toggle Pin" +map bd (CloseContent) +map bo (CloseAllEditorsButActive) +map bp (PinActiveEditorTab) " Popup Navigation inoremap (PopupMenu-selectNext) diff --git a/DesktopAnsible b/DesktopAnsible index d7e2dc0..92c1859 160000 --- a/DesktopAnsible +++ b/DesktopAnsible @@ -1 +1 @@ -Subproject commit d7e2dc0e6838c7666e4a1988ca22abf758e0119d +Subproject commit 92c1859b212db189d3a72feb25f0b4db4c26042c