changes since moving to fedora

master
alex 2023-05-04 23:09:10 -05:00
parent 0760d8cf35
commit b96f043a5a
16 changed files with 1868 additions and 238 deletions

View File

@ -5,6 +5,7 @@ alias wget='wget --hsts-file ~/.config/wget/wget-hsts'
#command fixes
alias ssh="TERM=xterm-256color ssh" #fix issues with TERM=foot not being defined by terminfo
alias distrobox='TERM=xterm-256color distrobox'
alias toolbox='TERM=xterm-256color toolbox'
alias vim='nvim'
alias mbsync="mbsync -c $HOME/.config/mbsync/config"

View File

@ -17,7 +17,7 @@
</alias>
<alias>
<family>monospace</family>
<prefer><family>mononoki Nerd Font Mono</family></prefer>
<prefer><family>SauceCodePro Nerd Font Mono</family></prefer>
</alias>
<alias>

View File

@ -8,7 +8,7 @@
# title=foot
# locked-title=no
font=monospace:size=11
font=monospace:size=10
# font-bold=<bold variant of regular font>
# font-italic=<italic variant of regular font>
# font-bold-italic=<bold+italic variant of regular font>

View File

@ -2,8 +2,8 @@
# Any customization should be done in ~/.gtkrc-2.0.mine instead.
include "/home/alex/.gtkrc-2.0.mine"
gtk-theme-name="Adwaita"
gtk-icon-theme-name="Adwaita"
gtk-theme-name="Adwaita-dark"
gtk-icon-theme-name="Adwaita-dark"
gtk-font-name="Sans 10"
gtk-cursor-theme-name="Adwaita"
gtk-cursor-theme-size=0

View File

@ -1,6 +1,6 @@
[Settings]
gtk-theme-name=Adwaita
gtk-icon-theme-name=Adwaita
gtk-theme-name=Adwaita-dark
gtk-icon-theme-name=Adwaita-dark
gtk-font-name=Sans 10
gtk-cursor-theme-size=0
gtk-toolbar-style=GTK_TOOLBAR_BOTH

View File

@ -1,8 +1,8 @@
#!/bin/sh
img () {
chafa "$1" --size="$2"x"$3" --animate=false | sed 's/#/\n#/g'
#chafa --format=symbols "$1" --size="$2"x"$3"
#chafa "$1" --size="$2"x"$3" --animate=false | sed 's/#/\n#/g'
chafa --format=symbols "$1" --size="$2"x"$3"
}
W="$(($(tput cols)/2 - 10))"

View File

@ -1,4 +1,4 @@
music_directory "~/media/audio"
music_directory "~/Music"
playlist_directory "~/.config/mpd/playlists/"
auto_update "yes"

View File

@ -2,7 +2,7 @@
ncmpcpp_directory = "~/.config/ncmpcpp/"
lyrics_directory = "~/.local/share/lyrics/"
mpd_music_dir = "~/media/audio/"
mpd_music_dir = "~/Music/"
message_delay_time = "1"
visualizer_type = "wave"
song_list_format = {$4%a - }{%t}|{$8%f$9}$R{$3(%l)$9}

View File

@ -1,25 +1,24 @@
#!/bin/sh
#remove things from $HOME
export XDG_CONFIG_HOME="$HOME/.config"
export XDG_CONFIG_DIRS="$HOME/.config"
export XDG_DATA_HOME="$HOME/.local/share"
export XDG_CACHE_HOME="$HOME/.cache"
export XDG_DOCUMENTS_DIR="$HOME/docs"
export XDG_DOWNLOAD_DIR="$HOME/dl"
export XDG_MUSIC_DIR="$HOME/media/audio/music"
export XDG_PICTURES_DIR="$HOME/media/img"
export XDG_VIDEOS_DIR="$HOME/media/video"
export HISTFILE="$XDG_DATA_HOME"/bash/history
#XDG_DESKTOP_DIR="$HOME/Desktop"
#XDG_PUBLICSHARE_DIR="$HOME/Public"
#XDG_TEMPLATES_DIR="$HOME/Templates"
#export XDG_CONFIG_HOME="$HOME/.config"
#export XDG_CONFIG_DIRS="$HOME/.config"
#export XDG_DATA_HOME="$HOME/.local/share"
#export XDG_CACHE_HOME="$HOME/.cache"
#export XDG_DOCUMENTS_DIR="$HOME/docs"
#export XDG_DOWNLOAD_DIR="$HOME/dl"
#export XDG_MUSIC_DIR="$HOME/media/audio/music"
#export XDG_PICTURES_DIR="$HOME/media/img"
#export XDG_VIDEOS_DIR="$HOME/media/video"
#export HISTFILE="$XDG_DATA_HOME"/bash/history
##XDG_DESKTOP_DIR="$HOME/Desktop"
##XDG_PUBLICSHARE_DIR="$HOME/Public"
##XDG_TEMPLATES_DIR="$HOME/Templates"
export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/notmuch-config"
export GTK2_RC_FILES="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-2.0/gtkrc-2.0"
export WGETRC="${XDG_CONFIG_HOME:-$HOME/.config}/wget/wgetrc"
export INPUTRC="${XDG_CONFIG_HOME:-$HOME/.config}/inputrc"
#export ALSA_CONFIG_PATH="$XDG_CONFIG_HOME/alsa/asoundrc"
export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default"
export STACK_ROOT="$XDG_DATA_HOME"/stack
export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store"

View File

@ -36,7 +36,7 @@ set $menu rofi -show run | xargs swaymsg exec --
output * bg #305767 solid_color
exec_always {
if [ -f "$HOME"/.config/wall ]; then
swaymsg "output * bg ~/.config/wall fit"
swaymsg "output * bg ~/.config/wall fill"
fi
}
@ -50,7 +50,7 @@ exec_always {
# Example configuration:
#
exec swayidle -w \
timeout 900 'waylock &' \
timeout 900 'swaylock &' \
timeout 1200 'swaymsg "output * dpms off"' \
resume 'swaymsg "output * dpms on"' \
before-sleep 'waylock &'
@ -98,7 +98,8 @@ xwayland enable
# Basics:
#
# Start a terminal
bindsym $mod+Return exec $term
bindsym $mod+Return exec $term -e distrobox enter main
bindsym $mod+Shift+Return exec $term
# Kill focused window
bindsym $mod+Shift+q kill
@ -304,7 +305,7 @@ default_border pixel 2
#set windows to float by default
for_window [class="Matplotlib"] floating enable
for_window [class="Steam"] floating enable
#for_window [class="Steam"] floating enable
#input config
input type:pointer accel_profile flat

View File

@ -5,12 +5,11 @@
# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
# absolute path. No other format is supported.
#
XDG_DESKTOP_DIR="$HOME/.local/share/desktop"
XDG_DOWNLOAD_DIR="$HOME/dl"
XDG_TEMPLATES_DIR="$HOME/.local/share/templates/"
XDG_PUBLICSHARE_DIR="$HOME/.local/share/public"
XDG_DOCUMENTS_DIR="$HOME/docs"
XDG_MUSIC_DIR="$HOME/.files/media/audio"
XDG_PICTURES_DIR="$HOME/.files/media/img"
XDG_VIDEOS_DIR="$HOME/.files/media/video"
XDG_DOWNLOADS_DIR="$HOME/dl"
XDG_DESKTOP_DIR="$HOME/Desktop"
XDG_DOWNLOAD_DIR="$HOME/Downloads"
XDG_TEMPLATES_DIR="$HOME/Templates"
XDG_PUBLICSHARE_DIR="$HOME/Public"
XDG_DOCUMENTS_DIR="$HOME/Documents"
XDG_MUSIC_DIR="$HOME/Music"
XDG_PICTURES_DIR="$HOME/Pictures"
XDG_VIDEOS_DIR="$HOME/Videos"

View File

@ -1,98 +0,0 @@
# Luke's config for the Zoomer Shell
# Enable colors and change prompt:
autoload -U colors && colors
#PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
PS1="%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~% %{$fg[yellow]%} -> "
# History in cache directory:
HISTSIZE=10000
SAVEHIST=10000
HISTFILE=~/.cache/zsh/history
# Basic auto/tab complete:
autoload -U compinit
zstyle ':completion:*' menu select
zmodload zsh/complist
compinit
_comp_options+=(globdots) # Include hidden files.
# vi mode
bindkey -v
export KEYTIMEOUT=1
# Use vim keys in tab complete menu:
bindkey -M menuselect 'h' vi-backward-char
bindkey -M menuselect 'k' vi-up-line-or-history
bindkey -M menuselect 'l' vi-forward-char
bindkey -M menuselect 'j' vi-down-line-or-history
bindkey -v '^?' backward-delete-char
# Change cursor shape for different vi modes.
function zle-keymap-select {
if [[ ${KEYMAP} == vicmd ]] ||
[[ $1 = 'block' ]]; then
echo -ne '\e[1 q'
elif [[ ${KEYMAP} == main ]] ||
[[ ${KEYMAP} == viins ]] ||
[[ ${KEYMAP} = '' ]] ||
[[ $1 = 'beam' ]]; then
echo -ne '\e[5 q'
fi
}
zle -N zle-keymap-select
zle-line-init() {
zle -K viins # initiate `vi insert` as keymap (can be removed if `bindkey -V` has been set elsewhere)
echo -ne "\e[5 q"
}
zle -N zle-line-init
echo -ne '\e[5 q' # Use beam shape cursor on startup.
preexec() { echo -ne '\e[5 q' ;} # Use beam shape cursor for each new prompt.
# Use lf to switch directories and bind it to ctrl-o
lfcd () {
tmp="$(mktemp)"
lf -last-dir-path="$tmp" "$@"
if [ -f "$tmp" ]; then
dir="$(cat "$tmp")"
rm -f "$tmp"
[ -d "$dir" ] && [ "$dir" != "$(pwd)" ] && cd "$dir"
fi
}
bindkey -s '^o' 'lfcd\n'
# Edit line in vim with ctrl-e:
autoload edit-command-line; zle -N edit-command-line
bindkey '^e' edit-command-line
# Load aliases and shortcuts if existent.
[ -f "$HOME/.config/shortcutrc" ] && source "$HOME/.config/shortcutrc"
[ -f "$HOME/.config/aliasrc" ] && source "$HOME/.config/aliasrc"
#my additions
unsetopt nomatch
#source haskell file if it exists
[ -f "$HOME/.ghcup/env" ] && source "$HOME/.ghcup/env"
if ! [ -f $HOME/.local/share/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ]; then
mkdir -p $HOME/.local/share/zsh/
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.local/share/zsh/zsh-syntax-highlighting
fi
# prompt stuff
#colorscript -r
#pfetch
#if [ -f "/usr/bin/starship" ]; then
# eval "$(starship init zsh)"
#fi
#export TERM='xterm-256color'
# Load zsh-syntax-highlighting; should be last.
source $HOME/.local/share/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh 2>/dev/null
[ -f "/home/alex/.local/share/ghcup/env" ] && source "/home/alex/.local/share/ghcup/env" # ghcup-env

1650
.p10k.zsh Normal file

File diff suppressed because it is too large Load Diff

103
.profile
View File

@ -1,103 +0,0 @@
#!/usr/bin/env sh
# Get the aliases and functions
#[ -f $HOME/.bashrc ] && . $HOME/.bashrc
#source ~/.config/shell config files
. "$HOME"/.config/shell/cleanup.sh
. "$HOME"/.config/shell/wayland.sh
#export PF_ASCII="artix" #set ascii art for pfetch
# OFF by default: shell editor wm de palette
export PF_INFO="ascii title os kernel uptime pkgs memory shell wm"
export XCURSOR_THEME=Adwaita
#fix image previews in lf not working
#export TERM="xterm-256color"
#other settings
export QT_QPA_PLATFORMTHEME="gtk2" # Have QT use gtk2 theme. must have qt5-styleplugins installed
#export QT_QPA_PLATFORMTHEME="qt5ct" #have QT use qt5ct theme
export QT_QPA_PLATFORM=wayland
export GTK_THEME=Adwaita:dark
export LESSHISTFILE="-"
export ZDOTDIR="$HOME/.config/zsh"
#get colored man pages
#export LESS_TERMCAP_mb=$'\e[1;32m'
#export LESS_TERMCAP_md=$'\e[1;32m'
#export LESS_TERMCAP_me=$'\e[0m'
#export LESS_TERMCAP_se=$'\e[0m'
#export LESS_TERMCAP_so=$'\e[01;33m'
#export LESS_TERMCAP_ue=$'\e[0m'
#export LESS_TERMCAP_us=$'\e[1;4;31m'
export LESS_TERMCAP_mb="$(printf '%b' '')"
export LESS_TERMCAP_md="$(printf '%b' '')"
export LESS_TERMCAP_me="$(printf '%b' '')"
export LESS_TERMCAP_so="$(printf '%b' '')"
export LESS_TERMCAP_se="$(printf '%b' '')"
export LESS_TERMCAP_us="$(printf '%b' '')"
export LESS_TERMCAP_ue="$(printf '%b' '')"
export MANPAGER=less
#set preferred programs
export EDITOR=nvim
export VISUAL=nvim
export BROWSER=browser.sh
export TERMINAL=foot
#sfeed vars
export SFEED_PLUMBER="$BROWSER"
export SFEED_URL_FILE="$HOME/.local/share/sfeed/read"
#lf icons
. "$HOME"/.config/lf/lf-icons.sh
# Add ~/.local/bin/ ~/.local/scripts/ and to PATH
export PATH="$HOME/.local/bin:$PATH"
export PATH="$HOME/.local/scripts:$PATH"
export PATH="$HOME/.local/appimages:$PATH"
export MANPATH="$MANPATH:/usr/local/man/"
export PATH="$HOME/.local/podman/bin:$PATH"
#add to path if installing rocm for amd
export PATH="/opt/rocm/bin:$PATH"
export PATH="/opt/rocm/hip/bin:$PATH"
export PATH="/opt/rocm/opencl/bin:$PATH"
export PATH="/opt/rocm/rocfft/bin:$PATH"
export PATH="/opt/rocm/rocfft/bin:$PATH"
#fix arduino ide issues
export AWT_TOOLKIT=MToolkit
export XDG_CURRENT_DESKTOP="sway"
#define variables used with transmission scripts
export TRNS_IP="192.168.1.162"
export TRNS_DL_DIR="/usr/local/etc/transmission/home/Downloads"
#needed for whisper, may be able to get rid of at some point
export HSA_OVERRIDE_GFX_VERSION=10.3.0
#mount samba share, needs entry in /etc/fstab for this line to work
# //192.168.1.218/storage /media/nagato cifs username=alex,pass=PASSWORD,workgroup=WORKGROUP,user,noauto 0 0
#mount /media/nagato/ &
#mount /media/bismarck &
#fix pinentry-curses on nixos
#export GPG_TTY="$(tty)"
#if [ "$(tty)" = /dev/tty1 ]; then
#exec dbus-launch sway
#fi

65
.zprofile Normal file
View File

@ -0,0 +1,65 @@
#!/bin/sh
export XDG_DATA_HOME="$HOME/.local/share"
export XDG_CONFIG_HOME="$HOME/.config"
export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/notmuch-config"
export GTK2_RC_FILES="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-2.0/gtkrc-2.0"
export WGETRC="${XDG_CONFIG_HOME:-$HOME/.config}/wget/wgetrc"
export INPUTRC="${XDG_CONFIG_HOME:-$HOME/.config}/inputrc"
export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default"
export STACK_ROOT="$XDG_DATA_HOME"/stack
export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store"
export GNUPGHOME="$XDG_DATA_HOME/gnupg"
export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go"
export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg"
export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android"
export MBSYNCRC="${XDG_CONFIG_HOME:-$HOME/.config}/mbsync/config"
export ELECTRUMDIR="${XDG_DATA_HOME:-$HOME/.local/share}/electrum"
export GHCUP_USE_XDG_DIRS=true
export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
#make firefox/librewolf use wayland
export GDK_BACKEND=wayland
export MOZ_ENABLE_WAYLAND=1
#theming
export GTK_THEME=Adwaita:dark
export XCURSOR_THEME=Adwaita
#add to path
export PATH="$PATH:$HOME/.local/bin"
export PATH="$PATH:$HOME/.local/scripts"
export PATH="$PATH:/var/lib/flatpak/exports/bin"
export LESSHISTFILE="-"
export LESS_TERMCAP_mb="$(printf '%b' '')"
export LESS_TERMCAP_md="$(printf '%b' '')"
export LESS_TERMCAP_me="$(printf '%b' '')"
export LESS_TERMCAP_so="$(printf '%b' '')"
export LESS_TERMCAP_se="$(printf '%b' '')"
export LESS_TERMCAP_us="$(printf '%b' '')"
export LESS_TERMCAP_ue="$(printf '%b' '')"
export MANPAGER=less
export XDG_CURRENT_DESKTOP="sway"
#sfeed vars
export SFEED_PLUMBER="$BROWSER"
export SFEED_URL_FILE="$HOME/.local/share/sfeed/read"
#set programs
export EDITOR=nvim
#lf icons
. "$HOME"/.config/lf/lf-icons.sh
#fixes
#fix weird terminal issues
#export TERM="xterm-256color"
#fix arduino ide issues
export AWT_TOOLKIT=MToolkit

116
.zshrc Normal file
View File

@ -0,0 +1,116 @@
# 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
# If you come from bash you might have to change your $PATH.
# export PATH=$HOME/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"
# 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
vi-mode
)
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='mvim'
# fi
# Compilation flags
# export ARCHFLAGS="-arch x86_64"
# 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 the ZSH_CUSTOM folder.
# For a full list of active aliases, run `alias`.
#
# Example aliases
# alias zshconfig="mate ~/.zshrc"
# alias ohmyzsh="mate ~/.oh-my-zsh"
source ~/.config/aliasrc
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh