From f57ce48a348e92b2150a55fcc8d316b4ef7c2857 Mon Sep 17 00:00:00 2001 From: Harri Lahtinen Date: Sun, 29 Jan 2023 22:50:24 +0200 Subject: [PATCH] commit --- .Xresources | 10 ---- .config/i3/config | 54 +++++++++---------- .config/polybar/colors.ini | 32 +++++------ .config/polybar/config | 29 +++++++--- .../templates/vim/templates/config.yaml | 15 +----- .../templates/vim/templates/vimlua.mustache | 7 --- .zaliases | 2 +- addons/pacman-packages | 8 +-- addons/yay-packages | 4 -- 9 files changed, 70 insertions(+), 91 deletions(-) delete mode 100644 .local/share/flavours/base16/templates/vim/templates/vimlua.mustache diff --git a/.Xresources b/.Xresources index c5a058d..7f9dfa1 100644 --- a/.Xresources +++ b/.Xresources @@ -21,16 +21,6 @@ *.color14: #8ec07c *.color15: #ebdbb2 -!! Transparency (0-1): -!st.alpha: 0.9 -!! Set a default font and font size as below: -st.font: UbuntuMono Nerd Font:pixelsize=28:antialias=true:autohint=true; -st.boldFont: UbuntuMono Nerd Font:pixelsize=28:bold:antialias=true:autohint=true; -st.bold_font: 1 -st.borderpx: 10 -! This option is can be preedit style. Available values: `root` `overthespot` ( Default taken `root`) -st.imstyle: root - !!HiDpi Xft.dpi: 200 Xft.autohint: 0 diff --git a/.config/i3/config b/.config/i3/config index 57c418a..6375773 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -15,7 +15,7 @@ set $term --no-startup-id $TERMINAL # Smart gaps (gaps used if only more than one container on the workspace) smart_gaps on -# Smart borders (draw borders around container only if it is not the only container on this workspace) +# Smart borders (draw borders around container only if it is not the only container on this workspace) # on|no_gaps (on=always activate and no_gaps=only activate if the gap size to the edge of the screen is 0) # smart_borders on @@ -34,27 +34,27 @@ bindsym Mod1+e layout toggle split bindsym $mod+Shift+c sticky toggle # Start flavours -## Base16 Generated -# Author: Flavours +## Base16 Nord +# Author: arcticicestudio # # You can use these variables anywhere in the i3 configuration file. -set $base00 #202633 -set $base01 #424752 -set $base02 #656872 -set $base03 #878991 -set $base04 #a9aab0 -set $base05 #cbcacf -set $base06 #d3d2d7 -set $base07 #dbdade -set $base08 #607b96 -set $base09 #677b87 -set $base0A #647c82 -set $base0B #7d957b -set $base0C #6d7893 -set $base0D #5e7c94 -set $base0E #727983 -set $base0F #6d7897 +set $base00 #2E3440 +set $base01 #3B4252 +set $base02 #434C5E +set $base03 #4C566A +set $base04 #D8DEE9 +set $base05 #E5E9F0 +set $base06 #ECEFF4 +set $base07 #8FBCBB +set $base08 #BF616A +set $base09 #D08770 +set $base0A #EBCB8B +set $base0B #A3BE8C +set $base0C #88C0D0 +set $base0D #81A1C1 +set $base0E #B48EAD +set $base0F #5E81AC # Basic color configuration using the Base16 variables for windows and borders. # Property Name Border BG Text Indicator Child Border @@ -66,12 +66,12 @@ client.placeholder $base00 $base00 $base05 $base00 $base00 client.background $base07 -bindsym $mod+d exec dmenu_run -nb '#202633' -sb '#6d7893' -nf '#d3d2d7' -sf '#202633' -fn 'UbuntuMono Nerd Font-20' -h '35' +bindsym $mod+d exec dmenu_run -nb '#2E3440' -sb '#88C0D0' -nf '#ECEFF4' -sf '#2E3440' -fn 'UbuntuMono Nerd Font-20' -h '35' # End flavours ###---Starting External Scripts---### #Load .Xresources -exec --no-startup-id xrdb -merge .Xresources +#exec --no-startup-id xrdb -merge .Xresources #Start mopidy #exec --no-startup-id mopidy & #Twmn @@ -83,8 +83,6 @@ exec --no-startup-id twmnd & #exec --no-startup-id ~/.config/wpg/wp_init.sh #Battery notify exec --no-startup-id ~/.config/Scripts/i3-battery-monitor & -#Conky -#exec --no-startup-id conky -d -c ~/.config/conky/conkybg & #Picom exec --no-startup-id picom -bc --experimental-backends --dbus --config /home/hate/.config/picom/picom.conf #Gnome privileges @@ -126,11 +124,11 @@ set $beg --no-startup-id mpc seek 0% set $BROWSER google-chrome-stable #FOR ALSA/AMIXER -set $inc --no-startup-id ~/.config/polybar/scripts/pavolume.sh --up +set $inc --no-startup-id ~/.config/polybar/scripts/pipewire/sound.sh up & set $biginc --no-startup-id amixer sset Master 5%+ -set $dec --no-startup-id ~/.config/polybar/scripts/pavolume.sh --down +set $dec --no-startup-id ~/.config/polybar/scripts/pipewire/sound.sh down & set $bigdec --no-startup-id amixer sset Master 5%- -set $mute --no-startup-id pactl set-sink-mute 0 toggle +set $mute --no-startup-id ~/.config/polybar/scripts/pipewire/sound.sh mute & set $truemute --no-startup-id amixer sset Master mute ###---Dropdown/Scratchpad Windows---### @@ -317,7 +315,7 @@ for_window [class="Gucharmap"] floating enable for_window [class="Pavucontrol"] floating enable for_window [class="Nm-connection-editor"] floating enable for_window [class="Lxappearance"] floating enable -for_window [instance="^package-update$" class="^st$"] floating enable, move position center +for_window [instance="^package-update$" class="^st$"] floating enable, move position center for_window [class="Yad"] floating enable for_window [class="Pcmanfm"] floating enable, resize set 1920 1080 for_window [class="(G|g)oogle-chrome"] border none @@ -383,6 +381,6 @@ bindsym XF86MonBrightnessDown exec light -S "$(light -G | awk '{ print int($1 / bindsym XF86MonBrightnessUp exec light -S "$(light -G | awk '{ print int(($1 + .72) * 1.4) }')" #bindsym XF86AudioMedia exec $music #bindsym XF86Display exec --no-startup-id arandr -#bindsym XF86KbdBrightnessDown exec --no-startup-id light -U 5 +#bindsym XF86KbdBrightnessDown exec --no-startup-id light -U 5 #bindsym XF86KbdBrightnessUp exec --no-startup-id light -A 5 #bindsym XF86WLAN exec --no-startup-id sudo systemctl restart NetworkManager diff --git a/.config/polybar/colors.ini b/.config/polybar/colors.ini index 0dd603c..0ac66a0 100644 --- a/.config/polybar/colors.ini +++ b/.config/polybar/colors.ini @@ -1,18 +1,18 @@ [colors] background = #00000000 -base00 = ee202633 -base01 = 424752 -base02 = 656872 -base03 = 878991 -base04 = a9aab0 -base05 = cbcacf -base06 = d3d2d7 -base07 = dbdade -base08 = 607b96 -base09 = 677b87 -base0A = 647c82 -base0B = 7d957b -base0C = 6d7893 -base0D = 5e7c94 -base0E = 727983 -base0F = 6d7897 +base00 = ee2E3440 +base01 = 3B4252 +base02 = 434C5E +base03 = 4C566A +base04 = D8DEE9 +base05 = E5E9F0 +base06 = ECEFF4 +base07 = 8FBCBB +base08 = BF616A +base09 = D08770 +base0A = EBCB8B +base0B = A3BE8C +base0C = 88C0D0 +base0D = 81A1C1 +base0E = B48EAD +base0F = 5E81AC diff --git a/.config/polybar/config b/.config/polybar/config index c2e2c21..9013f9d 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -10,8 +10,8 @@ include-file = ~/.config/polybar/colors.ini monitor = ${env:MONITOR:eDP-1} include-file = ~/.config/polybar/top-bar modules-left = i3 arrow01 xwindow arrow0 -modules-center = term chrome editor fm music vpn1 -modules-right = arrow10 redshift arrow9 vpn-wireguard-wg arrow7 wlan arrow6 pkg arrow5 pavolume arrow4 battery arrow3 backlight arrow2 networkmanager arrow1 popup-calendar +modules-center = +modules-right = arrow10 redshift arrow9 vpn-wireguard-wg arrow7 wlan arrow6 pkg arrow5 pulseaudio-devices arrow4 battery arrow3 backlight arrow2 networkmanager arrow1 popup-calendar ;tray-position = right ;tray-padding = 2 @@ -116,6 +116,19 @@ content = "" content-foreground = ${colors.base09} content-background = ${colors.background} +[module/pulseaudio-devices] +type = custom/script +label = "%output%" +label-font = 2 +interval = 2.0 +exec = ~/.config/polybar/scripts/pipewire/sound.sh +click-right = exec pavucontrol & +click-left = ~/.config/polybar/scripts/pipewire/sound.sh mute & +scroll-up = ~/.config/polybar/scripts/pipewire/sound.sh up & +scroll-down = ~/.config/polybar/scripts/pipewire/sound.sh down & +format-foreground = ${colors.base00} +format-background = ${colors.base09} + [module/bluetoothctl] type = custom/script exec = ~/.config/polybar/scripts/bluetoothctl.sh @@ -130,7 +143,7 @@ label-background = ${colors.base09} ;exec = ~/.config/polybar/scripts/nordvpn/vpn-nordvpn-status.sh ;interval = 5 ;label = " %output% " -;label-foreground = ${colors.base00} +;label-foreground = ${colors.base00} ;label-background = ${colors.base0F} [module/vpn] @@ -172,9 +185,9 @@ label-unmounted-foreground = ${colors.base0D} [module/redshift] type = custom/script -format-prefix = " " -exec = source ~/.config/polybar/scripts/redshift/env.sh && ~/.config/polybar/scripts/redshift/redshift.sh temperature -click-left = source ~/.config/polybar/scripts/redshift/env.sh && ~/.config/polybar/scripts/redshift/redshift.sh toggle +format-prefix = " " +exec = source ~/.config/polybar/scripts/redshift/env.sh && ~/.config/polybar/scripts/redshift/redshift.sh temperature +click-left = source ~/.config/polybar/scripts/redshift/env.sh && ~/.config/polybar/scripts/redshift/redshift.sh toggle scroll-up = source ~/.config/polybar/scripts/redshift/env.sh && ~/.config/polybar/scripts/redshift/redshift.sh increase scroll-down = source ~/.config/polybar/scripts/redshift/env.sh && ~/.config/polybar/scripts/redshift/redshift.sh decrease interval=0.5 @@ -500,7 +513,7 @@ format-charging-background = ${colors.base08} label-charging-foreground = ${colors.base00} label-charging-background = ${colors.base08} format-discharging-foreground = ${colors.base00} -format-discharging-background = ${colors.base08} +format-discharging-background = ${colors.base08} label-discharging-foreground = ${colors.base00} label-discharging-background = ${colors.base08} format-full-prefix = "  " @@ -528,7 +541,7 @@ animation-discharging-background = ${colors.base08} [module/networkmanager] type = custom/text -content = " net  " +content = " net  " content-foreground = ${colors.base00} content-background = ${colors.base0A} click-left = networkmanager_dmenu diff --git a/.local/share/flavours/base16/templates/vim/templates/config.yaml b/.local/share/flavours/base16/templates/vim/templates/config.yaml index 5c9ce9e..7f92b34 100644 --- a/.local/share/flavours/base16/templates/vim/templates/config.yaml +++ b/.local/share/flavours/base16/templates/vim/templates/config.yaml @@ -1,16 +1,3 @@ default: extension: .vim - output: colors - -custom: - extension: .vim - output: colors - -transparent: - extension: .vim - output: colors - -vimlua: - extension: .vim - output: colors - + output: colors \ No newline at end of file diff --git a/.local/share/flavours/base16/templates/vim/templates/vimlua.mustache b/.local/share/flavours/base16/templates/vim/templates/vimlua.mustache deleted file mode 100644 index dfd8e86..0000000 --- a/.local/share/flavours/base16/templates/vim/templates/vimlua.mustache +++ /dev/null @@ -1,7 +0,0 @@ -let g:colors_name = 'base16-vimlua' -lua require('base16-colorscheme').setup({ - \ base00 = '#{{base00-hex}}', base01 = '#{{base01-hex}}', base02 = '#{{base02-hex}}', base03 = '#{{base03-hex}}', - \ base04 = '#{{base04-hex}}', base05 = '#{{base05-hex}}', base06 = '#{{base06-hex}}', base07 = '#{{base07-hex}}', - \ base08 = '#{{base08-hex}}', base09 = '#{{base09-hex}}', base0A = '#{{base0A-hex}}', base0B = '#{{base0B-hex}}', - \ base0C = '#{{base0C-hex}}', base0D = '#{{base0D-hex}}', base0E = '#{{base0E-hex}}', base0F = '#{{base0F-hex}}' - \}) diff --git a/.zaliases b/.zaliases index 5b046b1..bf1b4a0 100644 --- a/.zaliases +++ b/.zaliases @@ -13,7 +13,7 @@ alias wspeedu="speedometer -tx wlp11s0" alias aws1='ssh ubuntu@ec2-18-196-102-236.eu-central-1.compute.amazonaws.com' alias gcp='gcloud compute ssh instance-1' alias blist='borg list ssh://borg@alpine0.home.hartzan.com:2222/backup/xps' -alias contabo='ssh hate@vmi292788.contaboserver.net' +alias contabo='ssh hate@164.68.120.85' alias oracle='ssh hate@130.61.180.151' alias yv='googler -w youtube.com --url-handler mpv $argv' alias rollback='sudo pacback --snapback' diff --git a/addons/pacman-packages b/addons/pacman-packages index 64addc8..ccb1194 100644 --- a/addons/pacman-packages +++ b/addons/pacman-packages @@ -20,7 +20,6 @@ chromium chrony cmatrix coreutils -crda cryptsetup ctags device-mapper @@ -57,6 +56,7 @@ gvfs-mtp gzip helm htop +i3-wm inetutils intel-media-driver intel-ucode @@ -110,6 +110,7 @@ noto-fonts noto-fonts-emoji npm ntp +obsidian openvpn p7zip pacman @@ -121,13 +122,14 @@ pavucontrol pciutils pcmanfm-gtk3 perl +pipewire-pulse pkgconf polkit-gnome +polybar powerline-fonts powertop procps-ng psmisc -pulseaudio-bluetooth python-cairo python-mpd2 python-pip @@ -237,7 +239,7 @@ xorg-xwud xsettingsd xterm yadm -youtube-dl +yt-dlp zathura zathura-pdf-poppler zsh diff --git a/addons/yay-packages b/addons/yay-packages index f163099..781bce1 100644 --- a/addons/yay-packages +++ b/addons/yay-packages @@ -7,7 +7,6 @@ bibata-cursor-theme breeze-snow-cursor-theme chkservice chromium-widevine -dell-bios-fan-control-git dmenu2 downgrade duf-bin @@ -16,9 +15,7 @@ flavours google-chrome googler gtk-theme-arc-gruvbox-git -i3-gaps-next-git i3-resurrect-git -i8kutils inxi-git khal-git kmscon-patched-git @@ -35,7 +32,6 @@ nordvpn-bin pacback pbincli picom-git -polybar-git pywal-git qt5-styleplugins ranger-git