latest

2021-10-14 02:04:14 -07:00
parent abb7405b4c
commit 27febcbc4d
12 changed files with 239 additions and 239 deletions
--- a/root/home/user/.config/nixpkgs/config.nix
+++ b/root/home/user/.config/nixpkgs/config.nix
@@ -1,45 +1,82 @@
 {
-  packageOverrides = pkgs: with pkgs; {
-
-    myPackages = pkgs.buildEnv {
-      name = "myPackages";
+  packageOverrides = pkgs: with pkgs; rec {
+    #  export PATH=$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:/sbin:/bin:/usr/sbin:/usr/bin
+    #  export MANPATH=$HOME/.nix-profile/share/man:/nix/var/nix/profiles/default/share/man:/usr/share/man
+    #'';
+    work = pkgs.buildEnv {
+      name = "workpackages";
      paths = [
-        aspell
-        bc
-        clang
-        coreutils
-        ctags
-        curl
-        docker
+        basePackages
+        adminPackages
+      ];
+      pathsToLink = [ "/share/man" "/share/doc" "/bin" "/etc" ];
+      extraOutputsToInstall = [ "man" "doc" ];
+    };
+    adminPackages = pkgs.buildEnv {
+      name = "adminPackages";
+      paths = [
+        awscli2
+        byobu
+        cmake
+        cdrkit
+        envdir
+        figlet
+        httpie
+        jq
+        libvirt
+        llvm
+        mosh
+        mutt
+        nmap
+        openssl
+        pv
+        rsync
+        runit
+        terraform_0_13
+        tmux
+        wget
+        xz
+      ];
+      pathsToLink = [ "/share/man" "/share/doc" "/bin" "/etc" ];
+      extraOutputsToInstall = [ "man" "doc" ];
+    };
+    basePackages = pkgs.buildEnv {
+      name = "my-packages";
+      paths = [
+        adminPackages
+        aria2
+        byobu
+        cmus
+        coreutils-prefixed
+        envdir
        ffmpeg
-        gdb
-        git
-        gnupg
        gnupg
        go
-        gpg-agent
+        httpie
        jq
-        nix-prefetch-scripts
+        neofetch
+        neovim
        nmap
-        openssh
+        nodejs
+        openssl
        par2cmdline
-        pinentry-mac
        pv
        pwgen
-        qemu
        rsync
+        runit
        tmux
        tor
-        tree
        vim
        vimpager
        weechat
        wget
-        whois
        xz
+        yarn
        zsh
-  ];
+      ];
+      pathsToLink = [ "/share/man" "/share/doc" "/bin" "/etc" ];
+      extraOutputsToInstall = [ "man" "doc" ];
    };
-
  };
 }
+
--- a/root/home/user/.local/profile.d/100.aliases.sh
+++ b/root/home/user/.local/profile.d/100.aliases.sh
@@ -1,3 +1,4 @@
 alias unsafessh="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 alias prettier="prettier --tab-width 4"
 alias gencapkey="ssh-keygen -m PEM -t rsa -b 2048 -C \"caprover\" -f ./key -q -N \"\""
+alias nixup="nix-channel --update && nix-env -iA nixpkgs.$(hostname -s)"
--- a/root/home/user/.vimrc
+++ b/root/home/user/.vimrc
@@ -1,43 +1,93 @@
-"execute pathogen#infect()
+" this has to be first apparently?
+" i had problems when it was lower in the file.
+let mapleader=","

-silent !mkdir -p ~/.vim/backup > /dev/null 2>&1
-silent !mkdir -p ~/.vim/undo > /dev/null 2>&1
-silent !mkdir -p ~/.vim/swap > /dev/null 2>&1
-silent !mkdir -p ~/.vim/autoload > /dev/null 2>&1
-silent !mkdir -p ~/.vim/plugged > /dev/null 2>&1
+silent !mkdir -p ~/Library/vim/plug > /dev/null 2>&1
+silent !mkdir -p ~/Library/vim/backup > /dev/null 2>&1
+silent !mkdir -p ~/Library/vim/undo > /dev/null 2>&1
+silent !mkdir -p ~/Library/vim/swap > /dev/null 2>&1
+silent !mkdir -p ~/.paths/sneak-sync/dotfiles/vim/autoload > /dev/null 2>&1
+silent !mkdir -p ~/.paths/sneak-sync/dotfiles/vim/plugged > /dev/null 2>&1

-if empty(glob('~/.vim/autoload/plug.vim'))
-  silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
+if empty(glob('~/Library/vim/plug/plug.vim'))
+  silent !curl -fLo ~/Library/vim/plug/plug.vim --create-dirs
    \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
 endif

-source ~/.vim/autoload/plug.vim
+source ~/Library/vim/plug/plug.vim

-call plug#begin('~/.vim/plugged')
+"Plug 'zchee/deoplete-go', { 'for': 'go' }
+"Plug 'zchee/deoplete-jedi', { 'for': 'python' }

-" Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-" Plug 'roxma/vim-hug-neovim-rpc'
+call plug#begin('~/Library/vim/plug')
+
+if has('nvim')
+  Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
+  Plug 'deoplete-plugins/deoplete-go', { 'do': 'make'}
+  Plug 'roxma/nvim-yarp'
+  Plug 'roxma/vim-hug-neovim-rpc'
+  let g:deoplete#enable_at_startup = 1
+endif
+
+Plug 'tpope/vim-sensible'
+Plug 'preservim/nerdtree'
+Plug 'ryanoasis/vim-devicons'
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
-"Plug 'edkolev/tmuxline.vim'
-Plug 'zchee/deoplete-go', { 'for': 'go' }
-Plug 'zchee/deoplete-jedi', { 'for': 'python' }
+Plug 'fatih/vim-go', { 'do': ':GoInstallBinaries' }
+"Plug 'fatih/molokai'
+Plug 'morhetz/gruvbox'
+Plug 'sbdchd/neoformat'
+Plug 'LnL7/vim-nix'

+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" syntastic
+""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 Plug 'vim-syntastic/syntastic'
-
 set statusline+=%#warningmsg#
-"set statusline+=%{SyntasticStatuslineFlag()}
+set statusline+=%{SyntasticStatuslineFlag()}
 set statusline+=%*
 let g:syntastic_always_populate_loc_list = 1
 let g:syntastic_auto_loc_list = 1
 let g:syntastic_check_on_open = 1
 let g:syntastic_check_on_wq = 0
-let g:syntastic_go_checkers = ['gofmt']
-let g:syntastic_enable_signs = 1
-highlight SyntasticErrorSign guifg=white guibg=red
+let g:syntastic_go_checkers = ['go']

-Plug 'scrooloose/nerdtree'
+call plug#end()
+
+let g:rehash256 = 1
+let g:molokai_original = 1
+let g:gruvbox_italic = 1
+"colorscheme molokai
+colorscheme gruvbox
+
+noremap <Leader>w :w<cr>
+noremap <Leader><cr> i<cr><Esc>
+noremap <Leader>l :GoMetaLinter<cr>
+noremap <Leader>b :GoBuild<cr>
+noremap <Leader>f :Neoformat<cr>
+noremap <Leader>t :NERDTreeToggle<CR>
+
+
+" vim-go golang configuration:
+let g:go_fmt_fail_silently = 0
+let g:go_fmt_command = "goimports"
+let g:go_addtags_transform = "camelcase"
+let g:go_highlight_types = 1
+let g:go_highlight_fields = 1
+let g:go_highlight_functions = 1
+let g:go_highlight_function_calls = 1
+let g:go_highlight_extra_types = 1
+
+let g:go_def_mode='gopls'
+let g:go_info_mode='gopls'
+let g:go_auto_type_info = 1
+
+
+"highlight SyntasticErrorSign guifg=white guibg=red
+
+"Plug 'scrooloose/nerdtree'
 "Plug 'ludovicchabant/vim-gutentags'

 let g:gutentags_ctags_tagfile = '.tags'
@@ -45,10 +95,10 @@ let g:gutentags_file_list_command = 'git ls-files'
 let g:gutentags_generate_on_new = 1

 "Plug 'majutsushi/tagbar'
-Plug 'fatih/vim-go', { 'do': 'GoUpdateBinaries', 'for': 'go' }
-Plug 'cespare/vim-toml', { 'for': 'toml' }
-let g:deoplete#enable_at_startup = 1
-call plug#end()
+"Plug 'fatih/vim-go', { 'do': 'GoUpdateBinaries', 'for': 'go' }
+"Plug 'cespare/vim-toml', { 'for': 'toml' }
+"call plug#end()
+

 let g:airline_powerline_fonts = 1

@@ -79,7 +129,7 @@ fun! InitBex()
    let myvar = "set backupext=.". myvar
    execute myvar
 endfun
-map <silent> <Esc> :call InitBex()<CR>
+map <silent> <Esc>:call InitBex()<CR>
 silent call InitBex()

 set relativenumber
@@ -87,16 +137,16 @@ filetype plugin indent on
 syntax on

 set modelines=10
-noremap  <Up> ""
-noremap! <Up> <Esc>
-noremap  <Down> ""
-noremap! <Down> <Esc>
-noremap  <Left> ""
-noremap! <Left> <Esc>
-noremap  <Right> ""
-noremap! <Right> <Esc>
-vnoremap > ><CR>gv 
-vnoremap < <<CR>gv 
+"noremap  <Up> ""
+"noremap! <Up> <Esc>
+"noremap  <Down> ""
+"noremap! <Down> <Esc>
+"noremap  <Left> ""
+"noremap! <Left> <Esc>
+"noremap  <Right> ""
+"noremap! <Right> <Esc>
+"vnoremap > ><CR>gv 
+"vnoremap < <<CR>gv 

 "au BufWinLeave * silent! mkview
 "au BufWinEnter * silent! loadview
@@ -104,7 +154,6 @@ vnoremap < <<CR>gv
 au BufRead,BufNewFile *.go set filetype=go
 "au BufRead,BufNewFile *.coffee set filetype=coffee

-let mapleader=","

 set ignorecase
 set smartcase
@@ -112,8 +161,9 @@ set gdefault
 set incsearch
 set showmatch
 set hlsearch
-nnoremap <leader><space> :noh<cr>
+"nnoremap <leader><space> :noh<cr>

+set bg=dark
 set ignorecase
 set smartcase
 set gdefault
@@ -124,10 +174,10 @@ set autoindent
 "set signcolumn=yes
 set backspace=indent,eol,start
 set backup
-set backupdir=~/.vim/backup//
+set backupdir=~/Library/vim/backup//
 set cmdheight=3
 "set clipboard=unnamed
-set directory=~/.vim/swap//
+set directory=~/Library/vim/swap//
 set encoding=utf-8
 set expandtab
 set fileencodings=utf-8,iso-8859-15
@@ -143,13 +193,13 @@ set showcmd
 set smartcase
 set smarttab
 set softtabstop=4
-set spellfile=~/.vim/spellfile.utf-8.add
+set spellfile=~/.paths/sneak-sync/dotfiles/vim/spellfile.utf-8.add
 set spelllang=en
 set tabstop=4
 set termencoding=utf-8
 set ttyfast
 set tw=76
-set undodir=~/.vim/undo//
+set undodir=~/Library/vim/undo//
 set undofile
 set wildignore+=*.pyc
 set writebackup
@@ -161,12 +211,17 @@ autocmd FileType markdown setlocal spell
 au BufNewFile,BufFilePre,BufRead *.md set filetype=markdown
 autocmd BufNewFile,BufRead *.json set ft=javascript

+autocmd BufWritePre *.js Neoformat
+autocmd BufWritePre *.jsx Neoformat
+autocmd BufWritePre *.json Neoformat
+autocmd BufWritePre *.css Neoformat
+
 "inoremap jj <Esc>

-map N Nzz
-map n nzz
+"map N Nzz
+"map n nzz
 "map <s-tab> <c-w><c-w>
-colorscheme koehler
+"colorscheme koehler
 hi CursorLine term=none cterm=none ctermbg=none
 set t_Co=256
 set foldmethod=indent
@@ -177,9 +232,9 @@ set foldlevel=1         "this is just what i use
 "nnoremap <silent> <Space> @=(foldlevel('.')?'za':'l')<CR>
 "vnoremap <Space> zf

-"nnoremap <silent> <Tab> :bn<CR>
-"nnoremap <silent> <Backspace> :bp<CR>
-"nnoremap <silent> <Leader><Enter> :ls<CR>
+nnoremap <silent> <Tab> :bn<CR>
+nnoremap <silent> <Backspace> :bp<CR>
+nnoremap <silent> <Leader><Enter> :ls<CR>

 highlight ExtraWhitespace ctermbg=red guibg=red
 match ExtraWhitespace /\s\+$/
--- a/root/home/user/.zshrc
+++ b/root/home/user/.zshrc
@@ -68,7 +68,8 @@ HIST_STAMPS="yyyy-mm-dd"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git git-prompt zsh-autosuggestions)
+#plugins=(git git-prompt zsh-autosuggestions)
+plugins=(git git-prompt)

 source $ZSH/oh-my-zsh.sh