update

13 files changed, 99 insertions, 193 deletions

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
deleted file mode 100644
index 78d7a68..0000000
--- a/.config/fish/config.fish
+++ /dev/null
@@ -1,7 +0,0 @@
-function fish_prompt
-  echo -n (set_color brred)"["(set_color bryellow)"$USER"(set_color brgreen)"@"(set_color brblue)(prompt_hostname)(set_color brpurple)" "(prompt_pwd)(set_color brred)"]"(set_color normal)'$'" "
-end
-if status is-interactive
-    # Commands to run in interactive sessions can go here
-    [ "$(tty)" = "/dev/tty1" ] && ! pidof -s Hyprland >/dev/null 2>&1 && exec "/home/awy/.config/hypr/start.sh"
-end
diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf
new file mode 100644
index 0000000..761ae00
--- /dev/null
+++ b/.config/fontconfig/fonts.conf
@@ -0,0 +1,40 @@
+<?xml version='1.0'?>
+<!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+<fontconfig>
+	<alias>
+		<family>serif</family>
+		<prefer>
+			<family>Libertinus Serif</family>
+			<family>Joy Pixels</family>
+			<family>Noto Color Emoji</family>
+			<family>FontAwesome</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>sans-serif</family>
+		<prefer>
+			<family>Libertinus Sans</family>
+			<family>Joy Pixels</family>
+			<family>Noto Color Emoji</family>
+			<family>FontAwesome</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>sans</family>
+		<prefer>
+			<family>Libertinus Sans</family>
+			<family>Joy Pixels</family>
+			<family>Noto Color Emoji</family>
+			<family>FontAwesome</family>
+		</prefer>
+	</alias>
+	<alias>
+		<family>monospace</family>
+		<prefer>
+			<family>Noto Sans Mono</family>
+			<family>Libertinus Mono</family>
+			<family>FontAwesome</family>
+			<family>Braille</family>
+		</prefer>
+	</alias>
+</fontconfig>
diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini
index ceaaeeb..6c35f1c 100644
--- a/.config/foot/foot.ini
+++ b/.config/foot/foot.ini
@@ -8,7 +8,7 @@
 # title=foot
 # locked-title=no
 
-font=LiterationMono Nerd Font Mono:size=14
+font=mono:size=14
 # font-bold=<bold variant of regular font>
 # font-italic=<italic variant of regular font>
 # font-bold-italic=<bold+italic variant of regular font>
@@ -25,7 +25,7 @@ font=LiterationMono Nerd Font Mono:size=14
 # initial-window-size-pixels=700x500  # Or,
 # initial-window-size-chars=<COLSxROWS>
 # initial-window-mode=windowed
-# pad=0x0                             # optionally append 'center'
+pad=10x10                             # optionally append 'center'
 # resize-by-cells=yes
 # resize-delay-ms=100
 
@@ -82,6 +82,7 @@ font=LiterationMono Nerd Font Mono:size=14
 # long-press-delay=400
 
 [colors]
+alpha=0.9
 background=282828
 foreground=ebdbb2
 regular0=282828
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 84d8d4c..bc3188f 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -62,18 +62,18 @@ general {
 }
 
 decoration {
-    rounding = 5
+    rounding = 0
 
     active_opacity = 1.0
     inactive_opacity = 1.0
 
-    drop_shadow = true 
+    drop_shadow = false 
     shadow_range = 32
     shadow_render_power = 4
     col.shadow = rgba(1a1a1aee)
 
     blur {
-        enabled = true
+        enabled = false
         size = 2
         passes = 4
         xray = false
@@ -210,3 +210,4 @@ layerrule = blur, notifications
 layerrule = ignorezero, notifications
 layerrule = blur, waybar 
 #layerrule = xray 1, waybar
+
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
index 02b5fce..41f134a 100644
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -4,7 +4,7 @@ general {
 
 background {
     monitor =
-    path = ~/.local/share/papes/wallhaven-kxg8xm_3840x2160.png 
+    #path = ~/.local/share/papes/wallhaven-kxg8xm_3840x2160.png 
     color = rgba(1e1e2ee0)
 
     # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf
index bfbf0df..35085a3 100644
--- a/.config/hypr/hyprpaper.conf
+++ b/.config/hypr/hyprpaper.conf
@@ -1,4 +1,4 @@
 ipc = on
-preload = /home/awy/.local/share/papes/Odles_Cisles_y_Mastle_pinus_Cembra.jpg
-wallpaper = , /home/awy/.local/share/papes/Odles_Cisles_y_Mastle_pinus_Cembra.jpg
+preload = /home/awy/.local/share/papes/TheMonsterBryce3d-cropped.jpg
+wallpaper = , /home/awy/.local/share/papes/TheMonsterBryce3d-cropped.jpg
 splash = false
diff --git a/.config/waybar/config b/.config/waybar/config
index c4dca4d..6ab4771 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -1,24 +1,16 @@
 {
     "layer": "top",
-    "position": "bottom",
-    "spacing": 0,
+    "position": "top",
+    "spacing": 20,
     "reload_style_on_change": true,
-    "modules-left": ["hyprland/workspaces","custom/separator","hyprland/window"],
+    "modules-left": ["hyprland/workspaces", "hyprland/window"],
     "modules-center": [],
-    "modules-right": ["network", "custom/weather","memory", "custom/separator", "image", "pulseaudio","wireplumber", "custom/separator", "clock","tray"],
+    "modules-right": ["network", "custom/weather","memory", "pulseaudio","wireplumber", "clock","tray"],
     
     "hyprland/window": {
         "format": "{}",
         "max-length": 50,
         "separate-outputs": true,
-        "rewrite": {
-            "(.*) — Mozilla Firefox": "󰈹 $1",
-            "(.*)Mozilla Firefox": "󰈹 Firefox",
-            "nvim(.*)": " $1",
-            "(.*)spotify_player(.*)": "󰓇 Spotify",
-            "proxychains -q spoti(.*)": "󰓇 Spotify",
-            "(.*)Steam": "󰓓 Steam"
-        }
     },
 
     "hyprland/workspaces": {
@@ -46,8 +38,8 @@
         "spacing": 10
     },
     "clock": {
-	      "interval": 1,
-	      "format": "{:%H:%M:%S}",
+	      "interval": 60,
+	      "format": "{:%Y %b %d (%a) 🕙 %H:%M}",
         "tooltip-format": "{:%a %d %b}"
     },
     "mpris": {
@@ -88,7 +80,7 @@
         "interval": 5,  
     },
     "wireplumber": {
-        "format": "{icon}{volume}%",
+        "format": "{icon} {volume}%",
         "format-muted": "󰝟",
         "on-click": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
         "format-icons": [" ", " ", " "]
diff --git a/.config/waybar/scripts/hyprweather b/.config/waybar/scripts/hyprweather
index 45687f6..6a1e698 100755
--- a/.config/waybar/scripts/hyprweather
+++ b/.config/waybar/scripts/hyprweather
@@ -1 +1 @@
-hyprctl dispatch exec "[float; size 1430 1100;]" 'kitty -e "/home/awy/.config/waybar/scripts/onclick-weather"'
+hyprctl dispatch exec "[float; size 1430 1100;]" 'foot "/home/awy/.config/waybar/scripts/onclick-weather"'
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 017b1cf..64d425a 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -2,15 +2,14 @@
 * {
     border: none;
     border-radius: 0;
-    font-family: LiterationMono Nerd Font Propo; 
+    font-family: monospace; 
     font-weight: normal;
     font-size: 14px;
     min-height: 0;
 }
 
 #waybar {
-    background: rgba(0,0,0,0.5);
-    /*background: @base;*/
+    background: #282828; 
 }
 
 tooltip {
@@ -18,44 +17,21 @@ tooltip {
 }
 
 #workspaces {
-    margin-left: 5px;
+    margin-left: 1px;
 }
 
 #workspaces button {
-    color:rgba(100,100,100,0.5);
-    border: 1px;
-    border-style: solid;
-    border-color: rgba(100,100,100,0.3);
-    background: rgba(0, 0, 0,0.2);
-    margin-top: 8px;
-    margin-bottom: 8px;
-    border-radius: 8px;
-    padding: 8px;
-    margin-right: 2px;
+    color: #EBDBB2;
 }
 
 #workspaces button.active {
-    color: #FFFFFF;
-    border: 1px;
-    border-style: solid;
-    border-color: rgba(100,100,100,0.5);
-    background: rgba(0, 0, 0,0.3);
-    margin-top: 8px;
-    margin-bottom: 8px;
-    border-radius: 8px;
-    padding: 8px;
+    color: #282828;
+    background: #EBDBB2;
 }
 
 #window {
-    color: #FFFFFF;
-    border: 1px;
-    border-style: solid;
-    border-color: rgba(100,100,100,0.5);
-    background: rgba(0, 0, 0,0.3);
-    margin-top: 8px;
-    margin-bottom: 8px;
-    border-radius: 8px;
-    padding: 8px;
+    color: #EBDBB2;
+    margin-left: 15px;
 }
 
 #mpris {
@@ -63,149 +39,46 @@ tooltip {
 }
 
 #network {
-    margin-right: 5px;
-    color: @green;
-    border: 1px;
-    border-style: solid;
-    border-color: rgba(100,100,100,0.5);
-    background: rgba(0, 0, 0,0.3);
-    margin-top: 8px;
-    margin-bottom: 8px;
-    border-radius: 8px;
-    padding: 8px;
+    color: #b8bb26;
 }
 
 #network.disconnected {
-    margin-right: 5px;
-    color: @red;
-    border: 1px;
-    border-style: solid;
-    border-color: rgba(100,100,100,0.5);
-    background: rgba(0, 0, 0,0.3);
-    margin-top: 8px;
-    margin-bottom: 8px;
-    border-radius: 8px;
-    padding: 8px;
+    color: #fb4934;
 }
 
 #custom-weather {
-    margin-right: 5px;
-    color: #FFFFFF;
-    border: 1px;
-    border-style: solid;
-    border-color: rgba(100,100,100,0.5);
-    background: rgba(0, 0, 0,0.3);
-    margin-top: 8px;
-    margin-bottom: 8px;
-    border-radius: 8px;
-    padding: 8px;
+    color: #EBDBB2;
 }
 
 #custom-pacman {
-    margin-right: 5px;
-    color: #FFFFFF;
-    border: 1px;
-    border-style: solid;
-    border-color: rgba(100,100,100,0.5);
-    background: rgba(0, 0, 0,0.3);
-    margin-top: 8px;
-    margin-bottom: 8px;
-    border-radius: 8px;
-    padding: 8px;
-}
-
-
-#custom-doppler {
-    margin-left: 15px;
-    color: @sky;
+    color: #EBDBB2;
 }
 
 #pulseaudio {
-    margin-right: 5px;
-    color: #FFFFFF;
-    border: 1px;
-    border-style: solid;
-    border-color: rgba(100,100,100,0.5);
-    background: rgba(0, 0, 0,0.3);
-    margin-top: 8px;
-    margin-bottom: 8px;
-    border-radius: 8px;
-    padding: 8px;
+    color: #EBDBB2;
 }
 
 #wireplumber {
-    color: #FFFFFF;
-    border: 1px;
-    border-style: solid;
-    border-color: rgba(100,100,100,0.5);
-    background: rgba(0, 0, 0,0.3);
-    margin-top: 8px;
-    margin-bottom: 8px;
-    border-radius: 8px;
-    padding: 8px;
+    color: #EBDBB2;
 }
 
-#image {
-    margin-left: 3px;
-    margin-right: 8px;
-    color: #FFFFFF;
-    border: 1px;
-    border-style: solid;
-    border-color: rgba(100,100,100,0.5);
-    margin-top: 8px;
-    margin-bottom: 8px;
-}
-
-
-
 #cpu {
-    margin-left: 15px;
     color: @yellow;
 }
 
 #memory {
-    margin-right: 5px;
-    color: #FFFFFF;
-    border: 1px;
-    border-style: solid;
-    border-color: rgba(100,100,100,0.5);
-    background: rgba(0, 0, 0,0.3);
-    margin-top: 8px;
-    margin-bottom: 8px;
-    border-radius: 8px;
-    padding: 8px;
+    color: #EBDBB2;
 }
 
 #temperature {
-    color: #FFFFFF;
-    border: 1px;
-    border-style: solid;
-    border-color: rgba(100,100,100,0.5);
-    background: rgba(0, 0, 0,0.3);
-    margin-top: 8px;
-    margin-bottom: 8px;
-    border-radius: 8px;
-    padding: 8px;
-}
-
-#custom-separator {
-    color: #BBBBBB;
+    color: #EBDBB2;
 }
 
 #clock {
-    margin-right: 5px;
-    color: #FFFFFF;
-    border: 1px;
-    border-style: solid;
-    border-color: rgba(100,100,100,0.5);
-    background: rgba(0, 0, 0,0.3);
-    margin-top: 8px;
-    margin-bottom: 8px;
-    border-radius: 8px;
-    padding: 8px;
+    color: #EBDBB2;
+    margin-right: 10px;
 }
 
 #tray {
-    margin-right: 15px;
     color: @red;
 }
diff --git a/.zshrc b/.zshrc
new file mode 100644
index 0000000..6bb4380
--- /dev/null
+++ b/.zshrc
@@ -0,0 +1,6 @@
+# Enable colors and change prompt:
+autoload -U colors && colors	# Load colors
+PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
+setopt autocd		# Automatically cd into typed directory.
+stty stop undef		# Disable ctrl-s to freeze terminal.
+setopt interactive_comments
diff --git a/dependencies.txt b/dependencies.txt
index fbcf7c3..8fea858 100644
--- a/dependencies.txt
+++ b/dependencies.txt
@@ -1,31 +1,37 @@
+#hyprland
 hyprland
+xdg-desktop-portal-hyprland
+hyprpaper
+hyprlock
+hypridle
+
+#sound
 pipewire
 pipewire-pulse
 pipewire-alsa
 wireplumber
+
+#fonts
+libertinus-font 
+noto-fonts
+noto-fonts-emoji
+
+#apps
 firefox
 wl-clipboard
 wofi
-#kitty
 foot
 waybar
 neovim
-ttf-liberation-mono-nerd
-ttf-ubuntu-nerd
-noto-fonts-emoji
-xdg-desktop-portal-hyprland
 obs-studio
 qt6-base
 qt6-wayland
 grim
 slurp
-fish
+zsh
 mpv
 yt-dlp
 fastfetch
-hyprpaper
-hyprlock
-hypridle
 mako
 unzip
 imv
@@ -35,3 +41,4 @@ ffmpegthumbnailer
 mediainfo
 bat
 chafa
+
diff --git a/fishrice b/fishrice
deleted file mode 100755
index 3b5273a..0000000
--- a/fishrice
+++ /dev/null
@@ -1,2 +0,0 @@
-fish_config prompt save pythonista
-set -U fish_greeting
diff --git a/rice.sh b/rice.sh
index 198f786..848190e 100755
--- a/rice.sh
+++ b/rice.sh
@@ -13,6 +13,7 @@ pacman -S $DEPLIST --noconfirm
 usermod -aG seat,input,audio,video $PERMUSER
 doas -u $PERMUSER cp -r $WORKDIRECTORY/.config /home/$PERMUSER
 
+doas -u $PERMUSER mkdir -p /home/$PERMUSER/.cache/lf
 doas -u $PERMUSER mkdir -p /home/$PERMUSER/.local/share/themes
 doas -u $PERMUSER mkdir -p /home/$PERMUSER/.local/share/icons
 doas -u $PERMUSER mkdir -p /home/$PERMUSER/.local/share/papes
@@ -29,12 +30,6 @@ doas -u $PERMUSER dbus-launch gsettings set org.gnome.desktop.wm.preferences but
 doas -u $PERMUSER dbus-launch gsettings set org.gnome.desktop.interface cursor-theme "Adwaita"
 doas -u $PERMUSER dbus-launch gsettings set org.gnome.desktop.interface font-name "Ubuntu Nerd Font 11"
 
-su - $PERMUSER -c "yes | fish $WORKDIRECTORY/fishrice"
-echo "[ -x /usr/bin/fish ] && SHELL=/usr/bin/fish exec fish" >> /home/$PERMUSER/.bashrc
-doas -u $PERMUSER mkdir -p /home/$PERMUSER/.config/fish
-
-#echo -e '\033c\e[35mwelcome to the system, master >w<\e[36m' > /etc/issue
-#sed -i "s/seat\ -n\ 3/seat -n 3 -l silent/g" /etc/runit/sv/seatd/run
 cd $WORKDIRECTORY
 cd ..
 rm -rf hyprdots