From df766c3a483fa3e7c0d22e264901e51273b4b301 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Thu, 15 Nov 2018 20:51:16 -0500 Subject: [PATCH] meta: Remove all references to urxvt and termite Now that I've learned kitty, other terminal emulators like termite and urxvt are no longer necessary. Here I remove any config files that were necessary for either termite or urxvt and change all terminal options to kitty. As an added bonus, a global gtk.css file is no longer necessary. This contradicted a core idea of dotfiles (that every program should have its own directory in $XDG_CONFIG_HOME) and was in general a weird hack that also affected non-termite emulators. --- Makefile | 15 ++++------ bspwm/.Xresources | 25 ---------------- bspwm/.config/bspwm/bspwmrc | 2 +- bspwm/.config/gtk-3.0/gtk.css | 8 ----- bspwm/.config/rofi/config.rasi | 2 +- bspwm/.config/sxhkd/dropdown.sh | 4 +-- bspwm/.config/sxhkd/sxhkdrc | 8 ++--- bspwm/.config/systemd/user/urxvtd.service | 9 ------ bspwm/.config/wal/templates/colors.Xresources | 29 ------------------- 9 files changed, 14 insertions(+), 88 deletions(-) delete mode 100644 bspwm/.config/gtk-3.0/gtk.css delete mode 100644 bspwm/.config/systemd/user/urxvtd.service delete mode 100644 bspwm/.config/wal/templates/colors.Xresources diff --git a/Makefile b/Makefile index 13a2ab4..06d9de3 100644 --- a/Makefile +++ b/Makefile @@ -38,13 +38,10 @@ uninstall: prune: @$(call ${NS_STOW_COMMAND},R) -# ======================== -# ======= systemd ======== -# ======================== +.PHONY: enable-mpd +enable-mpd: + @systemctl --user enable --now mpd.service -NS_SYSTEMD_SERVICES := ssh-agent urxvtd mpd - -.PHONY: systemd-enable-now -systemd-enable-now: - @$(foreach service,${NS_SYSTEMD_SERVICES},systemctl --user enable --now ${service}.service;) - @echo "SUCCESS: Enabled the following services: ${NS_SYSTEMD_SERVICES}" +.PHONY: enable-ssh-agent +enable-ssh-agent: + @systemctl --user enable --now ssh-agent.service diff --git a/bspwm/.Xresources b/bspwm/.Xresources index bc9bf4a..5cc379e 100644 --- a/bspwm/.Xresources +++ b/bspwm/.Xresources @@ -22,29 +22,4 @@ Xft.hintstyle: hintfull ! Set the type of subpixel antialiasing to rgb Xft.rgba: rgb -! Make letter spacing identical to termite -URxvt.letterSpace: 1 - -! urxvt settings -URxvt.font: xft:Hack:size=11 - -URxvt.scrollBar: false -URxvt.internalBorder: 30 -URxvt.cursorBlink: true -URxvt.pointerBlank: true - -! https://wiki.gentoo.org/wiki/Rxvt-unicode -URxvt.perl-ext-common: default,selection-to-clipboard,pasta,matcher,keyboard-select -URxvt.keysym.M-u: perl:url-select:select_next -URxvt.url-launcher: /usr/bin/firefox -URxvt.underlineURLs: true -URxvt.matcher.button: 1 -URxvt.keysym.M-Escape:perl:keyboard-select:activate -URxvt.keysym.Control-Shift-V: perl:pasta:paste -URxvt.clipboard.autocopy: true - -! Disable default ctrl shift behavior of urxvt -URxvt.iso14755: false -URxvt.iso14755_52: false - ! vim:ft=xdefaults diff --git a/bspwm/.config/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc index 14b2c2e..a9c728a 100755 --- a/bspwm/.config/bspwm/bspwmrc +++ b/bspwm/.config/bspwm/bspwmrc @@ -60,7 +60,7 @@ compton -b # bspc rules bspc rule -a mpv state=floating bspc rule -a feh state=floating -bspc rule -a URxvt:floating state=floating +bspc rule -a kitty:floating state=floating bspc rule -a kwrite state=floating bspc rule -a ark state=floating diff --git a/bspwm/.config/gtk-3.0/gtk.css b/bspwm/.config/gtk-3.0/gtk.css deleted file mode 100644 index e8e6673..0000000 --- a/bspwm/.config/gtk-3.0/gtk.css +++ /dev/null @@ -1,8 +0,0 @@ -/* New Start: A modern Arch workflow built with an emphasis on functionality. - * Copyright (C) 2017-2018 Donovan Glover - */ - -VteTerminal, vte-terminal { - /* Same as URxvt.internalBorder */ - padding: 30px; -} diff --git a/bspwm/.config/rofi/config.rasi b/bspwm/.config/rofi/config.rasi index 61551fe..8cc77f8 100644 --- a/bspwm/.config/rofi/config.rasi +++ b/bspwm/.config/rofi/config.rasi @@ -6,7 +6,7 @@ configuration { bw: 0; theme: "~/.cache/wal/colors-rofi-dark.rasi"; drun-icon-theme: "Papirus-Dark"; - terminal: "urxvtc"; + terminal: "kitty"; scroll-method: 1; columns: 3; width: 70; diff --git a/bspwm/.config/sxhkd/dropdown.sh b/bspwm/.config/sxhkd/dropdown.sh index 2f7edd1..d02c566 100755 --- a/bspwm/.config/sxhkd/dropdown.sh +++ b/bspwm/.config/sxhkd/dropdown.sh @@ -2,9 +2,9 @@ # New Start: A modern Arch workflow built with an emphasis on functionality. # Copyright (C) 2018 Donovan Glover -c='URxvt' # Class +c='kitty' # Class i='dropdown' # Instance -x='urxvtc -name' # Executable +x='kitty --name' # Executable # Note: This solution will not work with termite since it registers two ids. # See https://github.com/thestinger/termite/issues/634 for more information. diff --git a/bspwm/.config/sxhkd/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc index 1e478a7..c96819b 100644 --- a/bspwm/.config/sxhkd/sxhkdrc +++ b/bspwm/.config/sxhkd/sxhkdrc @@ -11,11 +11,11 @@ super + p # Open a new terminal window super + {_,shift} + Return - {kitty,urxvtc} + kitty {_,--name floating} -# Toggle a dropdown terminal or open a new floating window -super + {_,shift} + backslash - {~/.config/sxhkd/dropdown.sh,urxvtc -name floating} +# Toggle a dropdown terminal +super + backslash + ~/.config/sxhkd/dropdown.sh # toggle polybar: top_padding depends on the height you set in polybar/config super + o diff --git a/bspwm/.config/systemd/user/urxvtd.service b/bspwm/.config/systemd/user/urxvtd.service deleted file mode 100644 index fe9b855..0000000 --- a/bspwm/.config/systemd/user/urxvtd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=urxvtd - -[Service] -Type=forking -ExecStart=/usr/bin/urxvtd -q -o -f - -[Install] -WantedBy=default.target diff --git a/bspwm/.config/wal/templates/colors.Xresources b/bspwm/.config/wal/templates/colors.Xresources deleted file mode 100644 index 0c91fdc..0000000 --- a/bspwm/.config/wal/templates/colors.Xresources +++ /dev/null @@ -1,29 +0,0 @@ -*foreground: {foreground} -*background: {background} -URxvt*cursorColor: {cursor} -URxvt*borderColor: {background} - -*color0: {color0} -*color1: {color1} -*color2: {color2} -*color3: {color3} -*color4: {color4} -*color5: {color5} -*color6: {color6} -*color7: {color7} -*color8: {color8} -*color9: {color9} -*color10: {color10} -*color11: {color11} -*color12: {color12} -*color13: {color13} -*color14: {color14} -*color15: {color15} - -! Black color that will not be affected by bold highlighting. -*color66: {color0} - -! Disable transparency for better image support -! This also makes the terminal faster and makes images persist between -! desktops with the urxvt mode in ranger. -URxvt*depth:0