Merge branch 'master' of git.dustinswan.com:dustinswan/dotfiles

README.md

@@ -4,7 +4,7 @@ I'm going all in on [Nix](https://nixos.org/) & [home-manager](https://github.co
 
 - **home-cli**: terminal-only
 - **home-gui**: cross-platform gui
-- **home-mail**: eamil, contacts & calendar
+- **home-mail**: email, contacts & calendar
 - **home-mac**: Mac-only
 - **home-linux**: Linux-only
 

bin/clean

@@ -7,3 +7,7 @@ fi
 if command -v nix &> /dev/null; then
   nix-collect-garbage -d
 fi
+
+if command -v doom &> /dev/null; then
+  doom purge
+fi

bin/update

@@ -3,7 +3,7 @@
 if command -v brew &> /dev/null; then
   brew update
   brew upgrade
-  brew cask upgrade
+  brew upgrade --cask
 fi
 
 if command -v nix &> /dev/null; then
@@ -11,3 +11,9 @@ if command -v nix &> /dev/null; then
   nix-env -u
   home-manager switch
 fi
+
+if command -v doom &> /dev/null; then
+  doom sync
+  doom upgrade -y
+  doom env
+fi

doom/config.el

@@ -52,3 +52,9 @@
 ;;
 ;; You can also try 'gd' (or 'C-c g d') to jump to their definition and see how
 ;; they are implemented.
+
+(defun doom/ediff-init-and-example ()
+  "ediff the current `init.el' with the example in doom-emacs-dir"
+  (interactive)
+  (ediff-files (concat doom-private-dir "init.el")
+               (concat doom-emacs-dir "init.example.el")))

doom/init.el

@@ -4,19 +4,20 @@
 ;; in. Remember to run 'doom sync' after modifying it!
 
 ;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's
-;;      documentation. There you'll find information about all of Doom's
+;;      documentation. There you'll find a "Module Index" link where you'll find
-;;      modules and what flags they support.
+;;      a comprehensive list of Doom's modules and what flags they support.
 
 ;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or
-;;      'C-c g k' for non-vim users) to view its documentation. This works on
+;;      'C-c c k' for non-vim users) to view its documentation. This works on
 ;;      flags as well (those symbols that start with a plus).
 ;;
-;;      Alternatively, press 'gd' (or 'C-c g d') on a module to browse its
+;;      Alternatively, press 'gd' (or 'C-c c d') on a module to browse its
 ;;      directory (for easy access to its source code).
 
 (doom! :input
        ;;chinese
        japanese
+       ;;layout            ; auie,ctsrnm is the superior home row
 
        :completion
        company           ; the ultimate code completion backend
@@ -28,20 +29,22 @@
        ;;deft              ; notational velocity for Emacs
        doom              ; what makes DOOM look the way it does
        doom-dashboard    ; a nifty splash screen for Emacs
-       ;;doom-quit         ; DOOM quit-message prompts when you quit Emacs
+       doom-quit         ; DOOM quit-message prompts when you quit Emacs
+       (emoji +unicode)  ; 🙂
        ;;fill-column       ; a `fill-column' indicator
        hl-todo           ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW
        ;;hydra
        indent-guides     ; highlighted indent columns
+       ligatures         ; ligatures and symbols to make your code pretty again
+       minimap           ; show a map of the code on the side
        modeline          ; snazzy, Atom-inspired modeline, plus API
        ;;nav-flash         ; blink cursor line after big motions
-       ;;neotree           ; a project drawer, like NERDTree for vim
+       neotree           ; a project drawer, like NERDTree for vim
        ophints           ; highlight the region an operation acts on
        (popup +defaults)   ; tame sudden yet inevitable temporary windows
-       pretty-code       ; ligatures or substitute text with pretty symbols
+       tabs              ; a tab bar for Emacs
-       ;;tabs              ; an tab bar for Emacs
        treemacs          ; a project drawer, like neotree but cooler
-       ;;unicode           ; extended unicode support for various languages
+       unicode           ; extended unicode support for various languages
        vc-gutter         ; vcs diff in the fringe
        vi-tilde-fringe   ; fringe tildes to mark beyond EOB
        window-select     ; visually switch windows
@@ -60,7 +63,7 @@
        ;;parinfer          ; turn lisp into python, sort of
        ;;rotate-text       ; cycle region at point between text candidates
        snippets          ; my elves. They type so I don't have to
-       ;;word-wrap         ; soft wrapping with language-aware indent
+       word-wrap         ; soft wrapping with language-aware indent
 
        :emacs
        dired             ; making dired pretty [functional]
@@ -70,10 +73,10 @@
        vc                ; version-control and Emacs, sitting in a tree
 
        :term
-       ;;eshell            ; the elisp shell that works everywhere
+       eshell            ; the elisp shell that works everywhere
        ;;shell             ; simple shell REPL for Emacs
        ;;term              ; basic terminal emulator for Emacs
-       ;;vterm             ; the best terminal emulation in Emacs
+       vterm             ; the best terminal emulation in Emacs
 
        :checkers
        syntax              ; tasing you for every semicolon you forget
@@ -85,17 +88,16 @@
        ;;debugger          ; FIXME stepping through code, to help you add bugs
        ;;direnv
        ;;docker
-       ;;editorconfig      ; let someone else argue about tabs vs spaces
+       editorconfig      ; let someone else argue about tabs vs spaces
        ;;ein               ; tame Jupyter notebooks with emacs
        (eval +overlay)     ; run code, run (also, repls)
        ;;gist              ; interacting with github gists
        lookup              ; navigate your code and its documentation
        lsp
-       ;;macos             ; MacOS-specific commands
        magit             ; a git porcelain for Emacs
        ;;make              ; run make tasks from Emacs
        ;;pass              ; password manager for nerds
-       ;;pdf               ; pdf enhancements
+       pdf               ; pdf enhancements
        ;;prodigy           ; FIXME managing external services & code builders
        ;;rgb               ; creating color strings
        ;;taskrunner        ; taskrunner for all your projects
@@ -103,6 +105,10 @@
        ;;tmux              ; an API for interacting with tmux
        ;;upload            ; map local to remote projects via ssh/ftp
 
+       :os
+       (:if IS-MAC macos)  ; improve compatibility with macOS
+       ;;tty               ; improve the terminal Emacs experience
+
        :lang
        ;;agda              ; types of types of types of types...
        ;;cc                ; C/C++/Obj-C madness
@@ -119,12 +125,13 @@
        ;;erlang            ; an elegant language for a more civilized age
        ;;ess               ; emacs speaks statistics
        ;;faust             ; dsp, but you get to keep your soul
-       ;;fsharp           ; ML stands for Microsoft's Language
+       ;;fsharp            ; ML stands for Microsoft's Language
        ;;fstar             ; (dependent) types and (monadic) effects and Z3
+       ;;gdscript          ; the language you waited for
        ;;(go +lsp)         ; the hipster dialect
        (haskell +dante)  ; a language that's lazier than I am
        ;;hy                ; readability of scheme w/ speed of python
-       ;;idris             ;
+       ;;idris             ; a language you can depend on
        ;;json              ; At least it ain't XML
        ;;(java +meghanada) ; the poster child for carpal tunnel syndrome
        (javascript +lsp)        ; all(hope(abandon(ye(who(enter(here))))))
@@ -137,20 +144,20 @@
        ;;lua               ; one-based indices? one-based indices
        markdown          ; writing docs for people to ignore
        ;;nim               ; python + lisp at the speed of c
-       ;;nix               ; I hereby declare "nix geht mehr!"
+       nix               ; I hereby declare "nix geht mehr!"
        ;;ocaml             ; an objective camel
        org               ; organize your plain life in plain text
-       ;;perl              ; write code no one else can comprehend
+       ;;php               ; perl's insecure younger brother
-       php               ; perl's insecure younger brother
        ;;plantuml          ; diagrams for confusing people more
        ;;purescript        ; javascript, but functional
        ;;python            ; beautiful is better than ugly
        ;;qt                ; the 'cutest' gui framework ever
        ;;racket            ; a DSL for DSLs
+       ;;raku              ; the artist formerly known as perl6
        ;;rest              ; Emacs as a REST client
        ;;rst               ; ReST in peace
        ;;(ruby +rails)     ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"}
-       ;;rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
+       rust              ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
        ;;scala             ; java, but good
        ;;scheme            ; a fully conniving family of lisps
        sh                ; she sells {ba,z,fi}sh shells on the C xor
@@ -158,8 +165,8 @@
        ;;solidity          ; do you need a blockchain? No.
        ;;swift             ; who asked for emoji variables?
        ;;terra             ; Earth and Moon in alignment for performance.
-       ;;web               ; the tubes
+       web               ; the tubes
-       ;;yaml              ; JSON, but readable
+       yaml              ; JSON, but readable
 
        :email
        ;;(mu4e +gmail)

home-cli.nix

@@ -8,7 +8,7 @@
   home.sessionVariables = {
     EDITOR = "vim";
     MANPAGER = "sh -c 'col -bx | bat -l man -p'";
-    PATH = "$PATH:~/.composer/vendor/bin:";
+    PATH = "$PATH:${builtins.getEnv "HOME"}/.emacs.d/bin:${builtins.getEnv "HOME"}/.radicle/bin";
 
     P4USER = "dswan";
     P4PORT = "humu.iocom.com:1666";
@@ -25,6 +25,7 @@
     keyMode = "vi";
     baseIndex = 1;
     clock24 = true;
+    newSession = true;
     secureSocket = false;
     plugins = with pkgs.tmuxPlugins; [
       sensible
@@ -49,6 +50,11 @@
     '';
   };
 
+  programs.lsd = {
+    enable = true;
+    enableAliases = true;
+  };
+
   programs.zsh = {
     enable = true;
     enableAutosuggestions = true;
@@ -57,18 +63,18 @@
       plugins = [ "git" ];
     };
     shellAliases = {
-      l = "ls -la";
+      # l = "ls -la";
       n = "nnn";
-      ta = "tmux attach -d";
+      t = "tmux attach -d";
       er = "rm -rf logs; unzip -o";
       srsync = "rsync --rsync-path='sudo rsync'";
     };
   };
 
-  programs.dircolors = {
+  # programs.dircolors = {
-    enable = true;
+  #   enable = true;
-    enableZshIntegration = true;
+  #   enableZshIntegration = true;
-  };
+  # };
 
   programs.direnv = {
     enable = true;
@@ -132,8 +138,8 @@
     vimAlias = true;
     withNodeJs = true;
     withPython3 = true;
-    # unimpaired endwise textobj-word-column MatchTag vim-matchmaker vim-vertical-move stdtabs matchit splitjoin vimade floaterm fuzzymenu vim-markdown
+    # unimpaired endwise textobj-word-column MatchTag vim-matchmaker vim-vertical-move stdtabs matchit splitjoin vimade fuzzymenu vim-markdown
-    plugins = with pkgs.vimPlugins; [ nord-vim vim-airline vim-airline-themes vim-sensible vim-repeat vim-surround vim-fugitive vim-speeddating jdaddy-vim ale vim-snippets fzf-vim vim-tmux-navigator vim-multiple-cursors vim-easymotion vim-sneak nerdcommenter emmet-vim undotree vim-signature vim-easy-align vim-better-whitespace vim-signify vim-expand-region vim-exchange argtextobj-vim goyo vim-orgmode vim-polyglot vim-devicons vim-startify vim-abolish vim-peekaboo vim-table-mode tabular coc-nvim coc-css coc-html coc-eslint coc-tsserver coc-json coc-fzf coc-snippets vim-highlightedyank vim-which-key];
+    plugins = with pkgs.vimPlugins; [ nord-vim vim-airline vim-airline-themes vim-sensible vim-repeat vim-surround vim-fugitive vim-speeddating jdaddy-vim ale vim-snippets fzf-vim vim-tmux-navigator vim-multiple-cursors vim-easymotion vim-sneak nerdcommenter emmet-vim undotree vim-signature vim-easy-align vim-better-whitespace vim-signify vim-expand-region vim-exchange argtextobj-vim goyo vim-orgmode vim-polyglot vim-devicons vim-startify vim-abolish vim-peekaboo vim-table-mode tabular coc-nvim coc-css coc-html coc-eslint coc-tsserver coc-json coc-fzf coc-snippets vim-highlightedyank vim-which-key vim-floaterm];
     extraConfig = ''
       set expandtab
       set tabstop=2
@@ -153,6 +159,8 @@
 
       let g:EasyMotion_smartcase = 1
 
+      let g:NERDSpaceDelims = 1
+
       let g:coc_snippet_next = '<tab>'
       let g:coc_snippet_prev = '<S-Tab>'
 
@@ -180,7 +188,7 @@
       nnoremap <silent> <leader>f :Files<CR>
       nnoremap <silent> <leader>b :Buffers<CR>
       nnoremap <silent> <leader>w :Windows<CR>
-      nnoremap <silent> <leader>c :Commands<CR>
+      nnoremap <silent> <leader>C :Commands<CR>
       nnoremap <silent> <leader>hf :History<CR>
       nnoremap <silent> <leader>hc :History:<CR>
       nnoremap <silent> <leader>hs :History/<CR>
@@ -197,6 +205,9 @@
       imap <c-x><c-f> <plug>(fzf-complete-path)
       imap <c-x><c-j> <plug>(fzf-complete-file-ag)
       imap <c-x><c-l> <plug>(fzf-complete-line)
+
+      nnoremap <silent> <leader>n :FloatermNew nnn<CR>
+      nnoremap <silent> <leader>T :FloatermNew<CR>
     '';
   };
 

home-gui.nix

@@ -23,11 +23,7 @@
         size = 16.0;
       };
       key_bindings = [
-        {
+        { key = "N"; mods = "Control|Shift"; action = "SpawnNewInstance"; }
-          key = "N";
-          mods = "Control|Shift";
-          action = "SpawnNewInstance";
-        }
       ];
       background_opacity = 0.95;
       colors = { # Nord

home-mac.nix

@@ -1,7 +1,7 @@
 { pkgs, lib, ... }:
 
 {
-  home.packages = with pkgs; [ pinentry_mac terminal-notifier ]; # syncthing ];
+  home.packages = with pkgs; [ pinentry_mac terminal-notifier syncthing ];
 
   home.file.gpg-agent = {
     target = ".gnupg/gpg-agent.conf";
@@ -11,7 +11,6 @@
     '';
   };
 
-  # pinentry-program ${builtins.getEnv "HOME"}/.nix-profile/Applications/pinentry-mac.app/Contents/MacOS/pinentry-mac
   programs.zsh.initExtra = "source ~/.nix-profile/etc/profile.d/nix.sh";
   # programs.fish.interactiveShellInit = "source ~/.nix-profile/etc/profile.d/nix.sh";