feat(pls): add msg command

configs/neovim.nix

@@ -31,7 +31,7 @@
             supertab
             undotree
             tabular
-            vimwiki
+            # vimwiki
             vim-colors-paramount
             vim-commentary
             vim-css-color
@@ -45,26 +45,19 @@
           ];
           opt = [
             csv
-            dhall-vim
             elm-vim
             emmet-vim
             haskell-vim
             icalendar-vim
-            idris-vim
-            nim-vim
             jq-vim
-            purescript-vim
             rust-vim
             typescript-vim
-            vim-fsharp
             vim-javascript
             vim-ledger
             vim-nix
-            vim-reason-plus
-            vim-toml
             vimtex
             vim-pandoc
-            vim-pandoc-syntax # vim-pandoc-after
+            vim-pandoc-syntax
             vim-256noir
           ];
         };

configs/telegram-bots/astrology.nix

@@ -45,8 +45,9 @@ in {
     chatIds = [ "18980945" ];
     command = toString (pkgs.writers.writeDash "common-transits" ''
       {
-        ${nixpkgs-unstable.astrolog}/bin/astrolog -n -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto
-        ${nixpkgs-unstable.astrolog}/bin/astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $(${pkgs.coreutils}/bin/date +'%m %d %Y') -R Uranus Neptune Pluto
+        date=$(${pkgs.coreutils}/bin/date +'%m %d %Y')
+        ${nixpkgs-unstable.astrolog}/bin/astrolog -qd $date -zN Berlin -Yt -Yd -d -R Uranus Neptune Pluto
+        ${nixpkgs-unstable.astrolog}/bin/astrolog -Yt -Yd -q 10 22 1999 6:32 -zN Kassel -td $date -R Uranus Neptune Pluto
       } | ${toSymbols} | ${pkgs.coreutils}/bin/sort -n
     '');
   };

lib/vim/init.vim

@@ -17,16 +17,14 @@ let maplocalleader="\\"
 
 " noremap <Leader>h :<C-u>split<CR>
 " noremap <Leader>v :<C-u>vsplit<CR>
-noremap <Leader>gs :Gstatus<CR>
-noremap <Leader>gc :Gcommit<CR>
+noremap <Leader>gs :Git status<CR>
+noremap <Leader>gc :Git commit<CR>
 noremap <leader>n :bn<CR>
 noremap <leader>p :bp<CR>
 noremap <leader>c :bd<CR>
 noremap <leader>b :Buffers<CR>
 noremap <leader>t :Tags<CR>
 
-noremap <leader>f :Goyo<CR>
-
 " reindent whole file
 noremap <leader>i mzgg=G`z
 
@@ -62,18 +60,17 @@ set list listchars=tab:⇥\ ,extends:❯,precedes:❮,nbsp:␣,trail:· showbrea
 set foldlevelstart=30
 
 iabbrev ddate <C-R>=strftime("%F")<CR>
+iabbrev dtime <C-R>=strftime("%F %T")<CR>
 
-" if exists("g:loaded_netrwPlugin")
 let g:netrw_banner=0
 let g:netrw_browse_split=4
 let g:netrw_altv=1 " open splits to the right
 let g:netrw_liststyle=3 " tree view
 let g:netrw_list_hide=netrw_gitignore#Hide()
 let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+'
-" endif
 
-" call matchadd('colorcolumn', '\%101v', 100)
-" highlight colorcolumn ctermbg=red
+call matchadd('colorcolumn', '\%101v', 100)
+highlight colorcolumn ctermbg=red
 
 " undofile - This allows you to use undos after exiting and restarting
 " This, like swap and backups, uses .vim-undo first, then ~/.vim/undo
@@ -82,8 +79,7 @@ if exists("+undofile")
   if isdirectory($HOME . '/.vim/undo') == 0
     :silent !mkdir -p ~/.vim/undo > /dev/null 2>&1
   endif
-  set undodir=./.vim-undo//
-  set undodir+=~/.vim/undo//
+  set undodir=~/.vim/undo/
   set undofile
 endif
 
@@ -113,61 +109,37 @@ command! ToggleBackground call s:toggle_background()
 inoremap <F12> <C-O>:ToggleBackground<CR>
 nnoremap <F12> :ToggleBackground<CR>
 
-if has("autocmd")
-  autocmd bufnewfile,bufread *.4th set filetype=forth
-  autocmd bufnewfile,bufread *.asm set filetype=nasm
-  autocmd bufnewfile,bufread *.c set keywordprg=man\ 3
-  autocmd bufnewfile,bufread *.conf set filetype=conf
-  autocmd bufnewfile,bufread *.fs packadd vim-fsharp | set filetype=fsharp
-  autocmd bufnewfile,bufread *.h set keywordprg=man\ 3
-  autocmd bufnewfile,bufread *.nix packadd vim-nix | set filetype=nix | set path+=/var/src
-  autocmd bufnewfile,bufread *.rust packadd rust-vim " | packadd deoplete-rust
-  autocmd bufnewfile,bufread *.csv packadd csv-vim | set filetype=csv
-  autocmd bufnewfile,bufread *.toml packadd vim-toml | set filetype=toml
-  autocmd bufnewfile,bufread *.nim packadd nim-vim | set filetype=nim
-  autocmd bufnewfile,bufread *.tex packadd vimtex | set filetype=tex
-  autocmd bufnewfile,bufread *.ics packadd icalendar.vim | set filetype=icalendar
-  autocmd bufnewfile,bufread *.ts packadd typescript-vim | set filetype=typescript
-  autocmd bufnewfile,bufread *.purs packadd purescript-vim | set filetype=purescript
-  autocmd bufnewfile,bufread *.jq packadd jq.vim
-  autocmd bufnewfile,bufread *.re packadd vim-reason-plus | set filetype=reason
-  autocmd bufnewfile,bufread *.journal packadd vim-ledger | set filetype=ledger shiftwidth=4
-  autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax
-  autocmd bufnewfile,bufread urls,config set filetype=conf
-  autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4
-  autocmd bufnewfile,bufread *.dhall packadd dhall-vim | set filetype=dhall
-  autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
-  autocmd filetype javascript packadd vim-javascript
-  autocmd filetype make setlocal noexpandtab
-  autocmd filetype html packadd emmet-vim
-  autocmd filetype gitcommit setlocal spell spelllang=en
-  autocmd filetype mail setlocal spell spelllang=de textwidth=0 | command Send %! mail-send
-  autocmd bufreadpost *
-        \ if line("'\"") > 0 && line("'\"") <= line("$") |
-        \ exe "normal! g`\"" |
-        \ endif
-  autocmd bufreadpre * setlocal foldmethod=indent
-  " autocmd bufwritepre * :call <SID>StripTrailingWhitespaces()
-  " autocmd bufwinenter * if &fdm == 'indent' | setlocal foldmethod=manual | endif
+autocmd bufnewfile,bufread *.4th set filetype=forth
+autocmd bufnewfile,bufread *.asm set filetype=nasm
+autocmd bufnewfile,bufread *.c set keywordprg=man\ 3
+autocmd bufnewfile,bufread *.h set keywordprg=man\ 3
+autocmd bufnewfile,bufread *.conf set filetype=conf
+autocmd bufnewfile,bufread *.nix packadd vim-nix | set filetype=nix | set path+=/var/src
+autocmd bufnewfile,bufread *.rust packadd rust-vim
+autocmd bufnewfile,bufread *.csv packadd csv.vim | set filetype=csv
+autocmd bufnewfile,bufread *.tex packadd vimtex | set filetype=tex
+autocmd bufnewfile,bufread *.ics packadd icalendar.vim | set filetype=icalendar
+autocmd bufnewfile,bufread *.ts packadd typescript-vim | set filetype=typescript
+autocmd bufnewfile,bufread *.jq packadd jq.vim
+autocmd bufnewfile,bufread *.journal packadd vim-ledger | set filetype=ledger shiftwidth=4
+autocmd bufnewfile,bufread urls,config set filetype=conf
+autocmd bufnewfile,bufread *.elm packadd elm-vim | set filetype=elm shiftwidth=4
+autocmd bufnewfile,bufread *.md packadd vim-pandoc | packadd vim-pandoc-syntax | set filetype=pandoc
+autocmd filetype haskell packadd haskell-vim | set keywordprg=hoogle\ -i
+autocmd filetype javascript packadd vim-javascript
+autocmd filetype make setlocal noexpandtab
 
-  autocmd VimEnter * UpdateRemotePlugins
-endif
+autocmd filetype html packadd emmet-vim
+autocmd filetype gitcommit setlocal spell spelllang=en
+autocmd filetype mail setlocal spell spelllang=de textwidth=0
+autocmd bufreadpost *
+      \ if line("'\"") > 0 && line("'\"") <= line("$") |
+      \ exe "normal! g`\"" |
+      \ endif
+autocmd bufreadpre * setlocal foldmethod=indent
 
-let g:startify_custom_header = ''
-
-" let g:deoplete#enable_at_startup = 1
 set completeopt=noinsert,menuone,noselect
 set complete+=kspell
-" let g:deoplete#sources = {}
-" let g:deoplete#sources._ = ['ale', 'file', 'omni', 'buffer']
-"
-" let g:deoplete#sources#rust#racer_binary = $HOME . '/.cargo/bin/racer'
-" let g:deoplete#sources#rust#rust_source_path = substitute(system('rustc --print sysroot'), '\n$', '', '') . '/lib/rustlib/src/rust/src'
-
-inoremap ^] ^X^]
-inoremap ^F ^X^F
-inoremap ^D ^X^D
-inoremap ^L ^X^L
 
 let g:SuperTabDefaultCompletionType = 'context'
 
@@ -197,7 +169,6 @@ let g:ale_fixers = {
       \ 'typescript': ['prettier'],
       \ 'css': ['prettier'],
       \ 'html': ['prettier'],
-      \ 'markdown': ['prettier'],
       \ 'json': ['jq'],
       \ 'python': ['black'],
       \ 'rust': ['rustfmt']
@@ -209,29 +180,5 @@ autocmd bufnewfile,bufread elm.json let g:ale_fix_on_save = 0
 
 let g:ale_completion_enabled = 1
 
-"if exists("g:loaded_airline")
-" set noshowmode laststatus=0 noruler
-let g:airline#extensions#tabline#close_symbol = 'X'
-let g:airline#extensions#tabline#enabled = 0
-"let g:airline#extensions#tabline#left_alt_sep = ''
-"let g:airline#extensions#tabline#left_sep = ''
-"let g:airline#extensions#tabline#right_alt_sep = ''
-"let g:airline#extensions#tabline#right_sep = ''
-let g:airline#extensions#tabline#show_close_button = 1
-let g:airline#extensions#tabline#show_tab_type = 0
-let g:airline#extensions#tabline#tab_min_count = 2
-let g:airline#extensions#tabline#tab_nr_type = 0
-let g:airline#extensions#tmuxline#enabled = 0
-"let g:airline#extensions#wordcount#enabled = 1
-"let g:airline_left_alt_sep = ''
-"let g:airline_left_sep = ''
-"let g:airline_right_alt_sep = ''
-"let g:airline_right_sep = ''
-let g:airline_section_z = '%{line(".")}/%{line("$")} %{col(".")}'
-"endif
-"if exists("g:loaded_airline_themes")
-let g:airline_theme='base16'
-"endif
-
 let g:vimwiki_list = [{'path': '~/notes/',
-                      \ 'syntax': 'markdown', 'ext': '.md'}]
+      \ 'syntax': 'markdown', 'ext': '.md'}]

packages/scripts/pls.nix

@@ -51,6 +51,10 @@ pkgs.writers.writeDashBin "pls" ''
       ${pkgs.curl}/bin/curl -sS -XPOST "${playlistAPI}/skip"
       echo ${lib.escapeShellArg (lib.concatStringsSep "\n" messages.bad)} | shuf -n1 | ${sendIRC}
     ;;
+    say|msg)
+      shift
+      echo "$@" | ${sendIRC}
+    ;;
     recent)
       ${pkgs.curl}/bin/curl -sS -XGET "${playlistAPI}/recent" | tac | head
     ;;

systems/makanek/configuration.nix

@@ -23,7 +23,6 @@ in
     <niveum/configs/save-space.nix>
     <niveum/configs/spacetime.nix>
     <niveum/configs/sshd.nix>
-    <niveum/configs/tmux.nix>
     <niveum/configs/telegram-bots>
     <niveum/modules/retiolum.nix>
   ];

systems/makanek/names.nix

@@ -1,7 +1,8 @@
 { pkgs, lib, ... }:
 let
   port = 5703;
-  geogen = pkgs.callPackage "${<scripts>}/onomastics" {};
+  geogen-src = "${<scripts>}/onomastics";
+  geogen = pkgs.callPackage geogen-src {};
 in
 {
   systemd.services.names = {
@@ -13,7 +14,7 @@ in
     };
     script = ''
       cd $(mktemp -d)
-      ln -s "${geogen}/wsgi.py" wsgi.py
+      ln -s "${geogen-src}/wsgi.py" wsgi.py
       ${geogen.dependencyEnv}/bin/gunicorn wsgi:app -b :${toString port}
     '';
   };

systems/makanek/weechat.nix

@@ -34,7 +34,10 @@ in {
             color.chat_nick_colors = lib.lists.subtractLists (lib.range 52 69 ++ lib.range 231 248) (lib.range 31 254);
           };
           irc = {
-            look.server_buffer = "independent";
+            look = {
+              server_buffer = "independent";
+              color_nicks_in_nicklist = true;
+            };
             server_default = {
               nicks = nick;
               msg_part = "tschö mit ö";
@@ -145,6 +148,7 @@ in {
     preStop = "${tmux} kill-session -t IM";
     serviceConfig = {
       User = "weechat";
+      Group = "weechat";
       RemainAfterExit = true;
       Type = "oneshot";
     };