Update global gitconfig settings

git/.gitconfig

@@ -0,0 +1,27 @@
+# This is Git's per-user configuration file.
+[user]
+	email = steven.proctor@gmail.com
+	name = Proctor
+
+[core]
+	editor = nvim
+	excludesFile = ~/.gitignore.global
+[init]
+	defaultBranch = main
+
+[alias] ; Command aliases for the git[1] command wrapper
+	last = cat-file commit HEAD
+[branch]
+  autoSetupRebase = always
+[merge]
+  ff = only
+[push]
+  autoSetupRemote = true
+[rerere]
+	enabled = true
+[remote]
+	pushDefault = origin
+
+;; This is last, take in any other local file overrides
+[include]
+	path = ~/.gitconfig.local ; find ".gitconfig.local" in your `$HOME` directory

nvim/.config/nvim/fnl/dotfiles/conceal.fnl

@@ -21,6 +21,8 @@
                :false :⊥
 ;; and
 ;; or
+;; if-not
+;; when-not
 ;; (not
 ;; None        | ∅
 ;; true, false | ⊤, ⊥ (top and bottom from logic)
@@ -46,16 +48,18 @@
     (set nvim.wo.conceallevel 2)
     (set nvim.wo.conceallevel 0)))
 
+;(setup-conceals)
+;(toggle-conceal)
 ;(if true true false)
 
 
 (nu.fn-bridge :ToggleConceal :dotfiles.conceal :toggle-conceal {:return false})
 (nu.fn-bridge :SetupConceals :dotfiles.conceal :setup-conceals {:return false})
-(u.nnoremap :<leader>ct "call ToggleConceal()")
+(u.nnoremap :<leader>tc "call ToggleConceal()")
 
 (def pretty-filetypes [:fennel
                        :clojure])
 
-; (each [_ ftype (pairs pretty-filetypes)]
+(each [_ ftype (pairs pretty-filetypes)]
-;   (nvim.ex.autocmd :FileType ftype :call "SetupConceals()"))
+  (nvim.ex.autocmd :FileType ftype :call "SetupConceals()"))
-; 
+

nvim/.config/nvim/fnl/dotfiles/core.fnl

@@ -19,8 +19,7 @@
     (if (not (a.empty? glob))
       (nvim.ex.source filename))))
 
-(a.map safe-source ["~/.vimrc" "~/.vimrc.local"])
+; (a.map safe-source ["~/.vimrc" "~/.vimrc.local"])
-
 
 (def- backup-dir (.. (nvim.fn.glob "$HOME") "/.vim/backup"))
 (def- undo-dir (.. (nvim.fn.glob "$HOME") "/.vim/backup"))
@@ -51,36 +50,37 @@
 
 (def- val-based-opts
   {
-    ; :t_Co 256
+   ; :t_Co 256
-    :laststatus 2
+   :laststatus 2
-    :encoding "utf-8"
+   :encoding "utf-8"
-    :history 500
+   :history 500
-    :redrawtime 5000
+   :redrawtime 5000
-    :scrolloff 3
+   :scrolloff 3
-    :guifont "Hasklig"
+   :guifont "Hasklig"
-    :background "dark"
+   :background "dark"
-    :backupdir backup-dir
+   :backupdir backup-dir
-    :directory backup-dir      ;Don't clutter my dirs up with swp and tmp files
+   :directory backup-dir      ;Don't clutter my dirs up with swp and tmp files
-    :grepprg "ag" ; Use Silver Searcher instead of grep
+   :grepprg "ag --vimgrep" ; Use Silver Searcher instead of grep
-    :tags "tags"
+   :tags "tags"
-    :updatetime 300 ; per coc.vim for diagnostic messages
+   :updatetime 300 ; per coc.vim for diagnostic messages
-    :signcolumn "auto:1-3"
+   :signcolumn "auto:1-3"
-    :cmdheight 2 ; Better display for messages
+   :colorcolumn [80 100]
-    :undodir undo-dir
+   :cmdheight 2 ; Better display for messages
-    :undolevels 1000
+   :undodir undo-dir
-    :undoreload 10000
+   :undolevels 1000
-    :foldmethod "expr"
+   :undoreload 10000
-    :foldexpr "nvim_treesitter#foldexpr()"
+   :foldmethod "expr"
-    :foldlevelstart 100
+   :foldexpr "nvim_treesitter#foldexpr()"
-    :foldlevel 99
+   :foldlevelstart 100
-    :tabstop 2
+   :foldlevel 99
-    :shiftwidth 2
+   :tabstop 2
-    :softtabstop 2
+   :shiftwidth 2
-    :list true
+   :softtabstop 2
-    :listchars "tab:➥\\ ,trail:·"
+   :list true
-    :backspace "indent,eol,start"    ;allow backspacing over everything in insert mode
+   :listchars "tab:➥\\ ,trail:·,"
-    :wildmode "list:longest,list:full"
+   :backspace "indent,eol,start"    ;allow backspacing over everything in insert mode
-    :wrap false
+   :wildmode "list:longest,list:full"
+   :wrap false
    })
 
 (defn- set-opt
@@ -100,7 +100,7 @@
 
 
 
-(nvim.ex.autocmd "vimenter" "*" "++nested" "colorscheme" "solarized8")
+;(nvim.ex.autocmd "vimenter" "*" "++nested" "colorscheme" "solarized8")
 ;(nvim.ex.autocmd "vimenter" "*"  "luafile" "treesitter.lua")
 ;
 ; (nvim.fn.glob "~/.vimrc.local")

nvim/.config/nvim/fnl/dotfiles/init.fnl

@@ -5,11 +5,12 @@
    {nvim aniseed.nvim}})
 
 
-(require :dotfiles.plugins)
 (require :dotfiles.core)
+(require :dotfiles.plugins)
 (require :dotfiles.mapping)
 (require :dotfiles.conceal)
 (require :dotfiles.zoom-toggle)
 
 ;(nvim.ex.source "~/.vimrc")
 
+(a.println "(re)loaded")

nvim/.config/nvim/fnl/dotfiles/mapping.fnl

@@ -1,7 +1,9 @@
 (module dotfiles.mapping
   {autoload {nvim aniseed.nvim
              nu aniseed.nvim.util
-             core aniseed.core}})
+             core aniseed.core
+             util dotfiles.util
+             }})
 
 (defn- noremap [mode from to]
   "Sets a mapping with {:noremap true}."

nvim/.config/nvim/fnl/dotfiles/plugin/cmp.fnl

@@ -13,9 +13,12 @@
 
 (def- cmp-srcs
   [{:name :nvim_lsp}
+   {:name :nvim_lua}
    {:name :vsnip}
    {:name :conjure}
-   {:name :buffer}])
+   {:name :buffer}
+   {:name :orgmode}
+   {:name :emoji}])
 
 ;; Setup cmp with desired settings
 (let [cmp (require :cmp)]

nvim/.config/nvim/fnl/dotfiles/plugin/colorizer.fnl

@@ -1,13 +1,13 @@
 (module dotfiles.plugin.colorizer
   {autoload {colorizer colorizer}})
 
-(colorizer.setup {"*" {}}
+(colorizer.setup [:*]
-                 {:RGB      true ; #RGB hex codes, like #F00
+                  {:RGB      true ; #RGB hex codes, like #F00
-                  :RRGGBB   true ; #RRGGBB hex codes, like #00FF00
+                   :RRGGBB   true ; #RRGGBB hex codes, like #00FF00
-                  :names    true ; "Name" codes like Blue
+                   :names    true ; "Name" codes like Blue
-                  :RRGGBBAA true ; #RRGGBBAA hex codes
+                   :RRGGBBAA true ; #RRGGBBAA hex codes
-                  :rgb_fn   true ; CSS rgb() and rgba() functions
+                   :rgb_fn   true ; CSS rgb() and rgba() functions
-                  :hsl_fn   true ; CSS hsl() and hsla() functions
+                   :hsl_fn   true ; CSS hsl() and hsla() functions
-                  :css      true ; Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB
+                   :css      true ; Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB
-                  :css_fn   true ; Enable all CSS *functions*: rgb_fn, hsl_fn
+                   :css_fn   true ; Enable all CSS *functions*: rgb_fn, hsl_fn
-                  })
+                   })

nvim/.config/nvim/fnl/dotfiles/plugin/compe.fnl

@@ -25,6 +25,7 @@
                 :nvim_lsp true
                 :nvim_lua true
                 :conjure true
+                :orgmode true
                 :vsnip true
                 :vim_dadbod_completion true}})))
 

nvim/.config/nvim/fnl/dotfiles/plugin/conjure.fnl

@@ -6,6 +6,7 @@
 ; (set nvim.g.conjure#eval#result_register "*")
 ; (set nvim.g.conjure#log#botright true)
 (set nvim.g.conjure#mapping#doc_word "gk")
+(set nvim.g.conjure#client#clojure#nrepl#mapping#session_clone :sC)
 (set nvim.g.conjure#extract#tree_sitter#enabled true)
 
 (conjure-config.assoc-in [:filetypes] (a.concat (conjure-config.filetypes) [:markdown] ))

nvim/.config/nvim/fnl/dotfiles/plugin/fugitive.fnl

@@ -0,0 +1,9 @@
+(module dotfiles.plugin.fugitive
+  {autoload {nvim aniseed.nvim
+             nu aniseed.nvim.util
+             core aniseed.core
+             util dotfiles.util}})
+
+(nvim.ex.autocmd :FileType :fugitive :nmap :<buffer> :<leader>gp ":Git pull<CR>")
+;; Determine load time of fugitive
+(nvim.ex.autocmd :FileType :fugitive :nmap :<buffer> :<leader>gP ":Git push<CR>" )

nvim/.config/nvim/fnl/dotfiles/plugin/headlines.fnl

@@ -0,0 +1,2 @@
+(module dotfiles.plugin.headlines
+  {autoload {headlines headlines}})

nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl

@@ -3,9 +3,7 @@
    {a aniseed.core
     u dotfiles.util
     nvim aniseed.nvim
-    nu aniseed.nvim.util
+    nu aniseed.nvim.util}})
-    }
-   })
 
 (defn bufmap [mode from to]
   (u.noremap mode from to {:local? true}))
@@ -46,7 +44,8 @@
   :<leader>ca "lua vim.lsp.buf.code_action()"
   :<leader>cl "lua vim.lsp.codelens.run()"
   :<leader>ic "lua vim.lsp.buf.incoming_calls()"
-  :<leader>oc "lua vim.lsp.buf.outgoing_calls()"
+  ;; TODO: think of new mapping; conficts with org mode
+  ;; :<leader>oc "lua vim.lsp.buf.outgoing_calls()"
   :<leader>sld "lua vim.diagnostic.open_float(nil, {source = 'always'})"
   :<leader>rn "lua vim.lsp.buf.rename()"
   :<leader>fa "lua vim.lsp.buf.formatting_sync()"
@@ -64,12 +63,57 @@
   })
 
 
+(def client-command-lnmappings
+  {:clojure_lsp
+   {:ai [:add-import-to-namespace ["input('Namespace name: ')"]]
+    :am [:add-missing-libspec []]
+    :as [:add-require-suggestion ["input('Namespace name: ')" "input('Namespace as: ')" "input('Namespace name: ')"]]
+    :cc [:cycle-coll []]
+    :cn [:clean-ns []]
+    :cp [:cycle-privacy []]
+    :ct [:create-test []]
+    :df [:demote-fn []]
+    :db [:drag-backward []]
+    :df [:drag-forward []]
+    :dk [:destructure-keys []]
+    :ed [:extract-to-def ["input('Definition name: ')"]]
+    :ef [:extract-function ["input('Function name: ')"]]
+    :el [:expand-let []]
+    :fe [:create-function []]
+    :il [:introduce-let ["input('Binding name: ')"]]
+    :is [:inline-symbol []]
+    :ma [:resolve-macro-as []]
+    :mf [:move-form ["input('File name: ')"]]
+    :ml [:move-to-let ["input('Binding name: ')"]]
+    :pf [:promote-fn ["input('Function name: ')"]]
+    :sc [:change-collection ["input('Collection type: ')"]]
+    :sm [:sort-map []]
+    :tf [:thread-first-all []]
+    :tF [:thread-first []]
+    :tl [:thread-last-all []]
+    :tL [:thread-last []]
+    :ua [:unwind-all []]
+    :uw [:unwind-thread []]
+    }
+    })
+
+
 (defn bind-client-mappings [client]
   (let [client-name (a.get client :name)
-        mappings (a.get client-nmappings client-name)]
+        mappings (a.get client-nmappings client-name)
+        command-lnmappings (a.get client-command-lnmappings client-name)]
     (when mappings
       (each [mapping cmd (pairs mappings)]
-        (nbufmap mapping cmd)))))
+        (nbufmap mapping cmd)))
+    (when command-lnmappings
+      (each [lnmapping command-mapping (pairs command-lnmappings)]
+        (let [lsp-cmd (a.first command-mapping)
+              opts-str (accumulate [s ""
+                                    i opt (ipairs (a.second command-mapping))]
+                         (.. s ", " opt))
+              mapping (.. :<leader> lnmapping)
+              cmd (.. "call LspExecuteCommand('" lsp-cmd "'" opts-str ")")]
+          (nbufmap mapping cmd))))))
 
 (defn on_attach [client bufnr]
   (each [mapping cmd (pairs core-nmappings)]
@@ -132,64 +176,3 @@
     (nu.fn-bridge :LspExecuteCommand :dotfiles.plugin.lspconfig :lsp-execute-command {:return false})
 
     (u.nnoremap :<leader>li "LspInfo")))
-
-
-;; (let [eval (require :conjure.eval)
-;;       client (require :conjure.client)
-;;       ts-utils (require :nvim-treesitter.ts_utils)
-;;       parsers (require :nvim-treesitter.parsers)
-;;       ]
-;; 
-;;     ; client["with-filetype"]("fennel", eval["eval-str"], {
-;;     ;   origin = "my-awesome-plugin",
-;;     ;   code = "(+ 10 20)",
-;;     ;   ["passive?"] = true,
-;;     ;   ["on-result"] = function (r)
-;;     ;     print("RESULT:", r)
-;;     ;   end
-;;     ; })
-;; 
-;;     (defn ts-node-descendent-of? [node ancestor-type]
-;;       (print node)
-;;       (if (= nil node)
-;;         false
-;;         (let [node-type (node:type)]
-;;           (print node-type)
-;;           (if (= ancestor-type node-type)
-;;             true
-;;             (ts-node-descendent-of? (node:parent) ancestor-type)))))
-;; 
-;;     (defn in-fenced-code-block? []
-;;       (let [cursor (vim.api.nvim_win_get_cursor 0)
-;;             lnum (a.first cursor)
-;;             col (a.second cursor)
-;;             root_lang_tree (parsers.get_parser)
-;;             range [ lnum - 1 col lnum - 1 col ]
-;;             (node root lang-tree) (ts-utils.get_root_for_position (- lnum 1) col root_lang_tree) ]
-;;         (a.pr "language" (a.get lang-tree :_lang :err))
-;;         )
-;;       (let [node-at-cursor (ts-utils.get_node_at_cursor)]
-;;         (print "node at cursor" node-at-cursor)
-;;         (a.pr "root for node at cursor " (ts-utils.get_root_for_node node-at-cursor))
-;;         (print (ts-node-descendent-of? node-at-cursor :fenced_code_block))))
-;; 
-;;     (defn markdown-code-to-repl []
-;;       ; (let [buf-uri (vim.uri_from_bufnr 0)
-;;       ;       cursor (vim.api.nvim_win_get_cursor 0)
-;;       ;       r (- (a.first cursor) 1)
-;;       ;       c (a.second cursor)
-;;       ;       opts [buf-uri r c]
-;;       ;       args (a.concat opts [...])]
-;;       ;   (vim.lsp.buf.execute_command {:command cmd
-;;       ;                                 :arguments args}))
-;;       )
-;; 
-;;     (nu.fn-bridge :MarkdownCodeToRepl :dotfiles.plugin.lspconfig :markdown-code-to-repl {:return false})
-;; 
-;;     (nu.fn-bridge :IsInFencedCodeBlock :dotfiles.plugin.lspconfig :in-fenced-code-block? {:return false})
-;; 
-;;     ;; If file type is Markdown
-;;     ;(u.nnoremap :<leader>ee "call MarkdownCodeToRepl")
-;;     
-;;   )
-;; 

nvim/.config/nvim/fnl/dotfiles/plugin/orgbullets.fnl

@@ -0,0 +1,3 @@
+(module dotfiles.plugin.orgbullets
+  {autoload {org-bullets org-bullets}})
+

nvim/.config/nvim/fnl/dotfiles/plugin/orgmode.fnl

@@ -0,0 +1,8 @@
+(module dotfiles.plugin.orgmode
+  {autoload {orgmode orgmode}})
+
+(orgmode.setup_ts_grammar)
+
+(orgmode.setup
+  {:org_agenda_files ["~/Dropbox/org/*" "~/my-orgs/**/*"]
+   :org_default_notes_file "~/Dropbox/org/refile.org" })

nvim/.config/nvim/fnl/dotfiles/plugin/treesitter.fnl

@@ -1,9 +1,15 @@
 (module dotfiles.plugin.treesitter
-  {autoload {treesitter nvim-treesitter.configs}})
+  {autoload {treesitter nvim-treesitter
+             ts_utils nvim-treesitter.ts_utils
+             treesitter-configs nvim-treesitter.configs}})
 
-(treesitter.setup
+(treesitter-configs.setup
   {:highlight {:enable true
-               :additional_vim_regex_highlighting false}
+               ;; :additional_vim_regex_highlighting false
+               :additional_vim_regex_highlighting [:org]
+               }
+
+   :ensure_installed :all ; [:org]
 
    :rainbow {:enable true
              :extended_mode true ; Also highlight non-bracket delimiters like html tags, boolean or table: lang -> boolean
@@ -18,5 +24,4 @@
                       :#6c71c4 ; violet / brmagenta
                       ] ; table of hex strings
              }
-   :playground {:enable true}
    })

nvim/.config/nvim/fnl/dotfiles/plugins.fnl

@@ -2,9 +2,7 @@
   {autoload {nvim aniseed.nvim
              a aniseed.core
              ;; util dotfiles.util
-             packer packer
+             packer packer}
-
-             }
    ;; require {minpac minpac}
    })
 
@@ -33,11 +31,15 @@
    :Olical/fennel.vim {} ; Fennel
    :airblade/vim-gitgutter {} ; Git
    :airblade/vim-gitgutter {} ; Git
+   :akinsho/org-bullets.nvim {:mod :orgbullets}
    :clojure-vim/vim-jack-in {} ; Conjure support - jack-in with nrepl dependencies
+   :dhruvasagar/vim-table-mode {} ; table creation and formatting
    :folke/lsp-colors.nvim {}
    :hashivim/vim-terraform {} ; Terraform
    :hrsh7th/nvim-cmp {:requires [:hrsh7th/cmp-buffer
+                                 :hrsh7th/cmp-emoji
                                  :hrsh7th/cmp-nvim-lsp
+                                 :hrsh7th/cmp-nvim-lua
                                  :hrsh7th/cmp-vsnip
                                  :hrsh7th/vim-vsnip-integ
                                  :PaterJason/cmp-conjure]
@@ -50,10 +52,13 @@
    :kovisoft/paredit {}
    :kristijanhusak/vim-dadbod-completion {}
    :kristijanhusak/vim-dadbod-ui {}
+   :lukas-reineke/headlines.nvim {:mod :headlines}
+;   :michaelb/sniprun {:run "bash ./install.sh" :mod :sniprun}
    :neovim/nvim-lspconfig {:mod :lspconfig} ; NeoVim  lsp config
-   :norcalli/nvim-colorizer.lua {:mode :colorizer}
+   :norcalli/nvim-colorizer.lua {:mod :colorizer}
+   :nvim-orgmode/orgmode { :mod :orgmode }
    :nvim-telescope/telescope.nvim {:requires [[:nvim-lua/popup.nvim] [:nvim-lua/plenary.nvim]] :mod :telescope}
-   :nvim-treesitter/nvim-treesitter {:run ":TSUpdate" :mod :treesitter :requires [:nvim-treesitter/playground]}
+   :nvim-treesitter/nvim-treesitter {:run ":TSUpdate" :mod :treesitter}
    :nvim-treesitter/playground {}
    :p00f/nvim-ts-rainbow {}
    :radenling/vim-dispatch-neovim {} ; Clojure
@@ -61,7 +66,7 @@
    :tpope/vim-classpath {}
    :tpope/vim-dadbod {}
    :tpope/vim-dispatch {} ; Conjure support - jack-in with nrepl dependencies
-   :tpope/vim-fugitive {} ; Git
+   :tpope/vim-fugitive {:mod :fugitive} ; Git
    :tpope/vim-git {} ; Git Commit Message
    :tpope/vim-pathogen {}
    :tpope/vim-rails {}

tmux.conf

@@ -34,7 +34,7 @@ setw -g mouse off
 # set -g default-terminal "xterm-256:color"
 # set -g default-terminal "${TERM}"
 set -s default-terminal "tmux-256color"
-set -g history-limit 6000
+set -g history-limit 15000
 
 set -g window-status-style dim
 set -g window-status-current-style bright
@@ -46,8 +46,9 @@ set -g status-right '#(~/dotfiles/bin/tmux_battery_charge_indicator.sh) #[bg=whi
 set -g update-environment "DISPLAY SSH_ASKPASS SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY"
 set-environment -g 'SSH_AUTH_SOCK' ~/.ssh/ssh_auth_sock
 
-# set -as terminal-overrides ',xterm-257color:RGB'
+# set -as terminal-overrides ',xterm-256color:RGB'
 set -as terminal-features ',xterm-256color:RGB'
+set-option -sa terminal-overrides ',xterm-256color:RGB'
 
 # Undercurl
 set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm'  # undercurl support