diff --git a/README.org b/README.org index b2450d4..61b2078 100644 --- a/README.org +++ b/README.org @@ -9,6 +9,9 @@ It will link all dotfiles to their correct place. All files in =files/= are currently being used and =stow='ed. Configuration for my =i3= are found in =tiling-wm=. +* theme +Currently using =Flat Remix= theme + * fonts Should be installed manually or via system package manager. Fallsback are provided in =fallback-fonts/= diff --git a/files/emacs/.emacs.d/init.org b/files/emacs/.emacs.d/init.org index 6185267..356ba50 100644 --- a/files/emacs/.emacs.d/init.org +++ b/files/emacs/.emacs.d/init.org @@ -254,7 +254,6 @@ I mainly use these fonts: Use non-monospace font for org-mode! Blocks will still be mono-spaced. -*CURRENTLY DISABLED* #+begin_src emacs-lisp :tangle no (set-face-attribute 'variable-pitch nil :family "Roboto") (set-face-attribute 'fixed-pitch nil :family "JuliaMono") @@ -366,8 +365,8 @@ Show me those pesky trailing whitespaces... I hate them. Kill them. #+end_src *** 80 column indicator -I only need 80 columns on my 4K display. -#+begin_src emacs-lisp :tangle yes +Show me a nice column indicator line. +#+begin_src emacs-lisp :tangle no (use-package fill-column-indicator :straight t :defer 1 @@ -424,7 +423,7 @@ Sometimes I want to see all of my files. treemacs-directory-collapsed-face treemacs-file-face treemacs-tags-face)) - (set-face-attribute face nil :family "JuliaMono" :height 110)) + (set-face-attribute face nil :family "JuliaMono" :height 80)) :bind (:map global-map ("C-x t t" . treemacs))) @@ -860,7 +859,13 @@ I want to use =rust-analyzer= and see inlay type hints for variables. (use-package haskell-mode :straight t :hook - (haskell-mode . interactive-haskell-mode)) + (haskell-mode . interactive-haskell-mode) + (haskell-mode . prettify-symbols-mode) + (haskell-mode . (lambda () + (push '("->" . ?→) prettify-symbols-alist) + (push '("<-" . ?←) prettify-symbols-alist) + (push '("=>" . ?⇒) prettify-symbols-alist) + ))) (use-package lsp-haskell :straight t @@ -886,6 +891,7 @@ It depends on =ptvsd=, which can be installed via =pip=. #+begin_src emacs-lisp :tangle yes (require 'dap-python) #+end_src + *** rust TODO: add rust config for debugging diff --git a/files/tmux/.tmux.conf b/files/tmux/.tmux.conf new file mode 100644 index 0000000..b5558d8 --- /dev/null +++ b/files/tmux/.tmux.conf @@ -0,0 +1,41 @@ +# tmux.conf +# ~ M. Thomas + +# set default terminal +set -g default-terminal "tmux-256color" +# enable true color terminal +set -ga terminal-overrides ",*256col*:Tc" + +# new panes +bind-key -n M-v split-window -h +bind-key -n M-s split-window -v + +# pane selection +bind -n M-h select-pane -L +bind -n M-j select-pane -D +bind -n M-k select-pane -U +bind -n M-l select-pane -R + +# new windows +bind-key -n M-c new-window + +# navigate windows +bind-key -n M-1 select-window -t 1 +bind-key -n M-2 select-window -t 2 +bind-key -n M-3 select-window -t 3 +bind-key -n M-4 select-window -t 4 +bind-key -n M-5 select-window -t 5 +bind-key -n M-6 select-window -t 6 +bind-key -n M-7 select-window -t 7 +bind-key -n M-8 select-window -t 8 +bind-key -n M-9 select-window -t 9 + +# make escape bindings of programs work in tmux +set -s escape-time 5 + +# enable mouse +set-option -g mouse on + +# start pane index at 1 +set -g base-index 1 +setw -g pane-base-index 1 diff --git a/files/zsh/.zshrc b/files/zsh/.zshrc index 7a883ff..615a55e 100644 --- a/files/zsh/.zshrc +++ b/files/zsh/.zshrc @@ -20,28 +20,25 @@ DIR="%{$fg[blue]%}%~" GIT="%{$fg[red]%}\$vcs_info_msg_0_" # if [[ -n "$SSH_CONNECTION" ]]; then - NAME="%B%{$fg[yellow]%}%m%b " + HOSTNAME="%B%{$fg[yellow]%}%m%b " # fi - case $TERM in - (*xterm* | rxvt | alacritty) +export PROMPT="${HOSTNAME}${DIR}${GIT} ${ICON}%{$reset_color%} " +zstyle ':vcs_info:git:*' formats ' %b ' - # Write some info to terminal title. - # This is seen when the shell prompts for input. - function precmd { - print -Pn "\e]0;%(1j,%j job%(2j|s|) - ,)%~\a" - } - # Write command and arguments to terminal title. - # This is seen while the shell waits for a command to complete. - function preexec { - printf "\033]0;%s\a" "$1" - } +case $TERM in + (*xterm* | rxvt | alacritty) - ;; - esac - -export PROMPT="${NAME}${DIR}${GIT} ${ICON}%{$reset_color%} " -zstyle ':vcs_info:git:*' formats '|%b ' + # This is seen when the shell prompts for input. + function precmd { + print -Pn "\e]0;%m: %(1j,%j job%(2j|s|) - ,)%~\a" + } + # This is seen while the shell waits for a command to complete. + function preexec { + printf "\033]0;$(hostname): %s\a" "$1" + } + ;; +esac # ============================== Aliases alias c='clear' @@ -54,8 +51,9 @@ alias rm='rm -i' # Ask before removal alias cp='cp -i' # Ask before removal alias mv='mv -i' # Ask before removal -alias palmreject='xinput set-prop 19 340 1' -alias palmaccept='xinput set-prop 19 340 0' +alias conservation='cat /sys/bus/platform/drivers/ideapad_acpi/VPC2004:00/conservation_mode' + +alias truecolor='curl -s https://raw.githubusercontent.com/JohnMorales/dotfiles/master/colors/24-bit-color.sh | bash' alias nssh='SSH_AUTH_SOCK= ssh' alias cpu='watch -n.1 "grep \"^[c]pu MHz\" /proc/cpuinfo"' diff --git a/tiling-wm/tmux/.tmux.conf b/tiling-wm/tmux/.tmux.conf deleted file mode 100644 index f68124a..0000000 --- a/tiling-wm/tmux/.tmux.conf +++ /dev/null @@ -1,31 +0,0 @@ -set -g default-terminal "tmux-256color" -set -g terminal-overrides ",alacritty:RGB" - -#some vi behaviour -bind-key -r h select-pane -L -bind-key -r j select-pane -D -bind-key -r k select-pane -U -bind-key -r l select-pane -R - -bind-key v split-window -h -bind-key s split-window -v - -# in order to make escape bindings of programs in tmux work -set -s escape-time 5 - -# enable mouse -set-option -g mouse on - -# start pane index at 1 -set -g base-index 1 -setw -g pane-base-index 1 - -# reload bind -bind-key r source-file ~/.tmux.conf - -set-window-option -g window-status-current-format "[#I:#W]" -set-window-option -g window-status-format "#I:#W" -set-window-option -g window-status-current-style fg="#586e75",bg="#fdf6e3",bold - -set -g status-bg "#fdf6e3" -set -g status-fg "#586e75"