softlink zshrc since emacs breaks hard links

4 files changed, 146 insertions, 144 deletions

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index c02b643..6dfd325 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -20,7 +20,7 @@
  '(mediawiki-site-alist
    '(("Wikipedia" "https://en.wikipedia.org/w/" "Maddy from Celeste" "" nil "Main Page")))
  '(package-selected-packages
-   '(use-package elfeed-org elfeed mediawiki auctex eimp eglot ada-mode wisi portage-navi rust-mode csv-mode haskell-mode catppuccin-theme)))
+   '(org-drill ement use-package elfeed-org elfeed mediawiki auctex eimp eglot ada-mode wisi portage-navi rust-mode csv-mode haskell-mode catppuccin-theme)))
 
 (load-theme 'catppuccin t)
 (custom-set-faces
diff --git a/.config/sway/config b/.config/sway/config
index 75de6c6..f2139c2 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -71,6 +71,7 @@ output eDP-1 resolution 2880x1800
 input * {
       xkb_layout "custom,no,apl"
       xkb_variant "ficustom,,"
+#      xkb_options "ctrl:swapcaps"
 #      xkb_layout "us,no,fi,apl"
 #      xkb_variant "colemak,,,"
 #      xkb_model "applealu_iso"
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
new file mode 100644
index 0000000..c0ab752
--- /dev/null
+++ b/.config/zsh/.zshrc
@@ -0,0 +1,143 @@
+# If you come from bash you might have to change your $PATH.
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
+
+export XDG_CACHE_HOME="$HOME"/.cache
+export XDG_CONFIG_HOME="$HOME"/.config
+export XDG_DATA_HOME="$HOME"/.local/share
+export XDG_STATE_HOME="$HOME"/.local/state
+
+export XDG_DESKTOP_DIR=/dev/null
+
+export HISTFILE="$XDG_STATE_HOME"/zsh/history
+
+alias claws-mail=claws-mail --alternate-config-dir "$XDG_DATA_HOME"/claws-mail
+alias irssi=irssi --config="$XDG_CONFIG_HOME"/irssi/config --home="$XDG_DATA_HOME"/irssi
+alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
+alias units=units --history "$XDG_DATA_HOME"/units_history
+alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
+
+# Path to your oh-my-zsh installation.
+export ZSH="$XDG_DATA_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="dstufft"
+
+# 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)
+
+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"
+# Lines configured by zsh-newuser-install
+unsetopt beep
+# End of lines configured by zsh-newuser-install
+
+export CABAL_CONFIG="$XDG_CONFIG_HOME"/cabal/config
+export CABAL_DIR="$XDG_DATA_HOME"/cabal
+export CARGO_HOME="$XDG_DATA_HOME"/cargo
+export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle
+export GNUPGHOME="$XDG_DATA_HOME"/gnupg
+export IPFS_PATH="$XDG_DATA_HOME"/ipfs
+export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
+export LESSHISTFILE="$XDG_STATE_HOME"/less/history
+
+export PYTHONSTARTUP="/etc/python/pythonrc"
+export KITTY_ENABLE_WAYLAND=1
+export PATH=/home/lav/.ghcup/bin:$PATH:/home/lav/bin:/home/lav/.local/bin
+export XCURSOR_THEME=Adwaita
+source ~/src/shell-mommy/shell-mommy.zsh
+export EDITOR=/usr/bin/emacsclient
+export EMAIL=lav@vampires.gay
+export GPG_TTY=$(tty)
+alias dotfiles='/usr/bin/git --git-dir=${XDG_DATA_HOME:-${HOME}/.local/share}/dotfiles --work-tree=$HOME'
+compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
+
+if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
+    exec slay
+fi
diff --git a/.config/zsh/zshrc b/.config/zsh/zshrc
index c4e713f..ed08148 100644..120000
--- a/.config/zsh/zshrc
+++ b/.config/zsh/zshrc
@@ -1,143 +1 @@
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
-
-export XDG_CACHE_HOME="$HOME"/.cache
-export XDG_CONFIG_HOME="$HOME"/.config
-export XDG_DATA_HOME="$HOME"/.local/share
-export XDG_STATE_HOME="$HOME"/.local/state
-
-export XDG_DESKTOP_DIR=/dev/null
-
-export HISTFILE="$XDG_STATE_HOME"/zsh/history
-
-alias claws-mail=claws-mail --alternate-config-dir "$XDG_DATA_HOME"/claws-mail
-alias irssi=irssi --config="$XDG_CONFIG_HOME"/irssi/config --home="$XDG_DATA_HOME"/irssi
-alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
-alias units=units --history "$XDG_DATA_HOME"/units_history
-alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts"
-
-# Path to your oh-my-zsh installation.
-export ZSH="$XDG_DATA_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="dstufft"
-
-# 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)
-
-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"
-# Lines configured by zsh-newuser-install
-unsetopt beep
-# End of lines configured by zsh-newuser-install
-
-export CABAL_CONFIG="$XDG_CONFIG_HOME"/cabal/config
-export CABAL_DIR="$XDG_DATA_HOME"/cabal
-export CARGO_HOME="$XDG_DATA_HOME"/cargo
-export GRADLE_USER_HOME="$XDG_DATA_HOME"/gradle
-export GNUPGHOME="$XDG_DATA_HOME"/gnupg
-export IPFS_PATH="$XDG_DATA_HOME"/ipfs
-export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
-export LESSHISTFILE="$XDG_STATE_HOME"/less/history
-
-export PYTHONSTARTUP="/etc/python/pythonrc"
-export KITTY_ENABLE_WAYLAND=1
-export PATH=$PATH:/home/lav/bin:/home/lav/.local/bin
-export XCURSOR_THEME=Adwaita
-source ~/src/shell-mommy/shell-mommy.zsh
-export EDITOR=/usr/bin/emacsclient
-export EMAIL=lav@vampires.gay
-export GPG_TTY=$(tty)
-alias dotfiles='/usr/bin/git --git-dir=${XDG_DATA_HOME:-${HOME}/.local/share}/dotfiles --work-tree=$HOME'
-compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
-
-if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then
-    exec slay
-fi
+.zshrc
\ No newline at end of file