commit 799f11683c59c1b9d866a80aa89e9ab86e0b2df7 parent 1a1e0c3028875be1806982c016093d87e5761efb Author: Rikard Karlsen <rk@cassettian.space> Date: Mon, 28 Dec 2020 13:36:12 +0100 fix conflict Diffstat:
| D | .local/bin/ordur | | | 38 | -------------------------------------- |
| M | .local/bin/xkbutil | | | 4 | ++-- |
| M | installed-packs | | | 42 | ++++++++++++++++++++++++++++++++++++++++++ |
3 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/.local/bin/ordur b/.local/bin/ordur @@ -1,38 +0,0 @@ -#!/bin/sh - -m="$(date '+%_M' | tr -d ' ' )" - -if [ $m = "0" ]; then - M="" -elif [ $m -lt "15" ]; then - M="$m over" -elif [ $m -eq "15" ]; then - M="Kvart over" -elif [ $m -lt "30" ]; then - d="$(expr 30 - $m)" - M="$d på halv" -elif [ $m -eq "30" ]; then - M="Halv" -elif [ $m -lt "45" ]; then - d="$(expr $m - 30)" - M="$d over halv" -elif [ $m -eq "45" ]; then - M="Kvart på" -else - d="$(expr 60 - $m)" - M="$d på" -fi - -h="$(date '+%_I' | tr -d ' ')" -[ $m -gt "15" ] && h="$(date -d '1 hour' '+%_I' | tr -d ' ')" - -the_time="$M $h" - -while getopts nd o; do - case $o in - n) the_time="$the_time på $(date '+%A')";; - d) the_time="$the_time den $(date '+%_d. %B')";; - esac -done - -echo "$the_time" diff --git a/.local/bin/xkbutil b/.local/bin/xkbutil @@ -19,4 +19,5 @@ _toggle() { [ "$1" = "toggle" ] && _toggle && exit 0 [ "$1" = "set" ] && [ "$2" != "" ] && _set "$2" && exit 0 -echo "Usage: xkbutil [toggle|set layout]"- \ No newline at end of file +echo "Usage: xkbutil [toggle|set layout]" + diff --git a/installed-packs b/installed-packs @@ -0,0 +1,42 @@ +nvim +zsh +zsh-completions +zsh-autosuggestions +zsh-syntax-highlighting +ranger +termite +surf +i3-gaps +xorg-server +dmenu +neocurses +bspwm +sxhkd +dialog +git +dosbox +unclutter +thunderbird +zathura +zathura-pdf-mupdf +go +rofi +gnome-twitch +neofetch +redshift +palemoon +micro +scrot +youtube-dl +vlc +pinta +audacity +jq +fzf +xclip + +AUR: +ttf-go-git +ttf-librebaskerville +ttf-paratype +