diff --git a/ags/styles/colors.scss b/ags/styles/colors.scss
deleted file mode 100644
index dba36a0..0000000
--- a/ags/styles/colors.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-// SCSS Variables
-// Generated by 'wal'
-$wallpaper: "/home/sadorowo/images/wallpapers/youtube_Sheri_170.jpg";
-
-// Special
-$background: #f9f6f3;
-$foreground: #251F23;
-$cursor: #251F23;
-
-// Colors
-$color0: #f9f6f3;
-$color1: #AB8772;
-$color2: #D69768;
-$color3: #727188;
-$color4: #897A85;
-$color5: #79869C;
-$color6: #A29597;
-$color7: #251F23;
-$color8: #82766c;
-$color9: #AB8772;
-$color10: #D69768;
-$color11: #727188;
-$color12: #897A85;
-$color13: #79869C;
-$color14: #A29597;
-$color15: #251F23;
diff --git a/ags/styles/components/_bar.scss b/ags/styles/components/_bar.scss
index 109de5a..0d0d05d 100644
--- a/ags/styles/components/_bar.scss
+++ b/ags/styles/components/_bar.scss
@@ -1,4 +1,4 @@
-@use '../colors' as *;
+@use '../../../theme_colors.scss' as *;
window.bar {
font-weight: bold;
@@ -10,17 +10,17 @@ window.bar {
>.inner {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
- background: $color5;
+ background: $base0B;
padding: 0.25rem 1rem;
margin: 0;
- * { color: $color0; }
+ * { color: $base00; }
}
.tray .item {
padding: 0;
margin: 0;
- background: $color5;
+ background: $base0B;
image {
padding: 0;
diff --git a/ags/styles/components/_battery_info.scss b/ags/styles/components/_battery_info.scss
index 51f1aec..1e79d3d 100644
--- a/ags/styles/components/_battery_info.scss
+++ b/ags/styles/components/_battery_info.scss
@@ -1,10 +1,10 @@
-@use '../colors' as *;
+@use '../../../theme_colors.scss' as *;
window.battery_info {
font-weight: bold;
>box {
- border: 1px solid $color0;
+ border: 1px solid $base00;
border-radius: 10px;
margin: 8px;
}
@@ -12,7 +12,7 @@ window.battery_info {
>.inner {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
- background: $color5;
+ background: $base0B;
padding: 0.75rem 3rem;
margin: 0;
@@ -22,7 +22,7 @@ window.battery_info {
* {
transition: all 0.2s ease-in-out;
- color: $color0;
+ color: $base00;
}
}
@@ -33,24 +33,24 @@ window.battery_info {
window.battery_info button {
transition: all 0.2s ease-in-out;
- background: $color5;
- border: 2px solid $color0;
+ background: $base0B;
+ border: 2px solid $base00;
margin: 5px;
&:hover {
- background: $color0;
+ background: $base00;
* {
- color: $color5;
+ color: $base0B;
}
}
&.active {
- background: $color0;
- border: 0.5px solid $color5;
+ background: $base00;
+ border: 0.5px solid $base0B;
* {
- color: $color5;
+ color: $base0B;
}
}
}
\ No newline at end of file
diff --git a/ags/styles/components/_clipboard.scss b/ags/styles/components/_clipboard.scss
index e17eadb..3d81590 100644
--- a/ags/styles/components/_clipboard.scss
+++ b/ags/styles/components/_clipboard.scss
@@ -1,51 +1,51 @@
-@use '../colors' as *;
+@use '../../../theme_colors.scss' as *;
.clipboard {
entry {
- background: $color5;
- color: $color0;
+ background: $base0B;
+ color: $base00;
padding: 8px 12px;
border: none;
margin-bottom: 6px;
&:focus {
- outline: 2px solid $color0;
+ outline: 2px solid $base00;
}
}
.entry.primary {
- background: $color3;
+ background: $base00;
&:hover>.content {
- color: $color3;
+ color: $base0B;
}
}
.entry {
padding: 10px;
- background: $color5;
+ background: $base0B;
border-radius: 8px;
transition: background 0.2s ease;
&:hover {
- background: $color0;
+ background: $base00;
>.content {
- color: $color5;
+ color: $base0B;
}
}
.content {
- color: $color0;
+ color: $base00;
font-size: 14px;
font-weight: 600;
}
}
.not-found {
- background: $color5;
- color: $color0;
+ background: $base0B;
+ color: $base00;
font-size: 14px;
padding: 10px;
border-radius: 8px;
diff --git a/ags/styles/components/_launcher.scss b/ags/styles/components/_launcher.scss
index 684a04f..7de36e8 100644
--- a/ags/styles/components/_launcher.scss
+++ b/ags/styles/components/_launcher.scss
@@ -1,31 +1,31 @@
-@use '../colors' as *;
+@use '../../../theme_colors.scss' as *;
.launcher {
entry {
- background: $color5;
- color: $color0;
+ background: $base0B;
+ color: $base00;
padding: 8px 12px;
border: none;
margin-bottom: 6px;
&:focus {
- outline: 2px solid $color0;
+ outline: 2px solid $base00;
}
}
.application {
padding: 10px;
- background: $color5;
+ background: $base0B;
border-radius: 8px;
transition: background 0.2s ease;
&:hover {
- background: $color0;
+ background: $base00;
box>.name,
box>.description {
- color: $color5;
+ color: $base0B;
}
}
@@ -34,20 +34,20 @@
}
.name {
- color: $color0;
+ color: $base00;
font-size: 14px;
font-weight: 600;
}
.description {
- color: $color0;
+ color: $base00;
font-size: 12px;
}
}
.not-found {
- background: $color5;
- color: $color0;
+ background: $base0B;
+ color: $base00;
font-size: 14px;
padding: 10px;
border-radius: 8px;
diff --git a/ags/styles/components/_quick_settings.scss b/ags/styles/components/_quick_settings.scss
index 7a877a9..1711221 100644
--- a/ags/styles/components/_quick_settings.scss
+++ b/ags/styles/components/_quick_settings.scss
@@ -1,10 +1,10 @@
-@use '../colors' as *;
+@use '../../../theme_colors.scss' as *;
window.quick_settings {
font-weight: bold;
>box {
- border: 1px solid $color0;
+ border: 1px solid $base00;
border-radius: 10px;
margin: 8px;
}
@@ -12,13 +12,13 @@ window.quick_settings {
>.inner {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
- background: $color5;
+ background: $base0B;
padding: 0.75rem 3rem;
margin: 0;
* {
transition: all 0.2s ease-in-out;
- color: $color0;
+ color: $base00;
}
}
@@ -29,11 +29,11 @@ window.quick_settings {
window.qs_bluetooth {
>.inner {
- background: $color5;
+ background: $base0B;
padding: 0.75rem 3rem;
border-radius: 10px;
- * { color: $color0; }
+ * { color: $base00; }
}
.device {
@@ -47,24 +47,24 @@ window.qs_bluetooth {
window.quick_settings button, window.qs_bluetooth button {
transition: all 0.2s ease-in-out;
- background: $color5;
- border: 2px solid $color0;
+ background: $base0B;
+ border: 2px solid $base00;
margin: 5px;
&:hover {
- background: $color0;
+ background: $base00;
* {
- color: $color5;
+ color: $base0B;
}
}
&.active {
- background: $color0;
- border: 0.5px solid $color5;
+ background: $base00;
+ border: 0.5px solid $base0B;
* {
- color: $color5;
+ color: $base0B;
}
}
}
diff --git a/ags/styles/style.scss b/ags/styles/style.scss
index 4ae046b..6ff7fbd 100644
--- a/ags/styles/style.scss
+++ b/ags/styles/style.scss
@@ -1,5 +1,6 @@
+@use '../../../theme_colors.scss' as *;
+
@use 'variables' as *;
-@use 'colors' as *;
@use 'mixins';
@use 'classes';
@use 'components';
@@ -9,11 +10,11 @@
}
separator {
- background: $color0;
+ background: $base00;
}
popover>contents, calendar {
- background: $color5;
+ background: $base0B;
}
button, button:hover {
@@ -21,7 +22,7 @@ button, button:hover {
}
popover modelbutton {
- &:hover, &:focus { background: $color6; }
+ &:hover, &:focus { background: $base0C; }
}
image {
diff --git a/hypr/config/animations.conf b/hypr/config/animations.conf
index 12578b3..45ce499 100644
--- a/hypr/config/animations.conf
+++ b/hypr/config/animations.conf
@@ -14,7 +14,7 @@ animations {
animation = workspaces, 1, 6, default
animation = layersIn, 1, 3, menuOpen, slide
- animation = layersOut, 1, 1.6, menuClose
+ animation = layersOut, 1, 1.6, menuClose, slide
animation = fadeLayersIn, 1, 2, menuOpen
animation = fadeLayersOut, 1, 4.5, menuClose
}
diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf
new file mode 120000
index 0000000..723103c
--- /dev/null
+++ b/hypr/hyprpaper.conf
@@ -0,0 +1 @@
+/nix/store/9pn39dgph6rpfvw2dmw4qn2qcsk3bqmn-home-manager-files/.config/hypr/hyprpaper.conf
\ No newline at end of file
diff --git a/hypr/scripts/random-wallpaper.sh b/hypr/scripts/random-wallpaper.sh
deleted file mode 100755
index e604c9b..0000000
--- a/hypr/scripts/random-wallpaper.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env -S bash
-
-WALLPAPER_DIR="$HOME/images/wallpapers"
-THEME=$(darkman get)
-FLAGS=()
-
-if [ ! -d "$WALLPAPER_DIR" ]; then
- echo "Wallpaper directory does not exist: $WALLPAPER_DIR"
- exit 1
-fi
-
-if [[ "$THEME" == "light" ]]; then
- FLAGS+=("-l")
-fi
-
-WALLPAPER=$(find "$WALLPAPER_DIR" -type f \( -iname "*.jpg" -o -iname "*.png" -o -iname "*.jpeg" \) | shuf -n 1)
-
-swww img "$WALLPAPER" \
- --transition-type random \
- --transition-duration 0.8 \
- --transition-fps 60
-
-if command -v "wal" &> /dev/null; then
- wal -i "$WALLPAPER" -n ${FLAGS[@]}
- cp ~/.cache/wal/colors.scss ~/.config/ags/styles/colors.scss
-fi
-
-if command -v "pywalfox" &> /dev/null; then
- pywalfox $THEME
- pywalfox update
-fi
diff --git a/wal/templates/colors-hyprland.conf b/wal/templates/colors-hyprland.conf
deleted file mode 100644
index 6cacf92..0000000
--- a/wal/templates/colors-hyprland.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-$foreground = rgb({foreground.strip})
-$background = rgb({color0.strip})
-
-$color0 = rgb({color0.strip})
-$color1 = rgb({color1.strip})
-$color2 = rgb({color2.strip})
-$color3 = rgb({color3.strip})
-$color4 = rgb({color4.strip})
-$color5 = rgb({color5.strip})
-$color6 = rgb({color6.strip})
-$color7 = rgb({color7.strip})
-$color8 = rgb({color8.strip})
-$color9 = rgb({color9.strip})
-$color10 = rgb({color10.strip})
-$color11 = rgb({color11.strip})
-$color12 = rgb({color12.strip})
-$color13 = rgb({color13.strip})
-$color14 = rgb({color14.strip})
-$color15 = rgb({color15.strip})