Merge remote-tracking branch 'g.phga.de/master'

README.md

@@ -6,7 +6,7 @@ Heavily inspired by [LARBS](https://github.com/LukeSmithxyz/LARBS).
 
 To get started, run the following code after booting into the installation medium
 ``` bash
-bash <(curl https://g.phga.de/toerd/fresh/raw/branch/master/bootstrap.sh)
+bash <(curl https://g.phga.de/phga/fresh/raw/branch/master/bootstrap.sh)
 ```
 
 Done!

bootstrap.sh

@@ -83,7 +83,7 @@ swapon -L P_SWAP # swap
 sed -e '/## Germany/,+1!d' /etc/pacman.d/mirrorlist
 
 # for server dhcpcd and other programs are not required -> see good2know
-pacstrap /mnt base base-devel linux linux-firmware vi dhcpcd wpa_supplicant dialog git netctl curl
+pacstrap /mnt base base-devel linux-zen linux-firmware vi dhcpcd wpa_supplicant dialog git netctl curl
 genfstab -p /mnt > /mnt/etc/fstab
 
 cat <<EOF > /mnt/root/bootstrap2.sh
@@ -104,15 +104,15 @@ bootctl install
 # MAYBE: add intel-ucode images, check for amd
 cat <<EEE > /boot/loader/entries/arch-uefi.conf
 title	Arch
-linux	/vmlinuz-linux
+linux	/vmlinuz-linux-zen
-initrd	/initramfs-linux.img
+initrd	/initramfs-linux-zen.img
 options	root=LABEL=P_ROOT rw resume=LABEL=P_SWAP
 EEE
 
 cat <<EEE > /boot/loader/entries/arch-uefi-fallback.conf
 title    Arch Linux Fallback
-linux    /vmlinuz-linux
+linux    /vmlinuz-linux-zen
-initrd   /initramfs-linux-fallback.img
+initrd   /initramfs-linux-zen-fallback.img
 options	root=LABEL=P_ROOT rw resume=LABEL=P_SWAP
 EEE
 
@@ -127,7 +127,7 @@ reflector --country 'Germany' --sort rate --protocol https --save /etc/pacman.d/
 
 printf "${PASSWD}\n${PASSWD}\n" | passwd root
 
-cd && curl -L https://g.phga.de/toerd/fresh/archive/master.tar.gz -o fresh.tar.gz && tar -xzf fresh.tar.gz
+cd && curl -L https://g.phga.de/phga/fresh/archive/master.tar.gz -o fresh.tar.gz && tar -xzf fresh.tar.gz
 # basically a shitty one time job, which does not work, seems like root does not source .bashrc
 echo '/root/fresh/fresh.sh' > .bash_profile
 

etc/X11/xorg.conf.d/00-keyboard.conf

@@ -0,0 +1,11 @@
+# Written by systemd-localed(8), read by systemd-localed and Xorg. It's
+# probably wise not to edit this file manually. Use localectl(1) to
+# instruct systemd-localed to update it.
+Section "InputClass"
+        Identifier "system-keyboard"
+        MatchIsKeyboard "on"
+        Option "XkbLayout" "us"
+        Option "XkbModel" "pc104"
+        Option "XkbVariant" "altgr-intl"
+        Option "XkbOptions" "caps:escape"
+EndSection

etc/X11/xorg.conf.d/02-tearing.conf

@@ -0,0 +1,5 @@
+Section "Device"
+        Identifier "Nvidia tearing fix"
+        Driver "nvidia"
+        Option "ForceFullCompositionPipeline" "yes"
+EndSection

etc/pacman.conf

@@ -0,0 +1,99 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+# IgnorePkg = xournalpp jack2 jack2-dbus libpulse pulseaudio pulseaudio-jack mumble
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+Color
+CheckSpace
+VerbosePkgLists
+ILoveCandy
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs

etc/systemd/network/00-wired.network

@@ -0,0 +1,5 @@
+[Match]
+Name=ens6f*
+
+[Network]
+DHCP=yes

etc/udev/rules.d/50-huion-tablet.rules

@@ -1 +1 @@
-ACTION=="add",SUBSYSTEM=="usb",ATTRS{idVendor}=="256c",ATTRS{idProduct}=="006e",ENV{XAUTHORITY}="/home/toerd/.Xauthority",RUN+="/home/toerd/.dotfiles/huion/huion_udev.sh",MODE="0666",OWNER="toerd"
+ACTION=="add",SUBSYSTEM=="usb",ATTRS{idVendor}=="256c",ATTRS{idProduct}=="006e",ENV{XAUTHORITY}="/home/phga/.Xauthority",RUN+="/home/phga/.dotfiles/huion/huion_udev.sh",MODE="0666",OWNER="phga"

etc/udev/rules.d/50-qmk.rules

@@ -0,0 +1,71 @@
+# Atmel DFU
+### ATmega16U2
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2fef", TAG+="uaccess"
+### ATmega32U2
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff0", TAG+="uaccess"
+### ATmega16U4
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff3", TAG+="uaccess"
+### ATmega32U4
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff4", TAG+="uaccess"
+### AT90USB64
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff9", TAG+="uaccess"
+### AT90USB162
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ffa", TAG+="uaccess"
+### AT90USB128
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ffb", TAG+="uaccess"
+
+# Input Club
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1c11", ATTRS{idProduct}=="b007", TAG+="uaccess"
+
+# STM32duino
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1eaf", ATTRS{idProduct}=="0003", TAG+="uaccess"
+# STM32 DFU
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", TAG+="uaccess"
+
+# BootloadHID
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05df", TAG+="uaccess"
+
+# USBAspLoader
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05dc", TAG+="uaccess"
+
+# ModemManager should ignore the following devices
+# Atmel SAM-BA (Massdrop)
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+
+# Caterina (Pro Micro)
+## Spark Fun Electronics
+### Pro Micro 3V3/8MHz
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9203", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+### Pro Micro 5V/16MHz
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9205", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+### LilyPad 3V3/8MHz (and some Pro Micro clones)
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9207", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+## Pololu Electronics
+### A-Star 32U4
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1ffb", ATTRS{idProduct}=="0101", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+## Arduino SA
+### Leonardo
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0036", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+### Micro
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0037", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+## Adafruit Industries LLC
+### Feather 32U4
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000c", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+### ItsyBitsy 32U4 3V3/8MHz
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000d", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+### ItsyBitsy 32U4 5V/16MHz
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000e", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+## dog hunter AG
+### Leonardo
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a03", ATTRS{idProduct}=="0036", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+### Micro
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a03", ATTRS{idProduct}=="0037", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+
+# hid_listen
+KERNEL=="hidraw*", MODE="0660", GROUP="plugdev", TAG+="uaccess", TAG+="udev-acl"
+
+# hid bootloaders
+## QMK HID
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2067", TAG+="uaccess"
+## PJRC's HalfKay
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="0478", TAG+="uaccess"

etc/udev/rules.d/97-adb.rules

@@ -0,0 +1,3 @@
+SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0660", GROUP="adbusers"
+SUBSYSTEM=="usb",ATTR{idVendor}=="18d1",ATTR{idProduct}=="4ee7",SYMLINK+="android_adb"
+SUBSYSTEM=="usb",ATTR{idVendor}=="18d1",ATTR{idProduct}=="4ee7",SYMLINK+="android_fastboot"

etc/udev/rules.d/99-keyboard.rules

@@ -1,2 +1,3 @@
-ACTION=="add", ATTRS{idVendor}=="feed", ATTRS{idProduct}=="1307", ENV{XKBMODEL}="evdev", ENV{XKBLAYOUT}="us", ENV{XKBVARIANT}="altgr-intl"
+ACTION=="add", ATTRS{idVendor}=="3297", ATTRS{idProduct}=="4974", ENV{XKBMODEL}="pc104", ENV{XKBLAYOUT}="us", ENV{XKBVARIANT}="altgr-intl"
-ACTION=="add", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="422d", ENV{XKBMODEL}="evdev", ENV{XKBLAYOUT}="us", ENV{XKBVARIANT}="altgr-intl"
+ACTION=="add", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="422d", ENV{XKBMODEL}="pc104", ENV{XKBLAYOUT}="us", ENV{XKBVARIANT}="altgr-intl"
+ACTION=="add", ATTRS{idVendor}=="0c45", ATTRS{idProduct}=="652f", ENV{XKBMODEL}="pc104", ENV{XKBLAYOUT}="de"

etc/udev/rules.d/99-uinput.rules

@@ -0,0 +1 @@
+KERNEL=="uinput", GROUP="input", MODE:="0660"

fresh.sh

@@ -19,7 +19,7 @@ done
 
 # Default settings
 device=${device:="480"}
-repo=${repo:="https://toerd@g.phga.de/toerd/dotfiles"}
+repo=${repo:="https://phga@g.phga.de/phga/dotfiles"}
 prog=${prog:="$scriptdir/pack.csv"}
 aurhelper=${aurhelper:="yay"}
 logfile=${logfile:="/dev/null"}
@@ -41,7 +41,7 @@ wait_for_network() {
 
 init() {
     wait_for_network
-    pacman -S --noconfirm --needed dialog git make || { echo "Run as root user"; exit; }
+    pacman -S --noconfirm --needed dialog git make || { echo "Run as root user"; clear; exit; }
     refresh_keyring
 }
 
@@ -97,7 +97,7 @@ install_aur() {
     dialog --title "AUR packages" --infobox "AUR Package $asd/$as\n\nInstalling: $1\n\n> $2 <" 0 0
     # is package already installed?
     grep "^$1$" <<< "$aur_already_installed" && return
-    $aurhelper -S --noconfirm "$1" &>> $logfile
+    sudo -u $uname $aurhelper -S --noconfirm "$1" &>> $logfile
 }
 
 install_manual() {
@@ -108,14 +108,15 @@ install_manual() {
     cd "/home/$uname" || exit
 }
 
+# TODO: test with makepkg -si
 install_aur_helper() {
     dialog --title "Installing the AUR Helper" --infobox "Installing dependencies..." 0 0
     pacman --noconfirm --needed -S go &>> $logfile
     dialog --title "Installing the AUR Helper" --infobox "Cloning repository..." 0 0
     cd $(mktemp -d)
     git clone https://aur.archlinux.org/yay.git . &>> $logfile
-    makepkg --noconfirm -s &>> $logfile
+    sudo -u $uname makepkg --noconfirm -s &>> $logfile
-    pacman -U *.xz
+    pacman -U --noconfirm *.zst
 }
 
 installation_loop() {
@@ -157,8 +158,8 @@ enable_service() {
 }
 
 set_permissions() {
-    sed -i '/.*#toerd/d' /etc/sudoers
+    sed -i '/.*#phga/d' /etc/sudoers
-    echo -e "$@ #toerd" >> /etc/sudoers
+    echo -e "$@ #phga" >> /etc/sudoers
     echo "Permissions set\n\n" >> $logfile
 }
 
@@ -211,19 +212,24 @@ add_pacman_hooks() {
     cp $scriptdir/etc/pacman.d/hooks/* /etc/pacman.d/hooks/ &>> $logfile
 }
 
+add_xorg_conf() {
+    echo "Adding systemd configs\n\n" >> $logfile
+    cp $scriptdir/etc/systemd/network/00-wired.network /etc/systemd/network/00-wired.network &>> $logfile
+}
+
 set_pacman_config() {
     echo "Setting pacman conf\n\n" >> $logfile
-    pconf="/etc/pacman.conf"
+    cp $scriptdir/etc/pacman.conf /etc/pacman.conf &>> $logfile
-    uncom "Color" $pconf &>> $logfile
-    uncom "TotalDownload" $pconf &>> $logfile
-    uncom "VerbosePkgLists" $pconf &>> $logfile
-    add_after "VerbosePkgLists" "ILoveCandy" $pconf &>> $logfile
 }
 
 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 "qhga"
     sudo -u $uname git config --global credential.useHttpPath true
+    # gpg --list-keys --keyid-format=long
+    sudo -u $uname git config --global user.signingkey 5249548AA705F019
+    sudo -u $uname git config --global commit.gpgsign true
+
     # sudo -u $uname git config --global credential.helper /usr/bin/pass-git-helper
 }
 
@@ -286,8 +292,13 @@ case $todo in
         set_permissions "Defaults timestamp_timeout=45\n%wheel ALL=(ALL) ALL\n%wheel ALL=(ALL) NOPASSWD: /usr/bin/shutdown,/usr/bin/reboot,/usr/bin/systemctl suspend,/usr/bin/wifi-menu,/usr/bin/mount,/usr/bin/umount,/usr/bin/pacman -Syu,/usr/bin/pacman -Ss,/usr/bin/pacman -Syyu,/usr/bin/pacman -Syyu --noconfirm,/usr/bin/loadkeys"
         no_beep
         set_system_stuff
-        # enable_service "--user syncthing" "netctl-auto@wlp3s0" "--user offlineimap@philip_thi" "--user offlineimap@philip_posteo" "--user offlineimap@philip_gmail"
+        enable_service "--user syncthing"
-        enable_service "netctl-auto@wlp3s0" "systemd-timesyncd" "atd" "--user syncthing"
+        if [[ ${curr_platform} == "L" ]]; then
+            enable_service "netctl-auto@wlp3s0"
+        else
+            enable_service "systemd-networkd"
+        fi
+        enable_service "systemd-timesyncd" "atd"
         set_root_bashrc
         ready_steady_go
         clear
@@ -306,7 +317,12 @@ case $todo in
         init
         startup_msg
         pre_update
-        enable_service "netctl-auto@wlp3s0" "systemd-timesyncd" "atd" "--user syncthing"
+        if [[ ${curr_platform} == "L" ]]; then
+            enable_service "netctl-auto@wlp3s0"
+        else
+            enable_service "systemd-networkd"
+        fi
+        enable_service "systemd-timesyncd" "atd"
         ready_steady_go
         clear
         ;;

pack.csv

@@ -16,14 +16,17 @@ 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,gnupg,Complete and free implementation of the OpenPGP standard
-# A,P,oath-toolkit,library to use OATH-pam auth with yubikeys
+A,P,oath-toolkit,library to use OATH-pam auth with yubikeys
 A,P,yubico-pam,Authentication with yubikeys
+D,P,nvidia-dkms,Graphics driver
+A,P,expac,Pacman Database Extraction Tool (Get Install-Date)
+A,P,qt5ct,Tool to change themes for qt apps
 
 # libraries
-A,M,pyorgmode,lib to create and modify orgmode files used in quteb script
+# A,M,pyorgmode,lib to create and modify orgmode files used in quteb script
 
 # Driver related stuff
-A,P,linux-headers,linux kernel headers
+A,P,linux-zen-headers,linux kernel headers
 
 # Tablet related
 A,P,xf86-input-wacom,xsetwacom
@@ -59,6 +62,7 @@ A,P,xcape,Configure modifier keys to act as other keys when pressed and released
 A,P,feh,Image toolbelt
 A,P,rofi,Application launcher
 A,P,xsecurelock,Lockscreen
+A,P,xclip,clipboard
 # A,M,dmenu,Generic menu for X
 
 
@@ -91,12 +95,14 @@ A,P,pulseaudio,Sound server
 A,P,pulseaudio-alsa,ALSA Configuration for PulseAudio
 A,P,pulseaudio-jack,Jack support for PulseAudio
 A,P,jack2,C++ version of the JACK low-latency audio server for multi-processor machines
+A,P,jack2-dbus,The JACK low-latency audio server (dbus integration)
+A,P,a2jmidid,Dbus midi jack thingy
 A,P,qjackctl,A Qt front-end for the JACK low-latency audio server
 A,P,python-dbus,Python bindings for DBUS
 
 
 # Text editing
-A,A,emacs-git,The extensible customizable self-documenting real-time display editor
+A,P,emacs,The extensible customizable self-documenting real-time display editor
 A,P,xournalpp,Notetaking and sketching application
 
 # emacs reqs
@@ -116,6 +122,7 @@ A,P,minted,Syntaxhighlighting for Latex
 # Webbrowsing
 A,P,qutebrowser,A keyboard-driven vim-like browser based on PyQt5
 A,A,chromium-widevine,Watch netflix
+A,A,python-adblock,Better adblocking for qutebrowser
 # A,P,firefox,Browser with addon system. Please go faster qutebrowser dev!
 
 # General stuff
@@ -136,14 +143,14 @@ A,P,aspell-de,no desc
 # A,P,rsibreak,Prevent me from descroying myself
 A,P,nmap,network scanning
 A,P,thunar,filebrowser
-A,P,gnome-keyring,keyring implementiation
+# A,P,gnome-keyring,keyring implementiation
 
 # Screencapture
 A,P,maim,snipping tool for screenshots and stuff
 A,P,peek,record screen to gif/mp4
 
 # Remote assistance
-A,A,anydesk,remote software like teamviewer (but better)
+# A,A,anydesk,remote software like teamviewer (but better)
 
 A,P,syncthing,tool to sync all my docs
 # A,P,nextcloud-client,Client for nextcloud server
@@ -186,5 +193,10 @@ A,P,avr-libc
 A,P,teensy-loader-cli
 A,A,bootloadhid
 
+# Gaming
+D,P,steam,play play have fun
+D,A,legendary,epic but better
+D,A,protontricks,proton enhancements
+
 # downgrade packages
 A,A,downgrade

packages/st/config.h

@@ -5,7 +5,7 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char *font = "-*-Ttyp0-normal-normal-normal-*-17-*-*-*-c-70-iso10646-1";
+static char *font = "-UNKN-Ttyp0-normal-normal-normal-*-17-*-*-*-m-*-iso10646-1";
 static int borderpx = 8;
 
 /*
@@ -167,22 +167,22 @@ static uint forcemousemod = ShiftMask;
  */
 ResourcePref resources[] = {
     { "font",         STRING,  &font },
-		{ "color0",       STRING,  &colorname[0] },
+    { "black",       STRING,  &colorname[0] },
-		{ "color1",       STRING,  &colorname[1] },
+    { "red",       STRING,  &colorname[1] },
-		{ "color2",       STRING,  &colorname[2] },
+    { "green",       STRING,  &colorname[2] },
-		{ "color3",       STRING,  &colorname[3] },
+    { "yellow",       STRING,  &colorname[3] },
-		{ "color4",       STRING,  &colorname[4] },
+    { "blue",       STRING,  &colorname[4] },
-		{ "color5",       STRING,  &colorname[5] },
+    { "magenta",       STRING,  &colorname[5] },
-		{ "color6",       STRING,  &colorname[6] },
+    { "cyan",       STRING,  &colorname[6] },
-		{ "color7",       STRING,  &colorname[7] },
+    { "white",       STRING,  &colorname[7] },
-		{ "color8",       STRING,  &colorname[8] },
+    { "b_black",       STRING,  &colorname[8] },
-		{ "color9",       STRING,  &colorname[9] },
+    { "b_red",       STRING,  &colorname[9] },
-		{ "color10",      STRING,  &colorname[10] },
+    { "b_green",      STRING,  &colorname[10] },
-		{ "color11",      STRING,  &colorname[11] },
+    { "b_yellow",      STRING,  &colorname[11] },
-		{ "color12",      STRING,  &colorname[12] },
+    { "b_blue",      STRING,  &colorname[12] },
-		{ "color13",      STRING,  &colorname[13] },
+    { "b_magenta",      STRING,  &colorname[13] },
-		{ "color14",      STRING,  &colorname[14] },
+    { "b_cyan",      STRING,  &colorname[14] },
-		{ "color15",      STRING,  &colorname[15] },
+    { "b_white",      STRING,  &colorname[15] },
     { "background",   STRING,  &colorname[256] },
     { "foreground",   STRING,  &colorname[257] },
     { "cursorColor",  STRING,  &colorname[258] },