diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 9ea7c2e..352db54 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -3,8 +3,8 @@ env = TERMINAL,alacritty $scripts = /home/user/.config/scripts $mainMod = SUPER -monitor=DP-2,preferred,0x550,1 -monitor=DP-3,preferred,1920x0,1 +monitor=DP-3,preferred,0x550,1 +monitor=DP-2,preferred,1920x0,1 monitor=HDMI-A-1,preferred,5760x550,1 exec-once=hyprpaper diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 9df811d..a453911 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -16,22 +16,22 @@ "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "neogit": { "branch": "master", "commit": "0cae7abc30cb91d661f28257c331fcb5b5198e31" }, + "neogit": { "branch": "master", "commit": "98e6e855266282a3dd32e642ea14209b8787882a" }, "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, - "nvim-lspconfig": { "branch": "master", "commit": "7133e85c3df14a387da8942c094c7edddcdef309" }, + "nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" }, "nvim-neoclip.lua": { "branch": "main", "commit": "798cd0592a81c185465db3a091a0ff8a21af60fd" }, - "nvim-snippy": { "branch": "master", "commit": "6295b6cb30725c343a8986096c9f04b0e7646c52" }, + "nvim-snippy": { "branch": "master", "commit": "1184a8734e998649f3bb9a5db9efd4543282050b" }, "nvim-tree.lua": { "branch": "master", "commit": "59e65d88db177ad1e6a8cffaafd4738420ad20b6" }, - "nvim-treesitter": { "branch": "master", "commit": "dbbaa3f66e736a8e446572e1079ffa2f6d40b266" }, - "nvim-web-devicons": { "branch": "master", "commit": "27eac98fd6675d29d0e19d4d0622fd7a3968483a" }, - "obsidian.nvim": { "branch": "main", "commit": "b1bfc2ad9172f0405bf6c21e1f63cfb73f79b480" }, - "oil.nvim": { "branch": "master", "commit": "f3a31eba24587bc038592103d8f7e64648292115" }, + "nvim-treesitter": { "branch": "master", "commit": "99d3e799b46f5c2a1fc0d7a42d7ab452de48c067" }, + "nvim-web-devicons": { "branch": "master", "commit": "794bba734ec95eaff9bb82fbd112473be2087283" }, + "obsidian.nvim": { "branch": "main", "commit": "754d3410b907b5f5ae3c9f4ccf643ea945021341" }, + "oil.nvim": { "branch": "master", "commit": "bcfc0a2e01def5019aa14fac2fc6de20dedb6d3d" }, "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, "sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" }, "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" }, - "telescope-undo.nvim": { "branch": "main", "commit": "d19e2edc8b18d03283bd91f67310ac300ad003ce" }, - "telescope.nvim": { "branch": "master", "commit": "35f94f0ef32d70e3664a703cefbe71bd1456d899" }, + "telescope-undo.nvim": { "branch": "main", "commit": "95b61c01ea3a4c9e8747731148e905bbcf0ccaee" }, + "telescope.nvim": { "branch": "master", "commit": "2d0d057791854decb2c9b6a0b52d43f3900dff40" }, "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, "tree-sitter-hyprlang": { "branch": "master", "commit": "e5da7d0aa44403153e0394d87d9edea4e5bd6609" }, "tree-sitter-typst": { "branch": "master", "commit": "823309ed8b872dd33c7f350a3bab3d6e51436a5a" }, @@ -42,5 +42,5 @@ "vim-hypr-nav": { "branch": "main", "commit": "6ab4865a7eb5aad35305298815a4563c9d48556a" }, "vim-rooter": { "branch": "master", "commit": "45e53f01e4e1c4a3ee20814de232162713aff578" }, "vim-snippets": { "branch": "master", "commit": "393d980157b8149b3ff65a48bc4aae24dca9c846" }, - "vimtex": { "branch": "master", "commit": "18caeded58202e63bb170b5c745e6ee0bf870ba2" } + "vimtex": { "branch": "master", "commit": "a80934749c69cc6875b3c9b13ef59573a4824fb2" } } \ No newline at end of file diff --git a/.config/rofi/rofi-ykman.sh b/.config/rofi/rofi-ykman.sh index b53072e..3e19824 100755 --- a/.config/rofi/rofi-ykman.sh +++ b/.config/rofi/rofi-ykman.sh @@ -62,7 +62,7 @@ main() { esac } -default_command="${1:-type}" +default_command="${1:-clipboard}" case $default_command in clipboard|type) ;; diff --git a/.config/scripts/install.sh b/.config/scripts/install.sh index c5c3a2f..84b94a7 100755 --- a/.config/scripts/install.sh +++ b/.config/scripts/install.sh @@ -8,8 +8,8 @@ TMUX=true # GUI AWESOME=false -ALACRITTY=false -MPV=false +ALACRITTY=true +MPV=true SUDO="sudo" @@ -53,8 +53,6 @@ if $NVIM; then $SUDO apt install -y $dependencies python3-venv python3-pip nodejs golang fd-find cargo dotnet-sdk-8.0 fi - ln -s "$PWD"/nvim "$XDG_CONFIG_HOME"/nvim - ln -s "$PWD"/clang/.clang-tidy "$HOME"/.clang-tidy nvim --headless "+Lazy! sync" +qa nvim --headless "+MasonInstall bash-language-server pyright typescript-language-server rust-analyzer clangd cmake-language-server css-lsp dockerfile-language-server emmet-ls gopls html-lsp jdtls json-lsp ltex-ls lua-language-server ruff-lsp rustfmt rustywind texlab vetur-vls vim-language-server yaml-language-server csharp-language-server typst-lsp" +qa @@ -74,24 +72,14 @@ if $ZSH; then $SUDO apt install -y $dependencies fi - ln -s "$PWD"/zsh "$XDG_CONFIG_HOME"/zsh - ln -s "$PWD"/zsh/.zshrc "$HOME"/.zshrc mkdir -p "$HOME"/.local/state/zsh/ git clone https://github.com/cxreg/smartcd.git /tmp/smartcd cd /tmp/smartcd || exit make install - ln -s "$XDG_CONFIG_HOME"/zsh/.smartcd_config "$HOME"/.smartcd_config cd - || exit fi -################################################# -# Profile # -################################################# -if $PROFILE; then - rm -rf "$HOME"/.profile && ln -s "$PWD"/profile/.profile "$HOME"/.profile -fi - ################################################# # Awesome # ################################################# @@ -104,11 +92,6 @@ if $AWESOME; then $SUDO apt update $SUDO apt install -y $dependencies awesome-extra fi - - ln -s "$PWD"/awesome "$XDG_CONFIG_HOME"/awesome - ln -s "$PWD"/picom/picom.conf "$XDG_CONFIG_HOME"/picom.conf - ln -s "$PWD"/xmodmap/.Xmodmap "$XDG_CONFIG_HOME"/.Xmodmap - ln -s "$PWD"/rofi "$XDG_CONFIG_HOME"/rofi fi ################################################# @@ -127,7 +110,6 @@ if $ALACRITTY; then $SUDO apt install -y $dependencies fi - ln -s "$PWD"/alacritty "$XDG_CONFIG_HOME"/alacritty fi ################################################# @@ -142,8 +124,6 @@ if $MPV; then $SUDO apt update $SUDO apt install -y $dependencies fi - - ln -s "$PWD"/mpv "$XDG_CONFIG_HOME"/mpv fi ################################################# @@ -155,15 +135,12 @@ if $TMUX; then if [[ $OS == "NAME=\"Arch Linux\"" ]]; then $SUDO pacman -Sy --needed --noconfirm $dependencies - ln -s "$PWD"/tmux "$XDG_CONFIG_HOME"/tmux git clone https://github.com/tmux-plugins/tpm "$XDG_DATA_HOME"/tmux/plugins/tpm "$XDG_DATA_HOME"/tmux/plugins/tpm/bin/install_plugins elif [[ $OS == "NAME=\"Ubuntu\"" ]]; then $SUDO apt update $SUDO apt install -y $dependencies - ln -s "$PWD"/tmux "$HOME"/.tmux - ln -s "$PWD"/tmux/tmux.conf "$HOME"/.tmux.conf git clone https://github.com/tmux-plugins/tpm "$HOME"/.tmux/plugins/tpm "$HOME"/.tmux/plugins/tpm/bin/install_plugins fi diff --git a/.config/waybar/config b/.config/waybar/config index 495563a..94eda48 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -2,7 +2,7 @@ "layer": "top", // Waybar at top layer "height": 35, // Waybar height (to be removed for auto height) "spacing": 4, // Gaps between modules (4px) - "output": "DP-3", + "output": "DP-2", "modules-left": ["wlr/taskbar"], "modules-center": ["hyprland/workspaces"], "modules-right": ["tray", "wireplumber", "cpu#cpu2", "cpu", "memory", "custom/updates", "temperature", "battery", "clock", "clock#clock2"], diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 0525ec2..dc0e0aa 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -232,7 +232,9 @@ export GPULAB_DEV='False' # Smartcd export SMARTCD_QUIET=1 -source ~/.smartcd_config +if [ -f ~/.smartcd_config ]; then + source ~/.smartcd_config +fi export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01' export EDITOR=nvim