Remove hypr

.gitignore

@@ -1,5 +1,6 @@
 zsh/extraconfig.zsh
 zsh/env.zsh
 bash/extraconfig.bash
+nvim/lua/extraconfig.lua
 .data
 bin-extra

alacritty.toml

@@ -1,3 +1,4 @@
+[general]
 live_config_reload = true
 
 [bell]
@@ -46,7 +47,7 @@ style = "Block"
 unfocused_hollow = true
 
 [font]
-size = 10.0
+size = 11.0
 
 [font.glyph_offset]
 x = 0
@@ -60,7 +61,7 @@ x = 0
 y = 0
 
 [[keyboard.bindings]]
-action = "SpawnNewInstance"
+command = "clone-terminal"
 key = "E"
 mods = "Control|Shift"
 
@@ -637,7 +638,7 @@ semantic_escape_chars = ",│`|:\"' ()[]{}<>"
 [window]
 decorations = "none"
 dynamic_title = false
-opacity = 0.8
+opacity = 0.6
 
 [window.dimensions]
 columns = 0

bin/clone-terminal

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+# Extract parent window uuid
+
+# On hyprland
+hyprctl monitors > /dev/null 2>&1
+
+if [ $? -eq 0 ]; then
+    WM_NAME=$(hyprctl activewindow | grep title | cut -d ':' -f 2 | tr -d ' ')
+else
+    WINDOW_ID=$(xdotool getactivewindow)
+    WM_NAME=$(xprop -id $WINDOW_ID WM_NAME | cut -d '"' -f 2)
+fi
+
+# Generate new uuid for new terminal
+uuid=$(uuidgen)
+
+alacritty --title $uuid -e sh -c "TERMINAL_UUID=$uuid PARENT_TERMINAL=$WM_NAME exec $SHELL"
+

bin/new-terminal

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+UUID=$(uuidgen)
+alacritty --title $UUID -e sh -c "TERMINAL_UUID=$UUID exec $SHELL"

bin/post-scan

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# auto fix issues with my scanner
+input="$3"
+color=$(magick "$input" -format "%[hex:u.p{100,-1}]" info:)
+tmp=$(mktemp --suffix=.png)
+magick "$input" -page +0-100 -background \#$color -flatten -auto-level $tmp
+magick $tmp -quality 100 "${input%.*}.pdf"
+rm -rf $tmp "$input"

bin/quote

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+xclip -sel clip -o | sed -e 's/^/> /' | xclip -sel clip

bin/update

@@ -244,21 +244,31 @@ update-rust() {
     echo -e "\033[32;1m=== Updating rust ===\033[0m"
     rustup update
 
-    cargo install-update --help > /dev/null 2>&1
-
-    # Program to update cargo programs is not installed
-    if [ $? -ne 0 ]; then
-
-        echo -e "\033[33;1m=== To allow updating rust packages, run \`cargo install cargo-update\`===\033[0m"
-
-    fi
-
-    # If the user has no root, and if he doesn't have openssl, we won't install cargo update.
-    # Before running cargo update, we check again that it is installed.
-    cargo install-update --help > /dev/null 2>&1
     if [ $? -eq 0 ]; then
         echo -e "\033[32;1m=== Updating rust packages ===\033[0m"
-        cargo install-update -ag
+
+        IFS=$'\n'
+        for line in $(cargo install --list); do
+            if [[ $line == " "* ]] || [[ $line == "\t"* ]]; then
+                continue
+            fi
+
+            if [[ $line == *"("* ]]; then
+                crate=$(echo $line | cut -d ' ' -f 1)
+                full_repo=$(echo $line | cut -d '(' -f 2 | cut -d ')' -f 1)
+                repo=$(echo $full_repo | cut -d '#' -f 1)
+                current_commit=$(echo $full_repo | cut -d '#' -f 2)
+                latest_commit=$(git ls-remote $repo | head -n 1 | cut -d $'\t' -f 1)
+
+                if [[ $latest_commit == ${current_commit}* ]]; then
+                    echo -e "     \x1b[32;1mIgnored\x1b[0m package \`$crate\` is already installed"
+                else
+                    cargo install --git $repo
+                fi
+            else
+                cargo install $(echo $line | cut -d ' ' -f 1)
+            fi
+        done
     fi
 
     local seconds=$((`date +%s` - $start))

coc-settings.json

@@ -1,22 +0,0 @@
-{
-    "inlayHint": {
-        "enable": false
-    },
-    "languageserver": {
-        "rust": {
-            "command": "rustup",
-            "args": ["run", "stable", "rust-analyzer"],
-            "filetypes": ["rust"],
-            "rootPatterns": ["Cargo.toml"]
-        },
-        "elmLS": {
-            "command": "elm-language-server",
-            "filetypes": ["elm"],
-            "rootPatterns": ["elm.json"]
-        },
-        "python": {
-            "command": "pylsp",
-            "filetypes": ["python"]
-        }
-    }
-}

init.vim

@@ -1,226 +0,0 @@
-" Pas de compatibilité a VI !
-set nocompatible
-set notermguicolors
-
-" PLUGNIS ###########################################################{{{
-call plug#begin()
-
-" Conquer of Completion
-Plug 'neoclide/coc.nvim', {'branch': 'release'}
-
-" General plugins
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
-Plug 'https://gitea.tforgione.fr/tforgione/peach.git'
-Plug 'scrooloose/nerdtree'
-Plug 'tpope/vim-abolish'
-Plug 'lambdalisue/suda.vim'
-
-" Language specific plugins
-
-" Rust
-Plug 'rust-lang/rust.vim'
-
-" Elm
-Plug 'ElmCast/elm-vim'
-
-" Toml
-Plug 'cespare/vim-toml'
-
-" Pug
-Plug 'digitaltoad/vim-pug'
-
-" Typst
-Plug 'kaarmu/typst.vim'
-
-call plug#end()
-
-" Line numbers and syntaxic coloration
-" set nu
-" syntax on
-
-" Highlight bad spaces (not working...)
-" }}}
-
-" INDENTATION #######################################################{{{
-set expandtab
-set tabstop=4
-set shiftwidth=4
-set autoindent
-set tw=120
-if !empty($NVIM_TEXT_WIDTH)
-    execute 'set tw=' . $NVIM_TEXT_WIDTH
-endif
-" }}}
-
-" UI CONFIG #########################################################{{{
-set number
-if $NVIM_LINE_NUMBER == 'rnu'
-    set rnu
-endif
-set showcmd
-set wildmenu
-set lazyredraw
-set encoding=utf8
-set clipboard=unnamedplus
-set updatecount=50
-set mouse=a
-set guicursor=
-" set ttymouse=sgr
-" Espaces insécables grrrr
-set list
-set listchars=tab:  ,trail:·,extends:>,precedes:<,nbsp:¬
-" Remove trailing spaces
-autocmd BufWritePre * :%s/\s\+$//e
-
-" Compile on F12
-if executable('mars')
-    nnoremap <silent><F12> :wa \| !mars -p %:p<CR>
-    inoremap <silent><F12> <C-O>:wa \|!mars -p %:p<CR>
-    vnoremap <silent><F12> :wa \|!mars -p %:p<CR>
-elseif executable('make')
-    nnoremap <silent><F12> :wa \| !make -p %:p<CR>
-    inoremap <silent><F12> <C-O>:wa \|!make -p %:p<CR>
-    vnoremap <silent><F12> :wa \|!make -p %:p<CR>
-endif
-
-" SudaWrite with W
-command W SudaWrite
-
-" Escape on F1
-map <F1> <Esc>
-imap <F1> <Esc>
-" vim airline config
-set laststatus=2
-let g:airline_powerline_fonts = 1
-let g:airline#extensions#branch#format = 1
-let g:airline_theme='dark'
-set t_Co=256
-set textwidth=0
-" Set textwidth for latex
-" autocmd FileType tex set textwidth=79
-" }}}
-
-" COLOR #############################################################{{{
-set background=dark
-syntax enable
-try
-    colorscheme peach
-catch
-endtry
-highlight BadWhitespace ctermbg=red guibg=red
-match BadWhitespace / \| \+\t/
-" }}}
-
-" SEARCHING #########################################################{{{
-set title
-set showmatch
-set hlsearch
-set noincsearch
-" }}}
-
-" NERDTREE ##########################################################{{{
-let NERDTreeIgnore = ['\.pyc$','__pycache__']
-set shell=zsh
-let g:NERDTreeIndicatorMapCustom = {
-    \ "Modified"  : "✹",
-    \ "Staged"    : "✚",
-    \ "Untracked" : "✭",
-    \ "Renamed"   : "➜",
-    \ "Unmerged"  : "═",
-    \ "Deleted"   : "✖",
-    \ "Dirty"     : "✗",
-    \ "Clean"     : "✔︎",
-    \ "Unknown"   : "?"
-    \ }
-let g:WebDevIconsNerdTreeGitPluginForceVAlign = 1
-" }}}
-
-" BACKUPS ###########################################################{{{
-set dir=$HOME/.nvim/swp//
-autocmd BufWritePost * :silent execute ':w! ' ."$HOME/.nvim/backups/" . substitute(escape(substitute(expand('%:p'), "/", "%", "g"), "%"), ' ', '\\ ', 'g')
-
-if exists('+undofile')
-    set undofile
-    set undolevels=1000
-    set undoreload=10000
-    if exists('+undodir')
-        set undodir=$HOME/.nvim/undo
-    endif
-endif
-" }}}
-
-
-" MARKDOWN PREVIEW ##################################################{{{
-let g:markdown_composer_browser = 'firefox'
-let g:instant_markdown_autostart = 0
-" }}}
-
-" COC CONFIG ########################################################{{{
-
-" Use `[g` and `]g` to navigate diagnostics
-" Use `:CocDiagnostics` to get all diagnostics of current buffer in location list.
-nmap <silent> gp <Plug>(coc-diagnostic-prev)
-nmap <silent> gn <Plug>(coc-diagnostic-next)
-
-" GoTo code navigation.
-nmap <silent> gd <Plug>(coc-definition)
-nmap <silent> gy <Plug>(coc-type-definition)
-nmap <silent> gi <Plug>(coc-implementation)
-nmap <silent> gr <Plug>(coc-references)
-
-" Add `:Format` command to format current buffer.
-command! -nargs=0 Format :call CocAction('format')
-
-" Use K to show documentation in preview window.
-nnoremap <silent> K :call <SID>show_documentation()<CR>
-
-
-function! s:show_documentation()
-  if (index(['vim','help'], &filetype) >= 0)
-    execute 'h '.expand('<cword>')
-  elseif (coc#rpc#ready())
-    call CocActionAsync('doHover')
-  else
-    execute '!' . &keywordprg . " " . expand('<cword>')
-  endif
-endfunction
-
-" Having longer updatetime (default is 4000 ms = 4 s) leads to noticeable
-" delays and poor user experience.
-set updatetime=300
-
-" Highlight the symbol and its references when holding the cursor.
-autocmd CursorHold * silent call CocActionAsync('highlight')
-
-" Symbol renaming.
-nmap <leader>rn <Plug>(coc-rename)
-
-" Formatting selected code.
-xmap <leader>f  <Plug>(coc-format-selected)
-nmap <leader>f  <Plug>(coc-format-selected)
-
-" Autoclose preview
-autocmd CursorMovedI * if pumvisible() == 0|pclose|endif
-autocmd InsertLeave * if pumvisible() == 0|pclose|endif
-
-" Complete on tab
-" inoremap <expr><TAB>  pumvisible() ? "\<C-n>" : "\<TAB>"
-function! s:check_back_space() abort
-  let col = col('.') - 1
-  return !col || getline('.')[col - 1]  =~ '\s'
-endfunction
-
-" Insert <tab> when previous text is space, refresh completion if not.
-inoremap <silent><expr> <TAB>
-  \ coc#pum#visible() ? coc#pum#next(1):
-  \ <SID>check_back_space() ? "\<Tab>" :
-  \ coc#refresh()
-inoremap <expr><S-TAB> coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"
-" }}}
-
-" CUSTOM THINGS DEPENDING ON ENV ####################################{{{
-let g:rustfmt_autosave = 1
-
-" Apprently some people don't use vim
-" set autoread | au CursorHold * checktime | call feedkeys("lh")

nvim/init.lua

@@ -0,0 +1,234 @@
+local Plug = vim.fn['plug#']
+
+-- PLUGINS
+vim.call('plug#begin')
+
+-- General plugins
+Plug('vim-airline/vim-airline')
+Plug('vim-airline/vim-airline-themes')
+Plug('tpope/vim-abolish')
+Plug('lambdalisue/suda.vim')
+Plug('https://gitea.tforgione.fr/tforgione/peach.git')
+
+-- Language specific plugins
+Plug('rust-lang/rust.vim')
+Plug('ElmCast/elm-vim')
+Plug('cespare/vim-toml')
+Plug('kaarmu/typst.vim')
+
+vim.call('plug#end')
+
+-- INDENTATION
+vim.opt.expandtab = true
+vim.opt.tabstop = 4
+vim.opt.shiftwidth = 4
+vim.opt.autoindent = true
+vim.opt.textwidth = 120
+
+-- UI
+vim.opt.number = true
+vim.opt.showcmd = true
+vim.opt.wildmenu = true
+vim.opt.lazyredraw = true
+vim.opt.encoding = 'utf8'
+vim.opt.clipboard = 'unnamedplus'
+vim.opt.updatecount = 50
+vim.opt.mouse = 'a'
+vim.opt.guicursor = nil
+vim.opt.updatetime = 300
+
+vim.opt.list = true
+vim.opt.listchars = { trail = '·', tab = '  ', nbsp = '¬' }
+
+-- Auto remove trailing spaces
+vim.api.nvim_create_autocmd({'BufWritePre'}, {
+  pattern = {'*'},
+  callback = function(ev)
+      vim.cmd('%s/\\s\\+$//e')
+  end
+})
+
+-- COLOR --
+pcall(vim.cmd.colorscheme, 'peach')
+vim.cmd.highlight({'BadWhitespace', 'ctermbg=red', 'guibg=red'})
+vim.g.airline_powerline_fonts = 1
+vim.g.airline_theme = 'dark'
+
+-- SEARCHING
+vim.opt.title = true
+vim.opt.showmatch = true
+vim.opt.hlsearch = true
+vim.opt.incsearch = true
+
+-- BACKUPS
+vim.opt.undofile = true
+vim.opt.undolevels = 1000
+vim.opt.undoreload = 10000
+vim.opt.undodir = os.getenv('HOME') .. '/.nvim/undo'
+
+vim.g.backup_dir = os.getenv('HOME') .. '/.nvim/backups'
+
+vim.api.nvim_create_autocmd({'BufWritePost'}, {
+    pattern = {'*'},
+    callback = function(ev)
+        local backup_path = vim.g.backup_dir .. '/' .. vim.api.nvim_buf_get_name(0):gsub('/', '\\%%')
+        vim.cmd('silent w! ' .. backup_path)
+    end
+})
+
+-- LSPs
+-- Config
+vim.opt.completeopt = { 'menuone', 'noselect' }
+vim.opt.signcolumn = 'yes'
+
+vim.diagnostic.config {
+    signs = {
+        text = {
+            [vim.diagnostic.severity.ERROR] = '',
+            [vim.diagnostic.severity.WARN] = '',
+            [vim.diagnostic.severity.HINT] = '',
+            [vim.diagnostic.severity.INFO] = '',
+        },
+        color = {},
+    },
+    float = {
+      header = false,
+      border = 'rounded',
+  }
+}
+
+
+-- Show diagnostics on hover
+vim.api.nvim_create_autocmd({'CursorHold'}, {
+    pattern = {'*'},
+    callback = function(ev)
+        vim.diagnostic.open_float()
+    end
+})
+
+
+-- Shortcuts for mapping shortcuts
+local map = function(type, key, value)
+    vim.api.nvim_buf_set_keymap(0, type, key, value, { noremap = true, silent = true });
+end
+
+-- Compile on F12
+vim.keymap.set('n', '<F12>', function(e)
+    vim.cmd('wa')
+    vim.cmd('!mars -p %:p')
+end, { silent = true, expr = true })
+
+vim.keymap.set('i', '<F12>', function(e)
+    vim.cmd('wa')
+    vim.cmd('!mars -p %:p')
+end, { silent = true, expr = true })
+
+vim.keymap.set('i', '<F12>', function(e)
+    vim.cmd('wa')
+    vim.cmd('!mars -p %:p')
+end, { silent = true, expr = true })
+
+-- Autocomplete with tab
+vim.keymap.set('v', '<Tab>', function()
+    if vim.fn.pumvisible() == 1 then
+        return '<C-n>'
+    else
+        return '<Tab>'
+    end
+end, { silent = true, expr = true })
+
+-- Disable focus on infos
+vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
+  vim.lsp.handlers.hover, { focusable = false }
+)
+
+vim.api.nvim_create_autocmd("LspAttach", {
+    callback = function(args)
+        local client = vim.lsp.get_client_by_id(args.data.client_id)
+
+        -- Enable auto-completion. Note: Use CTRL-Y to select an item.
+        if client:supports_method('textDocument/completion') then
+
+            -- Trigger autocompletion on EVERY keypress. May be slow!
+            local chars = {}; for i = 32, 126 do table.insert(chars, string.char(i)) end
+            client.server_capabilities.completionProvider.triggerCharacters = chars
+
+            vim.lsp.completion.enable(true, client.id, args.buf, {
+                autotrigger = true,
+                convert = function(item)
+                    return { abbr = item.label:gsub('%b()', '') }
+                end,
+            })
+        end
+
+        -- Auto-format on save.
+        if not client:supports_method('textDocument/willSaveWaitUntil') and client:supports_method('textDocument/formatting') then
+            vim.api.nvim_create_autocmd('BufWritePre', {
+                group = vim.api.nvim_create_augroup('my.lsp', {clear=false}),
+                buffer = args.buf,
+                callback = function()
+                    vim.lsp.buf.format({ bufnr = args.buf, id = client.id, timeout_ms = 1000 })
+                end,
+            })
+        end
+
+        -- Don't use lsp to manage colorscheme
+        client.server_capabilities.semanticTokensProvider = nil
+
+        -- Some nice shortcuts
+        map('n','gD','<cmd>lua vim.lsp.buf.declaration()<CR>')
+        map('n','gd','<cmd>lua vim.lsp.buf.definition()<CR>')
+        map('n','K','<cmd>lua vim.lsp.buf.hover()<CR>')
+        map('n','gr','<cmd>lua vim.lsp.buf.references()<CR>')
+        map('n','gs','<cmd>lua vim.lsp.buf.signature_help()<CR>')
+        map('n','gi','<cmd>lua vim.lsp.buf.implementation()<CR>')
+        map('n','gt','<cmd>lua vim.lsp.buf.type_definition()<CR>')
+        map('n','<leader>gw','<cmd>lua vim.lsp.buf.document_symbol()<CR>')
+        map('n','<leader>gW','<cmd>lua vim.lsp.buf.workspace_symbol()<CR>')
+        map('n','<leader>ah','<cmd>lua vim.lsp.buf.hover()<CR>')
+        map('n','<leader>af','<cmd>lua vim.lsp.buf.code_action()<CR>')
+        map('n','<leader>ee','<cmd>lua vim.lsp.util.show_line_diagnostics()<CR>')
+        map('n','<leader>rn','<cmd>lua vim.lsp.buf.rename()<CR>')
+        map('n','<leader>=', '<cmd>lua vim.lsp.buf.formatting()<CR>')
+        map('n','<leader>ai','<cmd>lua vim.lsp.buf.incoming_calls()<CR>')
+        map('n','<leader>ao','<cmd>lua vim.lsp.buf.outgoing_calls()<CR>')
+    end,
+});
+
+-- Rust
+vim.lsp.config['rust'] = {
+    cmd = { 'rustup', 'run', 'stable', 'rust-analyzer' },
+    filetypes = { 'rust' },
+    root_markers = { 'Cargo.toml' },
+}
+
+vim.lsp.enable('rust')
+
+-- Elm
+vim.lsp.config['elm'] = {
+    cmd = { 'elm-language-server' },
+    filetypes = { 'elm' },
+    root_markers = { 'elm.json' },
+}
+
+vim.lsp.enable('elm')
+
+-- Python
+vim.lsp.config['python'] = {
+    cmd = { 'pylsp' },
+    filetypes = { 'python' },
+}
+
+vim.lsp.enable('python')
+
+-- Java
+vim.lsp.config['java'] = {
+    cmd = { 'jdtls', '--jvm-arg=-javaagent:/usr/share/java/lombok/lombok.jar' },
+    filetypes = { 'java' },
+    root_markers = { 'Makefile' },
+}
+
+vim.lsp.enable('java')
+
+-- Import custom config
+require("extraconfig")

pycodestyle

@@ -0,0 +1,2 @@
+[pycodestyle]
+max-line-length = 160

zsh/aliases.zsh

@@ -72,6 +72,9 @@ cdw() {
     fi
 }
 
+# Numbat shortcut
+alias nb=numbat
+
 # Initialize thefuck
 command -v thefuck > /dev/null 2>&1
 

zsh/exports.zsh

@@ -32,5 +32,8 @@ if [ -d $HOME/.venv ]; then
     export VIRTUAL_ENV=$HOME/.venv
 fi
 
+# Use port 8000 by default for flask, cause why would we use anything different?
+export FLASK_RUN_PORT=8000
+
 export TERM=xterm-256color
 export REPORTTIME=5

zsh/ohmyzsh/themes/laptop.zsh-theme

@@ -1,103 +0,0 @@
-# ZSH Theme - Preview: http://dl.dropbox.com/u/4109351/pics/gnzh-zsh-theme.png
-# Based on bira theme
-
-# load some modules
-autoload -U colors zsh/terminfo # Used in the colour alias below
-colors
-setopt prompt_subst
-
-# make some aliases for the colours: (coud use normal escap.seq's too)
-for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
-    eval PR_$color='%{$fg[${(L)color}]%}'
-done
-eval PR_NO_COLOR="%{$terminfo[sgr0]%}"
-eval PR_BOLD="%{$terminfo[bold]%}"
-
-# Check the UID
-if [[ $UID -ge 1000 ]]; then # normal user
-    # If ssh
-    if [[ -n "$SSH_CLIENT"  ||  -n "$SSH2_CLIENT" ]]; then
-        eval PR_USER='${PR_GREEN}%n${PR_NO_COLOR}'
-        eval PR_USER_OP='${PR_GREEN}%#${PR_NO_COLOR}'
-        local PR_ARROW_UP='${PR_GREEN}┌── ${PR_NO_COLOR}'
-        local PR_ARROW_DOWN='${PR_GREEN}└${PR_NO_COLOR}'
-        local PR_PROMPT='$PR_GREEN▷$PR_NO_COLOR'
-    else
-        eval PR_USER='${PR_MAGENTA}%n${PR_NO_COLOR}'
-        eval PR_USER_OP='${PR_BLUE}%#${PR_NO_COLOR}'
-        local PR_PROMPT='$PR_MAGENTA▷$PR_NO_COLOR'
-        local PR_ARROW_UP='$PR_MAGENTA┌── ${PR_NO_COLOR}'
-        local PR_ARROW_DOWN='$PR_MAGENTA└${PR_NO_COLOR}'
-    fi
-elif [[ $UID -eq 0 ]]; then # root
-    eval PR_USER='${PR_RED}%n${PR_NO_COLOR}'
-    eval PR_USER_OP='${PR_RED}%#${PR_NO_COLOR}'
-    local PR_ARROW_UP='${PR_RED}┌── ${PR_NO_COLOR}'
-    local PR_ARROW_DOWN='${PR_RED}└${PR_NO_COLOR}'
-    local PR_PROMPT='$PR_RED▷$PR_NO_COLOR'
-fi
-
-# Check if we are on SSH or not
-if [[ -n "$SSH_CLIENT"  ||  -n "$SSH2_CLIENT" ]]; then
-    eval PR_HOST='${PR_GREEN}%M${PR_NO_COLOR}' #SSH
-else
-    eval PR_HOST='${PR_BLUE}%M${PR_NO_COLOR}' # no SSH
-fi
-
-# local return_code="%(?..%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
-truncated_pwd() {
-    local max_allowed_size=$(( `tput cols` - 30 ))
-    local path_name=$(print -rD $PWD)
-    local new_path_name=""
-    local truncated=0
-    while [ ${#path_name} -gt $max_allowed_size ]; do
-        truncated=1
-        new_path_name=`echo $path_name | cut -d '/' -f 2-`
-        if [[ "$new_path_name" == "$path_name" ]]; then
-            break
-        fi
-        path_name=$new_path_name
-    done
-    if [ $truncated -eq 1 ]; then
-        echo "~/.../"$path_name
-    else
-        echo $path_name
-    fi
-}
-
-local user_host='$PR_BOLD${PR_USER}$PR_BOLD'
-local current_dir='$PR_BOLD%{$PR_BLUE%}$(truncated_pwd)$PR_NO_COLOR%}'
-local rvm_ruby=''
-if which rvm-prompt &> /dev/null; then
-    rvm_ruby='%{$PR_RED%}‹$(rvm-prompt i v g s)›%{$PR_NO_COLOR%}'
-else
-    if which rbenv &> /dev/null; then
-        rvm_ruby='%{$PR_RED%}‹$(rbenv version | sed -e "s/ (set.*$//")›%{$PR_NO_COLOR%}'
-    fi
-fi
-
-local return_code=""
-local git_branch='$(git_prompt_info)'
-
-local PR_DATE='${PR_BOLD}${PR_MAGENTA}[%D{%H:%M}]${PR_NO_COLOR}'
-
-#PROMPT="${user_host} ${current_dir} ${rvm_ruby}${git_branch}$PR_PROMPT  "
-separator='${PR_YELLOW}::${PR_NO_COLOR}'
-tty | read tty_value
-if [[ $tty_value == *pts* ]]; then # if in a tty
-    PROMPT="$PR_ARROW_UP${PR_DATE} ${user_host}${separator}${PR_NO_COLOR}${current_dir} ${rvm_ruby}${git_branch}
-$PR_ARROW_DOWN$PR_PROMPT  ${PR_NO_COLOR}"
-    return_code="%(?.%{$PR_GREEN%}%? ↵%{$PR_NO_COLOR%}.%{$PR_RED%}%? ↵%{$PR_NO_COLOR%})"
-else
-    eval PR_NO_COLOR="$PR_WHITE"
-    PROMPT="${user_host} ${current_dir} ${rvm_ruby} ${git_branch}> ${PR_NO_COLOR}"
-    return_code="%(?.%{$PR_GREEN%}%? <%{$PR_NO_COLOR%}.%{$PR_RED%}%? <%{$PR_NO_COLOR%})"
-fi
-RPS1="  ${return_code}"
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$PR_YELLOW%}‹"
-ZSH_THEME_GIT_PROMPT_SUFFIX="›%{$PR_NO_COLOR%}"
-
-TMOUT=30
-TRAPALRM() {
-    zle reset-prompt
-}

zsh/ohmyzsh/themes/tforgione.zsh-theme

@@ -77,6 +77,16 @@ else
 fi
 
 git_prompt_info_no_space() {
+    current="$PWD"
+    while [ "$PWD" != "/" ] && [ ! -d "$PWD/.git" ]; do
+        builtin cd ..
+    done
+
+    if [ -f "$PWD/.gitskipprompt" ]; then
+        return
+    fi
+
+    builtin cd "$current"
     local info=$(git_prompt_info)
     if [ ! -z $info ]; then
         echo " $info"

zsh/preserve-cwd-ssh.zsh

@@ -0,0 +1,84 @@
+if [ "$PRESERVE_SSH_CWD" = "true" ]; then
+
+    # Ensure the directory where we store terminal cwds and ssh exists
+    mkdir -p $HOME/.config/terminalscwd/
+
+    # Alias for cd: when we change directory, we write the new cwd in the file corresponding to the terminal uuid
+    cd() {
+        if [ -z "$1" ]; then
+            directory=$HOME
+        elif [[ "$1" == "-P" ]] && [ -z $2 ]; then
+            directory="$HOME"
+            option="$1"
+        elif [[ "$1" == "-P" ]]; then
+            directory="$2"
+            option="$1"
+        else
+            directory="$1"
+        fi
+
+        if [ -z "$option" ]; then
+            builtin cd "$directory"
+        else
+            builtin cd "$option" "$directory"
+        fi
+        pwd > $HOME/.config/terminalscwd/$TERMINAL_UUID.cwd
+    }
+
+    # Alias for ssh: when we ssh somewhere, we write it so that we know we should ssh when cloning terminal
+    ssh() {
+        echo $1 > $HOME/.config/terminalscwd/$TERMINAL_UUID.ssh
+        /usr/bin/ssh $@
+        rm $HOME/.config/terminalscwd/$TERMINAL_UUID.ssh
+        pwd > $HOME/.config/terminalscwd/$TERMINAL_UUID.cwd
+    }
+
+    # If terminal uuid does not exit
+    if [ -z $TERMINAL_UUID ]; then
+
+        # Generate one
+        export TERMINAL_UUID=$(uuidgen)
+    fi
+
+    # Copy state for new terminal
+    if [ ! -z $PARENT_TERMINAL ]; then
+        if [ -f $HOME/.config/terminalscwd/$PARENT_TERMINAL.cwd ]; then
+            cp $HOME/.config/terminalscwd/$PARENT_TERMINAL.cwd $HOME/.config/terminalscwd/$TERMINAL_UUID.cwd
+        fi
+
+        if [ -f $HOME/.config/terminalscwd/$PARENT_TERMINAL.ssh ]; then
+            cp $HOME/.config/terminalscwd/$PARENT_TERMINAL.ssh $HOME/.config/terminalscwd/$TERMINAL_UUID.ssh
+        fi
+    fi
+
+    # When we're done, delete the uuid files
+    preserve_ssh_cleanup() {
+        rm -rf $HOME/.config/terminalscwd/$TERMINAL_UUID.cwd
+        rm -rf $HOME/.config/terminalscwd/$TERMINAL_UUID.ssh
+    }
+
+    trap preserve_ssh_cleanup EXIT
+
+    # If there already is a file corresponding to the current uuid
+    if [ -f  $HOME/.config/terminalscwd/$TERMINAL_UUID.cwd ]; then
+
+        # Go the the right directory
+        cd "$(cat $HOME/.config/terminalscwd/$TERMINAL_UUID.cwd)"
+
+    else
+
+        # Use our custom alias to go to home, and set the file cwd
+        cd
+
+    fi
+
+    # If we're running in an ssh session
+    if [ -f $HOME/.config/terminalscwd/$TERMINAL_UUID.ssh ]; then
+
+        # Run the ssh command, and exec shell in the end so the terminal doesn't exit at end of ssh
+        ssh $(cat $HOME/.config/terminalscwd/$TERMINAL_UUID.ssh)
+
+    fi
+
+
+fi

zshrc

@@ -21,7 +21,7 @@ DISABLE_AUTO_UPDATE="true"
 ZSH=$HOME/.config/ohmyzsh
 ZSH_CUSTOM=$HOME/.config/dotfiles/zsh/ohmyzsh
 
-ZSH_THEME="laptop"
+ZSH_THEME="tforgione"
 
 if [ -f $DOTFILES/zsh/env.zsh ]; then
     source $DOTFILES/zsh/env.zsh
@@ -31,6 +31,7 @@ source $DOTFILES/zsh/config.zsh
 source $DOTFILES/zsh/path.zsh
 source $DOTFILES/zsh/exports.zsh
 source $DOTFILES/zsh/aliases.zsh
+source $DOTFILES/zsh/preserve-cwd-ssh.zsh
 
 if [ -f $DOTFILES/zsh/extraconfig.zsh ]; then
     source $DOTFILES/zsh/extraconfig.zsh