From d309d02db93ad29fbb2d8297bb400d94c0ea28a0 Mon Sep 17 00:00:00 2001
From: "Toerd@archlinux" <philipg@posteo.de>
Date: Mon, 6 Apr 2020 00:50:29 +0200
Subject: [PATCH] feat: cleaned up fresh.sh, added yubikey related packages

---
 fresh.sh | 16 +++++++---------
 pack.csv |  5 ++---
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/fresh.sh b/fresh.sh
index 360920b..b78e7c9 100755
--- a/fresh.sh
+++ b/fresh.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 
-# TODO: localegen etc
-
 scriptdir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-logfile="/dev/null"
-todo="install"
 
 # Get params
 while getopts "r:p:d:vush" opt;
@@ -21,10 +17,13 @@ do case $opt in
    esac
 done
 
+# Default settings
 device=${device:="480"}
 repo=${repo:="https://toerd@g.phga.de/toerd/dotfiles"}
 prog=${prog:="$scriptdir/pack.csv"}
 aurhelper=${aurhelper:="yay"}
+logfile=${logfile:="/dev/null"}
+todo=${todo:="install"}
 
 
 startup_msg() {
@@ -182,10 +181,9 @@ com() {
 
 add_after() {
     # Example:
-    # add_after "Color" 'tt="ILoveCandy"' "$HOME/test/pacman.conf"
-    # add_after "Color" 'tt="ILoveCandy"' "$HOME/test/pacman.conf"
+    # add_after "Color" "ILoveCandy" "$HOME/test/pacman.conf"
+    sed -i '/$2/d'
     sed -i '/'"$1"'/a '"$2"'' $3
-    # BUG adds the config bit even if it already exists
 }
 
 add_xorg_conf() {
@@ -215,9 +213,9 @@ set_pacman_config() {
 
 set_git_config() {
     sudo -u $uname git config --global user.email "philipg@posteo.de"
-    sudo -u $uname git config --global user.name "Toerd@"$(hostname)
+    sudo -u $uname git config --global user.name "toerd@"$(hostname)
     sudo -u $uname git config --global credential.useHttpPath true
-    sudo -u $uname git config --global credential.helper /usr/bin/pass-git-helper
+    # sudo -u $uname git config --global credential.helper /usr/bin/pass-git-helper
 }
 
 set_system_stuff() {
diff --git a/pack.csv b/pack.csv
index 3886d5f..1ba12aa 100644
--- a/pack.csv
+++ b/pack.csv
@@ -6,7 +6,6 @@
 # BASE
 A,P,dosfstools,DOS filesystem utilities
 A,P,efibootmgr,Tool to modify UEFI Firmware Boot Manager Variables
-A,P,gptfdisk,A text-mode partitioning tool that works on GUID Partition Table (GPT) disks
 A,P,exfat-utils,Utilities for exFAT file system
 A,P,nfs-utils,Support programs for Network File Systems
 A,P,xfsprogs,XFS filesystem utilities
@@ -16,8 +15,8 @@ L,P,acpid,A daemon for delivering ACPI power management events with netlink supp
 L,P,acpi_call,battery recalibration
 L,P,tlp,better battery life
 A,P,openssh,Premier connectivity tool for remote login with the SSH protocol
-A,P,opensc,Used to provide ssh key via yubikey
-A,P,yubico-pam,library to use pam auth with yubikeys
+A,P,gnupg,Complete and free implementation of the OpenPGP standard
+A,P,oath-toolkit,library to use OATH-pam auth with yubikeys
 
 # libraries
 A,M,pyorgmode,lib to create and modify orgmode files used in quteb script