Merge branch 'main' of https://git.sagev.space/sage/dotfiles
This commit is contained in:
commit
325c843df0
19
copy.sh
19
copy.sh
|
@ -3,6 +3,11 @@
|
||||||
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
|
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
|
||||||
FAKE_HOME="$SCRIPT_DIR/fake_home"
|
FAKE_HOME="$SCRIPT_DIR/fake_home"
|
||||||
|
|
||||||
|
if ! command -v wget &> /dev/null; then
|
||||||
|
echo "wget must be installed!"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
git submodule init
|
git submodule init
|
||||||
git submodule update
|
git submodule update
|
||||||
|
|
||||||
|
@ -77,7 +82,6 @@ echo -n "starship is "
|
||||||
if ! command -v starship &> /dev/null; then
|
if ! command -v starship &> /dev/null; then
|
||||||
echo "not installed. Installing..."
|
echo "not installed. Installing..."
|
||||||
curl -sS https://starship.rs/install.sh | sh
|
curl -sS https://starship.rs/install.sh | sh
|
||||||
echo "Starship requires an NFont: https://github.com/ryanoasis/nerd-fonts/releases/download/v2.1.0/FiraCode.zip"
|
|
||||||
else
|
else
|
||||||
echo "already installed."
|
echo "already installed."
|
||||||
fi
|
fi
|
||||||
|
@ -95,6 +99,19 @@ else
|
||||||
echo "already installed."
|
echo "already installed."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
mkdir -p "$HOME/.local/share/fonts"
|
||||||
|
echo -n "FiraCode is "
|
||||||
|
if ! test -f "$HOME/.local/share/fonts/FiraCodeNerdFontMono-Medium.ttf"; then
|
||||||
|
echo "not installed. Installing..."
|
||||||
|
wget -O /tmp/firacode.zip "https://github.com/ryanoasis/nerd-fonts/releases/download/v3.1.1/FiraCode.zip"
|
||||||
|
unzip -d "$HOME/.local/share/fonts" /tmp/firacode.zip
|
||||||
|
rm /tmp/firacode.zip
|
||||||
|
fc-cache -f -v
|
||||||
|
|
||||||
|
else
|
||||||
|
echo "already installed."
|
||||||
|
fi
|
||||||
|
|
||||||
if ! command -v fzf &> /dev/null; then
|
if ! command -v fzf &> /dev/null; then
|
||||||
echo "You may wish to install fzf for sofi and other search"
|
echo "You may wish to install fzf for sofi and other search"
|
||||||
else
|
else
|
||||||
|
|
|
@ -141,3 +141,7 @@ ex ()
|
||||||
|
|
||||||
source ~/.shell_aliases
|
source ~/.shell_aliases
|
||||||
. "$HOME/.cargo/env"
|
. "$HOME/.cargo/env"
|
||||||
|
|
||||||
|
export NVM_DIR="$HOME/.nvm"
|
||||||
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
||||||
|
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
||||||
|
|
|
@ -0,0 +1,104 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
|
<channel name="xfce4-panel" version="1.0">
|
||||||
|
<property name="configver" type="int" value="2"/>
|
||||||
|
<property name="panels" type="array">
|
||||||
|
<value type="int" value="1"/>
|
||||||
|
<property name="dark-mode" type="bool" value="true"/>
|
||||||
|
<property name="panel-1" type="empty">
|
||||||
|
<property name="position" type="string" value="p=8;x=683;y=750"/>
|
||||||
|
<property name="length" type="uint" value="100"/>
|
||||||
|
<property name="position-locked" type="bool" value="true"/>
|
||||||
|
<property name="icon-size" type="uint" value="9"/>
|
||||||
|
<property name="size" type="uint" value="26"/>
|
||||||
|
<property name="plugin-ids" type="array">
|
||||||
|
<value type="int" value="4"/>
|
||||||
|
<value type="int" value="2"/>
|
||||||
|
<value type="int" value="3"/>
|
||||||
|
<value type="int" value="6"/>
|
||||||
|
<value type="int" value="8"/>
|
||||||
|
<value type="int" value="9"/>
|
||||||
|
<value type="int" value="12"/>
|
||||||
|
<value type="int" value="13"/>
|
||||||
|
</property>
|
||||||
|
<property name="background-style" type="uint" value="1"/>
|
||||||
|
<property name="background-rgba" type="array">
|
||||||
|
<value type="double" value="0"/>
|
||||||
|
<value type="double" value="0"/>
|
||||||
|
<value type="double" value="0"/>
|
||||||
|
<value type="double" value="1"/>
|
||||||
|
</property>
|
||||||
|
</property>
|
||||||
|
</property>
|
||||||
|
<property name="plugins" type="empty">
|
||||||
|
<property name="plugin-2" type="string" value="tasklist">
|
||||||
|
<property name="grouping" type="uint" value="1"/>
|
||||||
|
<property name="show-handle" type="bool" value="false"/>
|
||||||
|
</property>
|
||||||
|
<property name="plugin-3" type="string" value="separator">
|
||||||
|
<property name="expand" type="bool" value="true"/>
|
||||||
|
<property name="style" type="uint" value="0"/>
|
||||||
|
</property>
|
||||||
|
<property name="plugin-6" type="string" value="systray">
|
||||||
|
<property name="square-icons" type="bool" value="false"/>
|
||||||
|
<property name="known-legacy-items" type="array">
|
||||||
|
<value type="string" value="seapplet"/>
|
||||||
|
<value type="string" value="networkmanager applet"/>
|
||||||
|
<value type="string" value="xfce terminal"/>
|
||||||
|
<value type="string" value="ibus panel"/>
|
||||||
|
</property>
|
||||||
|
<property name="known-items" type="array">
|
||||||
|
<value type="string" value="vlc"/>
|
||||||
|
<value type="string" value="toolbox"/>
|
||||||
|
<value type="string" value="dnfdragora-updater"/>
|
||||||
|
<value type="string" value="blueman"/>
|
||||||
|
</property>
|
||||||
|
<property name="hidden-items" type="array">
|
||||||
|
<value type="string" value="dnfdragora-updater"/>
|
||||||
|
<value type="string" value="blueman"/>
|
||||||
|
<value type="string" value="toolbox"/>
|
||||||
|
</property>
|
||||||
|
<property name="hide-new-items" type="bool" value="false"/>
|
||||||
|
<property name="icon-size" type="int" value="16"/>
|
||||||
|
<property name="menu-is-primary" type="bool" value="false"/>
|
||||||
|
<property name="symbolic-icons" type="bool" value="false"/>
|
||||||
|
</property>
|
||||||
|
<property name="plugin-8" type="string" value="pulseaudio">
|
||||||
|
<property name="enable-keyboard-shortcuts" type="bool" value="true"/>
|
||||||
|
<property name="show-notifications" type="bool" value="true"/>
|
||||||
|
<property name="known-players" type="string" value="firefox;Firefox;Videos;VLC media player"/>
|
||||||
|
</property>
|
||||||
|
<property name="plugin-9" type="string" value="power-manager-plugin"/>
|
||||||
|
<property name="plugin-12" type="string" value="clock">
|
||||||
|
<property name="digital-time-format" type="string" value="%I:%M %p"/>
|
||||||
|
<property name="digital-layout" type="uint" value="3"/>
|
||||||
|
<property name="digital-date-format" type="string" value="%m/%d/%Y"/>
|
||||||
|
<property name="digital-time-font" type="string" value="Sans 9"/>
|
||||||
|
</property>
|
||||||
|
<property name="plugin-13" type="string" value="separator">
|
||||||
|
<property name="style" type="uint" value="0"/>
|
||||||
|
</property>
|
||||||
|
<property name="plugin-4" type="string" value="whiskermenu">
|
||||||
|
<property name="favorites-in-recent" type="bool" value="true"/>
|
||||||
|
<property name="command-switchuser" type="string" value="dm-tool switch-to-greeter"/>
|
||||||
|
<property name="favorites" type="array">
|
||||||
|
<value type="string" value="xfce4-web-browser.desktop"/>
|
||||||
|
<value type="string" value="xfce4-mail-reader.desktop"/>
|
||||||
|
<value type="string" value="xfce4-file-manager.desktop"/>
|
||||||
|
<value type="string" value="xfce4-terminal-emulator.desktop"/>
|
||||||
|
</property>
|
||||||
|
<property name="recent" type="array">
|
||||||
|
<value type="string" value="xfce-settings-manager.desktop"/>
|
||||||
|
<value type="string" value="xfce-keyboard-settings.desktop"/>
|
||||||
|
<value type="string" value="firefox.desktop"/>
|
||||||
|
<value type="string" value="xfce4-terminal-emulator.desktop"/>
|
||||||
|
<value type="string" value="wine-winemine.desktop"/>
|
||||||
|
<value type="string" value="xfce-ui-settings.desktop"/>
|
||||||
|
<value type="string" value="xfce-mouse-settings.desktop"/>
|
||||||
|
<value type="string" value="org.gnome.Terminal.desktop"/>
|
||||||
|
<value type="string" value="jetbrains-phpstorm.desktop"/>
|
||||||
|
<value type="string" value="jetbrains-toolbox.desktop"/>
|
||||||
|
</property>
|
||||||
|
</property>
|
||||||
|
</property>
|
||||||
|
</channel>
|
|
@ -1,9 +1,9 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if command -v yay &> /dev/null; then
|
if command -v pikaur &> /dev/null; then
|
||||||
alias pacman="yay"
|
|
||||||
elif command -v pikaur &> /dev/null; then
|
|
||||||
alias pacman="sudo pikaur"
|
alias pacman="sudo pikaur"
|
||||||
|
elif command -v yay &> /dev/null; then
|
||||||
|
alias pacman="yay"
|
||||||
else
|
else
|
||||||
alias pacman="sudo pacman"
|
alias pacman="sudo pacman"
|
||||||
fi
|
fi
|
||||||
|
@ -30,7 +30,11 @@ function hearch {
|
||||||
history 0 | sed 's/[0-9 ]*//' | grep "$@"
|
history 0 | sed 's/[0-9 ]*//' | grep "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
alias j='journalctl -xefu'
|
||||||
alias hsearch='hearch'
|
alias hsearch='hearch'
|
||||||
|
alias d='docker'
|
||||||
|
|
||||||
|
alias tmux="tmux attach || tmux"
|
||||||
|
|
||||||
alias caddyfile="sudo vim /etc/caddy/Caddyfile"
|
alias caddyfile="sudo vim /etc/caddy/Caddyfile"
|
||||||
alias cf="sudo vim /etc/caddy/Caddyfile"
|
alias cf="sudo vim /etc/caddy/Caddyfile"
|
||||||
|
|
|
@ -12,7 +12,8 @@ set updatetime=100
|
||||||
set clipboard=unnamedplus " Use system clipboard
|
set clipboard=unnamedplus " Use system clipboard
|
||||||
|
|
||||||
if empty($DISPLAY) && empty($SSH_CONNECTION)
|
if empty($DISPLAY) && empty($SSH_CONNECTION)
|
||||||
colorscheme elflord
|
colorscheme monokai
|
||||||
|
syntax enable
|
||||||
else
|
else
|
||||||
set termguicolors
|
set termguicolors
|
||||||
let &t_8f = "\<Esc>[38:2:%lu:%lu:%lum"
|
let &t_8f = "\<Esc>[38:2:%lu:%lu:%lum"
|
||||||
|
|
|
@ -41,22 +41,22 @@ export PATH=~/.bin:$HOME/.dotnet:~/.local/bin:/usr/local/go/bin:$PATH
|
||||||
fignore=(o)
|
fignore=(o)
|
||||||
|
|
||||||
function SetTtyColors() {
|
function SetTtyColors() {
|
||||||
echo -en "\e]P0""292e2f" #black 1
|
echo -en "\e]P0""2c2d27" # black 1
|
||||||
echo -en "\e]P1""dc4848" #darkgrey 2
|
echo -en "\e]P1""f92672" # darkgrey 2
|
||||||
echo -en "\e]P2""00aa00" # darkred 3
|
echo -en "\e]P2""00aa00" # darkred 3
|
||||||
echo -en "\e]P3""d99f4e" #red 4
|
echo -en "\e]P3""f92672" # red 4
|
||||||
echo -en "\e]P4""4444aa" # darkgreen 5
|
echo -en "\e]P4""4444aa" # darkgreen 5
|
||||||
echo -en "\e]P5""c436b9" #green 6
|
echo -en "\e]P5""a6e22e" # green 6
|
||||||
echo -en "\e]P6""00aaaa" #brown 7
|
echo -en "\e]P6""f59762" # brown 7
|
||||||
echo -en "\e]P7""d7d7d7" #yellow 8
|
echo -en "\e]P7""fdfff1" # yellow 8
|
||||||
echo -en "\e]P8""7b7b7b" #darkblue 9
|
echo -en "\e]P8""f92672" # darkblue 9
|
||||||
echo -en "\e]P9""6f6fff" #blue 10
|
echo -en "\e]P9""f92672" # blue 10
|
||||||
echo -en "\e]PA""55ff55" # darkmagenta 11
|
echo -en "\e]PA""55ff55" # darkmagenta 11
|
||||||
echo -en "\e]PB""ffed8b" #magenta 12
|
echo -en "\e]PB""f92672" # magenta 12
|
||||||
echo -en "\e]PC""5555ff" #darkcyan 13
|
echo -en "\e]PC""66d9ef" # darkcyan 13
|
||||||
echo -en "\e]PD""ff6eff" #cyan 14
|
echo -en "\e]PD""ae81ff" # cyan 14
|
||||||
echo -en "\e]PE""55ffff" #lightgray 15
|
echo -en "\e]PE""a1efe4" # lightgray 15
|
||||||
echo -en "\e]PF""aaaaaa" #white 16
|
echo -en "\e]PF""fdfff1" # white 16
|
||||||
clear
|
clear
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue