diff --git a/.config/autostart/swayidle.desktop b/.config/autostart/swayidle.desktop deleted file mode 100644 index ae80dff..0000000 --- a/.config/autostart/swayidle.desktop +++ /dev/null @@ -1,10 +0,0 @@ -#[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.CosmicAppletTime/v1/military_time b/.config/cosmic/com.system76.CosmicAppletTime/v1/military_time new file mode 100644 index 0000000..02e4a84 --- /dev/null +++ b/.config/cosmic/com.system76.CosmicAppletTime/v1/military_time @@ -0,0 +1 @@ +false \ No newline at end of file diff --git a/.config/cosmic/com.system76.CosmicSettings.Shortcuts/v1/system_actions b/.config/cosmic/com.system76.CosmicSettings.Shortcuts/v1/system_actions index e98d3f7..463ec15 100644 --- a/.config/cosmic/com.system76.CosmicSettings.Shortcuts/v1/system_actions +++ b/.config/cosmic/com.system76.CosmicSettings.Shortcuts/v1/system_actions @@ -1,3 +1,3 @@ { - Terminal: "cosmic-term", + Terminal: "kitty", } \ No newline at end of file diff --git a/.config/nvim/lua/config/lspconfig.lua b/.config/nvim/lua/config/lspconfig.lua index e8bb785..cf158d2 100644 --- a/.config/nvim/lua/config/lspconfig.lua +++ b/.config/nvim/lua/config/lspconfig.lua @@ -46,16 +46,23 @@ lspconfig.pyright.setup({ }) lspconfig.powershell_es.setup({ - bundle_path = vim.fn.stdpath("data") .. "/mason/packages/powershell-editor-services", + bundle_path = vim.fn.stdpath("data") + .. "/mason/packages/powershell-editor-services", }) lspconfig.bashls.setup({}) -omnisharp_bin = vim.fn.stdpath("data") .. "/mason/packages/omnisharp/omnisharp" +omnisharp_bin = vim.fn.stdpath("data") + .. "/mason/packages/omnisharp/omnisharp" lspconfig.omnisharp.setup({ on_attach = on_attach, capabilities = capabilities, filetypes = { "cs" }, - cmd = { omnisharp_bin, "--languageserver", "--hostPID", tostring(pid) }, + cmd = { + omnisharp_bin, + "--languageserver", + "--hostPID", + tostring(pid), + }, }) diff --git a/.config/nvim/lua/plugins/codecomapnion.lua b/.config/nvim/lua/plugins/codecomapnion.lua index f0e516d..accd820 100644 --- a/.config/nvim/lua/plugins/codecomapnion.lua +++ b/.config/nvim/lua/plugins/codecomapnion.lua @@ -1,6 +1,7 @@ local OLLAMA_TOKEN = os.getenv("OLLAMA_TOKEN") local OPENAI_TOKEN = os.getenv("OPENAI_TOKEN") local GEMINI_TOKEN = os.getenv("GEMINI_TOKEN") +local ANTHROPIC_TOKEN = os.getenv("ANTHROPIC_TOKEN") return { { "olimorris/codecompanion.nvim", @@ -30,6 +31,22 @@ return { }, }) 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", diff --git a/.config/scripts/credentials.sh b/.config/scripts/credentials.sh new file mode 100755 index 0000000..4e7847d --- /dev/null +++ b/.config/scripts/credentials.sh @@ -0,0 +1,30 @@ +#!/usr/bin/zsh +source ~/.config/shell/functions.zsh + +set() { + export BW_SESSION="$(bw unlock $(secret-tool lookup drive bitwarden) --raw)" + bw sync + printf "$(bw get password cli-gitlab)" | secret-tool store --label='Gitlab Token for CLI' 'token' 'GITLAB_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-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' + printf "$(bw get password cli-anthropic)" | secret-tool store --label='Anthropic Token for CLI' 'token' 'ANTHROPIC_TOKEN' + + unset BW_SESSION +} + +get() { + export GITLAB_TOKEN="$(secret-tool lookup token GITLAB_TOKEN)" + export OLLAMA_TOKEN="$(secret-tool lookup token OLLAMA_TOKEN)" + export LITELLM_TOKEN="$(secret-tool lookup token LITELLM_TOKEN)" + export OPENAI_TOKEN="$(secret-tool lookup token OPENAI_TOKEN)" + export GEMINI_TOKEN="$(secret-tool lookup token GEMINI_TOKEN)" + export ANTHROPIC_TOKEN="$(secret-tool lookup token ANTHROPIC_TOKEN)" +} + +case "$1" in +set) set ;; +get) get ;; +*) echo "Please enter an action" ;; +esac diff --git a/.config/scripts/otp.sh b/.config/scripts/otp.sh index 36f5d40..c6e4d09 100755 --- a/.config/scripts/otp.sh +++ b/.config/scripts/otp.sh @@ -44,4 +44,4 @@ fi ykman -d $YUBIKEY_SERIAL oath accounts code $selection -p $password | cut -d' ' -f3 | wl-copy -notify-send "copied $selection to Clipboard" +notify-send "copied $selection to Clipboard" -t 5000 diff --git a/.config/shell/functions.zsh b/.config/shell/functions.zsh index 6c5d462..2a40348 100644 --- a/.config/shell/functions.zsh +++ b/.config/shell/functions.zsh @@ -10,6 +10,7 @@ set-cred () 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 GEMINI_TOKEN)" | secret-tool store --label='Gemini Token for CLI' 'token' 'GEMINI_TOKEN' + printf "$(bw get password cli-anthropic)" | secret-tool store --label='Anthropic Token for CLI' 'token' 'ANTHROPIC_TOKEN' unset BW_SESSION } @@ -21,6 +22,7 @@ set-env () export LITELLM_TOKEN="$(secret-tool lookup token LITELLM_TOKEN)" export OPENAI_TOKEN="$(secret-tool lookup token OPENAI_TOKEN)" export GEMINI_TOKEN="$(secret-tool lookup token GEMINI_TOKEN)" + export ANTHROPIC_TOKEN="$(secret-tool lookup token ANTHROPIC_TOKEN)" } clear-env () diff --git a/ansible/roles/packages/vars/Archlinux.yml b/ansible/roles/packages/vars/Archlinux.yml index d69548b..53012b7 100644 --- a/ansible/roles/packages/vars/Archlinux.yml +++ b/ansible/roles/packages/vars/Archlinux.yml @@ -3,8 +3,8 @@ required_packages_brew: - zsh-history-substring-search - zsh-autosuggestions - istioctl - - oven-sh/bun/bun - pkl + - tailwindcss required_packages_pacman: - sway @@ -142,11 +142,12 @@ required_packages_flatpak: - io.gitlab.librewolf-community - org.videolan.VLC - fr.handbrake.ghb + - app.zen_browser.zen systemd_service: - cronie.service - #- cosmic-greeter.service - - ly.service + - cosmic-greeter.service + #- ly.service - libvirtd.service - com.system76.PowerDaemon.service - ufw.service @@ -163,6 +164,8 @@ go_apps: - github.com/nats-io/natscli/nats@latest - github.com/go-task/task/v3/cmd/task@latest - github.com/a-h/templ/cmd/templ@latest + - github.com/segmentio/golines@latest + - github.com/templui/templui/cmd/templui@latest yay: - nwg-look @@ -179,4 +182,3 @@ yay: - wdisplays - bluetuith - powershell - - urbackup2-client diff --git a/install.sh b/install.sh index 39a0bd4..36ae4fe 100644 --- a/install.sh +++ b/install.sh @@ -3,4 +3,6 @@ rm .bashrc .zshrc .ideavirmrc .gitmodules sudo apt update && sudo apt install stow stow --adopt . git reset --hard + +curl -L https://nixos.org/nix/install | sh -s -- --daemon nix-env -iA nixpkgs.myPackages