diff options
| -rw-r--r-- | .config/mimeapps.list | 23 | ||||
| -rw-r--r-- | .config/packages | 203 | ||||
| -rw-r--r-- | .config/sesh/sesh.toml | 14 | ||||
| -rwxr-xr-x | .config/shell/aliasrc | 1 | ||||
| -rw-r--r-- | .config/shell/variables | 22 | ||||
| -rwxr-xr-x | .config/tmux/popup.sh | 3 | ||||
| -rw-r--r-- | .config/tmux/tmux.conf | 127 | ||||
| -rwxr-xr-x | .config/x11/xresources | 27 | ||||
| -rw-r--r-- | .config/zsh/managers | 9 | ||||
| -rw-r--r-- | .config/zsh/vi-mode | 2 |
10 files changed, 329 insertions, 102 deletions
diff --git a/.config/mimeapps.list b/.config/mimeapps.list index bc83351..3110307 100644 --- a/.config/mimeapps.list +++ b/.config/mimeapps.list @@ -1,32 +1,11 @@ [Default Applications] application/pdf=pdf.desktop -x-scheme-handler/http=firefox.desktop -x-scheme-handler/https=firefox.desktop -x-scheme-handler/chrome=firefox.desktop -text/html=firefox.desktop +text/html=html.desktop; text/plain=text.desktop; application/postscript=pdf.desktop; -application/x-extension-htm=firefox.desktop -application/x-extension-html=firefox.desktop -application/x-extension-shtml=firefox.desktop -application/xhtml+xml=firefox.desktop -application/x-extension-xhtml=firefox.desktop -application/x-extension-xht=firefox.desktop application/rss+xml=rss.desktop text/x-shellscript=text.desktop; image/png=img.desktop; image/jpeg=img.desktop; image/gif=img.desktop; inode/directory=file.desktop - -[Added Associations] -x-scheme-handler/http=firefox.desktop; -x-scheme-handler/https=firefox.desktop; -x-scheme-handler/chrome=firefox.desktop; -text/html=firefox.desktop; -application/x-extension-htm=firefox.desktop; -application/x-extension-html=firefox.desktop; -application/x-extension-shtml=firefox.desktop; -application/xhtml+xml=firefox.desktop; -application/x-extension-xhtml=firefox.desktop; -application/x-extension-xht=firefox.desktop; diff --git a/.config/packages b/.config/packages new file mode 100644 index 0000000..e51b725 --- /dev/null +++ b/.config/packages @@ -0,0 +1,203 @@ +abook +alsa-utils +archlinux-keyring +artix-archlinux-support +aura-git +autoconf +automake +avr-gcc-85 +avr-libc +base +bat +bc +bind +binutils +bison +bluez +bluez-runit +bluez-utils +btrfs-progs +chrony +chrony-runit +cloc +cmake +codespell +cronie +cronie-runit +cryptsetup +cuda +cudnn +cxxopts +dfu-util-git +dhclient +dhcpcd +dhcpcd-runit +dino +discord +docbook-xsl +docker-runit +dosfstools +dunst +dust +efibootmgr +elixir +elogind-runit +esysusers +etmpfiles +fakeroot +fd +fennel +ffmpeg +file +findutils +firefox +flex +fnlfmt-git +freecad +fzf +gawk +gcc +gcc-arm-none-eabi-bin +gettext +ghcup-hs-bin +git +git-lfs +git-remote-gcrypt +go +grep +groff +grub +gucharmap +gzip +htop +hugo +isync +jq +julia +kicad +lazygit +lf +libconfig +libffi7 +libnotify +librewolf +libtool +libxft-bgra-git +linux +linux-firmware +linux-headers +linux-lts +linux-lts-headers +lua +luarocks +lynx +m4 +make +man-db +man-pages +md2vim +monero +mpv +msmtp +neofetch +neomutt +net-tools +networkmanager +networkmanager-runit +newsboat +notmuch +noto-fonts +noto-fonts-emoji +nsxiv +nvidia-open-dkms +nvidia-settings +ollama-cuda +opam +opendoas +openssh +openssl-1.1 +os-prober +osqp +otf-eb-garamond +pacman +pacman-contrib +pam-gnupg-git +pamixer-git +pandoc-bin +pass +pass-otp +patch +pavucontrol +pgcli +pipewire +pipewire-alsa +pipewire-jack +pipewire-pulse +pkgconf +plocate +postgresql +postgresql-runit +procs +profanity +pulsemixer +qdrant +rebar3 +ripgrep +rsync +ruff +runit +rustup +scrot +sed +sesh-bin +shellcheck +shfmt +socklog +sqlfmt-bin +steam +steam-fonts +texinfo +texlive-basic +texlive-fontsextra +texlive-fontsrecommended +texlive-latexextra +texlive-mathscience +texlive-xetex +tmux +tokei +tokyocabinet +tree-sitter +ttf-font-awesome +ttf-inconsolata +ttf-joypixels +ttf-linux-libertine +ttf-material-design-icons +ttf-material-design-icons-webfont +ttf-nerd-fonts-symbols +unclutter +urlview +uv +vale +vi +wget +which +woff2-font-awesome +xautolock +xbanish +xclip +xdg-utils +xdotool +xf86-video-vesa +xorg-xdpyinfo +xorg-xinit +xorg-xprop +xorg-xrandr +xorg-xset +xsel +xwallpaper +yamllint +zathura +zathura-pdf-poppler +zoxide +zsh +zsync diff --git a/.config/sesh/sesh.toml b/.config/sesh/sesh.toml new file mode 100644 index 0000000..9210591 --- /dev/null +++ b/.config/sesh/sesh.toml @@ -0,0 +1,14 @@ +[default_session] +startup_command = "nvim ." + +[[session]] +name = "ocvx" +path = "~/projects/ocvx" + +[[session]] +name = "ocvx-portfolio" +path = "~/projects/ocvx-portfolio" + +[[session]] +name = "dotfiles" +path = "~/.config" diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 92a6054..62ea957 100755 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -45,6 +45,7 @@ alias \ # git alias \ + gst="git status" \ ga="git add" \ gb="git branch -a" \ gc="git commit" \ diff --git a/.config/shell/variables b/.config/shell/variables index 87eb1bd..0c9edb9 100644 --- a/.config/shell/variables +++ b/.config/shell/variables @@ -1,7 +1,7 @@ # Default programs: export EDITOR="nvim" export TERMINAL="st" -export BROWSER="firefox" +export BROWSER="librewolf" # ~/ Clean-up: export XDG_CONFIG_HOME="$HOME/.config" @@ -31,8 +31,10 @@ export CABAL_CONFIG="$XDG_CONFIG_HOME/cabal/config" export CABAL_DIR="$XDG_DATA_HOME/cabal" export CABAL_BUILDDIR="$XDG_CACHE_HOME/cabal" -# Haskell formatter -export PATH="$HOME/.local/share/cabal/bin/fourmolu:$PATH" +# Haskell +export GHCUP_USE_XDG_DIRS=true +export PATH="$XDG_DATA_HOME/cabal/bin/fourmolu:$PATH" + # Ocaml export OPAMROOT="$XDG_CONFIG_HOME/opam" @@ -43,11 +45,7 @@ export ALT_KB_LAYOUT="se" # Other program settings: export FZF_DEFAULT_OPTS="--layout=reverse --height 40%" -# pyenv -export PYENV_ROOT="${XDG_DATA_HOME:-$HOME/.local/share}/.pyenv" -export PATH="$PYENV_ROOT/bin:$PATH" - -export PYTHONSTARTUP="${XDG_CONFIG_HOME}/python/pythonrc" +export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/pythonrc" # Rust export RUSTUP_HOME="$XDG_DATA_HOME"/rustup @@ -61,13 +59,13 @@ export LD_LIBRARY_PATH="/opt/cuda/extras/CUPTI/lib64:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="/opt/cuda/lib64:$LD_LIBRARY_PATH" export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv -# Haskell -export GHCUP_USE_XDG_DIRS=true -export PATH="$XDG_DATA_HOME/cabal/bin/fourmolu:$PATH" - # Ollama models path export OLLAMA_MODELS="/storage2/projects/ollama/models" +# Huggingface +export HF_HUB_DISABLE_TELEMETRY=1 +export HF_HOME="/storage2/huggingface" + # This is the list for lf icons: export LF_ICONS="di=:\ fi=:\ diff --git a/.config/tmux/popup.sh b/.config/tmux/popup.sh new file mode 100755 index 0000000..7017cad --- /dev/null +++ b/.config/tmux/popup.sh @@ -0,0 +1,3 @@ +#!/bin/sh +parent=$(tmux display-message -p '#S') +tmux attach -t "popup-${parent}" 2>/dev/null || tmux new-session -s "popup-${parent}" diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 7311ff3..875da08 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -1,86 +1,123 @@ -# Load tmux config -bind r source-file $HOME/.config/tmux/tmux.conf +# ─── Prefix ─────────────────────────────────────────────────────────────────── -# Bind prefix to C-a set-option -g prefix C-a unbind-key C-b bind-key C-a send-prefix +# ─── General ────────────────────────────────────────────────────────────────── + +set -g base-index 1 +set -g pane-base-index 1 +set -g renumber-windows on +set -g history-limit 50000 +set -g display-time 1500 +set -g status-interval 5 +set -g focus-events on +set -s escape-time 0 + +set-window-option -g aggressive-resize on +set-window-option -g mode-keys vi +set-window-option -g mouse off +set -g status-keys vi + +# ─── Terminal / Colors ──────────────────────────────────────────────────────── -# Allows vim to display colors correctly. set -g default-terminal "${TERM}" set -ga terminal-overrides ',*256col*:Tc' +set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q' + # Undercurl -set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # undercurl support -set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' # underscore colours - needs tmux-3.0 -set -ga terminal-overrides ',*:Ss=\E[%p1%d q:Se=\E[2 q' +set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' +set -as terminal-overrides ',*:Setulc=\E[58::2::::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' + +# ─── Status Line ────────────────────────────────────────────────────────────── -# Status line set -g status on set -g status-position top -set -g focus-events on -set-option -sg status-interval 1 set-option -g status-style bg=#151515,fg=white set-option -g automatic-rename on -set-option -g renumber-windows on + set-option -g status-left "" -set -ga status-left '#[bg=#151515]#[fg=white] #{?window_zoomed_flag,, }' +set -ga status-left '#[bg=#151515]#[fg=white] #{?window_zoomed_flag,[Z], }' set-option -g status-right "" -set-option -g window-status-format " #[fg=#E1E1E1] #{window_index}#(echo ':')#{window_name}#{window_flag} " -set-option -g window-status-current-format " #[bold bg=#151515] > #{window_index}#(echo ':')#{window_name}#{window_flag} " -set -s escape-time 0 -set -g display-time 1500 -set -g status-interval 5 -setw -g aggressive-resize on +set-option -g window-status-format " #[fg=#E1E1E1] #{window_index}:#{window_name}#{window_flags} " +set-option -g window-status-current-format " #[bold bg=#151515] > #{window_index}:#{window_name}#{window_flags} " -set -g status-keys vi -set -g history-limit 10000 +# ─── Reload Config ──────────────────────────────────────────────────────────── + +bind r source-file $HOME/.config/tmux/tmux.conf \; display "Config reloaded" -setw -g mode-keys vi -setw -g mouse off +# ─── Splits & Windows ───────────────────────────────────────────────────────── -# split panes -bind h split-window -h -bind v split-window -v +bind h split-window -h -c "#{pane_current_path}" +bind v split-window -v -c "#{pane_current_path}" unbind '"' unbind % + +bind c new-window -c "#{pane_current_path}" bind s list-sessions -bind-key N resize-pane -D 5 -bind-key E resize-pane -U 5 -bind-key I resize-pane -L 5 -bind-key M resize-pane -R 5 +# ─── AI ────────────────────────────────────────────────────────────────────── + +bind a split-window -h -p 40 'claude' -bind-key M-n resize-pane -D -bind-key M-e resize-pane -U -bind-key M-i resize-pane -L -bind-key M-m resize-pane -R +# ─── Pane Navigation (Colemak: m/n/e/i = left/down/up/right) ───────────────── -# Use Alt-vim keys without prefix key to switch panes bind -n M-m select-pane -L bind -n M-n select-pane -D bind -n M-e select-pane -U bind -n M-i select-pane -R +# ─── Pane Resize (prefix + capital, or Alt+Shift for single-step) ───────────── + +bind -r M resize-pane -L 5 +bind -r N resize-pane -D 5 +bind -r E resize-pane -U 5 +bind -r I resize-pane -R 5 + +bind -r M-m resize-pane -L +bind -r M-n resize-pane -D +bind -r M-e resize-pane -U +bind -r M-i resize-pane -R + +# ─── Copy Mode ──────────────────────────────────────────────────────────────── + bind Escape copy-mode bind p paste-buffer -bind -T copy-mode-vi v send -X begin-selection -bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xsel -i --clipboard" -bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xsel -i --clipboard" -bind -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "xsel -i --clipboard" -# 0 is too far from ` ;) -set -g base-index 1 +bind -T copy-mode-vi v send -X begin-selection +bind -T copy-mode-vi V send -X select-line +bind -T copy-mode-vi C-v send -X rectangle-toggle +bind -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "xsel -i --clipboard" +bind -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel "xsel -i --clipboard" +bind -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xsel -i --clipboard" -# No delay for escape key press -set -sg escape-time 0 +# ─── Floating Terminal ──────────────────────────────────────────────────────── -# Fire up a floating terminal -bind-key -n -N 'Toggle popup window' M-g if-shell -F '#{==:#{session_name},popup}' { +bind-key -n -N 'Toggle popup window' M-g if-shell -F '#{m:popup-*,#{session_name}}' { detach-client } { display-popup -d "#{pane_current_path}" \ -xC -yC -w 80% -h 75% \ - -E 'tmux attach-session -t popup || tmux new-session -s popup' + -E "~/.config/tmux/popup.sh" } + +# ─── Sesh ───────────────────────────────────────────────────────────────────── + +set -g detach-on-destroy off +bind -N "last-session (via sesh)" L run-shell "sesh last" + +bind-key T run-shell "sesh connect \"$( + sesh list --icons | grep -v 'popup-' | fzf-tmux -p 80%,70% \ + --no-sort --ansi --border-label ' sesh ' --prompt '⚡ ' \ + --header ' ^a all ^t tmux ^g configs ^x zoxide ^d kill ^f find' \ + --bind 'tab:down,btab:up' \ + --bind 'ctrl-a:change-prompt(\uf0e7 )+reload(sesh list --icons | grep -v popup-)' \ + --bind 'ctrl-t:change-prompt(\uf2d2 )+reload(sesh list -t --icons | grep -v popup-)' \ + --bind 'ctrl-x:change-prompt(\uf013 )+reload(sesh list -z --icons | grep -v popup-)' \ + --bind 'ctrl-d:execute(tmux kill-session -t {2..})+change-prompt(\uf1f8 )+reload(sesh list --icons | grep -v popup-)' \ + --bind 'ctrl-f:change-prompt(\uf002 )+reload(fd -H -d 2 -t d . ~)' \ + --preview 'sesh preview {}' \ + --preview-window 'right:55%' +)\"" diff --git a/.config/x11/xresources b/.config/x11/xresources index d01c065..4c08b7e 100755 --- a/.config/x11/xresources +++ b/.config/x11/xresources @@ -1,46 +1,41 @@ Xcursor.size: 9 xterm*selectToClipboard: true xterm*disallowedWindowOps: 20,21,SetXProp -/* *.font: Monospace:pixelsize=25:antialias=true:autohint=true; */ -/* *.fontalt0:Braille:pixelsize=24:antialias=true:autohint=true; */ -/* *.fontalt1:JoyPixels:pixelsize=24:antialias=true:autohint=true; */ -! *.termname: st-256color ! colors ! special - *.background: #151515 -*.foreground: white -*.cursorColor: white +*.foreground: #D8D8D8 +*.cursorColor: #D8D8D8 ! black -*.color0: #202020 -*.color8: #555555 +*.color0: #3A3A3A +*.color8: #686868 ! red *.color1: #AC4142 -*.color9: #AC4142 +*.color9: #CC6666 ! green -*.color2: #88afa2 -*.color10: #90A959 +*.color2: #90A959 +*.color10: #A8C474 ! yellow *.color3: #F4BF75 -*.color11: #F4BF75 +*.color11: #F7D89A ! blue -*.color4: #A5D6FF +*.color4: #6B8BAE *.color12: #7E97AB ! magenta *.color5: #AA759F -*.color13: #AA759F +*.color13: #C9A0DC ! cyan *.color6: #75B5AA -*.color14: #75B5AA +*.color14: #A3D4CC ! white *.color7: #D0D0D0 diff --git a/.config/zsh/managers b/.config/zsh/managers index 6595601..0e23f3d 100644 --- a/.config/zsh/managers +++ b/.config/zsh/managers @@ -1,12 +1,11 @@ # Language managers -# Init pyenv -eval "$(pyenv init --path)" -eval "$(pyenv virtualenv-init -)" - # Init fnm (node manager) eval "$(fnm env)" # Ocaml -[[ ! -r /home/aktersnurra/.opam/opam-init/init.zsh ]] || source /home/aktersnurra/.opam/opam-init/init.zsh > /dev/null 2> /dev/null +[[ ! -r '/home/aktersnurra/.config/opam/opam-init/init.zsh' ]] || source '/home/aktersnurra/.config/opam/opam-init/init.zsh' > /dev/null 2> /dev/null eval "$(opam env)" + +# zoxide +eval "$(zoxide init zsh --cmd cd)" diff --git a/.config/zsh/vi-mode b/.config/zsh/vi-mode index fe4dd48..862c963 100644 --- a/.config/zsh/vi-mode +++ b/.config/zsh/vi-mode @@ -16,13 +16,11 @@ function zle-keymap-select () { viins|main) echo -ne '\e[5 q';; # beam esac } - 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. |