From 7368476deaaa1321789a15a8b23b4e56dcf4ea51 Mon Sep 17 00:00:00 2001 From: Harri Lahtinen Date: Thu, 14 Nov 2019 20:33:53 +0200 Subject: [PATCH] changes.. --- .config/i3/config | 12 +- .config/mpv/mpv.conf | 2 +- .config/polybar/config | 34 ++--- .config/wpg/templates/config_i3_config.base | 4 + .../wpg/templates/config_polybar_config.base | 6 +- .zshenv | 10 +- .zshrc | 12 +- addons/install_arch.txt | 141 ++++++++++++++++++ 8 files changed, 186 insertions(+), 35 deletions(-) create mode 100644 addons/install_arch.txt diff --git a/.config/i3/config b/.config/i3/config index 181bc3f..53c1bcb 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 #494C53 #6B6D73 #03060D #494C53 #5E6168 -client.unfocused #5E6168 #494C53 #bfc0c2 #5E6168 #03060D -client.focused_inactive #03060D #858687 #bfc0c2 #5E6168 #03060D -client.urgent #595C63 #595C63 #03060D #595C63 #595C63 -client.background #858687 +client.focused #4B4A43 #705967 #050407 #4B4A43 #694F58 +client.unfocused #694F58 #4B4A43 #c2b6b7 #694F58 #050407 +client.focused_inactive #050407 #877f80 #c2b6b7 #694F58 #050407 +client.urgent #564552 #564552 #050407 #564552 #564552 +client.background #877f80 ###---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 '#7A7C82' -sf '#03060D' -sb '#595C63' -nf '#bfc0c2' +bindsym $mod+d exec dmenu_run -fn 'Ubuntu Mono derivative Powerline-18' -h '35' -nb '#975F3B' -sf '#050407' -sb '#564552' -nf '#c2b6b7' 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/mpv/mpv.conf b/.config/mpv/mpv.conf index f4bb3df..d8dae17 100644 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -80,7 +80,7 @@ force-window=immediate # Force video to lock on the display's refresh rate, and change video and audio # speed to some degree to ensure synchronous playback - can cause problems # with some drivers and desktop environments. -#video-sync=display-resample +video-sync=display-resample # Enable hardware decoding if available. Often, this does not work with all # video outputs, but should work well with default settings on most systems. diff --git a/.config/polybar/config b/.config/polybar/config index 50c3be1..3824e59 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -5,21 +5,21 @@ ; [colors] background = #00000000 -background-alt = #494C53 -foreground = #5E6168 -foreground-alt = #7E8187 -highlight = #bfc0c2 -error = #595C63 -red = #595C63 -yellow = #6B6D73 -green = #7A7C82 -darkblue = #5E6168 +background-alt = #4B4A43 +foreground = #694F58 +foreground-alt = #936B6E +highlight = #c2b6b7 +error = #564552 +red = #564552 +yellow = #705967 +green = #975F3B +darkblue = #694F58 alert = #FF0000 -lightblue = #bfc0c2 -orange = #7E8187 -blue = #494C53 -black = #03060D -grey = #858687 +lightblue = #c2b6b7 +orange = #936B6E +blue = #4B4A43 +black = #050407 +grey = #877f80 [bar/top] monitor = ${env:MONITOR:eDP-1} @@ -38,7 +38,7 @@ monitor = ${env:MONITOR:eDP-1} include-file = ~/.config/polybar/bottom-bar modules-left = hostname arrowb01 modules-center = cpu memory temperature filesystem -modules-right = arrowb2 bluetoothctl arrowb1 openweather +modules-right = arrowb1 openweather [module/arrowb01] type = custom/text @@ -50,7 +50,7 @@ content-background = #00000000 type = custom/text content = "" content-foreground = ${colors.green} -content-background = ${colors.orange} +content-background = #00000000 [module/arrowb2] type = custom/text @@ -527,7 +527,7 @@ label-disconnected = [module/wlan] type = internal/network -interface = wlp2s0 +interface = wlan0 interval = 3.0 format-connected = label-connected = "  %essid%  %signal%  %upspeed:7%  %downspeed:7% " diff --git a/.config/wpg/templates/config_i3_config.base b/.config/wpg/templates/config_i3_config.base index 242920e..38348c5 100644 --- a/.config/wpg/templates/config_i3_config.base +++ b/.config/wpg/templates/config_i3_config.base @@ -127,6 +127,10 @@ bindsym $mod+Shift+b move scratchpad # Show the first scratchpad window bindsym $mod+Shift+e scratchpad show +# i3-resurrect save/restore +bindsym Mod1+Shift+s exec ~/.config/Scripts/i3-resurrect-save-all +bindsym Mod1+Shift+r exec ~/.config/Scripts/i3-resurrect-restore-all + #Composite manager: bindsym $mod+b exec --no-startup-id pkill compton bindsym $mod+Ctrl+b exec --no-startup-id compton -b -f diff --git a/.config/wpg/templates/config_polybar_config.base b/.config/wpg/templates/config_polybar_config.base index e888b10..5134059 100644 --- a/.config/wpg/templates/config_polybar_config.base +++ b/.config/wpg/templates/config_polybar_config.base @@ -38,7 +38,7 @@ monitor = ${{env:MONITOR:eDP-1}} include-file = ~/.config/polybar/bottom-bar modules-left = hostname arrowb01 modules-center = cpu memory temperature filesystem -modules-right = arrowb2 bluetoothctl arrowb1 openweather +modules-right = arrowb1 openweather [module/arrowb01] type = custom/text @@ -50,7 +50,7 @@ content-background = #00000000 type = custom/text content = "" content-foreground = ${{colors.green}} -content-background = ${{colors.orange}} +content-background = #00000000 [module/arrowb2] type = custom/text @@ -527,7 +527,7 @@ label-disconnected = [module/wlan] type = internal/network -interface = wlp2s0 +interface = wlan0 interval = 3.0 format-connected = label-connected = "  %essid%  %signal%  %upspeed:7%  %downspeed:7% " diff --git a/.zshenv b/.zshenv index 8b2b377..6c53a15 100644 --- a/.zshenv +++ b/.zshenv @@ -30,7 +30,9 @@ export GDK_DPI_SCALE=0.5 export QT_AUTO_SCREEN_SCALE_FACTOR=1 # gnome-keyring -if [ -n "$DESKTOP_SESSION" ];then - eval $(gnome-keyring-daemon --start) - export SSH_AUTH_SOCK -fi +#if [ -n "$DESKTOP_SESSION" ];then +# eval $(gnome-keyring-daemon --start) +# export SSH_AUTH_SOCK +#fi +#eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh) +#export $(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg) diff --git a/.zshrc b/.zshrc index d126d1b..bc54fdd 100644 --- a/.zshrc +++ b/.zshrc @@ -54,15 +54,22 @@ plugins=( zsh-autosuggestions zsh-syntax-highlighting history-substring-search + archlinux sudo tmux yadm + fasd + fzf ) source $ZSH/oh-my-zsh.sh # My scripts -PATH=/usr/local/bin:/home/hate/.local/bin:/home/hate/.config/Scripts:$PATH +PATH=/home/hate/go/bin:/usr/local/bin:/home/hate/.local/bin:/home/hate/.config/Scripts:$PATH + + +# Init pmy +eval "$(pmy init)" # Wpg restore on terminals (cat ~/.config/wpg/sequences &) @@ -97,6 +104,3 @@ if [ -f '/home/hate/google-cloud-sdk/path.zsh.inc' ]; then source '/home/hate/go # The next line enables shell command completion for gcloud. if [ -f '/home/hate/google-cloud-sdk/completion.zsh.inc' ]; then source '/home/hate/google-cloud-sdk/completion.zsh.inc'; fi -# Spaceship -SPACESHIP_BATTERY_THRESHOLD=40 - diff --git a/addons/install_arch.txt b/addons/install_arch.txt new file mode 100644 index 0000000..89e4e5a --- /dev/null +++ b/addons/install_arch.txt @@ -0,0 +1,141 @@ +# 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 +loadkeys fi + +# This assumes a wifi only system... +wifi-menu + +# 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 +mkfs.vfat -F32 /dev/sda1 + +# Create filesystem on root partition +mkfs.ext4 /dev/sda2 + +# Create swapfile +fallocate -l 4G /swapfile +chmod 600 /swapfile +mkswap /swapfile +swapon /swapfile + +# 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' 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 + +# 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) + +# Enter the new system +arch-chroot /mnt /bin/bash + +# Setup system clock +ln -s /usr/share/zoneinfo/Europe/Helsinki /etc/localtime +hwclock --systohc --utc + +# Set the hostname +echo MYHOSTNAME > /etc/hostname + +# 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 +#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 +passwd + +# 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 + +# Regenerate initrd image +mkinitcpio -p linux + +# Setup systembootd (grub will not work on nvme at this moment), install Intel microcode +pacman -S intel-ucode +bootctl install + +# 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 + +# 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 + +# Unmount all partitions +umount -R /mnt +swapoff -a + +# 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? +localectl set-keymap --no-convert fi +localectl set-x11-keymap fi + +# Install yay +git clone https://aur.archlinux.org/yay.git -> cd yay -> makepkg -si + +# 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 +sudo pacman -Syyu + +# 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 +git clone https://github.com/VundleVim/Vundle.vim.git ~/.config/nvim/bundle/Vundle.vim +# and tmux plugin manager +git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm