Update: Cleaning, added dependencies for sddm theme, improved arch install script.

This commit is contained in:
Keyitdev
2022-06-22 19:30:59 +02:00
parent f172585cfe
commit 09aedb8955
5 changed files with 71 additions and 72 deletions
+23 -52
View File
@@ -6,7 +6,7 @@
<a href="#-showcase">Showcase</a> · <a href="#%EF%B8%8F-info">Info</a> · <a href="#-dependencies">Dependencies</a> · <a href="#%EF%B8%8F-installation">Installation</a> · <a href="#-keybinds">Keybinds</a> · <a href="#-colors">Colors</a> · <a href="#%EF%B8%8F-troubleshooting">Troubleshooting</a> <a href="#-showcase">Showcase</a> · <a href="#%EF%B8%8F-info">Info</a> · <a href="#-dependencies">Dependencies</a> · <a href="#%EF%B8%8F-installation">Installation</a> · <a href="#-keybinds">Keybinds</a> · <a href="#-colors">Colors</a> · <a href="#%EF%B8%8F-troubleshooting">Troubleshooting</a>
</div> </div>
<br /> </br>
<p align=center> <p align=center>
<img src="https://img.shields.io/github/stars/keyitdev/dotfiles?color=dd864a&labelColor=202328&style=for-the-badge"> <img src="https://img.shields.io/github/stars/keyitdev/dotfiles?color=dd864a&labelColor=202328&style=for-the-badge">
@@ -16,20 +16,14 @@
<img src="https://img.shields.io/github/license/keyitdev/dotfiles?color=15121C&labelColor=202328&style=for-the-badge"> <img src="https://img.shields.io/github/license/keyitdev/dotfiles?color=15121C&labelColor=202328&style=for-the-badge">
</p> </p>
<br />
## 🌟 Showcase ## 🌟 Showcase
![](https://github.com/Keyitdev/dotfiles/blob/screenshots/screenshots/main.png?raw=true) ![](https://github.com/Keyitdev/dotfiles/blob/screenshots/screenshots/main.png?raw=true)
<br />
### [More screenshots here](https://github.com/Keyitdev/dotfiles/blob/screenshots/README.md) ### [More screenshots here](https://github.com/Keyitdev/dotfiles/blob/screenshots/README.md)
### [Watch the demo video here](https://www.youtube.com/watch?v=_dMkmf2ugPE) ### [Watch the demo video here](https://www.youtube.com/watch?v=_dMkmf2ugPE)
<br />
## 🗒️ Info ## 🗒️ Info
|Program|Name| |Program|Name|
@@ -47,31 +41,27 @@
|**Shell Framework**|[Oh-My-Zsh](https://github.com/ohmyzsh/ohmyzsh)| |**Shell Framework**|[Oh-My-Zsh](https://github.com/ohmyzsh/ohmyzsh)|
|**Music Player**|[mpd](https://github.com/MusicPlayerDaemon/MPD), [ncmpcpp](https://github.com/ncmpcpp/ncmpcpp) |**Music Player**|[mpd](https://github.com/MusicPlayerDaemon/MPD), [ncmpcpp](https://github.com/ncmpcpp/ncmpcpp)
|**Text Editor**|[Visual Studio Code](https://github.com/Microsoft/vscode), [Neovim](https://github.com/neovim/neovim)| |**Text Editor**|[Visual Studio Code](https://github.com/Microsoft/vscode), [Neovim](https://github.com/neovim/neovim)|
|**Visual Studio Code Colorscheme**|[One Dark Pro](https://marketplace.visualstudio.com/items?itemName=zhuangtongfa.Material-theme)| |**VSC Colorscheme**|[One Dark Pro](https://marketplace.visualstudio.com/items?itemName=zhuangtongfa.Material-theme)|
|**Neovim Theme**|[AstroVim](https://github.com/kabinspace/AstroVim) |**Neovim Theme**|[AstroVim](https://github.com/kabinspace/AstroVim)
|**GTK Theme**|[Ant (Dracula)](https://github.com/EliverLara/ant)| |**GTK Theme**|[Ant (Dracula)](https://github.com/EliverLara/ant)|
|**Icons**|[Papirus Dark](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme)| |**Icons**|[Papirus Dark](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme)|
|**Discord Theme**|[Custom](https://github.com/Keyitdev/BetterDiscord-themes)| |**Discord Theme**|[Custom](https://github.com/Keyitdev/BetterDiscord-themes)|
<br />
## ⚡ Dependencies ## ⚡ Dependencies
### Packages ### Packages
* <b>Base:</b> base-devel wget curl git gcc make acpi light pulseaudio pulseaudio-alsa alsa-utils pacman-contrib mpc * **Base:** base-devel wget curl git gcc make acpi light pulseaudio pulseaudio-alsa alsa-utils pacman-contrib mpc
* <b>WM/X11:</b> i3-gaps i3blocks i3lock-color xorg xorg-xinit xorg-server * **WM/X11:** i3-gaps i3blocks i3lock-color xorg xorg-xinit xorg-server
* <b>Lockscreen:</b> i3lock-color betterlockscreen feh imagemagick * **Lockscreen:** i3lock-color betterlockscreen feh imagemagick
* <b>Programs:</b> kitty rofi dunst (with libnotify) ranger ncmpcpp mpd polybar papirus-icon-theme btop sddm zsh (with oh-my-zsh) picom cava code neovim * **Programs:** kitty rofi dunst (with libnotify) ranger ncmpcpp mpd polybar papirus-icon-theme btop sddm (with qt5 qt5-quickcontrols2 qt5-svg) zsh (with oh-my-zsh) picom cava code neovim
* <b>Screenshots:</b> xclip scrot ffcast slop * **Screenshots:** xclip scrot ffcast slop
* <b>Emoji Fonts:</b> noto-fonts noto-fonts-emoji noto-fonts-extra noto-fonts-cjk * **Emoji Fonts:** noto-fonts noto-fonts-emoji noto-fonts-extra noto-fonts-cjk
### Fonts ### Fonts
* <b>Icons:</b> [Feather](https://github.com/AT-UI/feather-font/blob/master/src/fonts/feather.ttf) * **Icons:** [Feather](https://github.com/AT-UI/feather-font/blob/master/src/fonts/feather.ttf)
* <b>Interface Font:</b> [Open Sans](https://fonts.google.com/specimen/Open+Sans#standard-styles) * **Interface Font:** [Open Sans](https://fonts.google.com/specimen/Open+Sans#standard-styles)
* <b>Monospace Font:</b> [Roboto Mono](https://fonts.google.com/specimen/Roboto+Mono#standard-styles) * **Monospace Font:** [Roboto Mono](https://fonts.google.com/specimen/Roboto+Mono#standard-styles)
* <b>Polybar Font:</b> [Iosevka Nerd Font](https://github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/Iosevka) * **Polybar Font:** [Iosevka Nerd Font](https://github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/Iosevka)
<br />
## 🛠️ Installation ## 🛠️ Installation
@@ -83,53 +73,45 @@ It's recommended to install the dependencies manually, but if you have any issue
```sh ```sh
git clone -b master --depth 1 https://www.github.com/keyitdev/dotfiles.git git clone -b master --depth 1 https://www.github.com/keyitdev/dotfiles.git
``` ```
<br />
2. Install an AUR helper (for example, yay in ~/.srcs) 2. Install an AUR helper (for example, yay in $HOME/.srcs)
```sh ```sh
mkdir -p ~/.srcs mkdir -p $HOME/.srcs
git clone https://aur.archlinux.org/yay.git ~/.srcs/yay git clone https://aur.archlinux.org/yay.git $HOME/.srcs/yay
(cd ~/.srcs/yay/ && makepkg -si ) (cd $HOME/.srcs/yay/ && makepkg -si )
``` ```
<br />
3. Install packages (see [Dependencies](https://github.com/keyitdev/dotfiles#-dependencies)) 3. Install packages (see [Dependencies](https://github.com/keyitdev/dotfiles#-dependencies))
<br />
4. Make Light executable 4. Make Light executable
```sh ```sh
sudo chmod +s /usr/bin/light sudo chmod +s /usr/bin/light
``` ```
<br />
5. Copy the files (Config folder to `$HOME/.config`, scripts folder to `/usr/local/bin` fonts to `/usr/share/fonts/`, wallpaper to `$HOME/Pictures/wallpapers` etc.) 5. Copy the files (Config folder to `$HOME/.config`, scripts folder to `/usr/local/bin` fonts to `/usr/share/fonts/`, wallpaper to `$HOME/Pictures/wallpapers` etc.)
<br />
6. Install Oh-My-Zsh 6. Install Oh-My-Zsh
```sh ```sh
sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
``` ```
<br />
7. Set Zsh as the default shell 7. Set Zsh as the default shell
```sh ```sh
chsh -s /bin/zsh chsh -s /bin/zsh #user
sudo chsh -s /bin/zsh #root
``` ```
<br />
8. Install AstroVim 8. Install AstroVim
```sh ```sh
git clone --depth 10 https://github.com/kabinspace/AstroVim.git ~/.config/nvim git clone --depth 10 https://github.com/kabinspace/AstroVim.git $HOME/.config/nvim
nvim +PackerSync nvim +PackerSync
``` ```
<br />
9. Install GTK Theme 9. Install GTK Theme
```sh ```sh
git clone https://github.com/EliverLara/ant.git git clone https://github.com/EliverLara/ant.git
sudo mv ./ant /usr/share/themes sudo mv ./ant /usr/share/themes
``` ```
<br />
10. Install SDDM Astronaut Theme 10. Install SDDM Astronaut Theme
```sh ```sh
@@ -137,17 +119,14 @@ It's recommended to install the dependencies manually, but if you have any issue
sudo cp -fdr sddm-astronaut-theme /usr/share/sddm/themes/ sudo cp -fdr sddm-astronaut-theme /usr/share/sddm/themes/
sudo cp /usr/share/sddm/themes/sddm-astronaut-theme/Fonts/* /usr/share/fonts/ sudo cp /usr/share/sddm/themes/sddm-astronaut-theme/Fonts/* /usr/share/fonts/
``` ```
<br />
11. Edit `/etc/sddm.conf` 11. Edit `/etc/sddm.conf`
``` ```
[Theme] echo "[Theme]
Current=sddm-astronaut-theme Current=sddm-astronaut-theme" | sudo tee /etc/sddm.conf
``` ```
<br />
12. [Install the Firefox theme](https://color.firefox.com/?theme=XQAAAAKGAQAAAAAAAABBqYhm849SCia73laEGccwS-xMDPr5iE6kjVUHIsGRvs0-q94VqJzDmLds0B4GdTFd2KORmhozpED9fKKY97YpmeSVCJcSVB9rwzacQGHhaYG0HJIDBXLbAYUnjpkVXo5LFBoIgdJ4P7MSUoS9tEpFY9l-n8P03V91Kq7BmmKKrjKq9Hi2Jvfl7wBEWz3nWVxnwd4XKskPQ2G_JFlEZFH-xMtfBJ5OSQmfzox2bvycbCOGiDW99yOqfX2u-cPiqZwcshaSPxDSqShJ5_7OhZzPbP5x-BM) 12. [Install the Firefox theme](https://color.firefox.com/?theme=XQAAAAKGAQAAAAAAAABBqYhm849SCia73laEGccwS-xMDPr5iE6kjVUHIsGRvs0-q94VqJzDmLds0B4GdTFd2KORmhozpED9fKKY97YpmeSVCJcSVB9rwzacQGHhaYG0HJIDBXLbAYUnjpkVXo5LFBoIgdJ4P7MSUoS9tEpFY9l-n8P03V91Kq7BmmKKrjKq9Hi2Jvfl7wBEWz3nWVxnwd4XKskPQ2G_JFlEZFH-xMtfBJ5OSQmfzox2bvycbCOGiDW99yOqfX2u-cPiqZwcshaSPxDSqShJ5_7OhZzPbP5x-BM)
<br />
### Automated Install ### Automated Install
@@ -158,25 +137,22 @@ It's recommended to install the dependencies manually, but if you have any issue
chmod +x install-on-arch.sh chmod +x install-on-arch.sh
./install-on-arch.sh ./install-on-arch.sh
``` ```
<br />
2. [Install the Firefox theme](https://color.firefox.com/?theme=XQAAAAKGAQAAAAAAAABBqYhm849SCia73laEGccwS-xMDPr5iE6kjVUHIsGRvs0-q94VqJzDmLds0B4GdTFd2KORmhozpED9fKKY97YpmeSVCJcSVB9rwzacQGHhaYG0HJIDBXLbAYUnjpkVXo5LFBoIgdJ4P7MSUoS9tEpFY9l-n8P03V91Kq7BmmKKrjKq9Hi2Jvfl7wBEWz3nWVxnwd4XKskPQ2G_JFlEZFH-xMtfBJ5OSQmfzox2bvycbCOGiDW99yOqfX2u-cPiqZwcshaSPxDSqShJ5_7OhZzPbP5x-BM) 2. [Install the Firefox theme](https://color.firefox.com/?theme=XQAAAAKGAQAAAAAAAABBqYhm849SCia73laEGccwS-xMDPr5iE6kjVUHIsGRvs0-q94VqJzDmLds0B4GdTFd2KORmhozpED9fKKY97YpmeSVCJcSVB9rwzacQGHhaYG0HJIDBXLbAYUnjpkVXo5LFBoIgdJ4P7MSUoS9tEpFY9l-n8P03V91Kq7BmmKKrjKq9Hi2Jvfl7wBEWz3nWVxnwd4XKskPQ2G_JFlEZFH-xMtfBJ5OSQmfzox2bvycbCOGiDW99yOqfX2u-cPiqZwcshaSPxDSqShJ5_7OhZzPbP5x-BM)
<br />
## 🛠️ Uninstall ## 🛠️ Uninstall
1. Remove installed packages (see [Dependencies](https://github.com/keyitdev/dotfiles#-dependencies)) 1. Remove installed packages (see [Dependencies](https://github.com/keyitdev/dotfiles#-dependencies))
2. Remove the AUR helper ( ~/.srcs) 2. Remove the AUR helper ( $HOME/.srcs)
3. Uninstall Oh-My-Zsh ` uninstall_oh_my_zsh` 3. Uninstall Oh-My-Zsh ` uninstall_oh_my_zsh`
4. Change the default shell back to bash 4. Change the default shell back to bash
``` ```
chsh -s /bin/bash chsh -s /bin/bash
sudo chsh -s /bin/bash sudo chsh -s /bin/bash
``` ```
5. Remove installed fonts (~/.local/share/fonts/ or /usr/share/fonts/) 5. Remove installed fonts ($HOME/.local/share/fonts/ or /usr/share/fonts/)
6. Remove installed scripts (/usr/local/bin) 6. Remove installed scripts (/usr/local/bin)
7. Remove this repository 7. Remove this repository
<br />
## 🔑 Keybinds ## 🔑 Keybinds
@@ -209,8 +185,6 @@ These are the basic keybinds. Read through the `i3` config for more keybinds.
| `Win + Shift + R` | Restart i3 | | `Win + Shift + R` | Restart i3 |
Note: `Win` refers to the `Super/Mod` key. Note: `Win` refers to the `Super/Mod` key.
<br />
<br />
## 🌈 Colors ## 🌈 Colors
@@ -230,7 +204,6 @@ Note: `Win` refers to the `Super/Mod` key.
| cyan | #89ddff | | cyan | #89ddff |
| pink | #ffa8c5 | | pink | #ffa8c5 |
| orange | #dd864a | | orange | #dd864a |
<br />
## ⚙️ Troubleshooting ## ⚙️ Troubleshooting
@@ -238,7 +211,6 @@ Note: `Win` refers to the `Super/Mod` key.
3. Screen flashing black : Try changing picom config. 3. Screen flashing black : Try changing picom config.
4. Scripts not working : Maybe try to edit shebang. 4. Scripts not working : Maybe try to edit shebang.
5. MPD not working : Check if any other program is using port 6600 (http://127.0.0.1:6600/). 5. MPD not working : Check if any other program is using port 6600 (http://127.0.0.1:6600/).
<br />
## ✨ Big thanks to ## ✨ Big thanks to
@@ -250,7 +222,6 @@ These dotfiles includes some files from others rices. Original sources:
* [Ceuk](https://github.com/ceuk/) for [rofi screenshot script](https://github.com/ceuk/rofi-screenshot) * [Ceuk](https://github.com/ceuk/) for [rofi screenshot script](https://github.com/ceuk/rofi-screenshot)
* [Milosz](https://github.com/milosz) for [rofi-bookmarks](https://github.com/milosz/rofi-firefox-bookmarks) * [Milosz](https://github.com/milosz) for [rofi-bookmarks](https://github.com/milosz/rofi-firefox-bookmarks)
* [Unnat](https://github.com/UnnatShaneshwar) for [wallpaper](https://github.com/UnnatShaneshwar/OneDarkWallpapers/blob/main/11.png) * [Unnat](https://github.com/UnnatShaneshwar) for [wallpaper](https://github.com/UnnatShaneshwar/OneDarkWallpapers/blob/main/11.png)
<br />
## 🪪 License ## 🪪 License
+2 -2
View File
@@ -93,8 +93,8 @@ bindsym $mod+space focus mode_toggle
bindsym $mod+i exec betterlockscreen -l bindsym $mod+i exec betterlockscreen -l
# monitor settings # monitor settings
bindsym $mod+n exec xrandr --auto --output eDP-1 --mode 1920x1080 --right-of HDMI-1 && i3-msg restart & bindsym $mod+n exec xrandr --auto --output eDP --mode 1920x1080 --right-of HDMI-A-0 && i3-msg restart &
bindsym $mod+m exec xrandr --auto --output HDMI-1 --off && i3-msg restart & bindsym $mod+m exec xrandr --auto --output HDMI-A-0 --off && i3-msg restart &
# toggle polybar # toggle polybar
bindsym $mod+o exec $HOME/.config/polybar/launch.sh bindsym $mod+o exec $HOME/.config/polybar/launch.sh
+1 -1
View File
@@ -283,7 +283,7 @@ cursor-scroll =
; If unspecified, the application will pick the first one it finds. ; If unspecified, the application will pick the first one it finds.
; $ polybar -m | cut -d ':' -f 1 ; $ polybar -m | cut -d ':' -f 1
; $ xrandr -q | grep " connected" | cut -d ' ' -f1 ; $ xrandr -q | grep " connected" | cut -d ' ' -f1
monitor = HDMI-1 monitor = HDMI-A-0
; Use the specified monitor as a fallback if the main one is not found. ; Use the specified monitor as a fallback if the main one is not found.
monitor-fallback = monitor-fallback =
+1 -1
View File
@@ -275,7 +275,7 @@ cursor-scroll =
; If unspecified, the application will pick the first one it finds. ; If unspecified, the application will pick the first one it finds.
; $ polybar -m | cut -d ':' -f 1 ; $ polybar -m | cut -d ':' -f 1
; $ xrandr -q | grep " connected" | cut -d ' ' -f1 ; $ xrandr -q | grep " connected" | cut -d ' ' -f1
monitor = HDMI-1 monitor = HDMI-A-0
; Use the specified monitor as a fallback if the main one is not found. ; Use the specified monitor as a fallback if the main one is not found.
monitor-fallback = monitor-fallback =
+43 -15
View File
@@ -49,17 +49,6 @@ aur_helper(){
install_packages(){ install_packages(){
echo -e "[*3*] Installing packages with Pacman." echo -e "[*3*] Installing packages with Pacman."
sudo pacman -S --noconfirm --needed light pulseaudio pulseaudio-alsa pulsemixer alsa-utils pacman-contrib i3-gaps i3blocks xorg xorg-xinit xorg-server feh imagemagick kitty rofi dunst libnotify ranger ncmpcpp mpd papirus-icon-theme btop sddm zsh picom code neovim xclip scrot mpc sudo pacman -S --noconfirm --needed light pulseaudio pulseaudio-alsa pulsemixer alsa-utils pacman-contrib i3-gaps i3blocks xorg xorg-xinit xorg-server feh imagemagick kitty rofi dunst libnotify ranger ncmpcpp mpd papirus-icon-theme btop sddm zsh picom code neovim xclip scrot mpc
echo -e "\nInstalling other dependencies"
git clone --depth 10 https://github.com/kabinspace/AstroVim.git ~/.config/nvim
nvim +PackerSync
sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
git clone https://github.com/EliverLara/ant.git ~/ant
sudo mv ~/ant /usr/share/themes
git clone https://github.com/keyitdev/sddm-astronaut-theme.git ~/sddm-astronaut-theme
sudo cp -fdr ~/sddm-astronaut-theme /usr/share/sddm/themes/
sudo cp /usr/share/sddm/themes/sddm-astronaut-theme/Fonts/* /usr/share/fonts/
sudo echo "[Theme]
Current=sddm-astronaut-theme" >> /etc/sddm.conf
echo -e "\n[*] Installing packages with $HELPER." echo -e "\n[*] Installing packages with $HELPER."
$HELPER -S acpi \ $HELPER -S acpi \
polybar \ polybar \
@@ -67,16 +56,19 @@ Current=sddm-astronaut-theme" >> /etc/sddm.conf
betterlockscreen \ betterlockscreen \
i3lock-color \ i3lock-color \
cava \ cava \
slop slop \
qt5 \
qt5-quickcontrols2\
qt5-svg
echo -e "\n[*] Chmoding light." echo -e "\n[*] Chmoding light."
sudo chmod +s /usr/bin/light sudo chmod +s /usr/bin/light
echo -e "\n[*] Setting Zsh as default shell." echo -e "\n[*] Setting Zsh as default shell."
chsh -s /bin/zsh chsh -s /bin/zsh
sudo chsh -s /bin/zsh
cat <<- EOF cat <<- EOF
[*3*] Still installing packages. [*3*] Still installing packages.
[*] Do you want to install optional, but useful programs? (VSCode, iwd, Oh-My-Zsh, LibreOffice, Firefox, etc) [*] Do you want to install optional, but useful programs? (VSCode, iwd, LibreOffice, Firefox, etc)
[1] yes [1] yes
[2] no [2] no
@@ -232,11 +224,47 @@ make_default_directories(){
mkdir -p $HOME/Projects mkdir -p $HOME/Projects
} }
other_dependencies(){
DATE=$(date +%s)
echo -e "[*7*] Installing other dependencies"
if [ -d /usr/share/themes/ant ]; then
echo "[*] gtk theme detected, backing up..."
sudo mv /usr/share/themes/ant /usr/share/themes/ant$DATE
fi
echo -e "\n[*] Installing gtk theme"
git clone https://github.com/EliverLara/ant.git $HOME/ant
sudo mv $HOME/ant /usr/share/themes
if [ -d /usr/share/sddm/themes/sddm-astronaut-theme ]; then
echo "[*] sddm theme detected, backing up..."
sudo mv /usr/share/sddm/themes/sddm-astronaut-theme /usr/share/sddm/themes/sddm-astronaut-theme$DATE
fi
echo -e "\n[*] Installing sddm theme"
git clone https://github.com/keyitdev/sddm-astronaut-theme.git $HOME/sddm-astronaut-theme
sudo cp -fdr $HOME/sddm-astronaut-theme /usr/share/sddm/themes/
sudo cp /usr/share/sddm/themes/sddm-astronaut-theme/Fonts/* /usr/share/fonts/
echo "[Theme]
Current=sddm-astronaut-theme" | sudo tee /etc/sddm.conf
if [ -d $HOME/.config/nvim ]; then
echo "[*] nvim theme detected, backing up..."
sudo mv $HOME/.config/nvim $HOME/.config/nvim$DATE
fi
echo -e "\n[*] Installing nvim theme"
git clone --depth 10 https://github.com/kabinspace/AstroVim.git $HOME/.config/nvim
nvim +PackerSync
echo -e "\n[*] Installing ohmyzsh"
sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
}
system_update system_update
aur_helper aur_helper
install_packages install_packages
copy_flies copy_flies
copy_scripts copy_scripts
make_default_directories make_default_directories
other_dependencies
echo -e "[*7*] Everything is ready, enjoy :D." echo -e "[*8*] Everything is ready, enjoy :D."