laptop setup

7 files changed, 101 insertions, 89 deletions

diff --git a/.bashrc b/.bashrc
index 6a82f1c..7c64dc6 100644
--- a/.bashrc
+++ b/.bashrc
@@ -119,6 +119,7 @@ fi
 export EDITOR=vim
 export VISUAL=vim
 export PS1='\[\033[35m\]\u@\h\[\033[37m\]:\[\033[0;34m\]\w\[\033[37m\]$ ' # Shell prompt
+#export PF_INFO="ascii os host kernel uptime pkgs memory"
 
 alias mv='mv -i'
 alias rm='rm -i'
@@ -135,3 +136,8 @@ export PATH="$HOME/.dotnet/tools:$PATH"
 export CLASSPATH=".:/usr/local/lib/antlr-4.9.1-complete.jar:$CLASSPATH"
 alias antlr4='java -jar /usr/local/lib/antlr-4.9.1-complete.jar'
 alias grun='java org.antlr.v4.gui.TestRig'
+
+#pfetch=$(pfetch)
+#cat << EOF
+#$pfetch
+#EOF
diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
index f386abe..3ed3f18 100644
--- a/.config/alacritty/alacritty.yml
+++ b/.config/alacritty/alacritty.yml
@@ -131,7 +131,7 @@ font:
     #style: Bold Italic
 
   # Point size
-  size: 9.5
+  size: 6.5
   # Offset is the extra space around each character. `offset.y` can be thought
   # of as modifying the line spacing, and `offset.x` as modifying the letter
   # spacing.
diff --git a/.config/i3/config b/.config/i3/config
index 8ae9bb2..776d759 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -1,36 +1,32 @@
-##### i3 config
-
 set $mod Mod4
 set $alt Mod1
 floating_modifier $mod
 
-
 ##### Bindings 
 
 bindsym $mod+Shift+c reload
 bindsym $mod+Shift+r restart
-bindsym $mod+Shift+q kill
 bindsym $mod+Shift+e exec --no-startup-id "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-bindsym $mod+Shift+p exec --no-startup-id rofi -show p -modi "p:rofi-power-menu --choices=shutdown/reboot/suspend/logout --confirm=" 
-
+bindsym $mod+Shift+q kill
 bindsym $mod+Escape exec --no-startup-id systemctl suspend
 bindsym $mod+Return exec --no-startup-id alacritty
 bindsym $mod+b exec --no-startup-id firefox
 bindsym $mod+e exec --no-startup-id pcmanfm
 bindsym $mod+f fullscreen toggle
+bindsym $mod+c exec gnome-control-center --class=floating_window
 
+# Rofi
 bindsym $mod+d exec --no-startup-id rofi -show drun -show-icons -drun-display-format {name}
 bindsym $alt+Tab exec --no-startup-id rofi -show window -show-icons -drun-display-format {name}
 bindsym $alt+b exec --no-startup-id rofi -modi "clipboard:greenclip print" -show clipboard -run-command '{cmd}' -show-icons 
-bindsym $mod+p exec --no-startup-id rofi-pass
+bindsym $mod+Shift+p exec --no-startup-id rofi -show p -modi "p:rofi-power-menu --no-symbols --choices=shutdown/reboot/suspend/logout --confirm="
+bindsym $mod+p exec --no-startup-id rofi-pass  
 
-# Media keys
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5%
+bindsym XF86AudioRaiseVolume exec --no-startup-id ~/.config/i3/custom/volume_up.sh 100
 bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -5%
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle
-bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause
-bindsym XF86AudioNext exec --no-startup-id playerctl next
-bindsym XF86AudioPrev exec --no-startup-id playerctl previous
+bindsym XF86AudioPlay exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle
+bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 5
+bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 5
 
 # Change focus
 bindsym $mod+h focus left
@@ -137,6 +133,9 @@ for_window [class="floating_window"] floating enable
 for_window [window_role="pop-up"] floating enable
 for_window [window_role="About"] floating enable
 
+for_window [window_role="gnome-calculator"] floating enable
+for_window [title="GNOME Tweaks"] floating enable
+
 # Jetbrains
 for_window [class="^com-intellij-updater-Runner$" title="^Update$"] floating enable
 for_window [instance="^sun-awt-X11-XDialogPeer$" title="^Complete Installation$"] floating enable
@@ -147,7 +146,7 @@ for_window [class="^Unity$" title="^Hold On$"] floating enable
 for_window [class="^Unity$" title="^Preparing Package$"] floating enable
 for_window [class="^Unity$" title="^Importing Package$"] floating enable
 
-# Steam 
+# Steam https://github.com/ValveSoftware/steam-for-linux/issues/1040
 for_window [title="Friends List"] floating enable                       
 for_window [class="^Steam$" title="^Friends$"] floating enable
 for_window [class="^Steam$" title="Steam - News"] floating enable
@@ -162,9 +161,9 @@ for_window [title="Steam Guard - Computer Authorization Required"] floating enab
 for_window [class="^Steam$" title="^Steam Guard - Computer Authorization Required$"] floating enable
 for_window [title="^Steam Keyboard$"] floating enable
 
-
 ##### Exec
 
-exec_always --no-startup-id nm-applet
+exec_always --no-startup-id /usr/bin/nm-applet
+exec_always --no-startup-id /usr/bin/unclutter -b
 exec_always --no-startup-id $HOME/.config/polybar/launch.sh
-exec_always --no-startup-id picom --config $HOME/.config/picom/picom.conf -b 
+exec_always --no-startup-id picom --experimental-backends --config ~/.config/picom/picom.conf -b
diff --git a/.config/polybar/config b/.config/polybar/config
index 67fe125..ee55443 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -3,7 +3,8 @@
 ;background = #10152c
 ;background = #080f1f
 background = #090809
-background-alt = #1b2f60
+background-alt = #090809
+background-alt-i3 = #1b2f60
 ;foreground = ${xrdb:color7:#222}
 foreground = #dfdfdf
 foreground-alt = #254183
@@ -14,14 +15,13 @@ alert = #bd2c40
 
 
 [bar/bar1]
-monitor = DP-2
 width = 100%
 height = 25
 ;offset-x = 1%
 ;offset-y = 1%
 radius = 0
 fixed-center = false
-bottom = true
+bottom = false
 
 background = ${colors.background}
 foreground = ${colors.foreground}
@@ -35,17 +35,18 @@ border-color = #00000000
 padding-left = 0
 padding-right = 2   
 
-module-margin-left = 1
-module-margin-right = 2
+module-margin-left = 0
+module-margin-right = 2.5
 
-;font-0 = SFNS Display:style=Bold:size=12;3 
-font-0 = SFNS Display:style=Regular:size=13;3 
-font-1 = Font Awesome 5 Free Regular:size=12;3
-font-2 = Font Awesome 5 Free Solid:size=12;3
+font-0 = SFNS Display:style=Regular:size=14;3.5 
+font-1 = Font Awesome 5 Free Regular:size=13;3
+font-2 = Font Awesome 5 Free Solid:size=13;3
+font-3 = Font Awesome 5 Pro Solid:size=13;3
+font-4 = Font Awesome 5 Pro Regular:size=13;3
 
 modules-left = i3
 modules-center = 
-modules-right = xkeyboard pulseaudio date
+modules-right = xkeyboard pulseaudio battery date
 
 tray-position = right
 tray-padding = 2
@@ -58,53 +59,9 @@ enable-ipc = true
 
 
 
-[bar/bar2]
-monitor = DP-4.8
-width = 100%
-height = 25
-;offset-x = 1%
-;offset-y = 1%
-radius = 0
-fixed-center = false
-bottom = true
-
-background = ${colors.background}
-foreground = ${colors.foreground}
-
-line-size = 0
-line-color = #f00
-
-border-size = 0
-border-color = #00000000
-
-padding-left = 0
-padding-right = 0   
-
-module-margin-left = 1
-module-margin-right = 2
-
-font-0 = SFNS Display:style=Regular:size=13;3 
-font-1 = Font Awesome 5 Free Regular:size=12;3
-font-2 = Font Awesome 5 Free Solid:size=12;3
-
-modules-left = i3
-modules-center = 
-modules-right = date
-
-tray-position = none
-tray-padding = 2
-;tray-background = #0063ff
-
-cursor-click = pointer
-cursor-scroll = ns-resize
-
-enable-ipc = true
-
-
-
 [module/xkeyboard]
 type = internal/xkeyboard
-blacklist-0 = num lock
+;blacklist-0 = num lock
 
 ;format-prefix = "    "
 ;format-prefix-foreground = ${colors.foreground}
@@ -114,9 +71,10 @@ blacklist-0 = num lock
 label-layout = "  %layout%  "
 label-layout-background = ${colors.background-alt}
 
-label-indicator-padding = 2
-label-indicator-margin = 1
-label-indicator-background = ${colors.secondary}
+label-indicator-padding = 1
+label-indicator-margin = 0
+label-indicator-background = #bc99ed
+label-indicator-foreground = #000
 
 
 
@@ -135,7 +93,7 @@ label-mode-background = ${colors.primary}
 
 ; focused = Active workspace on focused monitor
 label-focused = %index%
-label-focused-background = ${colors.background-alt}
+label-focused-background = ${colors.background-alt-i3}
 label-focused-foreground = #f1e98a
 label-focused-underline= ${colors.primary}
 label-focused-padding = 3
@@ -159,22 +117,66 @@ label-urgent-padding = 3
 ; label-separator = |
 
 
+[module/battery]
+type = internal/battery
+full-at = 99
+battery = BAT0
+adapter = ADP1
+poll-interval = 5
+
+; Available tags:
+;   <label-charging> (default)
+;   <bar-capacity>
+;   <ramp-capacity>
+;   <animation-charging>
+format-charging = <label-charging>
+
+; Available tags:
+;   <label-discharging> (default)
+;   <bar-capacity>
+;   <ramp-capacity>
+;   <animation-discharging>
+format-discharging = <ramp-capacity> <label-discharging>
+format-discharging-background = ${colors.background-alt}
+
+; Available tokens:
+;   %percentage% (default) - is set to 100 if full-at is reached
+;   %percentage_raw%
+;   %time%
+;   %consumption% (shows current charge rate in watts)
+label-charging = "    %percentage%  "
+label-charging-background = ${colors.background-alt}
+
+; Available tokens:
+;   %percentage% (default) - is set to 100 if full-at is reached
+;   %percentage_raw%
+;   %time%
+;   %consumption% (shows current discharge rate in watts)
+label-discharging = "%percentage%  "
+label-discharging-background = ${colors.background-alt}
+
+; Only applies if <ramp-capacity> is used
+ramp-capacity-0 = "   "
+ramp-capacity-1 = "   "
+ramp-capacity-2 = "   "
+ramp-capacity-3 = "   "
+ramp-capacity-4 = "   "
+
+
 
 [module/date]
 type = internal/date
 interval = 5
 
-date = ""
-date-alt = " %a %b %d"
-
+date = " %a %b %d"
 time = %H:%M
-time-alt = %H:%M
 
 ;format-prefix = "   "  
 ;format-prefix-background = ${colors.background-alt}
 ;format-prefix-foreground = ${colors.foreground}
 ;format-underline = #0a6cf5
 
+;label = "   %date% %time%  " 
 label = " %date% %time%  " 
 label-background = ${colors.background-alt}
 
@@ -183,7 +185,14 @@ label-background = ${colors.background-alt}
 [module/pulseaudio]
 type = internal/pulseaudio
 
-format-volume = <label-volume> 
+format-volume = <label-volume>
+format-volume-background = ${colors.background-alt} 
+
+; Only applies if <ramp-volume> is used
+;ramp-volume-0 = "   "
+;ramp-volume-1 = "   "
+;ramp-volume-2 = "   "
+;ramp-volume-3 = "   "
 
 label-volume = "    %percentage%  "
 label-volume-foreground = ${root.foreground}
@@ -210,3 +219,4 @@ margin-top = 5
 margin-bottom = 5
 
 ; vim:ft=dosini
+
diff --git a/.config/polybar/launch.sh b/.config/polybar/launch.sh
index ff5065a..68d5cf2 100755
--- a/.config/polybar/launch.sh
+++ b/.config/polybar/launch.sh
@@ -6,8 +6,6 @@ killall -q polybar
 # polybar-msg cmd quit
 
 # Launch bar1
-echo "---" | tee -a /tmp/polybar1.log /tmp/polybar2.log
+echo "---" | tee -a /tmp/polybar1.log 
 polybar bar1 2>&1 | tee -a /tmp/polybar1.log & disown
-polybar bar2 2>&1 | tee -a /tmp/polybar2.log & disown
-
-echo "Bars launched..."
+echo "Bar launched..."
diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi
index 10caf15..0fba9d8 100644
--- a/.config/rofi/config.rasi
+++ b/.config/rofi/config.rasi
@@ -20,7 +20,7 @@ configuration {
 /*	drun-show-actions: false;*/
 /*	drun-display-format: "{name} [<span weight='light' size='small'><i>({generic})</i></span>]";*/
 /*	drun-url-launcher: "xdg-open";*/
-/*	disable-history: false;*/
+	disable-history: false;
 /*	ignored-prefixes: "";*/
 /*	sort: false;*/
 /*	sorting-method: "normal";*/
@@ -43,7 +43,7 @@ configuration {
 /*	window-format: "{w}    {c}   {t}";*/
 /*	click-to-exit: true;*/
 	theme: "onedark";
-/*	max-history-size: 25;*/
+	max-history-size: 25;
 /*	combi-hide-mode-prefix: false;*/
 /*	matching-negate-char: '-' /* unsupported */;*/
 /*	cache-dir: ;*/
diff --git a/.xinitrc b/.xinitrc
index 014d3ea..675dc2a 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -37,7 +37,6 @@ greenclip daemon &
 playerctld daemon &
 nitrogen --restore &
 setxkbmap -option grp:win_space_toggle us,dk &
-#picom --config $HOME/.config/picom/picom.conf -b &
 redshift -l 56:10 &
 pcmanfm -d &
 exec i3 & wmpid=$!