diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 01fe536..84e3b80 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -9,6 +9,8 @@ if status is-interactive alias la="lsd -la" alias dotfiles="git --git-dir=$HOME/repos/dotfiles --work-tree=$HOME/" + + set -U fish_user_paths $HOME/bin $fish_user_paths set -x PF_INFO "ascii title os kernel wm shell pkgs memory" diff --git a/.config/fish/fish_plugins b/.config/fish/fish_plugins index 9673b42..f32bf5f 100644 --- a/.config/fish/fish_plugins +++ b/.config/fish/fish_plugins @@ -1,2 +1,4 @@ jorgebucaran/fisher jorgebucaran/nvm.fish +derekstavis/fish-neovim +catppuccin/fish diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 488ea6d..f3c289a 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,48 +1,51 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR __fish_initialized:3400 +SETUVAR _fisher_catppuccin_2F_fish_files:\x7e/\x2econfig/fish/themes/Catppuccin\x20Frappe\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Latte\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Macchiato\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Mocha\x2etheme SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish SETUVAR _fisher_jorgebucaran_2F_nvm_2E_fish_files:\x7e/\x2econfig/fish/functions/_nvm_index_update\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_list\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_version_activate\x2efish\x1e\x7e/\x2econfig/fish/functions/_nvm_version_deactivate\x2efish\x1e\x7e/\x2econfig/fish/functions/nvm\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/nvm\x2efish\x1e\x7e/\x2econfig/fish/completions/nvm\x2efish -SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejorgebucaran/nvm\x2efish +SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejorgebucaran/nvm\x2efish\x1ederekstavis/fish\x2dneovim\x1ecatppuccin/fish SETUVAR _fisher_upgraded_to_4_4:\x1d -SETUVAR fish_color_autosuggestion:707A8C -SETUVAR fish_color_cancel:\x2d\x2dreverse -SETUVAR fish_color_command:5CCFE6 -SETUVAR fish_color_comment:5C6773 -SETUVAR fish_color_cwd:73D0FF +SETUVAR fish_color_autosuggestion:6e738d +SETUVAR fish_color_cancel:ed8796 +SETUVAR fish_color_command:8aadf4 +SETUVAR fish_color_comment:8087a2 +SETUVAR fish_color_cwd:eed49f SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:F29E74 -SETUVAR fish_color_error:FF3333 -SETUVAR fish_color_escape:95E6CB +SETUVAR fish_color_end:f5a97f +SETUVAR fish_color_error:ed8796 +SETUVAR fish_color_escape:ee99a0 +SETUVAR fish_color_gray:6e738d SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:\x1d -SETUVAR fish_color_keyword:\x1d +SETUVAR fish_color_host:8aadf4 +SETUVAR fish_color_host_remote:a6da95 +SETUVAR fish_color_keyword:ed8796 SETUVAR fish_color_match:F28779 -SETUVAR fish_color_normal:CBCCC6 -SETUVAR fish_color_operator:FFCC66 +SETUVAR fish_color_normal:cad3f5 +SETUVAR fish_color_operator:f5bde6 SETUVAR fish_color_option:\x1d -SETUVAR fish_color_param:CBCCC6 -SETUVAR fish_color_quote:BAE67E -SETUVAR fish_color_redirection:D4BFFF -SETUVAR fish_color_search_match:\x2d\x2dbackground\x3dFFCC66 -SETUVAR fish_color_selection:\x2d\x2dbackground\x3dFFCC66 -SETUVAR fish_color_status:red -SETUVAR fish_color_user:brgreen +SETUVAR fish_color_param:f0c6c6 +SETUVAR fish_color_quote:a6da95 +SETUVAR fish_color_redirection:f5bde6 +SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d363a4f +SETUVAR fish_color_selection:\x2d\x2dbackground\x3d363a4f +SETUVAR fish_color_status:ed8796 +SETUVAR fish_color_user:8bd5ca SETUVAR fish_color_valid_path:\x2d\x2dunderline SETUVAR fish_key_bindings:fish_default_key_bindings SETUVAR fish_pager_color_background:\x1d -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:B3A06D -SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan +SETUVAR fish_pager_color_completion:cad3f5 +SETUVAR fish_pager_color_description:6e738d +SETUVAR fish_pager_color_prefix:f5bde6 +SETUVAR fish_pager_color_progress:6e738d SETUVAR fish_pager_color_secondary_background:\x1d SETUVAR fish_pager_color_secondary_completion:\x1d SETUVAR fish_pager_color_secondary_description:\x1d SETUVAR fish_pager_color_secondary_prefix:\x1d -SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dFFCC66 +SETUVAR fish_pager_color_selected_background:\x1d SETUVAR fish_pager_color_selected_completion:\x1d SETUVAR fish_pager_color_selected_description:\x1d SETUVAR fish_pager_color_selected_prefix:\x1d +SETUVAR fish_user_paths:/home/q/bin SETUVAR nvm_data:/home/q/\x2elocal/share/nvm SETUVAR nvm_mirror:https\x3a//nodejs\x2eorg/dist diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini index 8760355..24fb756 100644 --- a/.config/foot/foot.ini +++ b/.config/foot/foot.ini @@ -65,55 +65,32 @@ font=JetBrainsMono Nerd Font Mono:size=11 # underline-thickness= [mouse] -# hide-when-typing=no -# alternate-scroll-mode=yes +hide-when-typing=no +alternate-scroll-mode=yes [colors] -alpha = 1 -foreground=cad3f5 # Text -background=24273a # Base -regular0=494d64 # Surface 1 -regular1=ed8796 # red -regular2=a6da95 # green -regular3=eed49f # yellow -regular4=8aadf4 # blue -regular5=f5bde6 # pink -regular6=8bd5ca # teal -regular7=b8c0e0 # Subtext 1 -bright0=5b6078 # Surface 2 -bright1=ed8796 # red -bright2=a6da95 # green -bright3=eed49f # yellow -bright4=8aadf4 # blue -bright5=f5bde6 # pink -bright6=8bd5ca # teal -bright7=a5adcb # Subtext 0 +#alpha = 0.99 -#[colors] -# alpha=1.0 -# foreground=dcdccc -# background=111111 +background=141b1e +foreground=dadada +regular0=232a2d +regular1=e57474 +regular2=8ccf7e +regular3=e5c76b +regular4=67b0e8 +regular5=c47fd5 +regular6=6cbfbf +regular7=b3b9b8 -## Normal/regular colors (color palette 0-7) -# regular0=222222 # black -# regular1=cc9393 # red -# regular2=7f9f7f # green -# regular3=d0bf8f # yellow -# regular4=6ca0a3 # blue -# regular5=dc8cc3 # magenta -# regular6=93e0e3 # cyan -# regular7=dcdccc # white - -## Bright colors (color palette 8-15) -# bright0=666666 # bright black -# bright1=dca3a3 # bright red -# bright2=bfebbf # bright green -# bright3=f0dfaf # bright yellow -# bright4=8cd0d3 # bright blue -# bright5=fcace3 # bright magenta -# bright6=b3ffff # bright cyan -# bright7=ffffff # bright white +bright0=2d3437 +bright1=ef7e7e +bright2=96d988 +bright3=f4d67a +bright4=71baf2 +bright5=ce89df +bright6=67cbe7 +bright7=bdc3c2 ## dimmed colors (see foot.ini(5) man page) # dim0= diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf index 7998873..9188e26 100644 --- a/.config/hypr/hyprpaper.conf +++ b/.config/hypr/hyprpaper.conf @@ -1,2 +1,6 @@ -preload = /home/q/Pictures/wallpapers/catppuccin/tetris.png -wallpaper = ,/home/q/Pictures/wallpapers/catppuccin/tetris.png +preload = /home/q/Pictures/wallpapers/mountain.png + +wallpaper = ,/home/q/Pictures/wallpapers/mountain.png + +#preload = /home/q/Pictures/wallpapers/catppuccin/tetris.png +#wallpaper = ,/home/q/Pictures/wallpapers/catppuccin/tetris.png diff --git a/images/my_rice.png b/images/my_rice.png deleted file mode 100644 index 844911c..0000000 Binary files a/images/my_rice.png and /dev/null differ diff --git a/images/old_rice.png b/images/old_rice.png deleted file mode 100644 index b85b42c..0000000 Binary files a/images/old_rice.png and /dev/null differ diff --git a/install-on-arch.sh b/install-on-arch.sh deleted file mode 100755 index e7ce481..0000000 --- a/install-on-arch.sh +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/bash - -config_directory="$HOME/.config" -fonts_directory="/usr/share/fonts" - -green="\033[0;32m" -no_color='\033[0m' - -echo "Welcome" - -alias pacman="pacman --noconfirm --needed" -alias paru="paru --noconfirm --needed" - -# sudo pacman -Sy dialog - -install_base_pkgs() { - echo -e "${green}[*] Doing a system update, cause stuff may break if it's not the latest version...${no_color}" - sudo pacman -Suuy - sudo pacman -S base-devel wget git curl vim - sudo pacman -S pacman-contrib -} - -install_software_pkgs() { - # Software - - sudo pacman -S bluez bluez-utils cups - - sudo systemctl enable bluetooth - sudo systemctl enable cups - - echo -e "${green}[*] Installing software.${no_color}" - sudo pacman -S kitty tmux bottom flameshot keepassxc gnupg nitrogen pipewire pipewire-pulse polkit-gnome - sudo pacman -S discord - sudo pacman -S rofi rofi-calc xsel neofetch dunst libqalculate ranger pkgfile zathura texlive-core - - # Shell utils - echo -e "${green}[*] Installing shell utils.${no_color}" - sudo pacman -S fish bat lsd fzf - sudo pacman -S mpv jq feh yt-dlp - - # Graphics - echo -e "${green}[*] Installing graphics.${no_color}" - sudo pacman -S xorg xorg-server xorg-xinit lxappearance papirus-icon-theme - sudo pacman -S bspwm sxhkd - - sudo pacman -S tor - sudo systemctl enable --now tor - - # MTP protocol - echo -e "${green}[*] Installing mtp protocol.${no_color}" - sudo pacman -S mtpfs gvfs-mtp gvfs-gphoto2 - sudo pacman -S ntfs-3g - - # Python - echo -e "${green}[*] Installing python.${no_color}" - sudo pacman -S ipython poetry - sudo pacman -S python python-pip python-poetry - - # VirtualMachine tool - echo -e "${green}[*] Configuring virtual manager.${no_color}" - sudo pacman -S qemu virt-manager ebtables dnsmasq firewalld nmap - sudo systemctl --now enable libvirtd - sudo systemctl --now enable firewalld - sudo sytemctl restart libvirtd -} - -create_dotfiles() { - echo -e "${green}[*] Copying configs to $config_directory.${no_color}" - mkdir -p "$HOME"/.config - mkdir -p /usr/share/themes - mkdir -p "$HOME"/Pictures/screenshots -} - -copy_fonts(){ - echo -e "${green}[*] Copying fonts to $fonts_directory.${no_color}" - sudo cp -r ./fonts/* "$fonts_directory" - fc-cache -fv -} - -# Install paru -install_aur_helper() { - echo -e "${green}[*] Installing aur helper.${no_color}" - git clone https://aur.archlinux.org/paru.git - (cd paru && makepkg -si) - rm -rf paru -} - -install_aur_pkgs() { - paru -S librewolf-bin timeshift-bin kotatogram-desktop-bin spotify pandoc-bin - paru -S polybar-git light-git picom-animations-git betterlockscreen - paru -S nordic-darker-theme - paru -S jmtpfs - paru -S epson-inkjet-printer-escpr -} - -finishing() { - echo -e "${green}[*] Copying wallpapers to "$HOME"/Pictures/wallpapers.${no_color}" - cp -r ./wallpapers/* "$HOME"/Pictures/wallpapers - sudo chsh -s /bin/fish - - # NeoVim - echo -e "${green}[*] Installing neovim.${no_color}" - sudo pacman -S neovim neovim-qt - sudo pacman -S npm ninja cargo go - git clone --depth 1 https://github.com/wbthomason/packer.nvim\ - ~/.local/share/nvim/site/pack/packer/start/packer.nvim - echo -e "${green}[*] Updating nvim extensions.${no_color}" - nvim +PackerSync -}