update dotfiles

i3-resurrect/config.json

@@ -1,4 +1,7 @@
 {
+  "directory": [
+    "~/.i3/i3-resurrect/"
+  ],
   "window_command_mappings": [
     {
       "class": "Gnome-terminal",

i3/config

@@ -3,9 +3,10 @@ set $sup Mod4
 
 # Screen setup
 # Turn on screen connected to AMD card
-#exec --no-startup-id /usr/bin/xrandr --output DVI-I-0 --off --output DVI-I-1 --off --output HDMI-0 --off --output DP-0 --off --output DP-1 --off --output DP-2 --off --output DP-3 --off --output DP-4 --off --output DP-5 --off --output DisplayPort-1-3 --off --output HDMI-1-1 --primary --mode 1920x1080 --pos 1920x0 --rotate normal --output DVI-1-1 --mode 1920x1080 --pos 0x0 --rotate normal --output DVI-1-0 --off
+exec_always /home/emamaker/.screenlayout/layout.sh
-set $screen1 HDMI-1-1
+#exec --no-startup-id xrandr --output DisplayPort-0 --primary --mode 1920x1080 --pos 1920x0 --rotate normal --output HDMI-0 --mode 1920x1080 --pos 0x0 --rotate normal --output DVI-0 --off --output DVI-1 --off
-set $screen2 DVI-1-1
+set $screen2 HDMI-0
+set $screen1 DisplayPort-0
 
 
 ######### Basic I3 Behaviour Config #########
@@ -31,7 +32,8 @@ exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec alacritty
+bindsym $mod+Return exec prime-run alacritty
+bindsym $mod+Shift Return exec alacritty
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -144,8 +146,9 @@ bindsym Mod1+Tab workspace back_and_forth
 bindsym Shift+F2 exec i3-input -F 'rename workspace to "%s"' -P 'New name for this workspace: '
 
 ############### gaps ###############
+
 # gaps
-gaps inner 15
+gaps inner 10
 # smart_gaps on
 
 # Smart borders (draw borders around container only if it is not the only container on this workspace)
@@ -202,7 +205,8 @@ focus_follows_mouse no
 exec_always --no-startup-id $HOME/.config/polybar/launch.sh
 
 # picom
-exec_always picom -b -i 0.65
+exec_always picom --config $HOME/.config/picom/picom.conf
+
 
 # Applets / System-tray
 exec --no-startup-id nm-applet
@@ -218,11 +222,13 @@ exec_always --no-startup-id feh --bg-fill $bg;
 #bindsym $mod+Tab exec --no-startup-id "killall -s SIGUSR1 i3expod.py"
 
 #rofi
-bindsym $mod+e exec --no-startup-id rofi -show drun -show-icons
+#running with prime so that applications launched from rofi use the dedicated gpu
+bindsym $mod+e exec --no-startup-id prime-run rofi -show drun -show-icons 
+bindsym Mod1+e exec --no-startup-id rofi -show drun -show-icons 
 
 #scratchpad
-bindsym $mod+Shift+minus move scratchpad
+bindsym $mod+minus move scratchpad
-bindsym $mod+minus exec --no-startup-id rofi -show window -show-icons
+bindsym $mod+Shift+minus exec --no-startup-id rofi -show window -show-icons
 
 ############### workspaces mapping ###############
 # Define names for default workspaces for which we configure key bindings later on.
@@ -319,20 +325,35 @@ workspace $ws20 output $screen2
 ############### end of workspace mapping ###############
 
 ############### i3 resurrect ###############
-set $i3_resurrect i3-resurrect
+set $i3_resurrect /home/emamaker/.local/bin/i3-resurrect
+
+exec --no-startup-id i3_resurrect restore -w $ws10; sleep 1; $i3_resurrect restore -w $ws20
+#exec_always /home/emamaker/.config/i3/restore.sh
+
+
 
 # Save workspace mode.
 mode "save" {
-  bindsym 1 exec $i3_resurrect save -w 1
+  bindsym 1 exec $i3_resurrect save -w $ws1
-  bindsym 2 exec $i3_resurrect save -w 2
+  bindsym 2 exec $i3_resurrect save -w $ws2
-  bindsym 3 exec $i3_resurrect save -w 3
+  bindsym 3 exec $i3_resurrect save -w $ws3
-  bindsym 4 exec $i3_resurrect save -w 4
+  bindsym 4 exec $i3_resurrect save -w $ws4
-  bindsym 5 exec $i3_resurrect save -w 5
+  bindsym 5 exec $i3_resurrect save -w $ws5
-  bindsym 6 exec $i3_resurrect save -w 6
+  bindsym 6 exec $i3_resurrect save -w $ws6
-  bindsym 7 exec $i3_resurrect save -w 7
+  bindsym 7 exec $i3_resurrect save -w $ws7
-  bindsym 8 exec $i3_resurrect save -w 8
+  bindsym 8 exec $i3_resurrect save -w $ws8
-  bindsym 9 exec $i3_resurrect save -w 9
+  bindsym 9 exec $i3_resurrect save -w $ws9
-  bindsym 0 exec $i3_resurrect save -w 0
+  bindsym 0 exec $i3_resurrect save -w $ws10
+  bindsym q exec $i3_resurrect save -w $ws11
+  bindsym w exec $i3_resurrect save -w $ws12
+  bindsym e exec $i3_resurrect save -w $ws13
+  bindsym r exec $i3_resurrect save -w $ws14
+  bindsym t exec $i3_resurrect save -w $ws15
+  bindsym y exec $i3_resurrect save -w $ws16
+  bindsym u exec $i3_resurrect save -w $ws17
+  bindsym i exec $i3_resurrect save -w $ws18
+  bindsym o exec $i3_resurrect save -w $ws19
+  bindsym p exec $i3_resurrect save -w $ws20
 
   # Back to normal: Enter, Escape, or s
   bindsym Return mode "default"
@@ -345,16 +366,26 @@ bindsym $mod+s mode "save"
 
 # Restore workspace mode.
 mode "restore" {
-  bindsym 1 exec $i3_resurrect restore -w 1
+  bindsym 1 exec $i3_resurrect restore -w $ws1
-  bindsym 2 exec $i3_resurrect restore -w 2
+  bindsym 2 exec $i3_resurrect restore -w $ws2
-  bindsym 3 exec $i3_resurrect restore -w 3
+  bindsym 3 exec $i3_resurrect restore -w $ws3
-  bindsym 4 exec $i3_resurrect restore -w 4
+  bindsym 4 exec $i3_resurrect restore -w $ws4
-  bindsym 5 exec $i3_resurrect restore -w 5
+  bindsym 5 exec $i3_resurrect restore -w $ws5
-  bindsym 6 exec $i3_resurrect restore -w 6
+  bindsym 6 exec $i3_resurrect restore -w $ws6
-  bindsym 7 exec $i3_resurrect restore -w 7
+  bindsym 7 exec $i3_resurrect restore -w $ws7
-  bindsym 8 exec $i3_resurrect restore -w 8
+  bindsym 8 exec $i3_resurrect restore -w $ws8
-  bindsym 9 exec $i3_resurrect restore -w 9
+  bindsym 9 exec $i3_resurrect restore -w $ws9
-  bindsym 0 exec $i3_resurrect restore -w 0
+  bindsym 0 exec $i3_resurrect restore -w $ws10
+  bindsym q exec $i3_resurrect restore -w $ws11
+  bindsym w exec $i3_resurrect restore -w $ws12
+  bindsym e exec $i3_resurrect restore -w $ws13
+  bindsym r exec $i3_resurrect restore -w $ws14
+  bindsym t exec $i3_resurrect restore -w $ws15
+  bindsym y exec $i3_resurrect restore -w $ws16
+  bindsym u exec $i3_resurrect restore -w $ws17
+  bindsym i exec $i3_resurrect restore -w $ws18
+  bindsym o exec $i3_resurrect restore -w $ws19
+  bindsym p exec $i3_resurrect restore -w $ws20
 
   # Back to normal: Enter, Escape, or n
   bindsym Return mode "default"
@@ -365,3 +396,7 @@ mode "restore" {
 
 bindsym $mod+n mode "restore"
 ############### end of i3-resurrect ###############
+
+
+exec /usr/lib/polkit-1/polkitd --no-debug
+exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &

picom/picom.conf

@@ -1,4 +1,410 @@
-# menu        = { shadow = true; };
+
-dropdown_menu = { shadow = true; };
+#################################
-popup_menu    = { shadow = true; };
+#             Shadows           #
-utility       = { shadow = true; };
+#################################
+
+
+# Enabled client-side shadows on windows. Note desktop windows
+# (windows with '_NET_WM_WINDOW_TYPE_DESKTOP') never get shadow,
+# unless explicitly requested using the wintypes option.
+#
+#shadow = false;
+shadow = true;
+
+# The blur radius for shadows, in pixels. (defaults to 12)
+shadow-radius = 12;
+
+# The opacity of shadows. (0.0 - 1.0, defaults to 0.75)
+shadow-opacity = .50
+
+# The left offset for shadows, in pixels. (defaults to -15)
+# shadow-offset-x = -15
+shadow-offset-x = -7;
+
+# The top offset for shadows, in pixels. (defaults to -15)
+# shadow-offset-y = -15
+shadow-offset-y = -7;
+
+# Red color value of shadow (0.0 - 1.0, defaults to 0).
+# shadow-red = 0
+
+# Green color value of shadow (0.0 - 1.0, defaults to 0).
+# shadow-green = 0
+
+# Blue color value of shadow (0.0 - 1.0, defaults to 0).
+# shadow-blue = 0
+
+# Hex string color value of shadow (#000000 - #FFFFFF, defaults to #000000). This option will override options set shadow-(red/green/blue)
+# shadow-color = "#000000"
+
+# Specify a list of conditions of windows that should have no shadow.
+#
+# examples:
+#   shadow-exclude = "n:e:Notification";
+#
+# shadow-exclude = []
+shadow-exclude = [
+  "name = 'Notification'",
+  "class_g = 'Conky'",
+  "class_g ?= 'Notify-osd'",
+  "class_g = 'Cairo-clock'",
+  "_GTK_FRAME_EXTENTS@:c"
+];
+
+# Specify a X geometry that describes the region in which shadow should not
+# be painted in, such as a dock window region. Use
+#    shadow-exclude-reg = "x10+0+0"
+# for example, if the 10 pixels on the bottom of the screen should not have shadows painted on.
+#
+# shadow-exclude-reg = ""
+
+# Crop shadow of a window fully on a particular Xinerama screen to the screen.
+# xinerama-shadow-crop = false
+
+
+#################################
+#           Fading              #
+#################################
+
+
+# Fade windows in/out when opening/closing and when opacity changes,
+#  unless no-fading-openclose is used.
+# fading = false
+fading = true;
+
+# Opacity change between steps while fading in. (0.01 - 1.0, defaults to 0.028)
+# fade-in-step = 0.03;
+
+# Opacity change between steps while fading out. (0.01 - 1.0, defaults to 0.03)
+# fade-out-step = 0.03
+fade-out-step = 0.03;
+
+# The time between steps in fade step, in milliseconds. (> 0, defaults to 10)
+fade-delta = 5;
+
+# Specify a list of conditions of windows that should not be faded.
+# fade-exclude = []
+
+# Do not fade on window open/close.
+# no-fading-openclose = false
+
+# Do not fade destroyed ARGB windows with WM frame. Workaround of bugs in Openbox, Fluxbox, etc.
+# no-fading-destroyed-argb = false
+
+
+#################################
+#   Transparency / Opacity      #
+#################################
+
+active-opacity = 1;
+
+# Opacity of inactive windows. (0.1 - 1.0, defaults to 1.0)
+# inactive-opacity = 1
+inactive-opacity = 0.8;
+
+# Opacity of window titlebars and borders. (0.1 - 1.0, disabled by default)
+rame-opacity = 1.0
+
+# Let inactive opacity set by -i override the '_NET_WM_OPACITY' values of windows.
+inactive-opacity-override = true
+# inactive-opacity-override = false;
+
+# Default opacity for active windows. (0.0 - 1.0, defaults to 1.0)
+# active-opacity = 1.0
+
+# Dim inactive windows. (0.0 - 1.0, defaults to 0.0)
+# inactive-dim = 0.2
+
+# Specify a list of conditions of windows that should always be considered focused.
+# focus-exclude = []
+focus-exclude = [ "class_g = 'Cairo-clock'" ];
+
+# Use fixed inactive dim value, instead of adjusting according to window opacity.
+# inactive-dim-fixed = 1.0
+
+# Specify a list of opacity rules, in the format `PERCENT:PATTERN`,
+# like `50:name *= "Firefox"`. picom-trans is recommended over this.
+# Note we don't make any guarantee about possible conflicts with other
+# programs that set '_NET_WM_WINDOW_OPACITY' on frame or client windows.
+# example:
+#    opacity-rule = [ "80:class_g = 'URxvt'" ];
+#
+# opacity-rule = ["99:name *= 'Plasma'"];
+
+opacity-rule = [ 
+  "99:class_i = 'Plasma'",
+  "99:class_g = 'plasmashell'",
+];
+
+#################################
+#     Background-Blurring       #
+#################################
+
+
+# Parameters for background blurring, see the *BLUR* section for more information.
+blur-method = "kernel";
+# blur-size = 12
+#
+# blur-deviation = false
+#
+blur-strength = 5
+
+# Blur background of semi-transparent / ARGB windows.
+# Bad in performance, with driver-dependent behavior.
+# The name of the switch may change without prior notifications.
+#
+ blur-background = true
+
+# Blur background of windows when the window frame is not opaque.
+# Implies:
+#    blur-background
+# Bad in performance, with driver-dependent behavior. The name may change.
+#
+# blur-background-frame = false
+
+
+# Use fixed blur strength rather than adjusting according to window opacity.
+blur-background-fixed = true
+
+
+# Specify the blur convolution kernel, with the following format:
+# example:
+   blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1";
+#
+# blur-kern = ""
+# blur-kern = "3x3box";
+
+
+# Exclude conditions for background blur.
+# blur-background-exclude = []
+blur-background-exclude = [
+  "class_g = 'plasmashell'",
+  "class_g = 'Plasma'",
+  "window_type = 'popup_menu'",
+  "window_type = 'dock'",
+  "window_type = 'desktop'",
+  "_GTK_FRAME_EXTENTS@:c"
+];
+
+#################################
+#       General Settings        #
+#################################
+
+# Daemonize process. Fork to background after initialization. Causes issues with certain (badly-written) drivers.
+# daemon = false
+
+# Specify the backend to use: `xrender`, `glx`, or `xr_glx_hybrid`.
+# `xrender` is the default one.
+#
+backend = "glx";
+# backend = "xrender";
+
+# Enable/disable VSync.
+# vsync = false
+vsync = true;
+
+# Enable remote control via D-Bus. See the *D-BUS API* section below for more details.
+# dbus = false
+
+# Try to detect WM windows (a non-override-redirect window with no
+# child that has 'WM_STATE') and mark them as active.
+#
+# mark-wmwin-focused = false
+mark-wmwin-focused = true;
+
+# Mark override-redirect windows that doesn't have a child window with 'WM_STATE' focused.
+# mark-ovredir-focused = false
+mark-ovredir-focused = true;
+
+# Try to detect windows with rounded corners and don't consider them
+# shaped windows. The accuracy is not very high, unfortunately.
+#
+# detect-rounded-corners = false
+detect-rounded-corners = true;
+
+# Detect '_NET_WM_OPACITY' on client windows, useful for window managers
+# not passing '_NET_WM_OPACITY' of client windows to frame windows.
+#
+# detect-client-opacity = false
+detect-client-opacity = true;
+
+# Specify refresh rate of the screen. If not specified or 0, picom will
+# try detecting this with X RandR extension.
+#
+# refresh-rate = 60
+refresh-rate = 0;
+
+# Use EWMH '_NET_ACTIVE_WINDOW' to determine currently focused window,
+# rather than listening to 'FocusIn'/'FocusOut' event. Might have more accuracy,
+# provided that the WM supports it.
+#
+# use-ewmh-active-win = false
+
+# Unredirect all windows if a full-screen opaque window is detected,
+# to maximize performance for full-screen windows. Known to cause flickering
+# when redirecting/unredirecting windows.
+#
+# unredir-if-possible = false
+
+# Delay before unredirecting the window, in milliseconds. Defaults to 0.
+# unredir-if-possible-delay = 0
+
+# Conditions of windows that shouldn't be considered full-screen for unredirecting screen.
+# unredir-if-possible-exclude = []
+
+# Use 'WM_TRANSIENT_FOR' to group windows, and consider windows
+# in the same group focused at the same time.
+#
+# detect-transient = false
+detect-transient = true;
+
+# Use 'WM_CLIENT_LEADER' to group windows, and consider windows in the same
+# group focused at the same time. 'WM_TRANSIENT_FOR' has higher priority if
+# detect-transient is enabled, too.
+#
+# detect-client-leader = false
+detect-client-leader = true;
+
+# Resize damaged region by a specific number of pixels.
+# A positive value enlarges it while a negative one shrinks it.
+# If the value is positive, those additional pixels will not be actually painted
+# to screen, only used in blur calculation, and such. (Due to technical limitations,
+# with use-damage, those pixels will still be incorrectly painted to screen.)
+# Primarily used to fix the line corruption issues of blur,
+# in which case you should use the blur radius value here
+# (e.g. with a 3x3 kernel, you should use `--resize-damage 1`,
+# with a 5x5 one you use `--resize-damage 2`, and so on).
+# May or may not work with *--glx-no-stencil*. Shrinking doesn't function correctly.
+#
+# resize-damage = 1
+
+# Specify a list of conditions of windows that should be painted with inverted color.
+# Resource-hogging, and is not well tested.
+#
+# invert-color-include = []
+
+# GLX backend: Avoid using stencil buffer, useful if you don't have a stencil buffer.
+# Might cause incorrect opacity when rendering transparent content (but never
+# practically happened) and may not work with blur-background.
+# My tests show a 15% performance boost. Recommended.
+#
+# glx-no-stencil = false
+
+# GLX backend: Avoid rebinding pixmap on window damage.
+# Probably could improve performance on rapid window content changes,
+# but is known to break things on some drivers (LLVMpipe, xf86-video-intel, etc.).
+# Recommended if it works.
+#
+# glx-no-rebind-pixmap = false
+
+# Disable the use of damage information.
+# This cause the whole screen to be redrawn everytime, instead of the part of the screen
+# has actually changed. Potentially degrades the performance, but might fix some artifacts.
+# The opposing option is use-damage
+#
+# no-use-damage = false
+use-damage = true;
+
+# Use X Sync fence to sync clients' draw calls, to make sure all draw
+# calls are finished before picom starts drawing. Needed on nvidia-drivers
+# with GLX backend for some users.
+#
+# xrender-sync-fence = false
+
+# GLX backend: Use specified GLSL fragment shader for rendering window contents.
+# See `compton-default-fshader-win.glsl` and `compton-fake-transparency-fshader-win.glsl`
+# in the source tree for examples.
+#
+# glx-fshader-win = ""
+
+# Force all windows to be painted with blending. Useful if you
+# have a glx-fshader-win that could turn opaque pixels transparent.
+#
+# force-win-blend = false
+
+# Do not use EWMH to detect fullscreen windows.
+# Reverts to checking if a window is fullscreen based only on its size and coordinates.
+#
+# no-ewmh-fullscreen = false
+
+# Dimming bright windows so their brightness doesn't exceed this set value.
+# Brightness of a window is estimated by averaging all pixels in the window,
+# so this could comes with a performance hit.
+# Setting this to 1.0 disables this behaviour. Requires --use-damage to be disabled. (default: 1.0)
+#
+# max-brightness = 1.0
+
+# Make transparent windows clip other windows like non-transparent windows do,
+# instead of blending on top of them.
+#
+# transparent-clipping = false
+
+# Set the log level. Possible values are:
+#  "trace", "debug", "info", "warn", "error"
+# in increasing level of importance. Case doesn't matter.
+# If using the "TRACE" log level, it's better to log into a file
+# using *--log-file*, since it can generate a huge stream of logs.
+#
+# log-level = "debug"
+log-level = "warn";
+
+# Set the log file.
+# If *--log-file* is never specified, logs will be written to stderr.
+# Otherwise, logs will to written to the given file, though some of the early
+# logs might still be written to the stderr.
+# When setting this option from the config file, it is recommended to use an absolute path.
+#
+# log-file = '/path/to/your/log/file'
+
+# Show all X errors (for debugging)
+# show-all-xerrors = false
+
+# Write process ID to a file.
+# write-pid-path = '/path/to/your/log/file'
+
+# Window type settings
+#
+# 'WINDOW_TYPE' is one of the 15 window types defined in EWMH standard:
+#     "unknown", "desktop", "dock", "toolbar", "menu", "utility",
+#     "splash", "dialog", "normal", "dropdown_menu", "popup_menu",
+#     "tooltip", "notification", "combo", and "dnd".
+#
+# Following per window-type options are available: ::
+#
+#   fade, shadow:::
+#     Controls window-type-specific shadow and fade settings.
+#
+#   opacity:::
+#     Controls default opacity of the window type.
+#
+#   focus:::
+#     Controls whether the window of this type is to be always considered focused.
+#     (By default, all window types except "normal" and "dialog" has this on.)
+#
+#   full-shadow:::
+#     Controls whether shadow is drawn under the parts of the window that you
+#     normally won't be able to see. Useful when the window has parts of it
+#     transparent, and you want shadows in those areas.
+#
+#   redir-ignore:::
+#     Controls whether this type of windows should cause screen to become
+#     redirected again after been unredirected. If you have unredir-if-possible
+#     set, and doesn't want certain window to cause unnecessary screen redirection,
+#     you can set this to `true`.
+#
+wintypes:
+{
+  tooltip = { fade = true; shadow = false ; opacity = 1; focus = true; full-shadow = false; };
+  dock = { shadow = false; opacity = 1};
+  dnd = { shadow = false };
+  popup_menu = { opacity = 1; shadow = false};
+  dropdown_menu = { opacity = 1; shadow = true};
+};
+
+# Rounded corners
+corner-radius = 8;
+round-borders = 1;
+ 
+#rounded-corners-exclude = [
+#  "class_g = 'plasmashell'"
+#]

polybar/config

@@ -32,10 +32,10 @@ alert = #bd2c40
 monitor = ${env:MONITOR:}
 width = 100%
 height = 27
-;offset-x = 1%
+;offset-x = -35%
 ;offset-y = 1%
 radius = 6.0
-fixed-center = false
+fixed-center = true
 
 background = ${colors.background}
 foreground = ${colors.foreground}
@@ -43,13 +43,16 @@ foreground = ${colors.foreground}
 line-size = 3
 line-color = #f00
 
-border-size = 4
+border-left-size = 9
+border-right-size = 9
+border-top-size = 8
+border-bottom-size = 2
 border-color = #00000000
 
-padding-left = 0
+padding-left = 2
 padding-right = 2
 
-module-margin-left = 1
+module-margin-left = 2
 module-margin-right = 2
 
 font-0 = fixed:pixelsize=10;1
@@ -57,8 +60,10 @@ font-1 = unifont:fontformat=truetype:size=8:antialias=false;0
 font-2 = siji:pixelsize=10;1
 
 modules-left = bspwm i3
-modules-center = mpd
+#modules-center = mpd 
-modules-right = filesystem xbacklight alsa pulseaudio xkeyboard memory cpu wlan eth battery temperature date powermenu
+modules-center = mpd date
+#modules-right = filesystem xbacklight pulseaudio xkeyboard memory cpu wlan eth battery temperature powermenu date
+modules-right = filesystem xbacklight pulseaudio memory cpu wlan eth battery temperature temperature2 powermenu
 
 tray-position = right
 tray-padding = 2
@@ -190,7 +195,7 @@ interval = 2
 format-prefix = " "
 format-prefix-foreground = ${colors.foreground-alt}
 format-underline = #f90000
-label = %percentage:2%%
+label = CPU: %percentage:2%%
 
 [module/memory]
 type = internal/memory
@@ -198,7 +203,7 @@ interval = 2
 format-prefix = " "
 format-prefix-foreground = ${colors.foreground-alt}
 format-underline = #4bffdc
-label = %percentage_used%%
+label = RAM: %used%
 
 [module/wlan]
 type = internal/network
@@ -245,6 +250,8 @@ interval = 5
 date = "%d/%m/%Y "
 date-alt = " %Y-%m-%d"
 
+offset-x = 50%
+
 time = %H:%M
 time-alt = %H:%M:%S
 
@@ -264,7 +271,7 @@ label-volume-foreground = ${root.foreground}
 label-muted = 🔇 muted
 label-muted-foreground = #666
 
-bar-volume-width = 10
+bar-volume-width = 3
 bar-volume-foreground-0 = #55aa55
 bar-volume-foreground-1 = #55aa55
 bar-volume-foreground-2 = #55aa55
@@ -313,15 +320,15 @@ bar-volume-empty-foreground = ${colors.foreground-alt}
 type = internal/battery
 battery = BAT0
 adapter = ADP1
-full-at = 98
+full-at = 100
 
-format-charging = <animation-charging> <label-charging>
+format-charging = BAT: <animation-charging> <label-charging> (Charging)
 format-charging-underline = #ffb52a
 
-format-discharging = <animation-discharging> <label-discharging>
+format-discharging = BAT <animation-discharging> <label-discharging>
 format-discharging-underline = ${self.format-charging-underline}
 
-format-full-prefix = " "
+format-full-prefix = "BAT FULL"
 format-full-prefix-foreground = ${colors.foreground-alt}
 format-full-underline = ${self.format-charging-underline}
 
@@ -346,13 +353,35 @@ animation-discharging-framerate = 750
 type = internal/temperature
 thermal-zone = 0
 warn-temperature = 60
+hwmon-path = /sys/devices/platform/nct6775.2592/hwmon/hwmon2/temp1_input
 
 format = <ramp> <label>
 format-underline = #f50a4d
 format-warn = <ramp> <label-warn>
 format-warn-underline = ${self.format-underline}
 
-label = %temperature-c%
+label = CPU: %temperature-c%
+label-warn = %temperature-c%
+label-warn-foreground = ${colors.secondary}
+
+ramp-0 = 
+ramp-1 = 
+ramp-2 = 
+ramp-foreground = ${colors.foreground-alt}
+
+[module/temperature2]
+type = internal/temperature
+thermal-zone = 0
+warn-temperature = 60
+#hwmon-path = /sys/devices/platform/nct6775.2592/hwmon/hwmon2/temp1_input
+hwmon-path = ($(nvidia-smi --query-gpu=temperature.gpu --format=csv,noheader) | awk {print $1})
+
+format = <ramp> <label>
+format-underline = #f50a4d
+format-warn = <ramp> <label-warn>
+format-warn-underline = ${self.format-underline}
+
+label = CPU: %temperature-c%
 label-warn = %temperature-c%
 label-warn-foreground = ${colors.secondary}