From 8fdcd343f3ef6e49891ed915ad031b830ee0ef82 Mon Sep 17 00:00:00 2001
From: Freya Murphy <freya@freyacat.org>
Date: Tue, 28 Nov 2023 09:44:11 -0500
Subject: [PATCH] mode waybar to bar config, add aliases

---
 .config/sway/config            | 4 ++--
 .config/sway/config.d/theme    | 3 +--
 .config/sway/scripts.d/auto.sh | 2 +-
 .config/waybar/style.css       | 3 ++-
 .zshrc                         | 8 ++++++++
 packages                       | 3 +++
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.config/sway/config b/.config/sway/config
index 61879fc..a446972 100755
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -1,6 +1,6 @@
 # xdg desktop portal fix
-exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
+exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP GTK_THEME
+exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY GTK_THEME XDG_CURRENT_DESKTOP=sway
 
 # Set super key
 set $mod Mod4
diff --git a/.config/sway/config.d/theme b/.config/sway/config.d/theme
index 661f9e5..beb58d2 100644
--- a/.config/sway/config.d/theme
+++ b/.config/sway/config.d/theme
@@ -32,5 +32,4 @@ layer_effects "wofi" blur enable; shadows enable
 output * bg $bg fill
 
 ### Bar
-
-exec env GTK_THEME="Adwaita-dark" waybar
+bar swaybar_command waybar
diff --git a/.config/sway/scripts.d/auto.sh b/.config/sway/scripts.d/auto.sh
index b22353d..4a4ebb7 100755
--- a/.config/sway/scripts.d/auto.sh
+++ b/.config/sway/scripts.d/auto.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-GTK_THEME="Lavanda-Sea-Dark" nm-applet --indicator &
+nm-applet --indicator &
 autotiling &
 discord &
 element-desktop &
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 0ca11f2..f084844 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -32,8 +32,9 @@ button {
 }
 
 #workspaces button {
+    all: initial;
     margin: 1px 0px;
-    padding: 0px 5px;
+    padding: 0px 8px;
     color: #c7c6c3;
     background-color: rgba(0, 0, 0, 0);
 }
diff --git a/.zshrc b/.zshrc
index bc56cd6..9075db5 100644
--- a/.zshrc
+++ b/.zshrc
@@ -30,6 +30,11 @@ alias neo="pfetch"
 alias rf="rm -fr" # remove le french hon hon hon
 alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME"
 alias ls="ls --color=auto"
+alias ip="ip --color=auto"
+alias grep="grep --color=auto"
+alias diff="diff --color=auto"
+alias ccat="highlight --out-format=ansi"
+
 
 alias config="/usr/bin/git --git-dir=$HOME/.cfg --work-tree=$HOME"
 
@@ -45,6 +50,9 @@ man() {
 	man "$@"
 }
 
+# exit bad
+[ $NOEXIT ] && alias exit="echo Exiting is disabled"
+
 # Enable zsh auto suggestions
 autoload compinit && compinit
 source $HOME/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
diff --git a/packages b/packages
index bae4350..3f610b7 100644
--- a/packages
+++ b/packages
@@ -12,6 +12,8 @@ btrfs-progs
 chromium
 clang
 cmake
+cups
+cups-pdf
 discord
 easyeffects
 efibootmgr
@@ -26,6 +28,7 @@ gnome-keyring
 gnome-themes-extra
 grim
 grub
+highlight
 htop
 imv
 iwd