diff --git a/config b/config index c01229e..0193f26 100644 --- a/config +++ b/config @@ -84,10 +84,15 @@ output HDMI-A-1 { # Idle configuration ############################################################################### -# Lock screen after 300 seconds of inactivity, then turn off displays +# Lock screen after 900 seconds of inactivity, then turn off displays +#exec swayidle -w \ +# timeout 900 'swaylock -f -c 000000' \ +# timeout 1800 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ +# before-sleep 'swaylock -f -c 000000' + +# Lock screen after 900 seconds of inactivity exec swayidle -w \ timeout 900 'swaylock -f -c 000000' \ - timeout 1800 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \ before-sleep 'swaylock -f -c 000000' ############################################################################### @@ -450,8 +455,8 @@ bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%- bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+ # Screenshots -bindsym Print exec grim -bindsym $mod+Print exec grim -g "$(slurp)" +bindsym Print exec grim - | swappy -f - +bindsym $mod+Print exec grim -g "$(slurp)" - | swappy -f - ## Modify // Toggle Bar // <> i ## bindsym $mod+i bar mode toggle @@ -477,10 +482,10 @@ bar { separator #666666 # border backgr. text - focused_workspace #4c7899 #285577 #ffffff - active_workspace #333333 #5f676a #ffffff - inactive_workspace #333333 #222222 #888888 - urgent_workspace #2f343a #900000 #ffffff + focused_workspace #ffffff #000000 #ffffff + active_workspace #000000 #000000 #ffffff + inactive_workspace #000000 #000000 #ffffff + urgent_workspace #000000 #000000 #ffffff } } diff --git a/home_dotfiles/.zshrc b/home_dotfiles/.zshrc new file mode 100644 index 0000000..fc3f583 --- /dev/null +++ b/home_dotfiles/.zshrc @@ -0,0 +1,143 @@ +# If you come from bash you might have to change your $PATH. +# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH + +# Path to your Oh My Zsh installation. +export ZSH="$HOME/.oh-my-zsh" + +# Set name of the theme to load --- if set to "random", it will +# load a random theme each time Oh My Zsh is loaded, in which case, +# to know which specific one was loaded, run: echo $RANDOM_THEME +# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes +ZSH_THEME="powerlevel10k/powerlevel10k" + +# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. +# Initialization code that may require console input (password prompts, [y/n] +# confirmations, etc.) must go above this block; everything else may go below. +if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then + source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" +fi + +# Set list of themes to pick from when loading at random +# Setting this variable when ZSH_THEME=random will cause zsh to load +# a theme from this variable instead of looking in $ZSH/themes/ +# If set to an empty array, this variable will have no effect. +# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to use hyphen-insensitive completion. +# Case-sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment one of the following lines to change the auto-update behavior +# zstyle ':omz:update' mode disabled # disable automatic updates +# zstyle ':omz:update' mode auto # update automatically without asking +# zstyle ':omz:update' mode reminder # just remind me to update when it's time + +# Uncomment the following line to change how often to auto-update (in days). +# zstyle ':omz:update' frequency 13 + +# Uncomment the following line if pasting URLs and other text is messed up. +# DISABLE_MAGIC_FUNCTIONS="true" + +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" + +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" + +# Uncomment the following line to display red dots whilst waiting for completion. +# You can also set it to another string to have that shown instead of the default red dots. +# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f" +# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765) +# COMPLETION_WAITING_DOTS="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# You can set one of the optional three formats: +# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# or set a custom format using the strftime function format specifications, +# see 'man strftime' for details. +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +# ZSH_CUSTOM=/path/to/new-custom-folder + +# Which plugins would you like to load? +# Standard plugins can be found in $ZSH/plugins/ +# Custom plugins may be added to $ZSH_CUSTOM/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=( + git + zsh-syntax-highlighting + zsh-autosuggestions + #zsh-history-substring-search + #zsh-autocomplete + #zsh-syntax-highlighting +) + +source $ZSH/oh-my-zsh.sh + +# User configuration + +# export MANPATH="/usr/local/man:$MANPATH" + +# You may need to manually set your language environment +# export LANG=en_US.UTF-8 + +# Preferred editor for local and remote sessions +# if [[ -n $SSH_CONNECTION ]]; then +# export EDITOR='vim' +# else +# export EDITOR='nvim' +# fi + +# Compilation flags +# export ARCHFLAGS="-arch $(uname -m)" + +# Set personal aliases, overriding those provided by Oh My Zsh libs, +# plugins, and themes. Aliases can be placed here, though Oh My Zsh +# users are encouraged to define aliases within a top-level file in +# the $ZSH_CUSTOM folder, with .zsh extension. Examples: +# - $ZSH_CUSTOM/aliases.zsh +# - $ZSH_CUSTOM/macos.zsh +# For a full list of active aliases, run `alias`. +# +# Example aliases +# alias zshconfig="mate ~/.zshrc" +# alias ohmyzsh="mate ~/.oh-my-zsh" + +# Initialize atuin +eval "$(atuin init zsh)" + +# Initialize zoxide +eval "$(zoxide init zsh)" + +# General aliases +alias la="ls -la" +alias c="clear" + +# Pacman aliases +alias update="sudo pacman -Syu" +alias install="sudo pacman -S" +alias remove="sudo pacman -R" +alias search="pacman -Ss" +alias info="pacman -Si" +alias list="pacman -Ql" +alias clean="sudo pacman -Sc" +alias sync="sudo pacman -Syy" +alias upgrade="sudo pacman -Syu" +alias info="pacman -Si" + +# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. +[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh diff --git a/home_dotfiles/install-arch-dotfiles-requirements.sh b/home_dotfiles/install-arch-dotfiles-requirements.sh new file mode 100755 index 0000000..4c1ed7a --- /dev/null +++ b/home_dotfiles/install-arch-dotfiles-requirements.sh @@ -0,0 +1,72 @@ +#!/bin/bash + +# Install Oh My Zsh and related requirements for Arch Linux +# This script installs all necessary packages for the enhanced zsh setup + +set -e + +echo "Installing Oh My Zsh and related requirements..." + +# Install base packages +echo "Installing base packages..." +sudo pacman -S \ + zsh \ + git \ + curl \ + wget \ + fzf \ + ripgrep \ + fd \ + bat \ + exa \ + atuin \ + zoxide + +# Install Oh My Zsh +echo "Installing Oh My Zsh..." +if [ ! -d "$HOME/.oh-my-zsh" ]; then + sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended +else + echo "Oh My Zsh already installed, skipping..." +fi + +# Install Powerlevel10k theme +echo "Installing Powerlevel10k theme..." +if [ ! -d "$HOME/.oh-my-zsh/custom/themes/powerlevel10k" ]; then + git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k +else + echo "Powerlevel10k theme already installed, skipping..." +fi + +# Install zsh-syntax-highlighting plugin +echo "Installing zsh-syntax-highlighting plugin..." +if [ ! -d "$HOME/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting" ]; then + git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting +else + echo "zsh-syntax-highlighting plugin already installed, skipping..." +fi + +# Install zsh-autosuggestions plugin +echo "Installing zsh-autosuggestions plugin..." +if [ ! -d "$HOME/.oh-my-zsh/custom/plugins/zsh-autosuggestions" ]; then + git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions +else + echo "zsh-autosuggestions plugin already installed, skipping..." +fi + +# Set zsh as default shell +echo "Setting zsh as default shell..." +if [ "$SHELL" != "/bin/zsh" ]; then + chsh -s /bin/zsh + echo "Default shell changed to zsh. Please log out and log back in for changes to take effect." +else + echo "Zsh is already the default shell." +fi + +echo "Installation complete!" +echo "" +echo "Next steps:" +echo "1. Run the install-arch-dotfiles.sh script to copy the .zshrc file" +echo "2. Restart your terminal or run 'source ~/.zshrc'" +echo "3. Run 'p10k configure' to set up Powerlevel10k theme" +echo "4. Log out and log back in for the default shell change to take effect" diff --git a/home_dotfiles/install-arch-dotfiles.sh b/home_dotfiles/install-arch-dotfiles.sh new file mode 100755 index 0000000..5f6ff35 --- /dev/null +++ b/home_dotfiles/install-arch-dotfiles.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +# Install dotfiles for Arch Linux +# This script copies the .zshrc file to the home directory + +set -e + +echo "Installing dotfiles..." + +# Get the directory where this script is located +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +# Copy .zshrc to home directory +echo "Copying .zshrc to home directory..." +cp "$SCRIPT_DIR/.zshrc" ~/.zshrc + +echo "Dotfiles installation complete!" +echo "" +echo "Next steps:" +echo "1. Restart your terminal or run 'source ~/.zshrc'" +echo "2. Run 'p10k configure' to set up Powerlevel10k theme" +echo "3. If you haven't already, run the install-arch-dotfiles-requirements.sh script first"