From 99b1911f9869944d47ceb3b407b2cd82b76af204 Mon Sep 17 00:00:00 2001 From: M1dgard Date: Sun, 19 Aug 2018 09:43:37 +0200 Subject: [PATCH] [xinitrc/profile] Fix bug and set terminal to st Removing xfce4-terminal configuration --- install.sh | 3 --- profile | 2 +- xfce4-terminal/accels.scm | 56 --------------------------------------- xfce4-terminal/terminalrc | 45 ------------------------------- xinitrc | 3 +-- 5 files changed, 2 insertions(+), 107 deletions(-) delete mode 100644 xfce4-terminal/accels.scm delete mode 100644 xfce4-terminal/terminalrc diff --git a/install.sh b/install.sh index 7f5e522..66e5a44 100644 --- a/install.sh +++ b/install.sh @@ -17,9 +17,6 @@ mkdir -p $DOT_CONF ln -s $PWD/compton.conf $DOT_CONF/compton/config ln -s $PWD/rofi/ $DOT_CONF/rofi/ ln -s $PWD/polybar/ $DOT_CONF/polybar/ - - mkdir -p $DOT_CONF/xfce4 - ln -s $PWD/xfce4-terminal $DOT_CONF/xfce4/terminal } ln -s $PWD/profile $HOME/.profile diff --git a/profile b/profile index 1a7ebc8..ec81dad 100644 --- a/profile +++ b/profile @@ -16,6 +16,6 @@ export PARINIT="rTbgqR B=.,?_A_a Q=_s>|" export PIPENV_VENV_IN_PROJECT=true # Automatically start x when logging in on tty1 -if [ ! $DISPLAY && $XDG_VTNR -eq 1 ]; then +if [ ! "$DISPLAY" -a "$XDG_VTNR" -eq 1 ]; then exec startx fi diff --git a/xfce4-terminal/accels.scm b/xfce4-terminal/accels.scm deleted file mode 100644 index c3c23c3..0000000 --- a/xfce4-terminal/accels.scm +++ /dev/null @@ -1,56 +0,0 @@ -; xfce4-terminal GtkAccelMap rc-file -*- scheme -*- -; this file is an automated accelerator map dump -; -(gtk_accel_path "/terminal-window/goto-tab-4" "4") -(gtk_accel_path "/terminal-window/goto-tab-3" "3") -; (gtk_accel_path "/terminal-window/file-menu" "") -; (gtk_accel_path "/terminal-window/close-other-tabs" "") -; (gtk_accel_path "/terminal-window/search" "f") -; (gtk_accel_path "/terminal-window/next-tab" "Page_Down") -; (gtk_accel_path "/terminal-window/copy-html" "") -; (gtk_accel_path "/terminal-window/show-menubar" "") -; (gtk_accel_path "/terminal-window/zoom-reset" "0") -; (gtk_accel_path "/terminal-window/close-window" "q") -; (gtk_accel_path "/terminal-window/save-contents" "") -; (gtk_accel_path "/terminal-window/close-tab" "w") -; (gtk_accel_path "/terminal-window/view-menu" "") -; (gtk_accel_path "/terminal-window/new-tab" "t") -; (gtk_accel_path "/terminal-window/show-toolbar" "") -; (gtk_accel_path "/terminal-window/copy-input" "") -; (gtk_accel_path "/terminal-window/paste" "v") -; (gtk_accel_path "/terminal-window/copy" "c") -; (gtk_accel_path "/terminal-window/edit-menu" "") -; (gtk_accel_path "/terminal-window/fullscreen" "F11") -; (gtk_accel_path "/terminal-window/read-only" "") -; (gtk_accel_path "/terminal-window/detach-tab" "d") -(gtk_accel_path "/terminal-window/goto-tab-9" "9") -(gtk_accel_path "/terminal-window/goto-tab-8" "8") -(gtk_accel_path "/terminal-window/goto-tab-2" "2") -; (gtk_accel_path "/terminal-window/scroll-on-output" "") -(gtk_accel_path "/terminal-window/goto-tab-5" "5") -; (gtk_accel_path "/terminal-window/prev-tab" "Page_Up") -; (gtk_accel_path "/terminal-window/move-tab-left" "Page_Up") -; (gtk_accel_path "/terminal-window/zoom-in" "plus") -; (gtk_accel_path "/terminal-window/search-prev" "") -; (gtk_accel_path "/terminal-window/reset-and-clear" "") -; (gtk_accel_path "/terminal-window/about" "") -; (gtk_accel_path "/terminal-window/search-next" "") -(gtk_accel_path "/terminal-window/toggle-menubar" "F10") -(gtk_accel_path "/terminal-window/goto-tab-7" "7") -; (gtk_accel_path "/terminal-window/select-all" "a") -; (gtk_accel_path "/terminal-window/help-menu" "") -(gtk_accel_path "/terminal-window/goto-tab-1" "1") -; (gtk_accel_path "/terminal-window/show-borders" "") -; (gtk_accel_path "/terminal-window/new-window" "n") -(gtk_accel_path "/terminal-window/goto-tab-6" "6") -; (gtk_accel_path "/terminal-window/contents" "F1") -; (gtk_accel_path "/terminal-window/preferences" "") -; (gtk_accel_path "/terminal-window/move-tab-right" "Page_Down") -; (gtk_accel_path "/terminal-window/zoom-out" "minus") -; (gtk_accel_path "/terminal-window/set-title" "s") -; (gtk_accel_path "/terminal-window/paste-selection" "") -; (gtk_accel_path "/terminal-window/undo-close-tab" "") -; (gtk_accel_path "/terminal-window/tabs-menu" "") -; (gtk_accel_path "/terminal-window/zoom-menu" "") -; (gtk_accel_path "/terminal-window/reset" "") -; (gtk_accel_path "/terminal-window/terminal-menu" "") diff --git a/xfce4-terminal/terminalrc b/xfce4-terminal/terminalrc deleted file mode 100644 index 4e49f8e..0000000 --- a/xfce4-terminal/terminalrc +++ /dev/null @@ -1,45 +0,0 @@ -[Configuration] -RunCustomCommand=TRUE -MiscAlwaysShowTabs=FALSE -MiscBell=FALSE -MiscBellUrgent=FALSE -MiscBordersDefault=FALSE -MiscCursorBlinks=FALSE -MiscCursorShape=TERMINAL_CURSOR_SHAPE_BLOCK -MiscDefaultGeometry=80x24 -MiscInheritGeometry=FALSE -MiscMenubarDefault=FALSE -MiscMouseAutohide=FALSE -MiscMouseWheelZoom=TRUE -MiscToolbarDefault=FALSE -MiscConfirmClose=TRUE -MiscCycleTabs=TRUE -MiscTabCloseButtons=TRUE -MiscTabCloseMiddleClick=TRUE -MiscTabPosition=GTK_POS_TOP -MiscHighlightUrls=TRUE -MiscMiddleClickOpensUri=FALSE -MiscCopyOnSelect=FALSE -MiscDefaultWorkingDir= -MiscRewrapOnResize=TRUE -MiscUseShiftArrowsToScroll=FALSE -MiscSlimTabs=TRUE -CustomCommand=/usr/bin/zsh -ScrollingOnOutput=FALSE -FontName=Fira Code 13 -ColorPalette=rgb(63,63,63);rgb(210,74,74);rgb(96,180,138);rgb(223,175,143);rgb(154,184,215);rgb(220,140,195);rgb(140,208,211);rgb(235,235,235);rgb(85,87,83);rgb(215,120,120);rgb(114,213,163);rgb(240,223,175);rgb(148,191,243);rgb(236,147,211);rgb(147,224,227);rgb(255,255,255) -ColorForeground=#f3f3f3f3f3f3 -ColorBackground=#000000000000 -ColorCursor=#dcdcdc -BackgroundDarkness=0,820000 -WordChars=-A-Za-z0-9,./?%&#_=+@~ -BackgroundMode=TERMINAL_BACKGROUND_TRANSPARENT -MiscShowRelaunchDialog=TRUE -MiscNewTabAdjacent=FALSE -ScrollingLines=9000 -TextBlinkMode=TERMINAL_TEXT_BLINK_MODE_FOCUSED -ColorBoldIsBright=FALSE -ScrollingBar=TERMINAL_SCROLLBAR_NONE -TitleMode=TERMINAL_TITLE_REPLACE -ShortcutsNoHelpkey=TRUE - diff --git a/xinitrc b/xinitrc index 1ca1c37..40bba60 100644 --- a/xinitrc +++ b/xinitrc @@ -11,8 +11,7 @@ xset b off # don't beep! that's annoying as hell xset r rate 170 40 # wait 170 ms before repeating, 40 chars/second -# fav terminal. it's lightweight (always starts instantly) and isn't as peculiar to configure as urxvt (it doesn't look as ugly as xterm by default) -export TERMINAL=xfce4-terminal +export TERMINAL=st # default desktop environment to start