This commit is contained in:
DeveloperDurp 2025-05-02 06:09:07 -05:00
parent cfb63db1ad
commit 6d25dbec6e
17 changed files with 86 additions and 13 deletions

View file

@ -3,6 +3,16 @@ profile {
output eDP-1 disable output eDP-1 disable
} }
profile {
output DP-6 enable position 0,0
output eDP-1 disable
}
profile {
output DP-7 enable position 0,0
output eDP-1 disable
}
profile { profile {
output DP-7 enable position 0,1440 output DP-7 enable position 0,1440
output DP-5 enable position 0,0 output DP-5 enable position 0,0

View file

@ -7,6 +7,7 @@
## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf ## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf
## blurb: Soothing pastel theme for the high-spirited! ## blurb: Soothing pastel theme for the high-spirited!
clear_all_shortcuts yes
hide_window_decorations no hide_window_decorations no
font_family GoMono Nerd Font font_family GoMono Nerd Font
#font_family JetBrainsMono Nerd Font Mono #font_family JetBrainsMono Nerd Font Mono

View file

@ -34,6 +34,7 @@
"nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" }, "nvim-treesitter": { "branch": "master", "commit": "0e21ee8df6235511c02bab4a5b391d18e165a58d" },
"nvim-treesitter-textobjects": { "branch": "master", "commit": "698b5f805722254bca3c509591c1806d268b6c2f" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "698b5f805722254bca3c509591c1806d268b6c2f" },
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
"omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "ec1a2431f8872f650a85ed71c24f0715df2e49c2" },
"persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" }, "persistence.nvim": { "branch": "main", "commit": "166a79a55bfa7a4db3e26fc031b4d92af71d0b51" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"powershell.nvim": { "branch": "main", "commit": "2e37888fba1d4fb09b6993c9d26bb53a05bac801" }, "powershell.nvim": { "branch": "main", "commit": "2e37888fba1d4fb09b6993c9d26bb53a05bac801" },

View file

@ -3,7 +3,8 @@
"lazyvim.plugins.extras.coding.mini-surround", "lazyvim.plugins.extras.coding.mini-surround",
"lazyvim.plugins.extras.lang.docker", "lazyvim.plugins.extras.lang.docker",
"lazyvim.plugins.extras.lang.go", "lazyvim.plugins.extras.lang.go",
"lazyvim.plugins.extras.lang.markdown" "lazyvim.plugins.extras.lang.markdown",
"lazyvim.plugins.extras.lang.omnisharp"
], ],
"install_version": 7, "install_version": 7,
"news": { "news": {

View file

@ -3,6 +3,9 @@ local map = vim.keymap.set
-- map("n", ";", ":", { desc = "CMD enter command mode" }) -- map("n", ";", ":", { desc = "CMD enter command mode" })
-- map("i", "jk", "<ESC>") -- map("i", "jk", "<ESC>")
-- mist
map("", "W", ":w<CR>", { desc = "Save File" })
-- Tmux -- Tmux
map( map(
"", "",

View file

@ -1,5 +1,6 @@
local OLLAMA_TOKEN = os.getenv("OLLAMA_TOKEN") local OLLAMA_TOKEN = os.getenv("OLLAMA_TOKEN")
local OPENAI_TOKEN = os.getenv("OPENAI_TOKEN") local OPENAI_TOKEN = os.getenv("OPENAI_TOKEN")
local GEMINI_TOKEN = os.getenv("GEMINI_TOKEN")
return { return {
{ {
"olimorris/codecompanion.nvim", "olimorris/codecompanion.nvim",
@ -17,6 +18,19 @@ return {
opts = { opts = {
show_defaults = false, 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,
openai = function() openai = function()
return require("codecompanion.adapters").extend("openai", { return require("codecompanion.adapters").extend("openai", {
name = "openai", name = "openai",

View file

@ -12,6 +12,7 @@ return {
}, },
{ {
"mfussenegger/nvim-dap", "mfussenegger/nvim-dap",
config = function() end,
}, },
{ {
"nvim-neotest/nvim-nio", "nvim-neotest/nvim-nio",

21
.config/scripts/nvim.sh Executable file
View file

@ -0,0 +1,21 @@
#!/usr/bin/zsh
source ~/.config/shell/functions.zsh
new() {
set-env
nvim
}
chat() {
set-env
nvim +CodeCompanionChat -c only
}
case "$1" in
new) new $2 ;;
chat) chat ;;
*) echo "Please enter an action" ;;
esac

View file

@ -1,4 +1,5 @@
#!/bin/bash #!/usr/bin/zsh
source ~/.config/shell/functions.zsh
new() { new() {

View file

@ -1,6 +1,7 @@
export ZSH="$HOME/.oh-my-zsh" export ZSH="$HOME/.oh-my-zsh"
export DOTNET_CLI_TELEMETRY_OPTOUT=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1
export POWERSHELL_TELEMETRY_OPTOUT=1 export POWERSHELL_TELEMETRY_OPTOUT=1
export DOTNET_ROOT="/usr/share/dotnet"
export PROMPT_EOL_MARK='' export PROMPT_EOL_MARK=''
export FZF_DEFAULT_OPTS="--preview 'bat --color=always {}'" export FZF_DEFAULT_OPTS="--preview 'bat --color=always {}'"
export EDITOR='nvim' export EDITOR='nvim'

View file

@ -6,6 +6,7 @@ set-cred ()
printf "$(bw get password cli-ollama-token)" | secret-tool store --label='Ollama Token for CLI' 'token' 'OLLAMA_TOKEN' printf "$(bw get password cli-ollama-token)" | secret-tool store --label='Ollama Token for CLI' 'token' 'OLLAMA_TOKEN'
printf "$(bw get password cli-litellm-token)" | secret-tool store --label='LiteLLM Token for CLI' 'token' 'LITELLM_TOKEN' printf "$(bw get password cli-litellm-token)" | secret-tool store --label='LiteLLM Token for CLI' 'token' 'LITELLM_TOKEN'
printf "$(bw get password cli-openai)" | secret-tool store --label='OpenAI Token for CLI' 'token' 'OPENAI_TOKEN' printf "$(bw get password cli-openai)" | secret-tool store --label='OpenAI Token for CLI' 'token' 'OPENAI_TOKEN'
printf "$(bw get password GEMINI_TOKEN)" | secret-tool store --label='Gemini Token for CLI' 'token' 'GEMINI_TOKEN'
unset BW_SESSION unset BW_SESSION
} }
@ -16,6 +17,7 @@ set-env ()
export OLLAMA_TOKEN="$(secret-tool lookup token OLLAMA_TOKEN)" export OLLAMA_TOKEN="$(secret-tool lookup token OLLAMA_TOKEN)"
export LITELLM_TOKEN="$(secret-tool lookup token LITELLM_TOKEN)" export LITELLM_TOKEN="$(secret-tool lookup token LITELLM_TOKEN)"
export OPENAI_TOKEN="$(secret-tool lookup token OPENAI_TOKEN)" export OPENAI_TOKEN="$(secret-tool lookup token OPENAI_TOKEN)"
export GEMINI_TOKEN="$(secret-tool lookup token GEMINI_TOKEN)"
} }
clear-env () clear-env ()
@ -24,6 +26,7 @@ clear-env ()
unset OLLAMA_TOKEN unset OLLAMA_TOKEN
unset LITELLM_TOKEN unset LITELLM_TOKEN
unset OPENAI_TOKEN unset OPENAI_TOKEN
unset GEMINI_TOKEN
} }
tmux-new () { tmux-new () {
@ -53,3 +56,7 @@ decode-jwtpayload(){
decode-jwtheader(){ decode-jwtheader(){
decode_base64_url $(echo -n $1 | cut -d "." -f '1') | jq . decode_base64_url $(echo -n $1 | cut -d "." -f '1') | jq .
} }
nvim-new () {
~/.config/scripts/nvim.sh $1
}

View file

@ -19,6 +19,10 @@ set $files nautilus
set $browser flatpak run app.zen_browser.zen set $browser flatpak run app.zen_browser.zen
set $menu wofi set $menu wofi
set $next_or_new swaymsg -r -t get_workspaces | jq -r --arg OUTPUT $(swaymsg -t get_outputs -r | jq -r '.[] | select(.focused == true) | .name') '(. | (max_by(.num) | .num)) as $max | [.[] | select(.output == $OUTPUT)] | (max_by(.num) | .num) as $maxOutput | (.[] | select(.focused == true) | .num) as $current | if $maxOutput > $current then "next_on_output" else $max + 1 end'
set $previous_or_first swaymsg -r -t get_workspaces | jq -r --arg OUTPUT $(swaymsg -t get_outputs -r | jq -r '.[] | select(.focused == true) | .name') '(. | (max_by(.num) | .num)) as $max | [.[] | select(.output == $OUTPUT)] | (min_by(.num) | .num) as $minOutput | (.[] | select(.focused == true) | .num) as $current | if $minOutput < $current then "prev_on_output" else $current end'
include /etc/sway/config-vars.d/* include /etc/sway/config-vars.d/*
exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
@ -147,12 +151,19 @@ bindsym $mod+Shift+i exec /opt/goland/bin/goland.sh
bindsym $mod+control+9 move container to workspace number 9;workspace number 9 bindsym $mod+control+9 move container to workspace number 9;workspace number 9
bindsym $mod+control+0 move container to workspace number 10;workspace number 10 bindsym $mod+control+0 move container to workspace number 10;workspace number 10
bindsym $mod+control+l workspace next
bindsym $mod+control+h workspace prev
# Move window to next or previous workspace bindsym $mod+control+l exec swaymsg "workspace $($next_or_new)"
bindsym $mod+Shift+control+$left move container to workspace prev; workspace prev bindsym $mod+control+h exec swaymsg "workspace $($previous_or_first)"
bindsym $mod+Shift+control+$right move container to workspace next; workspace next
bindsym $mod+Shift+control+$right exec swaymsg "move container to workspace $($next_or_new), workspace next_on_output"
bindsym $mod+Shift+control+$left exec swaymsg "move container to workspace $($previous_or_first), workspace prev_on_output"
# bindsym $mod+control+l workspace next
# bindsym $mod+control+h workspace prev
#
# # Move window to next or previous workspace
# bindsym $mod+Shift+control+$left move container to workspace prev; workspace prev
# bindsym $mod+Shift+control+$right move container to workspace next; workspace next
# bindsym $mod+control+$left move workspace to output left # bindsym $mod+control+$left move workspace to output left
# bindsym $mod+control+$down move workspace to output down # bindsym $mod+control+$down move workspace to output down

View file

@ -57,7 +57,7 @@ required_packages_pacman:
- iptables - iptables
- gnome-disk-utility - gnome-disk-utility
- ranger - ranger
- qemu-base - qemu-full
- virt-manager - virt-manager
- virt-viewer - virt-viewer
- dnsmasq - dnsmasq
@ -100,6 +100,7 @@ required_packages_pacman:
- freerdp - freerdp
- remmina - remmina
- wakeonlan - wakeonlan
- less
flatpak_remote: flatpak_remote:
- { name: "flathub", url: "https://dl.flathub.org/repo/flathub.flatpakrepo" } - { name: "flathub", url: "https://dl.flathub.org/repo/flathub.flatpakrepo" }