More cleaning

master
Dustin Swan 5 years ago
parent 9a2c4328d5
commit 3333a263a6
Signed by: dustinswan
GPG Key ID: AB49BD6B2B3A6377

@ -1,8 +1,9 @@
{ pkgs, ... }:
{
# nodePackages.eslint
home.packages = with pkgs; [
ripgrep fd wget silver-searcher tree ranger nodejs yarn mosh w3m urlview nmap rtv gnupg youtube-dl nodePackages.tern nodePackages.eslint nodePackages.javascript-typescript-langserver nodePackages.js-beautify nodePackages.prettier ffmpeg ispell aspell aspellDicts.en aspellDicts.en-computers aspellDicts.en-science aspellDicts.fr aspellDicts.de aspellDicts.eo aspellDicts.es hexyl nnn entr httpie cacert
ripgrep fd wget silver-searcher tree ranger nodejs yarn mosh w3m urlview nmap rtv gnupg youtube-dl nodePackages.tern nodePackages.javascript-typescript-langserver nodePackages.js-beautify nodePackages.prettier ffmpeg ispell aspell aspellDicts.en aspellDicts.en-computers aspellDicts.en-science aspellDicts.fr aspellDicts.de aspellDicts.eo aspellDicts.es hexyl nnn entr httpie cacert
];
home.sessionVariables = {
@ -114,9 +115,6 @@
er = "rm -rf logs; unzip -o";
srsync = "rsync --rsync-path='sudo rsync'";
};
initExtra = '' # for MacOS
source ~/.nix-profile/etc/profile.d/nix.sh
'';
};
programs.fzf = {

@ -12,5 +12,7 @@
'';
};
programs.zsh.initExtra = "source ~/.nix-profile/etc/profile.d/nix.sh";
imports = [ ./home-common.nix ];
}

@ -96,8 +96,8 @@ This function should only modify configuration layer settings."
org-want-todo-bindings t
org-enable-github-support t
org-enable-org-journal-support t
org-journal-enable-encryption t
org-journal-encrypt-journal t
; org-journal-enable-encryption t
; org-journal-encrypt-journal t
org-journal-dir "~/Sync/Notes/Journal/"
org-journal-file-format "%Y%m%d.org"
org-journal-date-format "%A, %B %d, %Y"
@ -306,7 +306,7 @@ It should only modify the values of Spacemacs settings."
;; Default font, or prioritized list of fonts. `powerline-scale' allows to
;; quickly tweak the mode-line size to make separators look not too crappy.
dotspacemacs-default-font '("Iosevka Nerd Font"
:size 16
:size 18
:weight normal
:width normal
:powerline-scale 1.5)
@ -561,6 +561,8 @@ before packages are loaded."
(setq prettify-symbols-unprettify-at-point t)
(global-prettify-symbols-mode +1)
(global-set-key (kbd "H-h") 'ns-do-hide-emacs)
(define-key evil-normal-state-map (kbd "C-h") 'evil-window-left)
(define-key evil-normal-state-map (kbd "C-l") 'evil-window-right)
(define-key evil-normal-state-map (kbd "C-j") 'evil-window-down)
@ -687,9 +689,9 @@ before packages are loaded."
)
(setenv "P4USER" "dswan")
(setenv "P4PORT" "humu.insors.net:1666")
(setenv "P4PORT" "humu.iocom.com:1666")
(setenv "P4CONFIG" "p4.cfg")
(setenv "LANG" "en_US.UTF-8")
; (setenv "LANG" "en_US.UTF-8")
;; Org
(with-eval-after-load 'org
@ -747,7 +749,7 @@ before packages are loaded."
(org-crypt-use-before-save-magic)
(setq org-tags-exclude-from-inheritance (quote ("crypt")))
(setq org-crypt-key nil) ;; symmetric encryption
(setq epg-gpg-program "/usr/local/bin/gpg")
(setq epg-gpg-program "~/.nix-profile/bin/gpg")
;; Deft
(setq deft-directory "~/Sync/Notes")

71
vimrc

@ -1,17 +1,15 @@
" set nocompatible " not necessary with neovim
call plug#begin('~/.vim/plugged')
let mapleader="\<Space>"
let maplocalleader="\\"
" Plug 'tomasr/molokai'
Plug 'arcticicestudio/nord-vim'
Plug 'vim-airline/vim-airline'
let g:airline#extensions#tabline#enabled = 1
let g:airline#extensions#ale#enabled = 1
let g:airline_powerline_fonts = 1
Plug 'vim-airline/vim-airline-themes'
Plug 'tpope/vim-sensible'
Plug 'tpope/vim-repeat' " repeats plugin maps
Plug 'tpope/vim-surround' " cs[{ -> change surrounding [ to {, cst -> change surrounding tag, ysiw] -> surround inner word with ], etc.
Plug 'tpope/vim-fugitive' " Gdiff, Gblame, Gstatus - to add/reset, Gcommit
@ -61,50 +59,23 @@ Plug 'sheerun/vim-polyglot' " syntax and indentation for many languages
Plug 'ryanoasis/vim-devicons' " icons in airline, NERDTree, etc.
Plug 'TaDaa/vimade' " fade inactive buffer
Plug 'mhinz/vim-startify' " fancy start page
Plug 'voldikss/vim-floaterm' " floating terminal
noremap <leader>T :FloatermToggle<CR>i
autocmd User Startified setlocal buflisted " fixing floaterm on Startify
call plug#end()
" general goodness
syntax enable
set hidden " allow hidden unsaved buffers
set history=1000 " longer history
set noswapfile " turn off swapfiles
" set hidden " allow hidden unsaved buffers
" set noswapfile " turn off swapfiles
set number " line numbers
set showcmd " show the command as it is typed
set showmode
set wildmenu
set backspace=indent,eol,start
set ttyfast
"set wildmode=longest:full
set wildmode=list:longest " try this on for a while
set autoread " when a file is changed externally
set ruler
set cursorline " Highlight current line
set laststatus=2 " Always show the statusline
set scrolloff=5 " Give us a few lines before and after the cursor
" long lines
set wrap
set formatoptions=rqn1
set textwidth=80
" set colorcolumn=80
" persistent undo
set undodir=~/.vim/undodir
set undofile
" indentation
" set autoindent
" set wrap
" set formatoptions=rqn1
" set smartindent
" search
" set hlsearch
" set incsearch
" set gdefault " now substitutions assume /g
set ignorecase
set smartcase " if we include uppercase, it will be case sensitive
" set showmatch " matching brackets
" set matchtime=2 " blink brackets
" clear highlighting
nnoremap <silent><leader>/ :noh<cr>
@ -112,19 +83,10 @@ nnoremap <silent><leader>/ :noh<cr>
" regex
set magic
" tab stops
" set tabstop=4
" set softtabstop=4
" set shiftwidth=4
" set expandtab
" set smarttab
" mouse
set mouse=a " a = all modes: nvic
" Colors
let g:nord_italic = 1
let g:nord_italic_comments = 1
" let g:nord_italic_comments = 1
let g:nord_underline = 1
colorscheme nord
@ -161,17 +123,6 @@ 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)
" Tabs
nmap <leader>1 1gt
nmap <leader>2 2gt
nmap <leader>3 3gt
nmap <leader>4 4gt
nmap <leader>5 5gt
nmap <leader>6 6gt
nmap <leader>7 7gt
nmap <leader>8 8gt
nmap <leader>9 9gt
" Coc
inoremap <silent><expr> <TAB>
\ pumvisible() ? coc#_select_confirm() :

Loading…
Cancel
Save