merging main

revert Adding initial doom emacs config

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "tmux/.tmux/plugins/tpm"]
+	path = tmux/.tmux/plugins/tpm
+	url = https://github.com/tmux-plugins/tpm.git

bash/.bashrc

@@ -10,10 +10,8 @@
                                                             
 
 # Set some defaults.
-export EDITOR="emacsclient -t"
-export VISUAL="emacsclient -c -a emacs"
-export ALTERNATE_EDITOR=""
-export PATH=".:~/bin:~/.local/bin:~/.emacs.d/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+export EDITOR="nvim"
+export PATH=".:~/bin:~/.local/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
 export LSCOLORS="ExGxBxDxCxEgEdxbxgxcxd"
 
 # XDG
@@ -202,12 +200,10 @@ alias nano='nano -ciw '
 alias tm="tmux new-session -A -s main"
 
 # always use nvim
-#alias vim='nvim'
-#alias vi='nvim'
-#alias nv='nvim'
+alias vim='nvim'
+alias vi='nvim'
+alias nv='nvim'
 
-# emacsclient
-alias ec="emacsclient -n -c -a emacs"
 
 if [[ HAS_GNOME ]]; then
     alias nosleep="gnome-session-inhibit --inhibit idle sleep infinity"
@@ -266,10 +262,6 @@ function mt {
     mosh $1 -- tmux new-session -A -s main
 }
 
-# emacs client function
-# function ec {
-#     emacsclient -c -a "emacs" $@ &
-# }
 
 
 

tmux/.tmux.conf

@@ -1,95 +1,11 @@
-# Support 256 colors rather than 16.
-#set -g default-terminal "screen-256color"
-
-# True color support in tmux
-set -g default-terminal "xterm-256color"
-set-option -ga terminal-overrides ",xterm-256color:Tc"
-
-# Big history.
-set -g history-limit 10000
-
-# Make the status bar pretty.
-# set -g status-bg colour16
-# set -g status-fg colour61
-# set -g window-status-style bg=colour236,fg=colour141
-# set -g window-status-current-style bg=colour236,fg=colour80
- 
-# Add some info to the status bar
-set -g status-right-length 70
-set -g status-right "#H | up #(uptime | awk '{print $3 \" \" $4}' | sed 's/,//') | Mem: #(~/bin/tmux-free-memory.sh) free | Load: #(uptime | rev | cut -f1-3 -d ' ' | rev)"
-
-# Auto-set window title
-setw -g automatic-rename
-
-# Make mouse useful
-set -g mouse on
-
-# Add vim keys to navigate
-set-window-option -g mode-keys vi
-
-# Add key to reload ~/.tmux.conf
-bind r source-file ~/.tmux.conf
-
 # More logical (to me) split keys.
 bind - split-window -p 38 -v
 bind | split-window -p 38 -h
 
-# Keybindings for resizing panes that don't collide with OSX bindings
-bind -r C-h resize-pane -L
-bind -r C-j resize-pane -D
-bind -r C-k resize-pane -U
-bind -r C-l resize-pane -R
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin "arcticicestudio/nord-tmux"
 
+set -g mouse on
 
-## COLORSCHEME: gruvbox dark
-set-option -g status "on"
-
-# default statusbar color
-set-option -g status-style bg=colour237,fg=colour223 # bg=bg1, fg=fg1
-
-# default window title colors
-set-window-option -g window-status-style bg=colour214,fg=colour237 # bg=yellow, fg=bg1
-
-# default window with an activity alert
-set-window-option -g window-status-activity-style bg=colour237,fg=colour248 # bg=bg1, fg=fg3
-
-# active window title colors
-set-window-option -g window-status-current-style bg=red,fg=colour237 # fg=bg1
-
-# pane border
-set-option -g pane-active-border-style fg=colour250 #fg2
-set-option -g pane-border-style fg=colour237 #bg1
-
-# message infos
-set-option -g message-style bg=colour239,fg=colour223 # bg=bg2, fg=fg1
-
-# writing commands inactive
-set-option -g message-command-style bg=colour239,fg=colour223 # bg=fg3, fg=bg1
-
-# pane number display
-set-option -g display-panes-active-colour colour250 #fg2
-set-option -g display-panes-colour colour237 #bg1
-
-# clock
-set-window-option -g clock-mode-colour colour109 #blue
-
-# bell
-set-window-option -g window-status-bell-style bg=colour167,fg=colour235 # bg=red, fg=bg
-
-## Theme settings mixed with colors (unfortunately, but there is no cleaner way)
-set-option -g status-justify "left"
-set-option -g status-left-style none
-set-option -g status-left-length "80"
-set-option -g status-right-style none
-set-option -g status-right-length "80"
-set-window-option -g window-status-separator ""
-
-set-option -g status-left "#[fg=colour248, bg=colour241] #S #[fg=colour241, bg=colour237, nobold, noitalics, nounderscore]"
-set-option -g status-right "#[fg=colour239, bg=colour237, nobold, nounderscore, noitalics]#[fg=colour246,bg=colour239] %Y-%m-%d  %H:%M #[fg=colour248, bg=colour239, nobold, noitalics, nounderscore]#[fg=colour237, bg=colour248] #h "
-
-set-window-option -g window-status-current-format "#[fg=colour237, bg=colour214, nobold, noitalics, nounderscore]#[fg=colour239, bg=colour214] #I #[fg=colour239, bg=colour214, bold] #W #[fg=colour214, bg=colour237, nobold, noitalics, nounderscore]"
-set-window-option -g window-status-format "#[fg=colour237,bg=colour239,noitalics]#[fg=colour223,bg=colour239] #I #[fg=colour223, bg=colour239] #W #[fg=colour239, bg=colour237, noitalics]"
-
-
-# Start a new session if one doesn't exist.
-new-session
+run '~/.tmux/plugins/tpm/tpm'

tmux/.tmux/plugins/.gitignore

@@ -0,0 +1 @@
+*

tmux/.tmux/plugins/tpm

@@ -0,0 +1 @@
+Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946