diff --git a/.config/i3/config b/.config/i3/config index 66022ac..3239dc2 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -51,11 +51,11 @@ bindsym $mod+Shift+c sticky toggle ######### COLORS ########## # BORDER BACKGROUND TEXT INDICATOR CHILD_BORDER -client.focused #88C0D0 #EBCB8B #2E3440 #88C0D0 #5E81AC -client.unfocused #5E81AC #88C0D0 #E5E9F0 #5E81AC #2E3440 -client.focused_inactive #2E3440 #4C566A #E5E9F0 #5E81AC #2E3440 -client.urgent #BF616A #BF616A #2E3440 #BF616A #BF616A -client.background #4C566A +client.focused #fb4934 #83a598 #282828 #fb4934 #fabd2f +client.unfocused #fabd2f #fb4934 #d5c4a1 #fabd2f #282828 +client.focused_inactive #282828 #665c54 #d5c4a1 #fabd2f #282828 +client.urgent #b8bb26 #b8bb26 #282828 #b8bb26 #b8bb26 +client.background #665c54 ###---Starting External Scripts---### @@ -197,7 +197,7 @@ bindsym $mod+s gaps inner current plus 5 bindsym $mod+Shift+s gaps inner current minus 5 #bindsym $mod+d exec rofi -config ~/.config/rofi/config -show drun -bindsym $mod+d exec dmenu_run -fn 'Ubuntu Mono derivative Powerline-18' -h '35' -nb '#A3BE8C' -sf '#2E3440' -sb '#BF616A' -nf '#8FBCBB' +bindsym $mod+d exec dmenu_run -fn 'Ubuntu Mono derivative Powerline-18' -h '35' -nb '#d3869b' -sf '#282828' -sb '#b8bb26' -nf '#fbf1c7' bindsym Mod1+d exec ~/.config/Scripts/rofi-bangs.sh bindsym $mod+Shift+d gaps inner current set 0; gaps outer current set 0 diff --git a/.config/nvim/config/main.vim b/.config/nvim/config/main.vim index 4d56c0a..7fa92ef 100644 --- a/.config/nvim/config/main.vim +++ b/.config/nvim/config/main.vim @@ -10,7 +10,7 @@ " Colorscheme -colorscheme nord +colorscheme gruvbox augroup specify_filetype autocmd! diff --git a/.config/nvim/config/plugin-settings.vim b/.config/nvim/config/plugin-settings.vim index 4e0feec..f3bad10 100644 --- a/.config/nvim/config/plugin-settings.vim +++ b/.config/nvim/config/plugin-settings.vim @@ -98,7 +98,7 @@ let g:NERDTreeIndicatorMapCustom = { "Airline " """""""""""" "main settings -let g:airline_theme='nord' +let g:airline_theme='gruvbox' let g:airline_powerline_fonts = 1 let g:airline_symbols = {} let g:airline_skip_empty_sections = 1 diff --git a/.config/nvim/config/plugins.vim b/.config/nvim/config/plugins.vim index 302c613..9ac0fb9 100644 --- a/.config/nvim/config/plugins.vim +++ b/.config/nvim/config/plugins.vim @@ -89,4 +89,5 @@ Plug 'deviantfero/wpgtk.vim' Plug 'itchyny/landscape.vim' Plug 'nanotech/jellybeans.vim' Plug 'cocopon/iceberg.vim' + Plug 'morhetz/gruvbox' call plug#end() diff --git a/.config/picom.conf b/.config/picom.conf index d67b92b..32055f3 100644 --- a/.config/picom.conf +++ b/.config/picom.conf @@ -117,20 +117,21 @@ shadow-ignore-shaped = true; #active-opacity = 1; #frame-opacity = 1; #inactive-opacity-override = false; -#alpha-step = 0.06; +alpha-step = 0.06; blur-kern = "7x7box"; blur-method = "dual_kawase"; blur-strength = 12; opacity-rule = [ + "99:class_g = 'i3-frame'", "90:class_g = 'St' && focused", "60:class_g = 'St' && !focused", "90:class_g = 'Alacritty' && focused", "60:class_g = 'Alacritty' && !focused", "99:class_g = 'mpv'", "60:class_g = 'kitty' && focused", - "90:class_g = 'kitty' && !focused", + "99:class_g = 'kitty' && !focused", "0:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_HIDDEN'", "0:_NET_WM_STATE@[1]:32a = '_NET_WM_STATE_HIDDEN'", "0:_NET_WM_STATE@[2]:32a = '_NET_WM_STATE_HIDDEN'", diff --git a/.config/polybar/config b/.config/polybar/config index 2b7b8da..67c050f 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -5,21 +5,21 @@ ; [colors] background = #00000000 -background-alt = #88C0D0 -foreground = #5E81AC -foreground-alt = #D08770 -highlight = #E5E9F0 -error = #BF616A -red = #BF616A -yellow = #EBCB8B -green = #A3BE8C -darkblue = #5E81AC +background-alt = #fb4934 +foreground = #fabd2f +foreground-alt = #8ec07c +highlight = #d5c4a1 +error = #b8bb26 +red = #b8bb26 +yellow = #83a598 +green = #d3869b +darkblue = #fabd2f alert = #FF0000 -lightblue = #8FBCBB -orange = #D08770 -blue = #88C0D0 -black = #2E3440 -grey = #4C566A +lightblue = #fbf1c7 +orange = #8ec07c +blue = #fb4934 +black = #282828 +grey = #665c54 [bar/top] monitor = ${env:MONITOR:eDP-1} @@ -141,7 +141,7 @@ interval = 5 ;format-foreground = #E5E9F0 ;format-backgound = #5E81AC label = " %output%" -label-foreground = ${colors.highlight} +label-foreground = ${colors.black} label-background = ${colors.darkblue} [module/pavolume] @@ -177,10 +177,10 @@ exec = ~/.config/Scripts/backlight.sh scroll-up = exec light -A 5 scroll-down = exec light -U 5 format-prefix = "  " -format-prefix-foreground = ${colors.highlight} +format-prefix-foreground = ${colors.black} format-prefix-background = ${colors.darkblue} label = "%output%% " -label-foreground = ${colors.highlight} +label-foreground = ${colors.black} label-background = ${colors.darkblue} [module/popup-calendar] diff --git a/.config/wpg/templates/config_polybar_config.base b/.config/wpg/templates/config_polybar_config.base index 5134059..09b09f0 100644 --- a/.config/wpg/templates/config_polybar_config.base +++ b/.config/wpg/templates/config_polybar_config.base @@ -141,7 +141,7 @@ interval = 5 ;format-foreground = #E5E9F0 ;format-backgound = #5E81AC label = " %output%" -label-foreground = ${{colors.highlight}} +label-foreground = ${{colors.black}} label-background = ${{colors.darkblue}} [module/pavolume] @@ -177,10 +177,10 @@ exec = ~/.config/Scripts/backlight.sh scroll-up = exec light -A 5 scroll-down = exec light -U 5 format-prefix = "  " -format-prefix-foreground = ${{colors.highlight}} +format-prefix-foreground = ${{colors.black}} format-prefix-background = ${{colors.darkblue}} label = "%output%% " -label-foreground = ${{colors.highlight}} +label-foreground = ${{colors.black}} label-background = ${{colors.darkblue}} [module/popup-calendar] diff --git a/addons/install_arch.txt b/addons/install_arch.md similarity index 51% rename from addons/install_arch.txt rename to addons/install_arch.md index 89e4e5a..0d7af16 100644 --- a/addons/install_arch.txt +++ b/addons/install_arch.md @@ -1,141 +1,180 @@ # Install ARCH Linux with UEFI + # The official installation guide (https://wiki.archlinux.org/index.php/Installation_Guide) contains a more verbose description. # Download the archiso image from https://www.archlinux.org/ + # Copy to a usb-drive + dd if=archlinux.img of=/dev/sdX bs=16M && sync # on linux # Boot from the usb. If the usb fails to boot, make sure that secure boot is disabled in the BIOS configuration. -# Set finnish keymap +### Installation Steps + +#### Set finnish keymap + loadkeys fi -# This assumes a wifi only system... +#### This assumes a wifi only system... + wifi-menu -# Create partitions +#### Create partitions + cgdisk /dev/sda 1 512MB EFI partition # Hex code ef00 ;sda1 2 100% size partiton # (to be encrypted) Hex code 8300 ;sda2 -# Create EFI partition +#### Create EFI partition + mkfs.vfat -F32 /dev/sda1 -# Create filesystem on root partition +#### Create filesystem on root partition + mkfs.ext4 /dev/sda2 -# Create swapfile +#### Create swapfile + fallocate -l 4G /swapfile chmod 600 /swapfile mkswap /swapfile swapon /swapfile -# Mount the new system +#### Mount the new system + mount /dev/sda2 /mnt # /mnt is the installed system mkdir /mnt/boot mount /dev/sda1 /mnt/boot -# Install the system also includes stuff needed for starting wifi when first booting into the newly installed system -# Unless nvim and zsh are desired these can be removed from the command. Dialog is needed by wifi-menu -pacstrap /mnt base base-devel linux linux-firmware zsh nvim git sudo networkmanager dialog wifi-menu wpa_supplicant wireless_tools gnome-keyring +#### Install the system also includes stuff needed for starting wifi when first booting into the newly installed system + +#### Unless nvim and zsh are desired these can be removed from the command. Dialog is needed by wifi-menu + +pacstrap /mnt base base-devel linux linux-firmware mkinitcpio e2fsprogs man zsh nvim git sudo +networkmanager dialog wifi-menu wpa_supplicant wireless_tools gnome-keyring + +#### 'install' fstab -# 'install' fstab genfstab -pU /mnt >> /mnt/etc/fstab -# Make /tmp a ramdisk (add the following line to /mnt/etc/fstab) -tmpfs /tmp tmpfs defaults,noatime,mode=1777 0 0 +#### Make /tmp a ramdisk (add the following line to /mnt/etc/fstab) + +tmpfs /tmp tmpfs defaults,noatime,mode=1777 0 0 + +#### Add swapfile to fstab -# Add swapfile to fstab /swapfile none swap defaults 0 0 -# Change relatime on all non-boot partitions to noatime (reduces wear if using an SSD) +#### Change relatime on all non-boot partitions to noatime (reduces wear if using an SSD) + +#### Enter the new system -# Enter the new system arch-chroot /mnt /bin/bash -# Setup system clock +#### Setup system clock + ln -s /usr/share/zoneinfo/Europe/Helsinki /etc/localtime hwclock --systohc --utc -# Set the hostname +#### Set the hostname + echo MYHOSTNAME > /etc/hostname -# Generate locale -#Uncomment wanted locales in /etc/locale.gen +#### Generate locale + +#### Uncomment wanted locales in /etc/locale.gen + vim /etc/locale.gen locale-gen localectl set-locale LANG=en_IE.UTF-8 #To avoid problems with gnome-terminal set locale system wide -#Do NOT set LC_ALL=C. It overrides all the locale vars and messes up special characters +#Do N-OT set LC_ALL=C. It overrides all the locale vars and messes up special characters #Pay attention to the UTF-8. Capital letters ! echo LANG=en_IE.UTF-8 >> /etc/locale.conf echo LC_ALL= >> /etc/locale.conf +#### Set password for root -# Set password for root passwd -# Add real user remove -s flag if you don't whish to use zsh +#### Add real user remove -s flag if you don't whish to use zsh + useradd -m -g users -G audio,video,network,rfkill,input,wheel,storage,power -s /bin/zsh MYUSERNAME passwd MYUSERNAME -# Configure mkinitcpio with modules needed for the initrd image -vim /etc/mkinitcpio.conf +#### Configure mkinitcpio with modules needed for the initrd image + +nvim /etc/mkinitcpio.conf + +#### Regenerate initrd image -# Regenerate initrd image mkinitcpio -p linux -# Setup systembootd (grub will not work on nvme at this moment), install Intel microcode +#### Setup systembootd (grub will not work on nvme at this moment), install Intel microcode + pacman -S intel-ucode bootctl install -# Create loader.conf +#### Create loader.conf + echo 'default Arch' >> /boot/loader/loader.conf echo 'timeout 10' >> /boot/loader/loader.conf -# Create arch.conf (or XYZ.conf for default XYZ in loader.conf) -vim /boot/loader/entries/Arch.conf +#### Create arch.conf (or XYZ.conf for default XYZ in loader.conf) + +nvim /boot/loader/entries/Arch.conf + +#### Add the following content to Arch.conf + +#### from /dev/sda2. It can be found with the 'blkid' command -# Add the following content to Arch.conf -# from /dev/sda2. It can be found with the 'blkid' command title Arch Linux linux /vmlinuz-linux initrd /initramfs-linux.img options root=PARTUUID=xxxx-xxxxx-xxx-xxx rw blkid >> /boot/loader/entries/Arch.conf -# Exit new system and go into the cd shell +#### Exit new system and go into the cd shell + exit -# Unmount all partitions +#### Unmount all partitions + umount -R /mnt swapoff -a -# Reboot into the new system, don't forget to remove the cd/usb +#### Reboot into the new system, don't forget to remove the cd/usb + reboot -# On a new system you might want to check keymap and fix it? +#### On a new system you might want to check keymap and fix it? + localectl set-keymap --no-convert fi localectl set-x11-keymap fi -# Install yay +#### Install yay + git clone https://aur.archlinux.org/yay.git -> cd yay -> makepkg -si -# Mirrors +#### Mirrors + pacman -S reflector cp etc/pacman.d/mirrorlist etc/pacman.d/mirrorlist.bak reflector --latest 200 --protocol http --protocol https --sort rate --save /etc/pacman.d/mirrorlist -# Install X-server and graphics drivers -pacman -S xorg-server xorg-xinit -pacman -S xf86-video-intel -pacman -S xf86-input-synaptics +#### Install X-server and graphics drivers + +pacman -S xorg-server xorg-apps xorg-xinit xterm sudo pacman -Syyu -# After scripts have completed install plug and vundle for neovim +#### After scripts have completed install plug and vundle for neovim + curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs \ - https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim + https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim git clone https://github.com/VundleVim/Vundle.vim.git ~/.config/nvim/bundle/Vundle.vim -# and tmux plugin manager + +#### and tmux plugin manager + git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm diff --git a/addons/pacman-packages b/addons/pacman-packages index d360ca3..800c8b3 100644 --- a/addons/pacman-packages +++ b/addons/pacman-packages @@ -21,7 +21,6 @@ coreutils crda cryptsetup device-mapper -dhcpcd dialog diffutils e2fsprogs diff --git a/addons/yay-packages b/addons/yay-packages index 0282ee3..ad65e35 100644 --- a/addons/yay-packages +++ b/addons/yay-packages @@ -15,6 +15,7 @@ fasd-git freerdp-git google-chrome googler +gtk-theme-arc-gruvbox-git i3-gaps-next-git i3-resurrect-git i8kutils @@ -35,7 +36,6 @@ polybar-git powerline-fonts-git python-ueberzug ranger-git -remmina-git st-luke-git systemd-boot-pacman-hook tlp-git