14 files changed, 287 insertions, 312 deletions
diff --git a/dotfiles/common/.Xresources b/dotfiles/common/.Xresources
deleted file mode 100644
index 96e4803..0000000
--- a/dotfiles/common/.Xresources
+++ /dev/null
@@ -1,106 +0,0 @@
-!! X Resources - Hudson theme
-!! Tomorrow Night + Goldenrod accent
-!! For X11 applications (st, xterm, etc.) and Emacs
-
-!! X Font Settings
-Xft.dpi: 109
-Xft.autohint: 0
-Xft.lcdfilter: lcddefault
-Xft.hintstyle: hintfull
-Xft.hinting: 1
-Xft.antialias: 1
-Xft.rgba: rgb
-Xcursor.size: 32
-Xcursor.theme: Vimix-white-cursors
-
-!! Emacs
-Emacs*toolBar: 0
-
-!! ============================================================================
-!! Hudson Theme Colors (Tomorrow Night + Goldenrod)
-!! ============================================================================
-
-#define hudson_fg          #eeeeee
-#define hudson_bg          #222222
-#define hudson_black       #222222
-#define hudson_red         #cc6666
-#define hudson_green       #b5bd68
-#define hudson_yellow      #f0c674
-#define hudson_blue        #81a2be
-#define hudson_magenta     #b294bb
-#define hudson_cyan        #8abeb7
-#define hudson_white       #c5c8c6
-#define hudson_br_black    #444444
-#define hudson_br_red      #d54e53
-#define hudson_br_green    #b9ca4a
-#define hudson_br_yellow   #e0b040
-#define hudson_br_blue     #7aa6da
-#define hudson_br_magenta  #c397d8
-#define hudson_br_cyan     #70c0b1
-#define hudson_br_white    #eeeeee
-
-!! Active theme aliases
-#define theme_fg           hudson_fg
-#define theme_bg           hudson_bg
-#define theme_black        hudson_black
-#define theme_red          hudson_red
-#define theme_green        hudson_green
-#define theme_yellow       hudson_yellow
-#define theme_blue         hudson_blue
-#define theme_magenta      hudson_magenta
-#define theme_cyan         hudson_cyan
-#define theme_white        hudson_white
-#define theme_br_black     hudson_br_black
-#define theme_br_red       hudson_br_red
-#define theme_br_green     hudson_br_green
-#define theme_br_yellow    hudson_br_yellow
-#define theme_br_blue      hudson_br_blue
-#define theme_br_magenta   hudson_br_magenta
-#define theme_br_cyan      hudson_br_cyan
-#define theme_br_white     hudson_br_white
-
-!! ============================================================================
-
-!! ST (suckless terminal) settings
-!! size is in points (fontconfig syntax)
-st.font: BerkeleyMono Nerd Font:size=13
-st.background:  theme_bg
-st.foreground:  theme_fg
-st.color0:      theme_black
-st.color1:      theme_red
-st.color2:      theme_green
-st.color3:      theme_yellow
-st.color4:      theme_blue
-st.color5:      theme_magenta
-st.color6:      theme_cyan
-st.color7:      theme_white
-st.color8:      theme_br_black
-st.color9:      theme_br_red
-st.color10:     theme_br_green
-st.color11:     theme_br_yellow
-st.color12:     theme_br_blue
-st.color13:     theme_br_magenta
-st.color14:     theme_br_cyan
-st.color15:     theme_br_white
-
-!! XTerm settings
-XTerm*faceName: BerkeleyMono Nerd Font:size=13
-XTerm*selectToClipboard: true
-XTerm*background:  theme_bg
-XTerm*foreground:  theme_fg
-XTerm*color0:      theme_black
-XTerm*color1:      theme_red
-XTerm*color2:      theme_green
-XTerm*color3:      theme_yellow
-XTerm*color4:      theme_blue
-XTerm*color5:      theme_magenta
-XTerm*color6:      theme_cyan
-XTerm*color7:      theme_white
-XTerm*color8:      theme_br_black
-XTerm*color9:      theme_br_red
-XTerm*color10:     theme_br_green
-XTerm*color11:     theme_br_yellow
-XTerm*color12:     theme_br_blue
-XTerm*color13:     theme_br_magenta
-XTerm*color14:     theme_br_cyan
-XTerm*color15:     theme_br_white
diff --git a/dotfiles/common/.bashrc.d/aliases.sh b/dotfiles/common/.bashrc.d/aliases.sh
index 28c0f3f..9be16da 100644
--- a/dotfiles/common/.bashrc.d/aliases.sh
+++ b/dotfiles/common/.bashrc.d/aliases.sh
@@ -51,7 +51,6 @@ alias speedtest="speedtest-go"
 # =============================================================================
 # Applications
 # =============================================================================
-alias vim="nvim"
 alias et="emacs -nw"
 alias weather="wego"
 alias crm="tickrs -s CRM"
diff --git a/dotfiles/common/.config/btop/btop.conf b/dotfiles/common/.config/btop/btop.conf
new file mode 100644
index 0000000..3c1318f
--- /dev/null
+++ b/dotfiles/common/.config/btop/btop.conf
@@ -0,0 +1,272 @@
+#? Config file for btop v.1.4.6
+
+#* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
+#* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
+color_theme = "Default"
+
+#* If the theme set background should be shown, set to False if you want terminal background transparency.
+theme_background = true
+
+#* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false.
+truecolor = true
+
+#* Set to true to force tty mode regardless if a real tty has been detected or not.
+#* Will force 16-color mode and TTY theme, set all graph symbols to "tty" and swap out other non tty friendly symbols.
+force_tty = false
+
+#* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets.
+#* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box.
+#* Use whitespace " " as separator between different presets.
+#* Example: "cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty"
+presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty"
+
+#* Set to True to enable "h,j,k,l,g,G" keys for directional control in lists.
+#* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift.
+vim_keys = false
+
+#* Rounded corners on boxes, is ignored if TTY mode is ON.
+rounded_corners = true
+
+#* Use terminal synchronized output sequences to reduce flickering on supported terminals.
+terminal_sync = true
+
+#* Default symbols to use for graph creation, "braille", "block" or "tty".
+#* "braille" offers the highest resolution but might not be included in all fonts.
+#* "block" has half the resolution of braille but uses more common characters.
+#* "tty" uses only 3 different symbols but will work with most fonts and should work in a real TTY.
+#* Note that "tty" only has half the horizontal resolution of the other two, so will show a shorter historical view.
+graph_symbol = "braille"
+
+# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
+graph_symbol_cpu = "default"
+
+# Graph symbol to use for graphs in gpu box, "default", "braille", "block" or "tty".
+graph_symbol_gpu = "default"
+
+# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
+graph_symbol_mem = "default"
+
+# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
+graph_symbol_net = "default"
+
+# Graph symbol to use for graphs in cpu box, "default", "braille", "block" or "tty".
+graph_symbol_proc = "default"
+
+#* Manually set which boxes to show. Available values are "cpu mem net proc" and "gpu0" through "gpu5", separate values with whitespace.
+shown_boxes = "cpu mem net proc"
+
+#* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
+update_ms = 2000
+
+#* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct",
+#* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly.
+proc_sorting = "cpu lazy"
+
+#* Reverse sorting order, True or False.
+proc_reversed = false
+
+#* Show processes as a tree.
+proc_tree = false
+
+#* Use the cpu graph colors in the process list.
+proc_colors = true
+
+#* Use a darkening gradient in the process list.
+proc_gradient = true
+
+#* If process cpu usage should be of the core it's running on or usage of the total available cpu power.
+proc_per_core = false
+
+#* Show process memory as bytes instead of percent.
+proc_mem_bytes = true
+
+#* Show cpu graph for each process.
+proc_cpu_graphs = true
+
+#* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate)
+proc_info_smaps = false
+
+#* Show proc box on left side of screen instead of right.
+proc_left = false
+
+#* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop).
+proc_filter_kernel = false
+
+#* In tree-view, always accumulate child process resources in the parent process.
+proc_aggregate = false
+
+#* Should cpu and memory usage display be preserved for dead processes when paused.
+keep_dead_proc_usage = false
+
+#* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available.
+#* Select from a list of detected attributes from the options menu.
+cpu_graph_upper = "Auto"
+
+#* Sets the CPU stat shown in lower half of the CPU graph, "total" is always available.
+#* Select from a list of detected attributes from the options menu.
+cpu_graph_lower = "Auto"
+
+#* If gpu info should be shown in the cpu box. Available values = "Auto", "On" and "Off".
+show_gpu_info = "Auto"
+
+#* Toggles if the lower CPU graph should be inverted.
+cpu_invert_lower = true
+
+#* Set to True to completely disable the lower CPU graph.
+cpu_single_graph = false
+
+#* Show cpu box at bottom of screen instead of top.
+cpu_bottom = false
+
+#* Shows the system uptime in the CPU box.
+show_uptime = true
+
+#* Shows the CPU package current power consumption in watts. Requires running `make setcap` or `make setuid` or running with sudo.
+show_cpu_watts = true
+
+#* Show cpu temperature.
+check_temp = true
+
+#* Which sensor to use for cpu temperature, use options menu to select from list of available sensors.
+cpu_sensor = "Auto"
+
+#* Show temperatures for cpu cores also if check_temp is True and sensors has been found.
+show_coretemp = true
+
+#* Set a custom mapping between core and coretemp, can be needed on certain cpus to get correct temperature for correct core.
+#* Use lm-sensors or similar to see which cores are reporting temperatures on your machine.
+#* Format "x:y" x=core with wrong temp, y=core with correct temp, use space as separator between multiple entries.
+#* Example: "4:0 5:1 6:3"
+cpu_core_map = ""
+
+#* Which temperature scale to use, available values: "celsius", "fahrenheit", "kelvin" and "rankine".
+temp_scale = "celsius"
+
+#* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024.
+base_10_sizes = false
+
+#* Show CPU frequency.
+show_cpu_freq = true
+
+#* How to calculate CPU frequency, available values: "first", "range", "lowest", "highest" and "average".
+freq_mode = "first"
+
+#* Draw a clock at top of screen, formatting according to strftime, empty string to disable.
+#* Special formatting: /host = hostname | /user = username | /uptime = system uptime
+clock_format = "%X"
+
+#* Update main ui in background when menus are showing, set this to false if the menus is flickering too much for comfort.
+background_update = true
+
+#* Custom cpu model name, empty string to disable.
+custom_cpu_name = ""
+
+#* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace " ".
+#* Only disks matching the filter will be shown. Prepend exclude= to only show disks not matching the filter. Examples: disk_filter="/boot /home/user", disks_filter="exclude=/boot /home/user"
+disks_filter = ""
+
+#* Show graphs instead of meters for memory values.
+mem_graphs = true
+
+#* Show mem box below net box instead of above.
+mem_below_net = false
+
+#* Count ZFS ARC in cached and available memory.
+zfs_arc_cached = true
+
+#* If swap memory should be shown in memory box.
+show_swap = true
+
+#* Show swap as a disk, ignores show_swap value above, inserts itself after first disk.
+swap_disk = true
+
+#* If mem box should be split to also show disks info.
+show_disks = true
+
+#* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar.
+only_physical = true
+
+#* Read disks list from /etc/fstab. This also disables only_physical.
+use_fstab = true
+
+#* Setting this to True will hide all datasets, and only show ZFS pools. (IO stats will be calculated per-pool)
+zfs_hide_datasets = false
+
+#* Set to true to show available disk space for privileged users.
+disk_free_priv = false
+
+#* Toggles if io activity % (disk busy time) should be shown in regular disk usage view.
+show_io_stat = true
+
+#* Toggles io mode for disks, showing big graphs for disk read/write speeds.
+io_mode = false
+
+#* Set to True to show combined read/write io graphs in io mode.
+io_graph_combined = false
+
+#* Set the top speed for the io graphs in MiB/s (100 by default), use format "mountpoint:speed" separate disks with whitespace " ".
+#* Example: "/mnt/media:100 /:20 /boot:1".
+io_graph_speeds = ""
+
+#* Set fixed values for network graphs in Mebibits. Is only used if net_auto is also set to False.
+net_download = 100
+
+net_upload = 100
+
+#* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest.
+net_auto = true
+
+#* Sync the auto scaling for download and upload to whichever currently has the highest scale.
+net_sync = true
+
+#* Starts with the Network Interface specified here.
+net_iface = ""
+
+#* "True" shows bitrates in base 10 (Kbps, Mbps). "False" shows bitrates in binary sizes (Kibps, Mibps, etc.). "Auto" uses base_10_sizes.
+base_10_bitrate = "Auto"
+
+#* Show battery stats in top right if battery is present.
+show_battery = true
+
+#* Which battery to use if multiple are present. "Auto" for auto detection.
+selected_battery = "Auto"
+
+#* Show power stats of battery next to charge indicator.
+show_battery_watts = true
+
+#* Set loglevel for "~/.local/state/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
+#* The level set includes all lower levels, i.e. "DEBUG" will show all logging info.
+log_level = "WARNING"
+
+#* Automatically save current settings to config file on exit.
+save_config_on_exit = true
+
+#* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards.
+nvml_measure_pcie_speeds = true
+
+#* Measure PCIe throughput on AMD cards, may impact performance on certain cards.
+rsmi_measure_pcie_speeds = true
+
+#* Horizontally mirror the GPU graph.
+gpu_mirror_graph = true
+
+#* Set which GPU vendors to show. Available values are "nvidia amd intel"
+shown_gpus = "nvidia amd intel"
+
+#* Custom gpu0 model name, empty string to disable.
+custom_gpu_name0 = ""
+
+#* Custom gpu1 model name, empty string to disable.
+custom_gpu_name1 = ""
+
+#* Custom gpu2 model name, empty string to disable.
+custom_gpu_name2 = ""
+
+#* Custom gpu3 model name, empty string to disable.
+custom_gpu_name3 = ""
+
+#* Custom gpu4 model name, empty string to disable.
+custom_gpu_name4 = ""
+
+#* Custom gpu5 model name, empty string to disable.
+custom_gpu_name5 = ""
diff --git a/dotfiles/common/.config/conky/conky.conf b/dotfiles/common/.config/conky/conky.conf
deleted file mode 100644
index 09ee8ea..0000000
--- a/dotfiles/common/.config/conky/conky.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-conky.config = {
-out_to_console = true,
-out_to_x = false,
-background = false,
-update_interval = 30,
-total_run_times = 0,
-};
-conky.text = [[ \
-${if_existing /sys/class/power_supply/BAT0}\
-󱊣 \
-${battery_percent BAT0}% \
-${if_existing /sys/class/power_supply/BAT0/status Charging} ${endif}\
-${if_existing /sys/class/power_supply/BAT0/status Discharging} ${endif}\
-${endif}\
-${if_existing /sys/class/power_supply/BAT1}\
-󱊣 \
-${battery_percent BAT1}% \
-${if_existing /sys/class/power_supply/BAT1/status Charging} ${endif}\
-${if_existing /sys/class/power_supply/BAT1/status Discharging} ${endif}\
-${endif}\
- ${fs_used}/${fs_size} \
- ${time %a %B %d} \
-󰥔 ${time %I:%M %p %Z}
-]];
diff --git a/dotfiles/common/.config/flameshot/flameshot.ini b/dotfiles/common/.config/flameshot/flameshot.ini
deleted file mode 100644
index 8874b3b..0000000
--- a/dotfiles/common/.config/flameshot/flameshot.ini
+++ /dev/null
@@ -1,11 +0,0 @@
-[General]
-contrastOpacity=216
-copyOnDoubleClick=true
-copyPathAfterSave=true
-saveAfterCopy=true
-saveAsFileExtension=jpg
-savePath=/home/cjennings/pictures/screenshots
-savePathFixed=true
-showStartupLaunchMessage=false
-uiColor=#2587e2
-useJpgForClipboard=true
diff --git a/dotfiles/common/.config/gtk-3.0/gtk.css b/dotfiles/common/.config/gtk-3.0/gtk.css
index a1d4c13..cffaf78 100644
--- a/dotfiles/common/.config/gtk-3.0/gtk.css
+++ b/dotfiles/common/.config/gtk-3.0/gtk.css
@@ -1,6 +1,6 @@
 .window-frame, .window-frame:backdrop {
     box-shadow: 0 0 0 black; /* removes shadow completely */
     border-style: none;
-    margin: 1; /* this retains the ability to resize with the mouse, if 1px is too narrow, set some higher values */
+    margin: 1px; /* this retains the ability to resize with the mouse, if 1px is too narrow, set some higher values */
     border-radius: 0;
 }
diff --git a/dotfiles/common/.config/picom.conf b/dotfiles/common/.config/picom.conf
deleted file mode 100644
index 0b65df7..0000000
--- a/dotfiles/common/.config/picom.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-# opacity-rule = [
-#     "85:class_g = 'XTerm'",
-#     "85:class_g = 'Alacritty'",
-#     "85:class_g = 'xterm-kitty'",
-#     "85:class_g = 'URxvt'",
-#     "85:class_g = 'tabbed'",
-# ];
-#    "85:class_g = 'st-256color'",
-#    "85:class_g = 'Emacs'",
-
-# Blur
-blur:
-{
-  method = "dual_kawase";
-  strength = 2;
-}
-
-wintypes:
-{
-  normal = { blur-background = true; };
-  splash = { blur-background = false; };
-};
-
-# Fading
-fading = false;
-fade-in-step = 0.07;
-fade-out-step = 0.07;
-fade-exclude = [ ];
-
-# Other
-corner-radius = 10.0;
-round-borders = 1;
-mark-wmwin-focused = true;
-mark-ovredir-focused = true;
-detect-rounded-corners = true;
-rounded-corners-exclude = [
-                        "class_g = 'dwm'",
-                        "class_g = 'dwmsystray'",
-                        "window_type = 'dock'"
-                        ];
-detect-client-opacity = true;
-
-vsync = true;
-dbe = false;
-unredir-if-possible = true;
-detect-transient = true;
-detect-client-leader = true;
-invert-color-include = [ ];
-
-# GLX backend
-backend = "glx";
-glx-no-stencil = true;
-glx-copy-from-front = false;
-use-damage = true
-glx-no-rebind-pixmap = true;
-
diff --git a/dotfiles/common/.config/redshift.conf b/dotfiles/common/.config/redshift.conf
deleted file mode 100644
index 92b61bf..0000000
--- a/dotfiles/common/.config/redshift.conf
+++ /dev/null
@@ -1,32 +0,0 @@
-[redshift]
-; Color temperature in Kelvin
-; 6500K = neutral daylight (no filter)
-; 5000K = subtle warmth
-; 4500K = noticeable but readable warmth (recommended for night)
-; 4000K = warm (like incandescent bulb)
-; 3500K = very warm/orange (often too much)
-
-temp-day=6500
-temp-night=4500
-
-; Brightness (1.0 = full, 0.8 = 20% dimmed)
-; Keeping at 1.0 avoids readability issues
-brightness-day=1.0
-brightness-night=1.0
-
-; Gamma correction (1.0 = no correction)
-gamma=1.0
-
-; Fade between day/night (1 = gradual, 0 = instant)
-fade=1
-
-; Screen adjustment method
-adjustment-method=randr
-
-; Location for sunrise/sunset calculation
-location-provider=manual
-
-[manual]
-; New Orleans, LA
-lat=29.951065
-lon=-90.071533
diff --git a/dotfiles/common/.config/systemd/user/xdg-desktop-portal-gtk.service.d/environment.conf b/dotfiles/common/.config/systemd/user/xdg-desktop-portal-gtk.service.d/environment.conf
deleted file mode 100644
index e8c5e8f..0000000
--- a/dotfiles/common/.config/systemd/user/xdg-desktop-portal-gtk.service.d/environment.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Service]
-Environment="DISPLAY=:0"
-Environment="XAUTHORITY=/home/cjennings/.Xauthority"
-\ No newline at end of file
diff --git a/dotfiles/common/.config/touchpad-indicator/touchpad-indicator.conf b/dotfiles/common/.config/touchpad-indicator/touchpad-indicator.conf
deleted file mode 100644
index 51a9907..0000000
--- a/dotfiles/common/.config/touchpad-indicator/touchpad-indicator.conf
+++ /dev/null
@@ -1 +0,0 @@
-{"first-time": false, "version": "2.2.3-ubuntu20.04.0", "is_working": false, "autostart": false, "on_mouse_plugged": true, "on_start": -1, "on_end": 1, "disable_on_typing": true, "interval": 3600.0, "start_hidden": false, "show_notifications": false, "theme": "light", "touchpad_enabled": false, "natural_scrolling": false, "speed": 0.0, "tapping": true, "two_finger_scrolling": true, "edge_scrolling": false, "cicular_scrolling": true, "right-top-corner": 0, "right-bottom-corner": 0, "left-top-corner": 0, "left-bottom-corner": 0, "one-finger-tap": 0, "two-finger-tap": 0, "three-finger-tap": 0, "faulty-devices": ["11/2/1/0", "11/2/a/0", "11/2/5/7326", "11/2/6/0", "18/93a/274/100"]}
-\ No newline at end of file
diff --git a/dotfiles/common/.config/wavemon/wavemonrc b/dotfiles/common/.config/wavemon/wavemonrc
new file mode 100644
index 0000000..e39c80b
--- /dev/null
+++ b/dotfiles/common/.config/wavemon/wavemonrc
@@ -0,0 +1,13 @@
+interface = wlp192s0
+cisco_mac = off
+sort_order = chan/sig
+sort_ascending = off
+scan_filter_band = both
+scan_hidden_essids = on
+stat_updates = 100
+lhist_slot_size = 4
+meter_smoothness = 0
+info_updates = 10
+override_auto_scale = off
+transparent_bg = on
+startup_screen = info screen
diff --git a/dotfiles/common/.mbsyncrc b/dotfiles/common/.mbsyncrc
index 51dfae2..636791a 100644
--- a/dotfiles/common/.mbsyncrc
+++ b/dotfiles/common/.mbsyncrc
@@ -63,7 +63,7 @@ IMAPAccount cmail
 Host 127.0.0.1
 Port 1143
 User c@cjennings.net
-PassCmd "cat ~/.config/.protonmailpass"
+PassCmd "cat ~/.config/.cmailpass"
 TLSType NONE
 AuthMechs LOGIN
 CertificateFile /etc/ssl/certs/ca-certificates.crt
diff --git a/dotfiles/common/.xinitrc b/dotfiles/common/.xinitrc
deleted file mode 100755
index 991f507..0000000
--- a/dotfiles/common/.xinitrc
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-# Craig Jennings <c@cjennings.net>
-# X11 session initialization
-
-# ============================================================================
-# Gnome Keyring Integration
-# ============================================================================
-# Start gnome-keyring-daemon and export environment variables
-# This ensures SSH agent, secrets, and GPG agent integration work properly
-eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
-export SSH_AUTH_SOCK
-
-# Update D-Bus activation environment with keyring variables
-# This allows apps started via D-Bus to access the keyring
-dbus-update-activation-environment --systemd DISPLAY XAUTHORITY SSH_AUTH_SOCK
-
-# ============================================================================
-# DWM Session Startup
-# ============================================================================
-# Set logfile for dwm output
-logdir="$HOME/.local/var/log"
-[ -d "$logdir" ] || mkdir -p "$logdir"
-logfile="$logdir/$(date +%Y-%m-%d_%H-%M-%S-%3N.dwm.log)"
-
-# X Org environment
-export XAUTHORITY=$HOME/.Xauthority
-export DISPLAY=:0.0
-
-# Reset GPG agent so it inherits DISPLAY for pinentry-dmenu
-~/.local/bin/reset-auth >/dev/null 2>&1
-
-# Allow sudo use of display
-xhost +si:localuser:root
-
-# Merge local configuration for X client applications
-[ -f ~/.Xresources ] && xrdb -merge -I $HOME ~/.Xresources
-
-# Merge xmodmap configuration
-[[ -f ~/.Xmodmap ]] && xmodmap ~/.Xmodmap
-
-# Info in the status bar
-(conky | while read LINE; do xsetroot -name "$LINE"; done) &
-
-# Map short-pressed Ctrl to Escape (commented out)
-# xcape -e 'Control_L=Escape' &
-
-# Map shift backspace to delete (commented out)
-# xcape -e 'Shift_L=Delete'
-
-# Make CapsLock behave like Ctrl
-setxkbmap -option ctrl:nocaps
-
-# Start background services
-xautolock -time 5 -locker slock &
-# picom &
-sxhkd &
-[ -f ~/.fehbg ] && ~/.fehbg &
-nm-applet &
-blueman-applet &
-caffeine start &
-battery_monitor &
-mpd &
-dunst &
-redshift &
-sudo powertop --auto-tune &
-flameshot &
-insync start &
-# touchpad-indicator-start &
-signal-desktop --start-in-tray &
-protonmail-bridge --no-window &
-# warpinator-start &
-
-# Start dwm window manager
-echo "$(date): Starting dwm" >> "$logfile" 2>&1
-exec dwm > $logfile 2>&1
diff --git a/dotfiles/common/.zshrc.d/aliases.sh b/dotfiles/common/.zshrc.d/aliases.sh
index 28c0f3f..9be16da 100644
--- a/dotfiles/common/.zshrc.d/aliases.sh
+++ b/dotfiles/common/.zshrc.d/aliases.sh
@@ -51,7 +51,6 @@ alias speedtest="speedtest-go"
 # =============================================================================
 # Applications
 # =============================================================================
-alias vim="nvim"
 alias et="emacs -nw"
 alias weather="wego"
 alias crm="tickrs -s CRM"