diff --git a/.config/picom/picom/picom.conf b/.config/picom/picom/picom.conf index 42eb62d..e37adeb 100644 --- a/.config/picom/picom/picom.conf +++ b/.config/picom/picom/picom.conf @@ -48,12 +48,12 @@ rounded-corners-exclude = [ "class_g = 'maim'" ]; opacity-rule = [ - "93:class_g = 'discord'", + "89:class_g = 'discord'", "80:class_g = 'spotify'", "80:class_g = 'st'", "80:class_g = 'dmenu'", "85:class_g = 'dwm'", - "100:class_g = 'floorp'", + "100:class_g = 'mullvad-browser'", "100:class_g = 'screenie'", "100:class_g = 'import'", "100:class_g = 'slop'" diff --git a/.suckless/dwm/config.h b/.suckless/dwm/config.h index c82b616..861fc95 100644 --- a/.suckless/dwm/config.h +++ b/.suckless/dwm/config.h @@ -119,8 +119,7 @@ static Key keys[] = { { MODKEY, XK_h, setmfact, {.f = -0.05} }, { MODKEY, XK_l, setmfact, {.f = +0.05} }, { MODKEY|ShiftMask, XK_q,quit, {0} }, - //{ MODKEY, XK_b, spawn, {.v = floorp} }, - { MODKEY, XK_b, spawn, SHCMD("floorp") }, + { MODKEY, XK_b, spawn, SHCMD("mullvad-browser") }, { MODKEY, XK_m, togglebar, {0} }, { MODKEY, XK_o, incnmaster, {.i = +1 } }, { MODKEY, XK_Return, spawn, {.v = termcmd } }, diff --git a/.suckless/tabbed b/.suckless/tabbed new file mode 160000 index 0000000..82374bc --- /dev/null +++ b/.suckless/tabbed @@ -0,0 +1 @@ +Subproject commit 82374bcf6d35f6b05412382b8e51e1202ce4379b diff --git a/.zshrc b/.zshrc index 098949e..6617f2d 100644 --- a/.zshrc +++ b/.zshrc @@ -1,31 +1,29 @@ #!/bin/sh -#historie + +# History settings HISTFILE=$HOME/.cache/zsh/history SAVEHIST=100000000 HISTSIZE=$SAVEHIST setopt appendhistory -#faediggoerelse + +# Completion autoload -U compinit zstyle ':completion:*' menu select zmodload zsh/complist compinit comp_options+=(globdots) -#ohmyzsh -#ZSH_THEME="gentoo" && export ZSH=$HOME/.config/.oh-my-zsh && source $ZSH/oh-my-zsh.sh -#source -source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh && fpath=(/usr/share/zsh/site-functions $fpath) && source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -#farver +zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' +source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh && fpath=(/usr/share/zsh/stie-functions $fpath) && source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh + +# Colors and prompt autoload -U colors && colors && setopt prompt_subst ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=5" ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=12" -#prompt -[ "$(id -u)" = 0 ] && PS1ICON="#" || PS1ICON='%' +[ "$(id -u)" = 0 ] && PS1ICON="#" || PS1ICON='%' PROMPT='%{$(echo -e "\e[38;2;114;47;55m")%}[%{$(echo -e "\e[38;2;197;198;200m")%}%n%{$(echo -e "\e[38;2;114;47;55m")%}@core %{$(echo -e "\e[38;2;197;198;200m")%}%~%{$(echo -e "\e[38;2;114;47;55m")%}]%$PS1ICON%{$(echo -e "\e[0m")%} ' -#coast's zshrc :3 -##!/bin/sh -#general aliases +# Aliases alias xi="doas xbps-install -S $1" alias nf="clear && fastfetch" alias ascdis="fastfetch --logo $1" @@ -60,7 +58,7 @@ alias hsw="home-manager switch --flake ~/.config/home-manager" alias hsc="swallow emacsd ~/.config/home-manager/home.nix" alias yell="echo" alias chm="ecop cat ~/.config/home-manager/home.nix" -if [ -n "$ZSH_VERSION" ]; then +if [ -n "$ZSH_VERSION" ]; then alias ed="ed -p '%: '" else alias ed="ed -p '$: '" @@ -68,7 +66,6 @@ fi alias weather="curl wttr.in/masjedsoleyman" alias emacs="swallow emacsd $1" alias emacsd="swallow emacsd $1" -#typo/shortcut alias las="eza" alias lasa="eza -a" alias c="clear" @@ -80,14 +77,15 @@ alias clare="clear" alias cleae="clear" alias clera="clear" alias hotp="htop" + +# Paths and environment fpath=(~/.zsh/completions $fpath) export PATH=$HOME/.local/bin:$PATH export PATH=$HOME/.luarocks/bin:$PATH -if [ -n "$ZSH_VERSION" ]; then +if [ -n "$ZSH_VERSION" ]; then export ZSH="/home/avery/.oh-my-zsh" fi export NIXPKGS_ALLOW_UNFREE=1 export EDITOR="emacs" - export PATH=/usr/pkg/sbin:/usr/pkg/bin:$PATH export MANPATH=/usr/pkg/man:$MANPATH