From 0deb673719ce18248d9065063626cdd5aeb81e87 Mon Sep 17 00:00:00 2001 From: steveokard Date: Wed, 14 Dec 2022 05:04:14 -0500 Subject: [PATCH] refactored init script and layout of directories --- {vim => config}/.SpaceVim.d/init.toml | 0 {bash => config}/.bash_aliases | 0 .../fontconfig/conf.d/01-emojifonts.conf | 69 ++++--- config/.config/htop/htoprc | 53 +++++- config/.config/mc/ini | 4 +- {bash => config}/.sensible.bash | 0 {vim => config}/.spacevim | 0 config/.t-theme/LICENSE | 1 + config/.t-theme/README.md | 118 ++++++++++++ config/.t-theme/tmux-power.tmux | 168 ++++++++++++++++++ {tmux => config}/.tmux.conf | 0 config/README.md | 2 + config/bottom/bottom.toml | 166 ----------------- desktop.sh | 1 + init.sh | 43 ++--- mc/ini | 143 --------------- mc/panels.ini | 33 ---- scripts/link_stevserver.sh | 2 + spacemacs.zsh | 22 +-- 19 files changed, 406 insertions(+), 419 deletions(-) rename {vim => config}/.SpaceVim.d/init.toml (100%) rename {bash => config}/.bash_aliases (100%) rename {bash => config}/.sensible.bash (100%) rename {vim => config}/.spacevim (100%) create mode 100644 config/.t-theme/LICENSE create mode 100644 config/.t-theme/README.md create mode 100755 config/.t-theme/tmux-power.tmux rename {tmux => config}/.tmux.conf (100%) create mode 100644 config/README.md delete mode 100644 config/bottom/bottom.toml delete mode 100644 mc/ini delete mode 100644 mc/panels.ini create mode 100755 scripts/link_stevserver.sh diff --git a/vim/.SpaceVim.d/init.toml b/config/.SpaceVim.d/init.toml similarity index 100% rename from vim/.SpaceVim.d/init.toml rename to config/.SpaceVim.d/init.toml diff --git a/bash/.bash_aliases b/config/.bash_aliases similarity index 100% rename from bash/.bash_aliases rename to config/.bash_aliases diff --git a/config/.config/fontconfig/conf.d/01-emojifonts.conf b/config/.config/fontconfig/conf.d/01-emojifonts.conf index d3aeca4..c4871c3 100644 --- a/config/.config/fontconfig/conf.d/01-emojifonts.conf +++ b/config/.config/fontconfig/conf.d/01-emojifonts.conf @@ -1,30 +1,43 @@ - - + + - - -sans-serif - - -Noto Color Emoji - - - - - -serif - - -Noto Color Emoji - - - - - -Apple Color Emoji - - -Noto Color Emoji - - + + + sans-serif + + + Noto Color Emoji + + + + + serif + + + Noto Color Emoji + + + + + Apple Color Emoji + + + Noto Color Emoji + + + + + rgb + + + + + true + + + + + hintfull + + diff --git a/config/.config/htop/htoprc b/config/.config/htop/htoprc index 2cada31..12014d6 100644 --- a/config/.config/htop/htoprc +++ b/config/.config/htop/htoprc @@ -1,26 +1,61 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. +htop_version=3.2.0 +config_reader_min_version=3 fields=0 48 17 18 38 39 40 2 46 47 49 1 -sort_key=46 -sort_direction=1 -hide_threads=0 hide_kernel_threads=1 hide_userland_threads=1 shadow_other_users=0 show_thread_names=0 show_program_path=1 highlight_base_name=0 +highlight_deleted_exe=1 highlight_megabytes=1 highlight_threads=1 -tree_view=0 +highlight_changes=0 +highlight_changes_delay_secs=5 +find_comm_in_cmdline=1 +strip_exe_from_cmdline=1 +show_merged_command=0 header_margin=1 +screen_tabs=0 detailed_cpu_time=0 -cpu_count_from_zero=0 +cpu_count_from_one=1 +show_cpu_usage=1 +show_cpu_frequency=0 +show_cpu_temperature=0 +degree_fahrenheit=0 update_process_names=0 account_guest_in_cpu_meter=0 color_scheme=6 +enable_mouse=1 delay=15 -left_meters=LeftCPUs2 Memory Swap -left_meter_modes=1 1 1 -right_meters=RightCPUs2 Tasks LoadAverage Uptime -right_meter_modes=1 2 2 2 +hide_function_bar=0 +header_layout=two_50_50 +column_meters_0=LeftCPUs2 Memory Swap +column_meter_modes_0=1 1 1 +column_meters_1=RightCPUs2 Tasks LoadAverage Uptime +column_meter_modes_1=1 2 2 2 +tree_view=0 +sort_key=46 +tree_sort_key=0 +sort_direction=-1 +tree_sort_direction=1 +tree_view_always_by_pid=0 +all_branches_collapsed=0 +screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command +.sort_key=PERCENT_CPU +.tree_sort_key=PID +.tree_view=0 +.tree_view_always_by_pid=0 +.sort_direction=-1 +.tree_sort_direction=1 +.all_branches_collapsed=0 +screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE +.sort_key=IO_RATE +.tree_sort_key=PID +.tree_view=0 +.tree_view_always_by_pid=0 +.sort_direction=-1 +.tree_sort_direction=1 +.all_branches_collapsed=0 diff --git a/config/.config/mc/ini b/config/.config/mc/ini index 36ab84d..14c37a9 100644 --- a/config/.config/mc/ini +++ b/config/.config/mc/ini @@ -83,11 +83,11 @@ editor_backup_extension=~ editor_filesize_threshold=64M editor_stop_format_chars=-+*\\,.;:&> mcview_eof= -skin=yadt256 +skin=dracula256 [Layout] output_lines=0 -left_panel_size=48 +left_panel_size=52 top_panel_size=0 message_visible=true keybar_visible=true diff --git a/bash/.sensible.bash b/config/.sensible.bash similarity index 100% rename from bash/.sensible.bash rename to config/.sensible.bash diff --git a/vim/.spacevim b/config/.spacevim similarity index 100% rename from vim/.spacevim rename to config/.spacevim diff --git a/config/.t-theme/LICENSE b/config/.t-theme/LICENSE new file mode 100644 index 0000000..69c066b --- /dev/null +++ b/config/.t-theme/LICENSE @@ -0,0 +1 @@ +https://wfxr.mit-license.org/2017 diff --git a/config/.t-theme/README.md b/config/.t-theme/README.md new file mode 100644 index 0000000..997cc71 --- /dev/null +++ b/config/.t-theme/README.md @@ -0,0 +1,118 @@ +# Tmux Powerline Theme + +[![TPM](https://img.shields.io/badge/tpm--support-true-blue)](https://github.com/tmux-plugins/tpm) +[![Awesome](https://img.shields.io/badge/Awesome-tmux-d07cd0?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAABVklEQVRIS+3VvWpVURDF8d9CRAJapBAfwWCt+FEJthIUUcEm2NgIYiOxsrCwULCwktjYKSgYLfQF1JjCNvoMNhYRCwOO7HAiVw055yoBizvN3nBmrf8+M7PZsc2RbfY3AfRWeNMSVdUlHEzS1t6oqvt4n+TB78l/AKpqHrdwLcndXndU1WXcw50k10c1PwFV1fa3cQVzSR4PMd/IqaoLeIj2N1eTfG/f1gFVtQMLOI+zSV6NYz4COYFneIGLSdZSVbvwCMdxMsnbvzEfgRzCSyzjXAO8xlHcxMq/mI9oD+AGlhqgxjD93OVOD9TUuICdXd++/VeAVewecKKv2NPlfcHUAM1qK9FTnBmQvJjkdDfWzzE7QPOkAfZiEce2ECzhVJJPHWAfGuTwFpo365pO0NYjmEFr5Eas4SPeJfll2rqb38Z7/yaaD+0eNM3kPejt86REvSX6AamgdXkgoxLxAAAAAElFTkSuQmCC)](https://github.com/rothgar/awesome-tmux) +[![License](https://img.shields.io/badge/License-MIT-brightgreen.svg)](https://wfxr.mit-license.org/2017) + +Yet another powerline theme for tmux. + +### 📥 Installation + +**Install manually** + +Clone the repo somewhere and source it in `.tmux.conf`: + +```tmux +run-shell "/path/to/tmux-power.tmux" +``` + +*NOTE: Options should be set before sourcing.* + +**Install using [TPM](https://github.com/tmux-plugins/tpm)** + +```tmux +set -g @plugin 'wfxr/tmux-power' +``` + +### 🎨 Themes + +**Gold**(default): `set -g @tmux_power_theme 'gold'` +![screenshot](https://raw.githubusercontent.com/wfxr/i/master/tmux-power-gold.png) + +**Redwine**: `set -g @tmux_power_theme 'redwine'` +![screenshot](https://raw.githubusercontent.com/wfxr/i/master/tmux-power-redwine.png) + +**Moon**: `set -g @tmux_power_theme 'moon'` +![screenshot](https://raw.githubusercontent.com/wfxr/i/master/tmux-power-moon.png) + +**Forest**: `set -g @tmux_power_theme 'forest'` +![screenshot](https://raw.githubusercontent.com/wfxr/i/master/tmux-power-forest.png) + +**Violet**: `set -g @tmux_power_theme 'violet'` +![screenshot](https://raw.githubusercontent.com/wfxr/i/master/tmux-power-violet.png) + +**Snow**: `set -g @tmux_power_theme 'snow'` +![screenshot](https://raw.githubusercontent.com/wfxr/i/master/tmux-power-snow.png) + +**Coral**: `set -g @tmux_power_theme 'coral'` +![screenshot](https://raw.githubusercontent.com/wfxr/i/master/tmux-power-coral.png) + +**Sky**: `set -g @tmux_power_theme 'sky'` +![screenshot](https://raw.githubusercontent.com/wfxr/i/master/tmux-power-sky.png) + +**Default**: `set -g @tmux_power_theme 'default'` +Set this theme if you want to honor the terminal colorscheme. To be used with +something like [pywal](https://github.com/dylanaraps/pywal) for instance. + +### ⚙ Customizing + +You can define your favourite main color if you don't like any of above. + +```tmux +set -g @tmux_power_theme '#483D8B' # dark slate blue +``` + +You can change the date and time formats using strftime: + +```tmux +set -g @tmux_power_date_format '%F' +set -g @tmux_power_time_format '%T' +``` + +You can also customize the icons: + +```tmux +set -g @tmux_power_date_icon ' ' # set it to a blank will disable the icon +set -g @tmux_power_time_icon '🕘' # emoji can be used if your terminal supports +set -g @tmux_power_user_icon 'U' +set -g @tmux_power_session_icon 'S' +set -g @tmux_power_upload_speed_icon '↑' +set -g @tmux_power_download_speed_icon '↓' +set -g @tmux_power_left_arrow_icon '<' +set -g @tmux_power_right_arrow_icon '>' +``` +*The default icons use glyphs from [nerd-fonts](https://github.com/ryanoasis/nerd-fonts).* + +### 📦 Plugin support + +**[tmux-net-speed](https://github.com/wfxr/tmux-net-speed)** + +```tmux +set -g @tmux_power_show_upload_speed true +set -g @tmux_power_show_download_speed true +``` + +**[tmux-prefix-highlight](https://github.com/tmux-plugins/tmux-prefix-highlight)** + +```tmux +# 'L' for left only, 'R' for right only and 'LR' for both +set -g @tmux_power_prefix_highlight_pos 'LR' +``` + +**[tmux-web-reachable](https://github.com/wfxr/tmux-web-reachable)** + +```tmux +set -g @tmux_power_show_web_reachable true +``` + +### 🔗 Other plugins + +You might also find these useful: + +- [tmux-fzf-url](https://github.com/wfxr/tmux-fzf-url) +- [tmux-net-speed](https://github.com/wfxr/tmux-net-speed) +- [tmux-web-reachable](https://github.com/wfxr/tmux-web-reachable) + +### 📃 License + +[MIT](https://wfxr.mit-license.org/2017) (c) Wenxuan Zhang diff --git a/config/.t-theme/tmux-power.tmux b/config/.t-theme/tmux-power.tmux new file mode 100755 index 0000000..5145334 --- /dev/null +++ b/config/.t-theme/tmux-power.tmux @@ -0,0 +1,168 @@ +#!/usr/bin/env bash +#=============================================================================== +# Author: Wenxuan +# Email: wenxuangm@gmail.com +# Created: 2018-04-05 17:37 +#=============================================================================== + +# $1: option +# $2: default value +tmux_get() { + local value="$(tmux show -gqv "$1")" + [ -n "$value" ] && echo "$value" || echo "$2" +} + +# $1: option +# $2: value +tmux_set() { + tmux set-option -gq "$1" "$2" +} + +# Options +right_arrow_icon=$(tmux_get '@tmux_power_right_arrow_icon' '') +left_arrow_icon=$(tmux_get '@tmux_power_left_arrow_icon' '') +upload_speed_icon=$(tmux_get '@tmux_power_upload_speed_icon' '') +download_speed_icon=$(tmux_get '@tmux_power_download_speed_icon' '') +session_icon="$(tmux_get '@tmux_power_session_icon' '')" +user_icon="$(tmux_get '@tmux_power_user_icon' '')" +time_icon="$(tmux_get '@tmux_power_time_icon' '')" +date_icon="$(tmux_get '@tmux_power_date_icon' '')" +show_upload_speed="$(tmux_get @tmux_power_show_upload_speed false)" +show_download_speed="$(tmux_get @tmux_power_show_download_speed false)" +show_web_reachable="$(tmux_get @tmux_power_show_web_reachable false)" +prefix_highlight_pos=$(tmux_get @tmux_power_prefix_highlight_pos) +time_format=$(tmux_get @tmux_power_time_format '%T') +date_format=$(tmux_get @tmux_power_date_format '%F') +# short for Theme-Colour +TC=$(tmux_get '@tmux_power_theme' 'gold') +case $TC in + 'gold' ) + TC='#ffb86c' + ;; + 'redwine' ) + TC='#b34a47' + ;; + 'moon' ) + TC='#00abab' + ;; + 'forest' ) + TC='#228b22' + ;; + 'violet' ) + TC='#9370db' + ;; + 'snow' ) + TC='#fffafa' + ;; + 'coral' ) + TC='#ff7f50' + ;; + 'sky' ) + TC='#87ceeb' + ;; + 'default' ) # Useful when your term changes colour dynamically (e.g. pywal) + TC='colour3' + ;; +esac + +G01=#080808 #232 +G02=#121212 #233 +G03=#1c1c1c #234 +G04=#262626 #235 +G05=#303030 #236 +G06=#3a3a3a #237 +G07=#444444 #238 +G08=#4e4e4e #239 +G09=#585858 #240 +G10=#626262 #241 +G11=#6c6c6c #242 +G12=#767676 #243 + +FG="$G10" +BG="$G04" + +# Status options +tmux_set status-interval 1 +tmux_set status on + +# Basic status bar colors +tmux_set status-fg "$FG" +tmux_set status-bg "$BG" +tmux_set status-attr none + +# tmux-prefix-highlight +tmux_set @prefix_highlight_fg "$BG" +tmux_set @prefix_highlight_bg "$FG" +tmux_set @prefix_highlight_show_copy_mode 'on' +tmux_set @prefix_highlight_copy_mode_attr "fg=$TC,bg=$BG,bold" +tmux_set @prefix_highlight_output_prefix "#[fg=$TC]#[bg=$BG]$left_arrow_icon#[bg=$TC]#[fg=$BG]" +tmux_set @prefix_highlight_output_suffix "#[fg=$TC]#[bg=$BG]$right_arrow_icon" + +#      +# Left side of status bar +tmux_set status-left-bg "$G04" +tmux_set status-left-fg "G12" +tmux_set status-left-length 150 +user=$(whoami) +LS="#[fg=$G04,bg=$TC,bold] $user_icon $user@#h #[fg=$TC,bg=$G06,nobold]$right_arrow_icon#[fg=$TC,bg=$G06] $session_icon #S " +if "$show_upload_speed"; then + LS="$LS#[fg=$G06,bg=$G05]$right_arrow_icon#[fg=$TC,bg=$G05] $upload_speed_icon #{upload_speed} #[fg=$G05,bg=$BG]$right_arrow_icon" +else + LS="$LS#[fg=$G06,bg=$BG]$right_arrow_icon" +fi +if [[ $prefix_highlight_pos == 'L' || $prefix_highlight_pos == 'LR' ]]; then + LS="$LS#{prefix_highlight}" +fi +tmux_set status-left "$LS" + +# Right side of status bar +tmux_set status-right-bg "$G04" +tmux_set status-right-fg "G12" +tmux_set status-right-length 150 +RS="#[fg=$TC,bg=$G06] $time_icon $time_format #[fg=$TC,bg=$G06]$left_arrow_icon#[fg=$G04,bg=$TC] $date_icon $date_format " +if "$show_download_speed"; then + RS="#[fg=$G05,bg=$BG]$left_arrow_icon#[fg=$TC,bg=$G05] $download_speed_icon #{download_speed} #[fg=$G06,bg=$G05]$left_arrow_icon$RS" +fi +if "$show_web_reachable"; then + RS=" #{web_reachable_status} $RS" +fi +if [[ $prefix_highlight_pos == 'R' || $prefix_highlight_pos == 'LR' ]]; then + RS="#{prefix_highlight}$RS" +fi +tmux_set status-right "$RS" + +# Window status +tmux_set window-status-format " #I:#W#F " +tmux_set window-status-current-format "#[fg=$BG,bg=$G06]$right_arrow_icon#[fg=$TC,bold] #I:#W#F #[fg=$G06,bg=$BG,nobold]$right_arrow_icon" + +# Window separator +tmux_set window-status-separator "" + +# Window status alignment +tmux_set status-justify centre + +# Current window status +tmux_set window-status-current-statys "fg=$TC,bg=$BG" + +# Pane border +tmux_set pane-border-style "fg=$G07,bg=default" + +# Active pane border +tmux_set pane-active-border-style "fg=$TC,bg=$BG" + +# Pane number indicator +tmux_set display-panes-colour "$G07" +tmux_set display-panes-active-colour "$TC" + +# Clock mode +tmux_set clock-mode-colour "$TC" +tmux_set clock-mode-style 24 + +# Message +tmux_set message-style "fg=$TC,bg=$BG" + +# Command message +tmux_set message-command-style "fg=$TC,bg=$BG" + +# Copy mode highlight +tmux_set mode-style "bg=$TC,fg=$FG" diff --git a/tmux/.tmux.conf b/config/.tmux.conf similarity index 100% rename from tmux/.tmux.conf rename to config/.tmux.conf diff --git a/config/README.md b/config/README.md new file mode 100644 index 0000000..4b3b8e4 --- /dev/null +++ b/config/README.md @@ -0,0 +1,2 @@ +# Home Folder +Everything in here is a dotfile that will be symlinked into the home directory diff --git a/config/bottom/bottom.toml b/config/bottom/bottom.toml deleted file mode 100644 index 4c8d822..0000000 --- a/config/bottom/bottom.toml +++ /dev/null @@ -1,166 +0,0 @@ -# This is a default config file for bottom. All of the settings are commented -# out by default; if you wish to change them uncomment and modify as you see -# fit. - -# This group of options represents a command-line flag/option. Flags explicitly -# added when running (ie: btm -a) will override this config file if an option -# is also set here. - -[flags] -# Whether to hide the average cpu entry. -#hide_avg_cpu = false -# Whether to use dot markers rather than braille. -#dot_marker = false -# The update rate of the application. -#rate = 1000 -# Whether to put the CPU legend to the left. -#left_legend = false -# Whether to set CPU% on a process to be based on the total CPU or just current usage. -#current_usage = false -# Whether to group processes with the same name together by default. -#group_processes = false -# Whether to make process searching case sensitive by default. -#case_sensitive = false -# Whether to make process searching look for matching the entire word by default. -#whole_word = false -# Whether to make process searching use regex by default. -#regex = false -# Defaults to Celsius. Temperature is one of: -#temperature_type = "k" -#temperature_type = "f" -#temperature_type = "c" -#temperature_type = "kelvin" -#temperature_type = "fahrenheit" -#temperature_type = "celsius" -# The default time interval (in milliseconds). -#default_time_value = 60000 -# The time delta on each zoom in/out action (in milliseconds). -#time_delta = 15000 -# Override layout default widget -#default_widget_type = "proc" -#default_widget_count = 1 -# Use basic mode -#basic = false -# Use the old network legend style -#use_old_network_legend = false -# Remove space in tables -#hide_table_gap = false -# Disable mouse clicks -#disable_click = false -# Built-in themes. Valid values are "default", "default-light", "gruvbox", "gruvbox-light", "nord", "nord-light" -#color = "default" -# Show memory values in the processes widget as values by default -#mem_as_value = false -# Show tree mode by default in the processes widget. -#tree = false -# Shows an indicator in table widgets tracking where in the list you are. -#show_table_scroll_position = false -# Show processes as their commands by default in the process widget. -#process_command = false -# Displays the network widget with binary prefixes. -#network_use_binary_prefix = false -# Displays the network widget using bytes. -#network_use_bytes = false -# Displays the network widget with a log scale. -#network_use_log = false -# Hides advanced options to stop a process on Unix-like systems. -#disable_advanced_kill = false - -# These are all the components that support custom theming. Note that colour support -# will depend on terminal support. - -#[colors] # Uncomment if you want to use custom colors -# Represents the colour of table headers (processes, CPU, disks, temperature). -#table_header_color="LightBlue" -# Represents the colour of the label each widget has. -#widget_title_color="Gray" -# Represents the average CPU color. -#avg_cpu_color="Red" -# Represents the colour the core will use in the CPU legend and graph. -#cpu_core_colors=["LightMagenta", "LightYellow", "LightCyan", "LightGreen", "LightBlue", "LightRed", "Cyan", "Green", "Blue", "Red"] -# Represents the colour RAM will use in the memory legend and graph. -#ram_color="LightMagenta" -# Represents the colour SWAP will use in the memory legend and graph. -#swap_color="LightYellow" -# Represents the colour rx will use in the network legend and graph. -#rx_color="LightCyan" -# Represents the colour tx will use in the network legend and graph. -#tx_color="LightGreen" -# Represents the colour of the border of unselected widgets. -#border_color="Gray" -# Represents the colour of the border of selected widgets. -#highlighted_border_color="LightBlue" -# Represents the colour of most text. -#text_color="Gray" -# Represents the colour of text that is selected. -#selected_text_color="Black" -# Represents the background colour of text that is selected. -#selected_bg_color="LightBlue" -# Represents the colour of the lines and text of the graph. -#graph_color="Gray" -# Represents the colours of the battery based on charge -#high_battery_color="green" -#medium_battery_color="yellow" -#low_battery_color="red" - -# Layout - layouts follow a pattern like this: -# [[row]] represents a row in the application. -# [[row.child]] represents either a widget or a column. -# [[row.child.child]] represents a widget. -# -# All widgets must have the type value set to one of ["cpu", "mem", "proc", "net", "temp", "disk", "empty"]. -# All layout components have a ratio value - if this is not set, then it defaults to 1. -# The default widget layout: -#[[row]] -# ratio=30 -# [[row.child]] -# type="cpu" -#[[row]] -# ratio=40 -# [[row.child]] -# ratio=4 -# type="mem" -# [[row.child]] -# ratio=3 -# [[row.child.child]] -# type="temp" -# [[row.child.child]] -# type="disk" -#[[row]] -# ratio=30 -# [[row.child]] -# type="net" -# [[row.child]] -# type="proc" -# default=true - - -# Filters - you can hide specific temperature sensors, network interfaces, and disks using filters. This is admittedly -# a bit hard to use as of now, and there is a planned in-app interface for managing this in the future: -[disk_filter] -is_list_ignored = true -list = ["loop"] -regex = true -case_sensitive = false -whole_word = false - -#[mount_filter] -#is_list_ignored = true -#list = ["/mnt/.*", "/boot"] -#regex = true -#case_sensitive = false -#whole_word = false - -#[temp_filter] -#is_list_ignored = true -#list = ["cpu", "wifi"] -#regex = false -#case_sensitive = false -#whole_word = false - -#[net_filter] -#is_list_ignored = true -#list = ["virbr0.*"] -#regex = true -#case_sensitive = false -#whole_word = false diff --git a/desktop.sh b/desktop.sh index 1044a71..98aa311 100755 --- a/desktop.sh +++ b/desktop.sh @@ -18,3 +18,4 @@ wget https://telegram.org/dl/desktop/linux -O ~/Downloads/tsetup.tar.xz dpkg_url https://discord.com/api/download?platform=linux&format=deb dpkg_url https://downloads.vivaldi.com/stable/vivaldi-stable_5.1.2567.73-1_amd64.deb #dpkg_url https://www.guilded.gg/downloads/Guilded-Linux.deb +sudo apt install yt-dlp diff --git a/init.sh b/init.sh index f902a77..fa01a28 100755 --- a/init.sh +++ b/init.sh @@ -19,8 +19,15 @@ case $answer in ;; esac +#create symlinks using stow +mkdir ~/.ssh +echo "Stowing Configs" +stow config +chmod 0700 ~/.ssh +chmod -R 0600 ~/.ssh/* + #setup shell -stow bash +stow home echo "Select which shell to configure and use: zsh/fish/bash"; read -r answer case $answer in z | zsh) @@ -47,40 +54,28 @@ case $answer in ;; esac -#create symlinks using stow -mkdir ~/.ssh -echo "Stowing Configs" -cd ~/stevset -stow tmux #init TMP - git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm -stow vim -stow zsh -stow config -chmod 0700 ~/.ssh -chmod -R 0600 ~/.ssh/* +echo "set up Tmux Plugins" +git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm + #Configure git user git_user () { echo -n "Would you like to configure your git name and email? (y/n) => "; read -r answer if [[ $answer = "Y" ]] || [[ $answer = "y" ]]; then - echo -n "What is your git user name => "; read -r name - git config --global user.name "$name" - echo -n "What is your git email => "; read -r email - git config --global user.email "$email" + echo -n "What is your git user name => "; read -r name + git config --global user.name "$name" + echo -n "What is your git email => "; read -r email + git config --global user.email "$email" fi } #install spacevim spacevim () { - if [ ! -e ~/.space-vim ]; then - echo "Install SpaceVim now? y/n"; read -r answer - if [[ $answer = "Y" ]] || [[ $answer = "y" ]]; then - mv "$HOME/.vim" "$HOME/vim_bk" - mv "$HOME/.vimrc" "$HOME/vimrc_bk" - (curl -sLf https://spacevim.org/install.sh | bash) - fi - fi + echo "Installing Spacevim!" + [ -d $HOME/.vim ] && mv "$HOME/.vim" "$HOME/vim_bk" + [ -f $HOME/.vimrc ] && mv "$HOME/.vimrc" "$HOME/vimrc_bk" + curl -sLf https://spacevim.org/install.sh | bash } #install fonts for terminal fonts () { diff --git a/mc/ini b/mc/ini deleted file mode 100644 index a5b3ec7..0000000 --- a/mc/ini +++ /dev/null @@ -1,143 +0,0 @@ -[Midnight-Commander] -verbose=true -shell_patterns=true -auto_save_setup=true -preallocate_space=false -auto_menu=false -use_internal_view=true -use_internal_edit=false -clear_before_exec=true -confirm_delete=true -confirm_overwrite=true -confirm_execute=false -confirm_history_cleanup=true -confirm_exit=false -confirm_directory_hotlist_delete=false -confirm_view_dir=false -safe_delete=false -use_8th_bit_as_meta=false -mouse_move_pages_viewer=true -mouse_close_dialog=false -fast_refresh=false -drop_menus=false -wrap_mode=true -old_esc_mode=true -cd_symlinks=true -show_all_if_ambiguous=false -use_file_to_guess_type=true -alternate_plus_minus=false -only_leading_plus_minus=true -show_output_starts_shell=false -xtree_mode=false -file_op_compute_totals=true -classic_progressbar=true -use_netrc=true -ftpfs_always_use_proxy=false -ftpfs_use_passive_connections=true -ftpfs_use_passive_connections_over_proxy=false -ftpfs_use_unix_list_options=true -ftpfs_first_cd_then_ls=true -ignore_ftp_chattr_errors=true -editor_fill_tabs_with_spaces=false -editor_return_does_auto_indent=false -editor_backspace_through_tabs=false -editor_fake_half_tabs=true -editor_option_save_position=true -editor_option_auto_para_formatting=false -editor_option_typewriter_wrap=false -editor_edit_confirm_save=true -editor_syntax_highlighting=true -editor_persistent_selections=true -editor_drop_selection_on_copy=true -editor_cursor_beyond_eol=false -editor_cursor_after_inserted_block=false -editor_visible_tabs=true -editor_visible_spaces=true -editor_line_state=false -editor_simple_statusbar=false -editor_check_new_line=false -editor_show_right_margin=false -editor_group_undo=true -editor_state_full_filename=true -editor_ask_filename_before_edit=false -nice_rotating_dash=true -mcview_remember_file_position=false -auto_fill_mkdir_name=true -copymove_persistent_attr=true -pause_after_run=1 -mouse_repeat_rate=100 -double_click_speed=250 -old_esc_mode_timeout=1000000 -max_dirt_limit=10 -num_history_items_recorded=60 -vfs_timeout=60 -ftpfs_directory_timeout=900 -ftpfs_retry_seconds=30 -fish_directory_timeout=900 -editor_tab_spacing=8 -editor_word_wrap_line_length=72 -editor_option_save_mode=0 -editor_backup_extension=~ -editor_filesize_threshold=64M -editor_stop_format_chars=-+*\\,.;:&> -mcview_eof= -skin=modarcon16 - -[Layout] -message_visible=1 -keybar_visible=1 -xterm_title=1 -output_lines=0 -command_prompt=1 -menubar_visible=1 -free_space=1 -horizontal_split=0 -vertical_equal=1 -left_panel_size=103 -horizontal_equal=1 -top_panel_size=1 - -[Misc] -timeformat_recent=%b %e %H:%M -timeformat_old=%b %e %Y -ftp_proxy_host=gate -ftpfs_password=anonymous@ -display_codepage=UTF-8 -source_codepage=Other_8_bit -autodetect_codeset= -spell_language=en -clipboard_store= -clipboard_paste= - -[Colors] -base_color= -xterm-256color= -color_terminals= - -[Panels] -simple_swap=false -show_mini_info=true -kilobyte_si=false -mix_all_files=false -show_backups=true -show_dot_files=true -fast_reload=false -fast_reload_msg_shown=false -mark_moves_down=true -reverse_files_only=true -auto_save_setup_panels=false -navigate_with_arrows=false -panel_scroll_pages=true -panel_scroll_center=false -mouse_move_pages=true -filetype_mode=true -permission_mode=false -torben_fj_mode=false -quick_search_mode=2 -select_flags=6 - -[Panelize] -Find *.orig after patching=find . -name \\*.orig -print -Find SUID and SGID programs=find . \\( \\( -perm -04000 -a -perm /011 \\) -o \\( -perm -02000 -a -perm /01 \\) \\) -print -Find rejects after patching=find . -name \\*.rej -print -Modified git files=git ls-files --modified diff --git a/mc/panels.ini b/mc/panels.ini deleted file mode 100644 index 96d4493..0000000 --- a/mc/panels.ini +++ /dev/null @@ -1,33 +0,0 @@ -[New Left Panel] -display=listing -reverse=0 -case_sensitive=1 -exec_first=0 -sort_order=name -list_mode=full -brief_cols=2 -user_format=half type name | size | perm -user_status0=half type name | size | perm -user_status1=half type name | size | perm -user_status2=half type name | size | perm -user_status3=half type name | size | perm -user_mini_status=false - -[New Right Panel] -display=info -reverse=0 -case_sensitive=1 -exec_first=0 -sort_order=name -list_mode=full -brief_cols=2 -user_format=half type name | size | perm -user_status0=half type name | size | perm -user_status1=half type name | size | perm -user_status2=half type name | size | perm -user_status3=half type name | size | perm -user_mini_status=false - -[Dirs] -current_is_left=true -other_dir=/home/stev/stevset/prezto/.zprezto diff --git a/scripts/link_stevserver.sh b/scripts/link_stevserver.sh new file mode 100755 index 0000000..4f5e925 --- /dev/null +++ b/scripts/link_stevserver.sh @@ -0,0 +1,2 @@ +[ -d $HOME/server ] || mkdir $HOME/server +sudo mount -t nfs 192.168.1.147:/home/stev $HOME/server diff --git a/spacemacs.zsh b/spacemacs.zsh index 9bcbb93..1a1da00 100755 --- a/spacemacs.zsh +++ b/spacemacs.zsh @@ -1,15 +1,9 @@ -#!/bin/zsh -#This will install Spacemacs (again) -#cleanup -if [ -d "$HOME/.emacs.d" ]; then - echo "Moved Doom Config" - mv ~/.emacs.d ~/doom.d -fi - -#Select Stable or Develop -if read -q "REPLY?Should we use the development version of emacs? \n"; then - git clone -b develop https://github.com/syl20bnr/spacemacs ~/.emacs.d -else - git clone https://github.com/syl20bnr/spacemacs ~/.emacs.d -fi +#!/bin/bash +#This will install Spacemacs +#backup existing files +echo "backing up existing emacs config" +[ -d $HOME/.emacs.d ] && mv $HOME/.emacs.d $HOME/.emacs.d.bak +[ -f $HOME/.emacs.el ] && mv $HOME/.emacs.el .emacs.el.bak +[ -f $HOME/.emacs ] && mv $HOME/.emacs $HOME/.emacs.bak +git clone https://github.com/syl20bnr/spacemacs $HOME/.emacs.d