From 09aedb8955a9331498af0a5f504cef3cdcf8ce47 Mon Sep 17 00:00:00 2001 From: Keyitdev <70140437+Keyitdev@users.noreply.github.com> Date: Tue, 22 Feb 2022 16:30:32 +0100 Subject: [PATCH] Update: Cleaning, added dependencies for sddm theme, improved arch install script. --- README.md | 75 +++++++---------------- config/i3/config | 4 +- config/polybar/polybar-rounded/config.ini | 2 +- config/polybar/polybar-square/config.ini | 2 +- install-on-arch.sh | 60 +++++++++++++----- 5 files changed, 71 insertions(+), 72 deletions(-) diff --git a/README.md b/README.md index a17e1a7..3399587 100755 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Showcase · Info · Dependencies · Installation · Keybinds · Colors · Troubleshooting -
+

@@ -16,20 +16,14 @@

-
- ## 🌟 Showcase ![](https://github.com/Keyitdev/dotfiles/blob/screenshots/screenshots/main.png?raw=true) -
- ### [More screenshots here](https://github.com/Keyitdev/dotfiles/blob/screenshots/README.md) ### [Watch the demo video here](https://www.youtube.com/watch?v=_dMkmf2ugPE) -
- ## 🗒️ Info |Program|Name| @@ -47,31 +41,27 @@ |**Shell Framework**|[Oh-My-Zsh](https://github.com/ohmyzsh/ohmyzsh)| |**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)| -|**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) |**GTK Theme**|[Ant (Dracula)](https://github.com/EliverLara/ant)| |**Icons**|[Papirus Dark](https://github.com/PapirusDevelopmentTeam/papirus-icon-theme)| |**Discord Theme**|[Custom](https://github.com/Keyitdev/BetterDiscord-themes)| -
- ## ⚡ Dependencies ### Packages -* Base: base-devel wget curl git gcc make acpi light pulseaudio pulseaudio-alsa alsa-utils pacman-contrib mpc -* WM/X11: i3-gaps i3blocks i3lock-color xorg xorg-xinit xorg-server -* Lockscreen: i3lock-color betterlockscreen feh imagemagick -* Programs: kitty rofi dunst (with libnotify) ranger ncmpcpp mpd polybar papirus-icon-theme btop sddm zsh (with oh-my-zsh) picom cava code neovim -* Screenshots: xclip scrot ffcast slop -* Emoji Fonts: noto-fonts noto-fonts-emoji noto-fonts-extra noto-fonts-cjk +* **Base:** base-devel wget curl git gcc make acpi light pulseaudio pulseaudio-alsa alsa-utils pacman-contrib mpc +* **WM/X11:** i3-gaps i3blocks i3lock-color xorg xorg-xinit xorg-server +* **Lockscreen:** i3lock-color betterlockscreen feh imagemagick +* **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 +* **Screenshots:** xclip scrot ffcast slop +* **Emoji Fonts:** noto-fonts noto-fonts-emoji noto-fonts-extra noto-fonts-cjk ### Fonts -* Icons: [Feather](https://github.com/AT-UI/feather-font/blob/master/src/fonts/feather.ttf) -* Interface Font: [Open Sans](https://fonts.google.com/specimen/Open+Sans#standard-styles) -* Monospace Font: [Roboto Mono](https://fonts.google.com/specimen/Roboto+Mono#standard-styles) -* Polybar Font: [Iosevka Nerd Font](https://github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/Iosevka) - -
+* **Icons:** [Feather](https://github.com/AT-UI/feather-font/blob/master/src/fonts/feather.ttf) +* **Interface Font:** [Open Sans](https://fonts.google.com/specimen/Open+Sans#standard-styles) +* **Monospace Font:** [Roboto Mono](https://fonts.google.com/specimen/Roboto+Mono#standard-styles) +* **Polybar Font:** [Iosevka Nerd Font](https://github.com/ryanoasis/nerd-fonts/tree/master/patched-fonts/Iosevka) ## 🛠️ Installation @@ -83,53 +73,45 @@ It's recommended to install the dependencies manually, but if you have any issue ```sh git clone -b master --depth 1 https://www.github.com/keyitdev/dotfiles.git ``` -
-2. Install an AUR helper (for example, yay in ~/.srcs) +2. Install an AUR helper (for example, yay in $HOME/.srcs) ```sh - mkdir -p ~/.srcs - git clone https://aur.archlinux.org/yay.git ~/.srcs/yay - (cd ~/.srcs/yay/ && makepkg -si ) + mkdir -p $HOME/.srcs + git clone https://aur.archlinux.org/yay.git $HOME/.srcs/yay + (cd $HOME/.srcs/yay/ && makepkg -si ) ``` -
3. Install packages (see [Dependencies](https://github.com/keyitdev/dotfiles#-dependencies)) -
4. Make Light executable ```sh sudo chmod +s /usr/bin/light ``` -
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.) -
6. Install Oh-My-Zsh ```sh sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" ``` -
7. Set Zsh as the default shell ```sh - chsh -s /bin/zsh + chsh -s /bin/zsh #user + sudo chsh -s /bin/zsh #root ``` -
8. Install AstroVim ```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 ``` -
9. Install GTK Theme ```sh git clone https://github.com/EliverLara/ant.git sudo mv ./ant /usr/share/themes ``` -
10. Install SDDM Astronaut Theme ```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 /usr/share/sddm/themes/sddm-astronaut-theme/Fonts/* /usr/share/fonts/ ``` -
11. Edit `/etc/sddm.conf` ``` - [Theme] - Current=sddm-astronaut-theme + echo "[Theme] + Current=sddm-astronaut-theme" | sudo tee /etc/sddm.conf ``` -
12. [Install the Firefox theme](https://color.firefox.com/?theme=XQAAAAKGAQAAAAAAAABBqYhm849SCia73laEGccwS-xMDPr5iE6kjVUHIsGRvs0-q94VqJzDmLds0B4GdTFd2KORmhozpED9fKKY97YpmeSVCJcSVB9rwzacQGHhaYG0HJIDBXLbAYUnjpkVXo5LFBoIgdJ4P7MSUoS9tEpFY9l-n8P03V91Kq7BmmKKrjKq9Hi2Jvfl7wBEWz3nWVxnwd4XKskPQ2G_JFlEZFH-xMtfBJ5OSQmfzox2bvycbCOGiDW99yOqfX2u-cPiqZwcshaSPxDSqShJ5_7OhZzPbP5x-BM) -
### 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 ./install-on-arch.sh ``` -
2. [Install the Firefox theme](https://color.firefox.com/?theme=XQAAAAKGAQAAAAAAAABBqYhm849SCia73laEGccwS-xMDPr5iE6kjVUHIsGRvs0-q94VqJzDmLds0B4GdTFd2KORmhozpED9fKKY97YpmeSVCJcSVB9rwzacQGHhaYG0HJIDBXLbAYUnjpkVXo5LFBoIgdJ4P7MSUoS9tEpFY9l-n8P03V91Kq7BmmKKrjKq9Hi2Jvfl7wBEWz3nWVxnwd4XKskPQ2G_JFlEZFH-xMtfBJ5OSQmfzox2bvycbCOGiDW99yOqfX2u-cPiqZwcshaSPxDSqShJ5_7OhZzPbP5x-BM) -
## 🛠️ Uninstall 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` 4. Change the default shell back to bash ``` 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) 7. Remove this repository -
## 🔑 Keybinds @@ -209,8 +185,6 @@ These are the basic keybinds. Read through the `i3` config for more keybinds. | `Win + Shift + R` | Restart i3 | Note: `Win` refers to the `Super/Mod` key. -
-
## 🌈 Colors @@ -230,7 +204,6 @@ Note: `Win` refers to the `Super/Mod` key. | cyan | #89ddff | | pink | #ffa8c5 | | orange | #dd864a | -
## ⚙️ Troubleshooting @@ -238,7 +211,6 @@ Note: `Win` refers to the `Super/Mod` key. 3. Screen flashing black : Try changing picom config. 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/). -
## ✨ 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) * [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) -
## 🪪 License diff --git a/config/i3/config b/config/i3/config index f658c3d..97e6016 100755 --- a/config/i3/config +++ b/config/i3/config @@ -93,8 +93,8 @@ bindsym $mod+space focus mode_toggle bindsym $mod+i exec betterlockscreen -l # monitor settings -bindsym $mod+n exec xrandr --auto --output eDP-1 --mode 1920x1080 --right-of HDMI-1 && i3-msg restart & -bindsym $mod+m exec xrandr --auto --output HDMI-1 --off && 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-A-0 --off && i3-msg restart & # toggle polybar bindsym $mod+o exec $HOME/.config/polybar/launch.sh diff --git a/config/polybar/polybar-rounded/config.ini b/config/polybar/polybar-rounded/config.ini index 86098d6..2e9c555 100755 --- a/config/polybar/polybar-rounded/config.ini +++ b/config/polybar/polybar-rounded/config.ini @@ -283,7 +283,7 @@ cursor-scroll = ; If unspecified, the application will pick the first one it finds. ; $ polybar -m | cut -d ':' -f 1 ; $ 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. monitor-fallback = diff --git a/config/polybar/polybar-square/config.ini b/config/polybar/polybar-square/config.ini index c02134e..d83b67c 100755 --- a/config/polybar/polybar-square/config.ini +++ b/config/polybar/polybar-square/config.ini @@ -275,7 +275,7 @@ cursor-scroll = ; If unspecified, the application will pick the first one it finds. ; $ polybar -m | cut -d ':' -f 1 ; $ 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. monitor-fallback = diff --git a/install-on-arch.sh b/install-on-arch.sh index eb9dc48..2eceaee 100755 --- a/install-on-arch.sh +++ b/install-on-arch.sh @@ -49,17 +49,6 @@ aur_helper(){ install_packages(){ 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 - 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." $HELPER -S acpi \ polybar \ @@ -67,16 +56,19 @@ Current=sddm-astronaut-theme" >> /etc/sddm.conf betterlockscreen \ i3lock-color \ cava \ - slop + slop \ + qt5 \ + qt5-quickcontrols2\ + qt5-svg echo -e "\n[*] Chmoding light." sudo chmod +s /usr/bin/light echo -e "\n[*] Setting Zsh as default shell." chsh -s /bin/zsh - + sudo chsh -s /bin/zsh cat <<- EOF [*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 [2] no @@ -220,7 +212,7 @@ copy_scripts(){ fi sudo mkdir -p /usr/local/bin sudo cp -frd ./scripts/* /usr/local/bin - echo -e "\n[*5*] Scripts copied." + echo -e "\n[*5*] Scripts copied." } make_default_directories(){ @@ -232,11 +224,47 @@ make_default_directories(){ 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 aur_helper install_packages copy_flies copy_scripts make_default_directories +other_dependencies -echo -e "[*7*] Everything is ready, enjoy :D." +echo -e "[*8*] Everything is ready, enjoy :D."