From 0abd5419dc60297eeed6de6b6c38576bbf635884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Sun, 7 Jul 2019 15:42:50 +0200 Subject: [PATCH 1/4] mrconfig -> mrconfig.ini --- configs/git.nix | 2 +- dot/{mrconfig => mrconfig.ini} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename dot/{mrconfig => mrconfig.ini} (100%) diff --git a/configs/git.nix b/configs/git.nix index b6696f1..8778f2f 100644 --- a/configs/git.nix +++ b/configs/git.nix @@ -12,7 +12,7 @@ ]; home-manager.users.me = { - home.file.".mrconfig".text = builtins.readFile ; + home.file.".mrconfig".text = builtins.readFile ; programs.git = { enable = true; diff --git a/dot/mrconfig b/dot/mrconfig.ini similarity index 100% rename from dot/mrconfig rename to dot/mrconfig.ini From 1b0bdfdbc71538da663caf8ad15acc25b4d54f15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 9 Jul 2019 09:31:08 +0200 Subject: [PATCH 2/4] vimrc: fix typescript --- dot/vimrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dot/vimrc b/dot/vimrc index fdf3965..3919689 100644 --- a/dot/vimrc +++ b/dot/vimrc @@ -116,7 +116,7 @@ if has("autocmd") autocmd bufnewfile,bufread *.rust packadd rust-vim " | packadd deoplete-rust autocmd bufnewfile,bufread *.csv packadd csv-vim | set filetype=csv autocmd bufnewfile,bufread *.tex packadd vimtex | set filetype=tex - autocmd bufnewfile,bufread *.ts packadd vim-typescript + autocmd bufnewfile,bufread *.ts packadd typescript-vim autocmd bufnewfile,bufread *.jq packadd jq.vim autocmd bufnewfile,bufread *.journal packadd vim-ledger | set filetype=ledger shiftwidth=4 autocmd bufnewfile,bufread config set filetype=conf From a3dc6196ebdfb05638d388f30a1391e924da062c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 9 Jul 2019 09:31:17 +0200 Subject: [PATCH 3/4] scripts: add man-pdf --- packages/man-pdf.nix | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 packages/man-pdf.nix diff --git a/packages/man-pdf.nix b/packages/man-pdf.nix new file mode 100644 index 0000000..1ac77a1 --- /dev/null +++ b/packages/man-pdf.nix @@ -0,0 +1,5 @@ +{ writeShellScriptBin, texlive }: +writeShellScriptBin "man-pdf" '' + for program in "$@"; do + man -t "$program" | ${texlive.combined.scheme-basic}/bin/ps2pdf +'' From 28ee2bb1999520e37d32970e7eac2604649aa393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Tue, 9 Jul 2019 09:31:57 +0200 Subject: [PATCH 4/4] packages: add unfinished --- packages/_todo/fe | 3 +++ packages/_todo/fkill | 12 ++++++++++++ packages/_todo/fo | 7 +++++++ packages/_todo/vg | 7 +++++++ 4 files changed, 29 insertions(+) create mode 100755 packages/_todo/fe create mode 100755 packages/_todo/fkill create mode 100755 packages/_todo/fo create mode 100755 packages/_todo/vg diff --git a/packages/_todo/fe b/packages/_todo/fe new file mode 100755 index 0000000..85201f0 --- /dev/null +++ b/packages/_todo/fe @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +IFS=$'\n' files=($(fzf-tmux --query="$1" --multi --select-1 --exit-0)) +[[ -n "$files" ]] && ${EDITOR:-vim} "${files[@]}" diff --git a/packages/_todo/fkill b/packages/_todo/fkill new file mode 100755 index 0000000..5ad1f86 --- /dev/null +++ b/packages/_todo/fkill @@ -0,0 +1,12 @@ +#!/bin/sh + +if [ "$UID" != "0" ]; then + pid=$(ps -f -u $UID | sed 1d | fzf -m | awk '{print $2}') +else + pid=$(ps -ef | sed 1d | fzf -m | awk '{print $2}') +fi + +if [ "x$pid" != "x" ] +then + echo $pid | xargs kill -${1:-9} +fi diff --git a/packages/_todo/fo b/packages/_todo/fo new file mode 100755 index 0000000..d7d6754 --- /dev/null +++ b/packages/_todo/fo @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +IFS=$'\n' out=("$(fzf-tmux --query="$1" --exit-0 --expect=ctrl-o,ctrl-e)") +key=$(head -1 <<< "$out") +file=$(head -2 <<< "$out" | tail -1) +if [ -n "$file" ]; then + [ "$key" = ctrl-o ] && open "$file" || ${EDITOR:-vim} "$file" +fi diff --git a/packages/_todo/vg b/packages/_todo/vg new file mode 100755 index 0000000..256bdf4 --- /dev/null +++ b/packages/_todo/vg @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +file="$(rg $@ | fzf -0 -1 | awk -F: '{print $1}')" + +if [[ -n $file ]] +then + vim $file +fi