diff --git a/.zshrc b/.zshrc index 4ad9372..7af55d4 100644 --- a/.zshrc +++ b/.zshrc @@ -25,19 +25,19 @@ compinit # source /usr/share/nvm/init-nvm.sh alias v="nvim" -alias conservation-on="sudo ectool chargecontrol normal 80 80" -alias conservation-off="sudo ectool chargecontrol normal" -# alias orphans="sudo pacman -Qtdq | sudo pacman -Rns -" - -# Define variables for monitor names -LAPTOP_MONITOR="eDP-1" -EXTERNAL_MONITOR="DP-2" - -# Alias to disable laptop screen (only if external is connected) -alias laptop-screen-off='if xrandr | grep "$EXTERNAL_MONITOR connected"; then swaymsg output $LAPTOP_MONITOR disable; echo "Laptop screen disabled."; else echo "External monitor not connected. Keeping laptop screen on."; fi' - -# Alias to enable laptop screen -alias laptop-screen-on='swaymsg output $LAPTOP_MONITOR enable; echo "Laptop screen enabled."' +# alias conservation-on="sudo ectool chargecontrol normal 80 80" +# alias conservation-off="sudo ectool chargecontrol normal" +# # alias orphans="sudo pacman -Qtdq | sudo pacman -Rns -" +# +# # Define variables for monitor names +# LAPTOP_MONITOR="eDP-1" +# EXTERNAL_MONITOR="DP-2" +# +# # Alias to disable laptop screen (only if external is connected) +# alias laptop-screen-off='if xrandr | grep "$EXTERNAL_MONITOR connected"; then swaymsg output $LAPTOP_MONITOR disable; echo "Laptop screen disabled."; else echo "External monitor not connected. Keeping laptop screen on."; fi' +# +# # Alias to enable laptop screen +# alias laptop-screen-on='swaymsg output $LAPTOP_MONITOR enable; echo "Laptop screen enabled."' alias space="du -hsx * | sort -rh | head -10" @@ -47,10 +47,3 @@ export GPG_TTY=$(tty) export EDITOR="nvim" [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh - - -source ~/.cargo/env - -export GOROOT="$HOME/.local/bin/go" -export GOPATH="$HOME/.go" -export PATH="$GOROOT/bin:$GOPATH/bin:$PATH" diff --git a/link.sh b/link.sh index 8fc1b4f..a5605cb 100755 --- a/link.sh +++ b/link.sh @@ -1,17 +1,17 @@ -#!/bin/bash +#!bash -ln -s ~/Documents/dotfiles/alacritty ~/.config/ +# ln -s ~/Documents/dotfiles/alacritty ~/.config/ ln -s ~/Documents/dotfiles/foot ~/.config/ -ln -s ~/Documents/dotfiles/.gitconfig ~/ ln -s ~/Documents/dotfiles/mako ~/.config/ ln -s ~/Documents/dotfiles/mpv ~/.config/ ln -s ~/Documents/dotfiles/nvim ~/.config/ ln -s ~/Documents/dotfiles/sway ~/.config/ ln -s ~/Documents/dotfiles/swayidle ~/.config/ ln -s ~/Documents/dotfiles/tmux ~/.config/ -ln -s ~/Documents/dotfiles/topgrade ~/.config/ +# ln -s ~/Documents/dotfiles/topgrade ~/.config/ ln -s ~/Documents/dotfiles/waybar ~/.config/ ln -s ~/Documents/dotfiles/wofi ~/.config/ ln -s ~/Documents/dotfiles/yt-dlp ~/.config/ ln -s ~/Documents/dotfiles/zathura ~/.config/ ln -s ~/Documents/dotfiles/.zshrc ~/ +ln -s ~/Documents/dotfiles/.gitconfig ~/ diff --git a/nvim/lua/kanopo/plugins/lsp.lua b/nvim/lua/kanopo/plugins/lsp.lua index 3f6b5e0..cf15c80 100644 --- a/nvim/lua/kanopo/plugins/lsp.lua +++ b/nvim/lua/kanopo/plugins/lsp.lua @@ -116,9 +116,8 @@ return { local servers = { texlab = {}, -- clangd = {}, - -- gopls = {}, - -- pyright = {}, - -- rust_analyzer = {}, + gopls = {}, + nil_ls = {}, ts_ls = {}, lua_ls = { settings = { @@ -149,6 +148,7 @@ return { local ensure_installed = vim.tbl_keys(servers or {}) vim.list_extend(ensure_installed, { "stylua", -- Used to format Lua code + "nixfmt" }) require("mason-tool-installer").setup({ ensure_installed = ensure_installed })